diff options
Diffstat (limited to 'arch')
658 files changed, 28701 insertions, 9776 deletions
diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile index 4e1a8e2c4541..4759fe751aa1 100644 --- a/arch/alpha/Makefile +++ b/arch/alpha/Makefile | |||
| @@ -13,6 +13,7 @@ NM := $(NM) -B | |||
| 13 | LDFLAGS_vmlinux := -static -N #-relax | 13 | LDFLAGS_vmlinux := -static -N #-relax |
| 14 | CHECKFLAGS += -D__alpha__ -m64 | 14 | CHECKFLAGS += -D__alpha__ -m64 |
| 15 | cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data | 15 | cflags-y := -pipe -mno-fp-regs -ffixed-8 -msmall-data |
| 16 | cflags-y += $(call cc-option, -fno-jump-tables) | ||
| 16 | 17 | ||
| 17 | cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 | 18 | cpuflags-$(CONFIG_ALPHA_EV4) := -mcpu=ev4 |
| 18 | cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 | 19 | cpuflags-$(CONFIG_ALPHA_EV5) := -mcpu=ev5 |
diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c index c0750291b44a..d9980d47ab81 100644 --- a/arch/alpha/kernel/core_t2.c +++ b/arch/alpha/kernel/core_t2.c | |||
| @@ -74,6 +74,8 @@ | |||
| 74 | # define DBG(args) | 74 | # define DBG(args) |
| 75 | #endif | 75 | #endif |
| 76 | 76 | ||
| 77 | DEFINE_SPINLOCK(t2_hae_lock); | ||
| 78 | |||
| 77 | static volatile unsigned int t2_mcheck_any_expected; | 79 | static volatile unsigned int t2_mcheck_any_expected; |
| 78 | static volatile unsigned int t2_mcheck_last_taken; | 80 | static volatile unsigned int t2_mcheck_last_taken; |
| 79 | 81 | ||
diff --git a/arch/alpha/kernel/init_task.c b/arch/alpha/kernel/init_task.c index 835d09a7b332..1f762189fa64 100644 --- a/arch/alpha/kernel/init_task.c +++ b/arch/alpha/kernel/init_task.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | static struct fs_struct init_fs = INIT_FS; | 11 | static struct fs_struct init_fs = INIT_FS; |
| 12 | static struct files_struct init_files = INIT_FILES; | ||
| 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 15 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 36ab22a7ea12..5cf45fc51343 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c | |||
| @@ -71,6 +71,23 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_i | |||
| 71 | static void __init | 71 | static void __init |
| 72 | quirk_cypress(struct pci_dev *dev) | 72 | quirk_cypress(struct pci_dev *dev) |
| 73 | { | 73 | { |
| 74 | /* The Notorious Cy82C693 chip. */ | ||
| 75 | |||
| 76 | /* The generic legacy mode IDE fixup in drivers/pci/probe.c | ||
| 77 | doesn't work correctly with the Cypress IDE controller as | ||
| 78 | it has non-standard register layout. Fix that. */ | ||
| 79 | if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE) { | ||
| 80 | dev->resource[2].start = dev->resource[3].start = 0; | ||
| 81 | dev->resource[2].end = dev->resource[3].end = 0; | ||
| 82 | dev->resource[2].flags = dev->resource[3].flags = 0; | ||
| 83 | if (PCI_FUNC(dev->devfn) == 2) { | ||
| 84 | dev->resource[0].start = 0x170; | ||
| 85 | dev->resource[0].end = 0x177; | ||
| 86 | dev->resource[1].start = 0x376; | ||
| 87 | dev->resource[1].end = 0x376; | ||
| 88 | } | ||
| 89 | } | ||
| 90 | |||
| 74 | /* The Cypress bridge responds on the PCI bus in the address range | 91 | /* The Cypress bridge responds on the PCI bus in the address range |
| 75 | 0xffff0000-0xffffffff (conventional x86 BIOS ROM). There is no | 92 | 0xffff0000-0xffffffff (conventional x86 BIOS ROM). There is no |
| 76 | way to turn this off. The bridge also supports several extended | 93 | way to turn this off. The bridge also supports several extended |
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index dc57790250d2..c778779007fc 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c | |||
| @@ -447,7 +447,7 @@ struct unaligned_stat { | |||
| 447 | 447 | ||
| 448 | 448 | ||
| 449 | /* Macro for exception fixup code to access integer registers. */ | 449 | /* Macro for exception fixup code to access integer registers. */ |
| 450 | #define una_reg(r) (regs->regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) | 450 | #define una_reg(r) (_regs[(r) >= 16 && (r) <= 18 ? (r)+19 : (r)]) |
| 451 | 451 | ||
| 452 | 452 | ||
| 453 | asmlinkage void | 453 | asmlinkage void |
| @@ -456,6 +456,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, | |||
| 456 | { | 456 | { |
| 457 | long error, tmp1, tmp2, tmp3, tmp4; | 457 | long error, tmp1, tmp2, tmp3, tmp4; |
| 458 | unsigned long pc = regs->pc - 4; | 458 | unsigned long pc = regs->pc - 4; |
| 459 | unsigned long *_regs = regs->regs; | ||
| 459 | const struct exception_table_entry *fixup; | 460 | const struct exception_table_entry *fixup; |
| 460 | 461 | ||
| 461 | unaligned[0].count++; | 462 | unaligned[0].count++; |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b786e68914d4..b92925c70172 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -84,6 +84,11 @@ config STACKTRACE_SUPPORT | |||
| 84 | bool | 84 | bool |
| 85 | default y | 85 | default y |
| 86 | 86 | ||
| 87 | config HAVE_LATENCYTOP_SUPPORT | ||
| 88 | bool | ||
| 89 | depends on !SMP | ||
| 90 | default y | ||
| 91 | |||
| 87 | config LOCKDEP_SUPPORT | 92 | config LOCKDEP_SUPPORT |
| 88 | bool | 93 | bool |
| 89 | default y | 94 | default y |
| @@ -147,6 +152,10 @@ config FIQ | |||
| 147 | config ARCH_MTD_XIP | 152 | config ARCH_MTD_XIP |
| 148 | bool | 153 | bool |
| 149 | 154 | ||
| 155 | config GENERIC_HARDIRQS_NO__DO_IRQ | ||
| 156 | bool | ||
| 157 | def_bool y | ||
| 158 | |||
| 150 | if OPROFILE | 159 | if OPROFILE |
| 151 | 160 | ||
| 152 | config OPROFILE_ARMV6 | 161 | config OPROFILE_ARMV6 |
| @@ -232,13 +241,6 @@ config ARCH_CLPS711X | |||
| 232 | help | 241 | help |
| 233 | Support for Cirrus Logic 711x/721x based boards. | 242 | Support for Cirrus Logic 711x/721x based boards. |
| 234 | 243 | ||
| 235 | config ARCH_CO285 | ||
| 236 | bool "Co-EBSA285" | ||
| 237 | select FOOTBRIDGE | ||
| 238 | select FOOTBRIDGE_ADDIN | ||
| 239 | help | ||
| 240 | Support for Intel's EBSA285 companion chip. | ||
| 241 | |||
| 242 | config ARCH_EBSA110 | 244 | config ARCH_EBSA110 |
| 243 | bool "EBSA-110" | 245 | bool "EBSA-110" |
| 244 | select ISA | 246 | select ISA |
| @@ -299,6 +301,8 @@ config ARCH_IOP32X | |||
| 299 | depends on MMU | 301 | depends on MMU |
| 300 | select PLAT_IOP | 302 | select PLAT_IOP |
| 301 | select PCI | 303 | select PCI |
| 304 | select GENERIC_GPIO | ||
| 305 | select HAVE_GPIO_LIB | ||
| 302 | help | 306 | help |
| 303 | Support for Intel's 80219 and IOP32X (XScale) family of | 307 | Support for Intel's 80219 and IOP32X (XScale) family of |
| 304 | processors. | 308 | processors. |
| @@ -308,6 +312,8 @@ config ARCH_IOP33X | |||
| 308 | depends on MMU | 312 | depends on MMU |
| 309 | select PLAT_IOP | 313 | select PLAT_IOP |
| 310 | select PCI | 314 | select PCI |
| 315 | select GENERIC_GPIO | ||
| 316 | select HAVE_GPIO_LIB | ||
| 311 | help | 317 | help |
| 312 | Support for Intel's IOP33X (XScale) family of processors. | 318 | Support for Intel's IOP33X (XScale) family of processors. |
| 313 | 319 | ||
| @@ -347,6 +353,16 @@ config ARCH_L7200 | |||
| 347 | If you have any questions or comments about the Linux kernel port | 353 | If you have any questions or comments about the Linux kernel port |
| 348 | to this board, send e-mail to <sjhill@cotw.com>. | 354 | to this board, send e-mail to <sjhill@cotw.com>. |
| 349 | 355 | ||
| 356 | config ARCH_KIRKWOOD | ||
| 357 | bool "Marvell Kirkwood" | ||
| 358 | select PCI | ||
| 359 | select GENERIC_TIME | ||
| 360 | select GENERIC_CLOCKEVENTS | ||
| 361 | select PLAT_ORION | ||
| 362 | help | ||
| 363 | Support for the following Marvell Kirkwood series SoCs: | ||
| 364 | 88F6180, 88F6192 and 88F6281. | ||
| 365 | |||
| 350 | config ARCH_KS8695 | 366 | config ARCH_KS8695 |
| 351 | bool "Micrel/Kendin KS8695" | 367 | bool "Micrel/Kendin KS8695" |
| 352 | select GENERIC_GPIO | 368 | select GENERIC_GPIO |
| @@ -365,6 +381,24 @@ config ARCH_NS9XXX | |||
| 365 | 381 | ||
| 366 | <http://www.digi.com/products/microprocessors/index.jsp> | 382 | <http://www.digi.com/products/microprocessors/index.jsp> |
| 367 | 383 | ||
| 384 | config ARCH_LOKI | ||
| 385 | bool "Marvell Loki (88RC8480)" | ||
| 386 | select GENERIC_TIME | ||
| 387 | select GENERIC_CLOCKEVENTS | ||
| 388 | select PLAT_ORION | ||
| 389 | help | ||
| 390 | Support for the Marvell Loki (88RC8480) SoC. | ||
| 391 | |||
| 392 | config ARCH_MV78XX0 | ||
| 393 | bool "Marvell MV78xx0" | ||
| 394 | select PCI | ||
| 395 | select GENERIC_TIME | ||
| 396 | select GENERIC_CLOCKEVENTS | ||
| 397 | select PLAT_ORION | ||
| 398 | help | ||
| 399 | Support for the following Marvell MV78xx0 series SoCs: | ||
| 400 | MV781x0, MV782x0. | ||
| 401 | |||
| 368 | config ARCH_MXC | 402 | config ARCH_MXC |
| 369 | bool "Freescale MXC/iMX-based" | 403 | bool "Freescale MXC/iMX-based" |
| 370 | select ARCH_MTD_XIP | 404 | select ARCH_MTD_XIP |
| @@ -381,7 +415,8 @@ config ARCH_ORION5X | |||
| 381 | select PLAT_ORION | 415 | select PLAT_ORION |
| 382 | help | 416 | help |
| 383 | Support for the following Marvell Orion 5x series SoCs: | 417 | Support for the following Marvell Orion 5x series SoCs: |
| 384 | Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.) | 418 | Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), |
| 419 | Orion-2 (5281). | ||
| 385 | 420 | ||
| 386 | config ARCH_PNX4008 | 421 | config ARCH_PNX4008 |
| 387 | bool "Philips Nexperia PNX4008 Mobile" | 422 | bool "Philips Nexperia PNX4008 Mobile" |
| @@ -406,6 +441,7 @@ config ARCH_RPC | |||
| 406 | select FIQ | 441 | select FIQ |
| 407 | select TIMER_ACORN | 442 | select TIMER_ACORN |
| 408 | select ARCH_MAY_HAVE_PC_FDC | 443 | select ARCH_MAY_HAVE_PC_FDC |
| 444 | select HAVE_PATA_PLATFORM | ||
| 409 | select ISA_DMA_API | 445 | select ISA_DMA_API |
| 410 | select NO_IOPORT | 446 | select NO_IOPORT |
| 411 | help | 447 | help |
| @@ -502,6 +538,10 @@ source "arch/arm/mach-ixp2000/Kconfig" | |||
| 502 | 538 | ||
| 503 | source "arch/arm/mach-ixp23xx/Kconfig" | 539 | source "arch/arm/mach-ixp23xx/Kconfig" |
| 504 | 540 | ||
| 541 | source "arch/arm/mach-loki/Kconfig" | ||
| 542 | |||
| 543 | source "arch/arm/mach-mv78xx0/Kconfig" | ||
| 544 | |||
| 505 | source "arch/arm/mach-pxa/Kconfig" | 545 | source "arch/arm/mach-pxa/Kconfig" |
| 506 | 546 | ||
| 507 | source "arch/arm/mach-sa1100/Kconfig" | 547 | source "arch/arm/mach-sa1100/Kconfig" |
| @@ -514,6 +554,8 @@ source "arch/arm/mach-omap2/Kconfig" | |||
| 514 | 554 | ||
| 515 | source "arch/arm/mach-orion5x/Kconfig" | 555 | source "arch/arm/mach-orion5x/Kconfig" |
| 516 | 556 | ||
| 557 | source "arch/arm/mach-kirkwood/Kconfig" | ||
| 558 | |||
| 517 | source "arch/arm/plat-s3c24xx/Kconfig" | 559 | source "arch/arm/plat-s3c24xx/Kconfig" |
| 518 | source "arch/arm/plat-s3c/Kconfig" | 560 | source "arch/arm/plat-s3c/Kconfig" |
| 519 | 561 | ||
| @@ -703,27 +745,6 @@ config PREEMPT | |||
| 703 | Say Y here if you are building a kernel for a desktop, embedded | 745 | Say Y here if you are building a kernel for a desktop, embedded |
| 704 | or real-time system. Say N if you are unsure. | 746 | or real-time system. Say N if you are unsure. |
| 705 | 747 | ||
| 706 | config NO_IDLE_HZ | ||
| 707 | bool "Dynamic tick timer" | ||
| 708 | depends on !GENERIC_CLOCKEVENTS | ||
| 709 | help | ||
| 710 | Select this option if you want to disable continuous timer ticks | ||
| 711 | and have them programmed to occur as required. This option saves | ||
| 712 | power as the system can remain in idle state for longer. | ||
| 713 | |||
| 714 | By default dynamic tick is disabled during the boot, and can be | ||
| 715 | manually enabled with: | ||
| 716 | |||
| 717 | echo 1 > /sys/devices/system/timer/timer0/dyn_tick | ||
| 718 | |||
| 719 | Alternatively, if you want dynamic tick automatically enabled | ||
| 720 | during boot, pass "dyntick=enable" via the kernel command string. | ||
| 721 | |||
| 722 | Please note that dynamic tick may affect the accuracy of | ||
| 723 | timekeeping on some platforms depending on the implementation. | ||
| 724 | Currently at least OMAP, PXA2xx and SA11x0 platforms are known | ||
| 725 | to have accurate timekeeping with dynamic tick. | ||
| 726 | |||
| 727 | config HZ | 748 | config HZ |
| 728 | int | 749 | int |
| 729 | default 128 if ARCH_L7200 | 750 | default 128 if ARCH_L7200 |
| @@ -789,7 +810,7 @@ source "mm/Kconfig" | |||
| 789 | 810 | ||
| 790 | config LEDS | 811 | config LEDS |
| 791 | bool "Timer and CPU usage LEDs" | 812 | bool "Timer and CPU usage LEDs" |
| 792 | depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \ | 813 | depends on ARCH_CDB89712 || ARCH_EBSA110 || \ |
| 793 | ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ | 814 | ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ |
| 794 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ | 815 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ |
| 795 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ | 816 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e72db27e0ba0..91fac81833e8 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -100,8 +100,6 @@ textofs-y := 0x00008000 | |||
| 100 | incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 | 100 | incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 |
| 101 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 101 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
| 102 | incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 | 102 | incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 |
| 103 | machine-$(CONFIG_ARCH_CO285) := footbridge | ||
| 104 | incdir-$(CONFIG_ARCH_CO285) := ebsa285 | ||
| 105 | machine-$(CONFIG_ARCH_SHARK) := shark | 103 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 106 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 104 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| 107 | ifeq ($(CONFIG_ARCH_SA1100),y) | 105 | ifeq ($(CONFIG_ARCH_SA1100),y) |
| @@ -135,11 +133,14 @@ endif | |||
| 135 | machine-$(CONFIG_ARCH_NETX) := netx | 133 | machine-$(CONFIG_ARCH_NETX) := netx |
| 136 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | 134 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx |
| 137 | machine-$(CONFIG_ARCH_DAVINCI) := davinci | 135 | machine-$(CONFIG_ARCH_DAVINCI) := davinci |
| 136 | machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood | ||
| 138 | machine-$(CONFIG_ARCH_KS8695) := ks8695 | 137 | machine-$(CONFIG_ARCH_KS8695) := ks8695 |
| 139 | incdir-$(CONFIG_ARCH_MXC) := mxc | 138 | incdir-$(CONFIG_ARCH_MXC) := mxc |
| 140 | machine-$(CONFIG_ARCH_MX3) := mx3 | 139 | machine-$(CONFIG_ARCH_MX3) := mx3 |
| 141 | machine-$(CONFIG_ARCH_ORION5X) := orion5x | 140 | machine-$(CONFIG_ARCH_ORION5X) := orion5x |
| 142 | machine-$(CONFIG_ARCH_MSM7X00A) := msm | 141 | machine-$(CONFIG_ARCH_MSM7X00A) := msm |
| 142 | machine-$(CONFIG_ARCH_LOKI) := loki | ||
| 143 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | ||
| 143 | 144 | ||
| 144 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 145 | ifeq ($(CONFIG_ARCH_EBSA110),y) |
| 145 | # This is what happens if you forget the IOCS16 line. | 146 | # This is what happens if you forget the IOCS16 line. |
| @@ -190,8 +191,6 @@ core-$(CONFIG_PLAT_S3C24XX) += arch/arm/plat-s3c24xx/ | |||
| 190 | core-$(CONFIG_ARCH_MXC) += arch/arm/plat-mxc/ | 191 | core-$(CONFIG_ARCH_MXC) += arch/arm/plat-mxc/ |
| 191 | 192 | ||
| 192 | drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ | 193 | drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ |
| 193 | drivers-$(CONFIG_ARCH_CLPS7500) += drivers/acorn/char/ | ||
| 194 | drivers-$(CONFIG_ARCH_L7200) += drivers/acorn/char/ | ||
| 195 | 194 | ||
| 196 | libs-y := arch/arm/lib/ $(libs-y) | 195 | libs-y := arch/arm/lib/ $(libs-y) |
| 197 | 196 | ||
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index 67ea99ef6521..dd3fbd6766e1 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S | |||
| @@ -33,10 +33,6 @@ __XScale_start: | |||
| 33 | bic r0, r0, #0x1000 @ clear Icache | 33 | bic r0, r0, #0x1000 @ clear Icache |
| 34 | mcr p15, 0, r0, c1, c0, 0 | 34 | mcr p15, 0, r0, c1, c0, 0 |
| 35 | 35 | ||
| 36 | #ifdef CONFIG_ARCH_COTULLA_IDP | ||
| 37 | mov r7, #MACH_TYPE_COTULLA_IDP | ||
| 38 | #endif | ||
| 39 | |||
| 40 | #ifdef CONFIG_ARCH_IXP2000 | 36 | #ifdef CONFIG_ARCH_IXP2000 |
| 41 | mov r1, #-1 | 37 | mov r1, #-1 |
| 42 | mov r0, #0xd6000000 | 38 | mov r0, #0xd6000000 |
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 3c2c8f2a1dc4..de41daeab5e9 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -623,8 +623,8 @@ proc_types: | |||
| 623 | b __armv4_mmu_cache_off | 623 | b __armv4_mmu_cache_off |
| 624 | b __armv4_mmu_cache_flush | 624 | b __armv4_mmu_cache_flush |
| 625 | 625 | ||
| 626 | .word 0x56055310 @ Feroceon | 626 | .word 0x56050000 @ Feroceon |
| 627 | .word 0xfffffff0 | 627 | .word 0xff0f0000 |
| 628 | b __armv4_mmu_cache_on | 628 | b __armv4_mmu_cache_on |
| 629 | b __armv4_mmu_cache_off | 629 | b __armv4_mmu_cache_off |
| 630 | b __armv5tej_mmu_cache_flush | 630 | b __armv5tej_mmu_cache_flush |
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 3d0b9fa42f84..325e4b6a6afb 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y += rtctime.o | ||
| 6 | obj-$(CONFIG_ARM_GIC) += gic.o | 5 | obj-$(CONFIG_ARM_GIC) += gic.o |
| 7 | obj-$(CONFIG_ARM_VIC) += vic.o | 6 | obj-$(CONFIG_ARM_VIC) += vic.o |
| 8 | obj-$(CONFIG_ICST525) += icst525.o | 7 | obj-$(CONFIG_ICST525) += icst525.o |
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index 52fc6a883281..2744673314b4 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c | |||
| @@ -650,7 +650,8 @@ EXPORT_SYMBOL(dma_map_sg); | |||
| 650 | EXPORT_SYMBOL(dma_unmap_sg); | 650 | EXPORT_SYMBOL(dma_unmap_sg); |
| 651 | EXPORT_SYMBOL(dma_sync_single_for_cpu); | 651 | EXPORT_SYMBOL(dma_sync_single_for_cpu); |
| 652 | EXPORT_SYMBOL(dma_sync_single_for_device); | 652 | EXPORT_SYMBOL(dma_sync_single_for_device); |
| 653 | EXPORT_SYMBOL(dma_sync_sg); | 653 | EXPORT_SYMBOL(dma_sync_sg_for_cpu); |
| 654 | EXPORT_SYMBOL(dma_sync_sg_for_device); | ||
| 654 | EXPORT_SYMBOL(dmabounce_register_dev); | 655 | EXPORT_SYMBOL(dmabounce_register_dev); |
| 655 | EXPORT_SYMBOL(dmabounce_unregister_dev); | 656 | EXPORT_SYMBOL(dmabounce_unregister_dev); |
| 656 | 657 | ||
diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c deleted file mode 100644 index aa8f7739c822..000000000000 --- a/arch/arm/common/rtctime.c +++ /dev/null | |||
| @@ -1,434 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/common/rtctime.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2003 Deep Blue Solutions Ltd. | ||
| 5 | * Based on sa1100-rtc.c, Nils Faerber, CIH, Nicolas Pitre. | ||
| 6 | * Based on rtc.c by Paul Gortmaker | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | #include <linux/module.h> | ||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/time.h> | ||
| 15 | #include <linux/rtc.h> | ||
| 16 | #include <linux/poll.h> | ||
| 17 | #include <linux/proc_fs.h> | ||
| 18 | #include <linux/miscdevice.h> | ||
| 19 | #include <linux/spinlock.h> | ||
| 20 | #include <linux/capability.h> | ||
| 21 | #include <linux/device.h> | ||
| 22 | #include <linux/mutex.h> | ||
| 23 | |||
| 24 | #include <asm/rtc.h> | ||
| 25 | |||
| 26 | static DECLARE_WAIT_QUEUE_HEAD(rtc_wait); | ||
| 27 | static struct fasync_struct *rtc_async_queue; | ||
| 28 | |||
| 29 | /* | ||
| 30 | * rtc_lock protects rtc_irq_data | ||
| 31 | */ | ||
| 32 | static DEFINE_SPINLOCK(rtc_lock); | ||
| 33 | static unsigned long rtc_irq_data; | ||
| 34 | |||
| 35 | /* | ||
| 36 | * rtc_sem protects rtc_inuse and rtc_ops | ||
| 37 | */ | ||
| 38 | static DEFINE_MUTEX(rtc_mutex); | ||
| 39 | static unsigned long rtc_inuse; | ||
| 40 | static struct rtc_ops *rtc_ops; | ||
| 41 | |||
| 42 | #define rtc_epoch 1900UL | ||
| 43 | |||
| 44 | /* | ||
| 45 | * Calculate the next alarm time given the requested alarm time mask | ||
| 46 | * and the current time. | ||
| 47 | */ | ||
| 48 | void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc_time *alrm) | ||
| 49 | { | ||
| 50 | unsigned long next_time; | ||
| 51 | unsigned long now_time; | ||
| 52 | |||
| 53 | next->tm_year = now->tm_year; | ||
| 54 | next->tm_mon = now->tm_mon; | ||
| 55 | next->tm_mday = now->tm_mday; | ||
| 56 | next->tm_hour = alrm->tm_hour; | ||
| 57 | next->tm_min = alrm->tm_min; | ||
| 58 | next->tm_sec = alrm->tm_sec; | ||
| 59 | |||
| 60 | rtc_tm_to_time(now, &now_time); | ||
| 61 | rtc_tm_to_time(next, &next_time); | ||
| 62 | |||
| 63 | if (next_time < now_time) { | ||
| 64 | /* Advance one day */ | ||
| 65 | next_time += 60 * 60 * 24; | ||
| 66 | rtc_time_to_tm(next_time, next); | ||
| 67 | } | ||
| 68 | } | ||
| 69 | EXPORT_SYMBOL(rtc_next_alarm_time); | ||
| 70 | |||
| 71 | static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm) | ||
| 72 | { | ||
| 73 | memset(tm, 0, sizeof(struct rtc_time)); | ||
| 74 | return ops->read_time(tm); | ||
| 75 | } | ||
| 76 | |||
| 77 | static inline int rtc_arm_set_time(struct rtc_ops *ops, struct rtc_time *tm) | ||
| 78 | { | ||
| 79 | int ret; | ||
| 80 | |||
| 81 | ret = rtc_valid_tm(tm); | ||
| 82 | if (ret == 0) | ||
| 83 | ret = ops->set_time(tm); | ||
| 84 | |||
| 85 | return ret; | ||
| 86 | } | ||
| 87 | |||
| 88 | static inline int rtc_arm_read_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm) | ||
| 89 | { | ||
| 90 | int ret = -EINVAL; | ||
| 91 | if (ops->read_alarm) { | ||
| 92 | memset(alrm, 0, sizeof(struct rtc_wkalrm)); | ||
| 93 | ret = ops->read_alarm(alrm); | ||
| 94 | } | ||
| 95 | return ret; | ||
| 96 | } | ||
| 97 | |||
| 98 | static inline int rtc_arm_set_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm) | ||
| 99 | { | ||
| 100 | int ret = -EINVAL; | ||
| 101 | if (ops->set_alarm) | ||
| 102 | ret = ops->set_alarm(alrm); | ||
| 103 | return ret; | ||
| 104 | } | ||
| 105 | |||
| 106 | void rtc_update(unsigned long num, unsigned long events) | ||
| 107 | { | ||
| 108 | spin_lock(&rtc_lock); | ||
| 109 | rtc_irq_data = (rtc_irq_data + (num << 8)) | events; | ||
| 110 | spin_unlock(&rtc_lock); | ||
| 111 | |||
| 112 | wake_up_interruptible(&rtc_wait); | ||
| 113 | kill_fasync(&rtc_async_queue, SIGIO, POLL_IN); | ||
| 114 | } | ||
| 115 | EXPORT_SYMBOL(rtc_update); | ||
| 116 | |||
| 117 | |||
| 118 | static ssize_t | ||
| 119 | rtc_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | ||
| 120 | { | ||
| 121 | DECLARE_WAITQUEUE(wait, current); | ||
| 122 | unsigned long data; | ||
| 123 | ssize_t ret; | ||
| 124 | |||
| 125 | if (count < sizeof(unsigned long)) | ||
| 126 | return -EINVAL; | ||
| 127 | |||
| 128 | add_wait_queue(&rtc_wait, &wait); | ||
| 129 | do { | ||
| 130 | __set_current_state(TASK_INTERRUPTIBLE); | ||
| 131 | |||
| 132 | spin_lock_irq(&rtc_lock); | ||
| 133 | data = rtc_irq_data; | ||
| 134 | rtc_irq_data = 0; | ||
| 135 | spin_unlock_irq(&rtc_lock); | ||
| 136 | |||
| 137 | if (data != 0) { | ||
| 138 | ret = 0; | ||
| 139 | break; | ||
| 140 | } | ||
| 141 | if (file->f_flags & O_NONBLOCK) { | ||
| 142 | ret = -EAGAIN; | ||
| 143 | break; | ||
| 144 | } | ||
| 145 | if (signal_pending(current)) { | ||
| 146 | ret = -ERESTARTSYS; | ||
| 147 | break; | ||
| 148 | } | ||
| 149 | schedule(); | ||
| 150 | } while (1); | ||
| 151 | set_current_state(TASK_RUNNING); | ||
| 152 | remove_wait_queue(&rtc_wait, &wait); | ||
| 153 | |||
| 154 | if (ret == 0) { | ||
| 155 | ret = put_user(data, (unsigned long __user *)buf); | ||
| 156 | if (ret == 0) | ||
| 157 | ret = sizeof(unsigned long); | ||
| 158 | } | ||
| 159 | return ret; | ||
| 160 | } | ||
| 161 | |||
| 162 | static unsigned int rtc_poll(struct file *file, poll_table *wait) | ||
| 163 | { | ||
| 164 | unsigned long data; | ||
| 165 | |||
| 166 | poll_wait(file, &rtc_wait, wait); | ||
| 167 | |||
| 168 | spin_lock_irq(&rtc_lock); | ||
| 169 | data = rtc_irq_data; | ||
| 170 | spin_unlock_irq(&rtc_lock); | ||
| 171 | |||
| 172 | return data != 0 ? POLLIN | POLLRDNORM : 0; | ||
| 173 | } | ||
| 174 | |||
| 175 | static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | ||
| 176 | unsigned long arg) | ||
| 177 | { | ||
| 178 | struct rtc_ops *ops = file->private_data; | ||
| 179 | struct rtc_time tm; | ||
| 180 | struct rtc_wkalrm alrm; | ||
| 181 | void __user *uarg = (void __user *)arg; | ||
| 182 | int ret = -EINVAL; | ||
| 183 | |||
| 184 | switch (cmd) { | ||
| 185 | case RTC_ALM_READ: | ||
| 186 | ret = rtc_arm_read_alarm(ops, &alrm); | ||
| 187 | if (ret) | ||
| 188 | break; | ||
| 189 | ret = copy_to_user(uarg, &alrm.time, sizeof(tm)); | ||
| 190 | if (ret) | ||
| 191 | ret = -EFAULT; | ||
| 192 | break; | ||
| 193 | |||
| 194 | case RTC_ALM_SET: | ||
| 195 | ret = copy_from_user(&alrm.time, uarg, sizeof(tm)); | ||
| 196 | if (ret) { | ||
| 197 | ret = -EFAULT; | ||
| 198 | break; | ||
| 199 | } | ||
| 200 | alrm.enabled = 0; | ||
| 201 | alrm.pending = 0; | ||
| 202 | alrm.time.tm_mday = -1; | ||
| 203 | alrm.time.tm_mon = -1; | ||
| 204 | alrm.time.tm_year = -1; | ||
| 205 | alrm.time.tm_wday = -1; | ||
| 206 | alrm.time.tm_yday = -1; | ||
| 207 | alrm.time.tm_isdst = -1; | ||
| 208 | ret = rtc_arm_set_alarm(ops, &alrm); | ||
| 209 | break; | ||
| 210 | |||
| 211 | case RTC_RD_TIME: | ||
| 212 | ret = rtc_arm_read_time(ops, &tm); | ||
| 213 | if (ret) | ||
| 214 | break; | ||
| 215 | ret = copy_to_user(uarg, &tm, sizeof(tm)); | ||
| 216 | if (ret) | ||
| 217 | ret = -EFAULT; | ||
| 218 | break; | ||
| 219 | |||
| 220 | case RTC_SET_TIME: | ||
| 221 | if (!capable(CAP_SYS_TIME)) { | ||
| 222 | ret = -EACCES; | ||
| 223 | break; | ||
| 224 | } | ||
| 225 | ret = copy_from_user(&tm, uarg, sizeof(tm)); | ||
| 226 | if (ret) { | ||
| 227 | ret = -EFAULT; | ||
| 228 | break; | ||
| 229 | } | ||
| 230 | ret = rtc_arm_set_time(ops, &tm); | ||
| 231 | break; | ||
| 232 | |||
| 233 | case RTC_EPOCH_SET: | ||
| 234 | #ifndef rtc_epoch | ||
| 235 | /* | ||
| 236 | * There were no RTC clocks before 1900. | ||
| 237 | */ | ||
| 238 | if (arg < 1900) { | ||
| 239 | ret = -EINVAL; | ||
| 240 | break; | ||
| 241 | } | ||
| 242 | if (!capable(CAP_SYS_TIME)) { | ||
| 243 | ret = -EACCES; | ||
| 244 | break; | ||
| 245 | } | ||
| 246 | rtc_epoch = arg; | ||
| 247 | ret = 0; | ||
| 248 | #endif | ||
| 249 | break; | ||
| 250 | |||
| 251 | case RTC_EPOCH_READ: | ||
| 252 | ret = put_user(rtc_epoch, (unsigned long __user *)uarg); | ||
| 253 | break; | ||
| 254 | |||
| 255 | case RTC_WKALM_SET: | ||
| 256 | ret = copy_from_user(&alrm, uarg, sizeof(alrm)); | ||
| 257 | if (ret) { | ||
| 258 | ret = -EFAULT; | ||
| 259 | break; | ||
| 260 | } | ||
| 261 | ret = rtc_arm_set_alarm(ops, &alrm); | ||
| 262 | break; | ||
| 263 | |||
| 264 | case RTC_WKALM_RD: | ||
| 265 | ret = rtc_arm_read_alarm(ops, &alrm); | ||
| 266 | if (ret) | ||
| 267 | break; | ||
| 268 | ret = copy_to_user(uarg, &alrm, sizeof(alrm)); | ||
| 269 | if (ret) | ||
| 270 | ret = -EFAULT; | ||
| 271 | break; | ||
| 272 | |||
| 273 | default: | ||
| 274 | if (ops->ioctl) | ||
| 275 | ret = ops->ioctl(cmd, arg); | ||
| 276 | break; | ||
| 277 | } | ||
| 278 | return ret; | ||
| 279 | } | ||
| 280 | |||
| 281 | static int rtc_open(struct inode *inode, struct file *file) | ||
| 282 | { | ||
| 283 | int ret; | ||
| 284 | |||
| 285 | mutex_lock(&rtc_mutex); | ||
| 286 | |||
| 287 | if (rtc_inuse) { | ||
| 288 | ret = -EBUSY; | ||
| 289 | } else if (!rtc_ops || !try_module_get(rtc_ops->owner)) { | ||
| 290 | ret = -ENODEV; | ||
| 291 | } else { | ||
| 292 | file->private_data = rtc_ops; | ||
| 293 | |||
| 294 | ret = rtc_ops->open ? rtc_ops->open() : 0; | ||
| 295 | if (ret == 0) { | ||
| 296 | spin_lock_irq(&rtc_lock); | ||
| 297 | rtc_irq_data = 0; | ||
| 298 | spin_unlock_irq(&rtc_lock); | ||
| 299 | |||
| 300 | rtc_inuse = 1; | ||
| 301 | } | ||
| 302 | } | ||
| 303 | mutex_unlock(&rtc_mutex); | ||
| 304 | |||
| 305 | return ret; | ||
| 306 | } | ||
| 307 | |||
| 308 | static int rtc_release(struct inode *inode, struct file *file) | ||
| 309 | { | ||
| 310 | struct rtc_ops *ops = file->private_data; | ||
| 311 | |||
| 312 | if (ops->release) | ||
| 313 | ops->release(); | ||
| 314 | |||
| 315 | spin_lock_irq(&rtc_lock); | ||
| 316 | rtc_irq_data = 0; | ||
| 317 | spin_unlock_irq(&rtc_lock); | ||
| 318 | |||
| 319 | module_put(rtc_ops->owner); | ||
| 320 | rtc_inuse = 0; | ||
| 321 | |||
| 322 | return 0; | ||
| 323 | } | ||
| 324 | |||
| 325 | static int rtc_fasync(int fd, struct file *file, int on) | ||
| 326 | { | ||
| 327 | return fasync_helper(fd, file, on, &rtc_async_queue); | ||
| 328 | } | ||
| 329 | |||
| 330 | static const struct file_operations rtc_fops = { | ||
| 331 | .owner = THIS_MODULE, | ||
| 332 | .llseek = no_llseek, | ||
| 333 | .read = rtc_read, | ||
| 334 | .poll = rtc_poll, | ||
| 335 | .ioctl = rtc_ioctl, | ||
| 336 | .open = rtc_open, | ||
| 337 | .release = rtc_release, | ||
| 338 | .fasync = rtc_fasync, | ||
| 339 | }; | ||
| 340 | |||
| 341 | static struct miscdevice rtc_miscdev = { | ||
| 342 | .minor = RTC_MINOR, | ||
| 343 | .name = "rtc", | ||
| 344 | .fops = &rtc_fops, | ||
| 345 | }; | ||
| 346 | |||
| 347 | |||
| 348 | static int rtc_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) | ||
| 349 | { | ||
| 350 | struct rtc_ops *ops = data; | ||
| 351 | struct rtc_wkalrm alrm; | ||
| 352 | struct rtc_time tm; | ||
| 353 | char *p = page; | ||
| 354 | |||
| 355 | if (rtc_arm_read_time(ops, &tm) == 0) { | ||
| 356 | p += sprintf(p, | ||
| 357 | "rtc_time\t: %02d:%02d:%02d\n" | ||
| 358 | "rtc_date\t: %04d-%02d-%02d\n" | ||
| 359 | "rtc_epoch\t: %04lu\n", | ||
| 360 | tm.tm_hour, tm.tm_min, tm.tm_sec, | ||
| 361 | tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, | ||
| 362 | rtc_epoch); | ||
| 363 | } | ||
| 364 | |||
| 365 | if (rtc_arm_read_alarm(ops, &alrm) == 0) { | ||
| 366 | p += sprintf(p, "alrm_time\t: "); | ||
| 367 | if ((unsigned int)alrm.time.tm_hour <= 24) | ||
| 368 | p += sprintf(p, "%02d:", alrm.time.tm_hour); | ||
| 369 | else | ||
| 370 | p += sprintf(p, "**:"); | ||
| 371 | if ((unsigned int)alrm.time.tm_min <= 59) | ||
| 372 | p += sprintf(p, "%02d:", alrm.time.tm_min); | ||
| 373 | else | ||
| 374 | p += sprintf(p, "**:"); | ||
| 375 | if ((unsigned int)alrm.time.tm_sec <= 59) | ||
| 376 | p += sprintf(p, "%02d\n", alrm.time.tm_sec); | ||
| 377 | else | ||
| 378 | p += sprintf(p, "**\n"); | ||
| 379 | |||
| 380 | p += sprintf(p, "alrm_date\t: "); | ||
| 381 | if ((unsigned int)alrm.time.tm_year <= 200) | ||
| 382 | p += sprintf(p, "%04d-", alrm.time.tm_year + 1900); | ||
| 383 | else | ||
| 384 | p += sprintf(p, "****-"); | ||
| 385 | if ((unsigned int)alrm.time.tm_mon <= 11) | ||
| 386 | p += sprintf(p, "%02d-", alrm.time.tm_mon + 1); | ||
| 387 | else | ||
| 388 | p += sprintf(p, "**-"); | ||
| 389 | if ((unsigned int)alrm.time.tm_mday <= 31) | ||
| 390 | p += sprintf(p, "%02d\n", alrm.time.tm_mday); | ||
| 391 | else | ||
| 392 | p += sprintf(p, "**\n"); | ||
| 393 | p += sprintf(p, "alrm_wakeup\t: %s\n", | ||
| 394 | alrm.enabled ? "yes" : "no"); | ||
| 395 | p += sprintf(p, "alrm_pending\t: %s\n", | ||
| 396 | alrm.pending ? "yes" : "no"); | ||
| 397 | } | ||
| 398 | |||
| 399 | if (ops->proc) | ||
| 400 | p += ops->proc(p); | ||
| 401 | |||
| 402 | return p - page; | ||
| 403 | } | ||
| 404 | |||
| 405 | int register_rtc(struct rtc_ops *ops) | ||
| 406 | { | ||
| 407 | int ret = -EBUSY; | ||
| 408 | |||
| 409 | mutex_lock(&rtc_mutex); | ||
| 410 | if (rtc_ops == NULL) { | ||
| 411 | rtc_ops = ops; | ||
| 412 | |||
| 413 | ret = misc_register(&rtc_miscdev); | ||
| 414 | if (ret == 0) | ||
| 415 | create_proc_read_entry("driver/rtc", 0, NULL, | ||
| 416 | rtc_read_proc, ops); | ||
| 417 | } | ||
| 418 | mutex_unlock(&rtc_mutex); | ||
| 419 | |||
| 420 | return ret; | ||
| 421 | } | ||
| 422 | EXPORT_SYMBOL(register_rtc); | ||
| 423 | |||
| 424 | void unregister_rtc(struct rtc_ops *rtc) | ||
| 425 | { | ||
| 426 | mutex_lock(&rtc_mutex); | ||
| 427 | if (rtc == rtc_ops) { | ||
| 428 | remove_proc_entry("driver/rtc", NULL); | ||
| 429 | misc_deregister(&rtc_miscdev); | ||
| 430 | rtc_ops = NULL; | ||
| 431 | } | ||
| 432 | mutex_unlock(&rtc_mutex); | ||
| 433 | } | ||
| 434 | EXPORT_SYMBOL(unregister_rtc); | ||
diff --git a/arch/arm/configs/at91cap9adk_defconfig b/arch/arm/configs/at91cap9adk_defconfig index 47e722511bdf..be2b2f38fd94 100644 --- a/arch/arm/configs/at91cap9adk_defconfig +++ b/arch/arm/configs/at91cap9adk_defconfig | |||
| @@ -213,7 +213,6 @@ CONFIG_CPU_CP15_MMU=y | |||
| 213 | # | 213 | # |
| 214 | # CONFIG_TICK_ONESHOT is not set | 214 | # CONFIG_TICK_ONESHOT is not set |
| 215 | # CONFIG_PREEMPT is not set | 215 | # CONFIG_PREEMPT is not set |
| 216 | # CONFIG_NO_IDLE_HZ is not set | ||
| 217 | CONFIG_HZ=100 | 216 | CONFIG_HZ=100 |
| 218 | CONFIG_AEABI=y | 217 | CONFIG_AEABI=y |
| 219 | CONFIG_OABI_COMPAT=y | 218 | CONFIG_OABI_COMPAT=y |
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig index 2dbbbc3d4ac3..868fb7b9530b 100644 --- a/arch/arm/configs/at91rm9200dk_defconfig +++ b/arch/arm/configs/at91rm9200dk_defconfig | |||
| @@ -169,7 +169,6 @@ CONFIG_AT91_CF=y | |||
| 169 | # Kernel Features | 169 | # Kernel Features |
| 170 | # | 170 | # |
| 171 | # CONFIG_PREEMPT is not set | 171 | # CONFIG_PREEMPT is not set |
| 172 | # CONFIG_NO_IDLE_HZ is not set | ||
| 173 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 172 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 174 | CONFIG_SELECT_MEMORY_MODEL=y | 173 | CONFIG_SELECT_MEMORY_MODEL=y |
| 175 | CONFIG_FLATMEM_MANUAL=y | 174 | CONFIG_FLATMEM_MANUAL=y |
diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index 6e994f7820c6..de43fc675616 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig | |||
| @@ -160,7 +160,6 @@ CONFIG_ISA_DMA_API=y | |||
| 160 | # Kernel Features | 160 | # Kernel Features |
| 161 | # | 161 | # |
| 162 | # CONFIG_PREEMPT is not set | 162 | # CONFIG_PREEMPT is not set |
| 163 | # CONFIG_NO_IDLE_HZ is not set | ||
| 164 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 163 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 165 | CONFIG_SELECT_MEMORY_MODEL=y | 164 | CONFIG_SELECT_MEMORY_MODEL=y |
| 166 | CONFIG_FLATMEM_MANUAL=y | 165 | CONFIG_FLATMEM_MANUAL=y |
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index f659c938473f..2011adfa6758 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_defconfig | |||
| @@ -220,7 +220,6 @@ CONFIG_CPU_CP15_MMU=y | |||
| 220 | # | 220 | # |
| 221 | # CONFIG_TICK_ONESHOT is not set | 221 | # CONFIG_TICK_ONESHOT is not set |
| 222 | # CONFIG_PREEMPT is not set | 222 | # CONFIG_PREEMPT is not set |
| 223 | # CONFIG_NO_IDLE_HZ is not set | ||
| 224 | CONFIG_HZ=100 | 223 | CONFIG_HZ=100 |
| 225 | # CONFIG_AEABI is not set | 224 | # CONFIG_AEABI is not set |
| 226 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 225 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/at91sam9261ek_defconfig b/arch/arm/configs/at91sam9261ek_defconfig index 3802e85f7483..4049768962d2 100644 --- a/arch/arm/configs/at91sam9261ek_defconfig +++ b/arch/arm/configs/at91sam9261ek_defconfig | |||
| @@ -213,7 +213,6 @@ CONFIG_CPU_CP15_MMU=y | |||
| 213 | # | 213 | # |
| 214 | # CONFIG_TICK_ONESHOT is not set | 214 | # CONFIG_TICK_ONESHOT is not set |
| 215 | # CONFIG_PREEMPT is not set | 215 | # CONFIG_PREEMPT is not set |
| 216 | # CONFIG_NO_IDLE_HZ is not set | ||
| 217 | CONFIG_HZ=100 | 216 | CONFIG_HZ=100 |
| 218 | # CONFIG_AEABI is not set | 217 | # CONFIG_AEABI is not set |
| 219 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 218 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index 32a0d74e0c89..fa1c5aecb5a8 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig | |||
| @@ -213,7 +213,6 @@ CONFIG_CPU_CP15_MMU=y | |||
| 213 | # | 213 | # |
| 214 | # CONFIG_TICK_ONESHOT is not set | 214 | # CONFIG_TICK_ONESHOT is not set |
| 215 | # CONFIG_PREEMPT is not set | 215 | # CONFIG_PREEMPT is not set |
| 216 | # CONFIG_NO_IDLE_HZ is not set | ||
| 217 | CONFIG_HZ=100 | 216 | CONFIG_HZ=100 |
| 218 | # CONFIG_AEABI is not set | 217 | # CONFIG_AEABI is not set |
| 219 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 218 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/at91sam9rlek_defconfig b/arch/arm/configs/at91sam9rlek_defconfig index 98e6746d02be..d8ec5f9ca6ec 100644 --- a/arch/arm/configs/at91sam9rlek_defconfig +++ b/arch/arm/configs/at91sam9rlek_defconfig | |||
| @@ -211,7 +211,6 @@ CONFIG_CPU_CP15_MMU=y | |||
| 211 | # | 211 | # |
| 212 | # CONFIG_TICK_ONESHOT is not set | 212 | # CONFIG_TICK_ONESHOT is not set |
| 213 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
| 214 | # CONFIG_NO_IDLE_HZ is not set | ||
| 215 | CONFIG_HZ=100 | 214 | CONFIG_HZ=100 |
| 216 | # CONFIG_AEABI is not set | 215 | # CONFIG_AEABI is not set |
| 217 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 216 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/ateb9200_defconfig b/arch/arm/configs/ateb9200_defconfig index d846a492e5ce..85c80f723d8e 100644 --- a/arch/arm/configs/ateb9200_defconfig +++ b/arch/arm/configs/ateb9200_defconfig | |||
| @@ -171,7 +171,6 @@ CONFIG_AT91_CF=m | |||
| 171 | # Kernel Features | 171 | # Kernel Features |
| 172 | # | 172 | # |
| 173 | CONFIG_PREEMPT=y | 173 | CONFIG_PREEMPT=y |
| 174 | CONFIG_NO_IDLE_HZ=y | ||
| 175 | CONFIG_HZ=100 | 174 | CONFIG_HZ=100 |
| 176 | # CONFIG_AEABI is not set | 175 | # CONFIG_AEABI is not set |
| 177 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 176 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/cm_x270_defconfig b/arch/arm/configs/cm_x270_defconfig index 5cab08397ae7..33b201c3b309 100644 --- a/arch/arm/configs/cm_x270_defconfig +++ b/arch/arm/configs/cm_x270_defconfig | |||
| @@ -194,7 +194,6 @@ CONFIG_PCI_HOST_ITE8152=y | |||
| 194 | # | 194 | # |
| 195 | # CONFIG_TICK_ONESHOT is not set | 195 | # CONFIG_TICK_ONESHOT is not set |
| 196 | # CONFIG_PREEMPT is not set | 196 | # CONFIG_PREEMPT is not set |
| 197 | # CONFIG_NO_IDLE_HZ is not set | ||
| 198 | CONFIG_HZ=100 | 197 | CONFIG_HZ=100 |
| 199 | # CONFIG_AEABI is not set | 198 | # CONFIG_AEABI is not set |
| 200 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 199 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig index 4264e273202d..f7622e658163 100644 --- a/arch/arm/configs/collie_defconfig +++ b/arch/arm/configs/collie_defconfig | |||
| @@ -166,7 +166,6 @@ CONFIG_PCMCIA_SA1100=y | |||
| 166 | # Kernel Features | 166 | # Kernel Features |
| 167 | # | 167 | # |
| 168 | # CONFIG_PREEMPT is not set | 168 | # CONFIG_PREEMPT is not set |
| 169 | # CONFIG_NO_IDLE_HZ is not set | ||
| 170 | CONFIG_HZ=100 | 169 | CONFIG_HZ=100 |
| 171 | # CONFIG_AEABI is not set | 170 | # CONFIG_AEABI is not set |
| 172 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 171 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index e8980a9bb893..9b8748a8d9dd 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig | |||
| @@ -165,7 +165,6 @@ CONFIG_PCMCIA_PXA2XX=y | |||
| 165 | # Kernel Features | 165 | # Kernel Features |
| 166 | # | 166 | # |
| 167 | CONFIG_PREEMPT=y | 167 | CONFIG_PREEMPT=y |
| 168 | # CONFIG_NO_IDLE_HZ is not set | ||
| 169 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 168 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 170 | CONFIG_SELECT_MEMORY_MODEL=y | 169 | CONFIG_SELECT_MEMORY_MODEL=y |
| 171 | CONFIG_FLATMEM_MANUAL=y | 170 | CONFIG_FLATMEM_MANUAL=y |
diff --git a/arch/arm/configs/ecbat91_defconfig b/arch/arm/configs/ecbat91_defconfig index 90ed214e3673..cfeb817ad21a 100644 --- a/arch/arm/configs/ecbat91_defconfig +++ b/arch/arm/configs/ecbat91_defconfig | |||
| @@ -230,7 +230,6 @@ CONFIG_AT91_CF=y | |||
| 230 | # | 230 | # |
| 231 | # CONFIG_TICK_ONESHOT is not set | 231 | # CONFIG_TICK_ONESHOT is not set |
| 232 | CONFIG_PREEMPT=y | 232 | CONFIG_PREEMPT=y |
| 233 | # CONFIG_NO_IDLE_HZ is not set | ||
| 234 | CONFIG_HZ=100 | 233 | CONFIG_HZ=100 |
| 235 | # CONFIG_AEABI is not set | 234 | # CONFIG_AEABI is not set |
| 236 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 235 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig index 6bea0901bdf0..d3114c23603b 100644 --- a/arch/arm/configs/em_x270_defconfig +++ b/arch/arm/configs/em_x270_defconfig | |||
| @@ -197,7 +197,6 @@ CONFIG_XSCALE_PMU=y | |||
| 197 | # | 197 | # |
| 198 | # CONFIG_TICK_ONESHOT is not set | 198 | # CONFIG_TICK_ONESHOT is not set |
| 199 | # CONFIG_PREEMPT is not set | 199 | # CONFIG_PREEMPT is not set |
| 200 | # CONFIG_NO_IDLE_HZ is not set | ||
| 201 | CONFIG_HZ=100 | 200 | CONFIG_HZ=100 |
| 202 | CONFIG_AEABI=y | 201 | CONFIG_AEABI=y |
| 203 | CONFIG_OABI_COMPAT=y | 202 | CONFIG_OABI_COMPAT=y |
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig index 24a701ab33e5..21aa013793c6 100644 --- a/arch/arm/configs/ep93xx_defconfig +++ b/arch/arm/configs/ep93xx_defconfig | |||
| @@ -184,7 +184,6 @@ CONFIG_ARM_AMBA=y | |||
| 184 | # Kernel Features | 184 | # Kernel Features |
| 185 | # | 185 | # |
| 186 | # CONFIG_PREEMPT is not set | 186 | # CONFIG_PREEMPT is not set |
| 187 | # CONFIG_NO_IDLE_HZ is not set | ||
| 188 | CONFIG_HZ=100 | 187 | CONFIG_HZ=100 |
| 189 | # CONFIG_AEABI is not set | 188 | # CONFIG_AEABI is not set |
| 190 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 189 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig index ed487b90dbed..493ecee24f94 100644 --- a/arch/arm/configs/eseries_pxa_defconfig +++ b/arch/arm/configs/eseries_pxa_defconfig | |||
| @@ -251,7 +251,6 @@ CONFIG_PCMCIA_PXA2XX=m | |||
| 251 | # Kernel Features | 251 | # Kernel Features |
| 252 | # | 252 | # |
| 253 | # CONFIG_PREEMPT is not set | 253 | # CONFIG_PREEMPT is not set |
| 254 | # CONFIG_NO_IDLE_HZ is not set | ||
| 255 | CONFIG_HZ=100 | 254 | CONFIG_HZ=100 |
| 256 | CONFIG_AEABI=y | 255 | CONFIG_AEABI=y |
| 257 | CONFIG_OABI_COMPAT=y | 256 | CONFIG_OABI_COMPAT=y |
diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig index 988b4d13e76f..482e57061053 100644 --- a/arch/arm/configs/iop13xx_defconfig +++ b/arch/arm/configs/iop13xx_defconfig | |||
| @@ -197,7 +197,6 @@ CONFIG_PCI_LEGACY=y | |||
| 197 | # | 197 | # |
| 198 | # CONFIG_TICK_ONESHOT is not set | 198 | # CONFIG_TICK_ONESHOT is not set |
| 199 | # CONFIG_PREEMPT is not set | 199 | # CONFIG_PREEMPT is not set |
| 200 | # CONFIG_NO_IDLE_HZ is not set | ||
| 201 | CONFIG_HZ=100 | 200 | CONFIG_HZ=100 |
| 202 | # CONFIG_AEABI is not set | 201 | # CONFIG_AEABI is not set |
| 203 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 202 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig index 83f40d4041a6..8612f58e1056 100644 --- a/arch/arm/configs/iop32x_defconfig +++ b/arch/arm/configs/iop32x_defconfig | |||
| @@ -201,7 +201,6 @@ CONFIG_PCI_LEGACY=y | |||
| 201 | # | 201 | # |
| 202 | # CONFIG_TICK_ONESHOT is not set | 202 | # CONFIG_TICK_ONESHOT is not set |
| 203 | # CONFIG_PREEMPT is not set | 203 | # CONFIG_PREEMPT is not set |
| 204 | # CONFIG_NO_IDLE_HZ is not set | ||
| 205 | CONFIG_HZ=100 | 204 | CONFIG_HZ=100 |
| 206 | # CONFIG_AEABI is not set | 205 | # CONFIG_AEABI is not set |
| 207 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 206 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig index 917afb5ccfac..8b0098d19d08 100644 --- a/arch/arm/configs/iop33x_defconfig +++ b/arch/arm/configs/iop33x_defconfig | |||
| @@ -197,7 +197,6 @@ CONFIG_PCI_LEGACY=y | |||
| 197 | # | 197 | # |
| 198 | # CONFIG_TICK_ONESHOT is not set | 198 | # CONFIG_TICK_ONESHOT is not set |
| 199 | # CONFIG_PREEMPT is not set | 199 | # CONFIG_PREEMPT is not set |
| 200 | # CONFIG_NO_IDLE_HZ is not set | ||
| 201 | CONFIG_HZ=100 | 200 | CONFIG_HZ=100 |
| 202 | # CONFIG_AEABI is not set | 201 | # CONFIG_AEABI is not set |
| 203 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 202 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/ixp2000_defconfig b/arch/arm/configs/ixp2000_defconfig index f8f9793b526f..84680db6c615 100644 --- a/arch/arm/configs/ixp2000_defconfig +++ b/arch/arm/configs/ixp2000_defconfig | |||
| @@ -184,7 +184,6 @@ CONFIG_PCI=y | |||
| 184 | # Kernel Features | 184 | # Kernel Features |
| 185 | # | 185 | # |
| 186 | # CONFIG_PREEMPT is not set | 186 | # CONFIG_PREEMPT is not set |
| 187 | # CONFIG_NO_IDLE_HZ is not set | ||
| 188 | CONFIG_HZ=100 | 187 | CONFIG_HZ=100 |
| 189 | # CONFIG_AEABI is not set | 188 | # CONFIG_AEABI is not set |
| 190 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 189 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig index 27cf022dd807..4a2f7b2372db 100644 --- a/arch/arm/configs/ixp23xx_defconfig +++ b/arch/arm/configs/ixp23xx_defconfig | |||
| @@ -180,7 +180,6 @@ CONFIG_PCI=y | |||
| 180 | # Kernel Features | 180 | # Kernel Features |
| 181 | # | 181 | # |
| 182 | # CONFIG_PREEMPT is not set | 182 | # CONFIG_PREEMPT is not set |
| 183 | # CONFIG_NO_IDLE_HZ is not set | ||
| 184 | CONFIG_HZ=100 | 183 | CONFIG_HZ=100 |
| 185 | # CONFIG_AEABI is not set | 184 | # CONFIG_AEABI is not set |
| 186 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 185 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig index efa0485d2f7e..fc14932e3abd 100644 --- a/arch/arm/configs/ixp4xx_defconfig +++ b/arch/arm/configs/ixp4xx_defconfig | |||
| @@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y | |||
| 165 | CONFIG_MACH_NAS100D=y | 165 | CONFIG_MACH_NAS100D=y |
| 166 | CONFIG_MACH_DSMG600=y | 166 | CONFIG_MACH_DSMG600=y |
| 167 | CONFIG_ARCH_IXDP4XX=y | 167 | CONFIG_ARCH_IXDP4XX=y |
| 168 | CONFIG_MACH_FSG=y | ||
| 168 | CONFIG_CPU_IXP46X=y | 169 | CONFIG_CPU_IXP46X=y |
| 169 | CONFIG_CPU_IXP43X=y | 170 | CONFIG_CPU_IXP43X=y |
| 170 | CONFIG_MACH_GTWX5715=y | 171 | CONFIG_MACH_GTWX5715=y |
| @@ -770,7 +771,7 @@ CONFIG_ATA=y | |||
| 770 | # CONFIG_SATA_SIL24 is not set | 771 | # CONFIG_SATA_SIL24 is not set |
| 771 | # CONFIG_SATA_SIS is not set | 772 | # CONFIG_SATA_SIS is not set |
| 772 | # CONFIG_SATA_ULI is not set | 773 | # CONFIG_SATA_ULI is not set |
| 773 | # CONFIG_SATA_VIA is not set | 774 | CONFIG_SATA_VIA=y |
| 774 | # CONFIG_SATA_VITESSE is not set | 775 | # CONFIG_SATA_VITESSE is not set |
| 775 | # CONFIG_SATA_INIC162X is not set | 776 | # CONFIG_SATA_INIC162X is not set |
| 776 | # CONFIG_PATA_ALI is not set | 777 | # CONFIG_PATA_ALI is not set |
| @@ -1143,7 +1144,7 @@ CONFIG_HWMON=y | |||
| 1143 | # CONFIG_SENSORS_VIA686A is not set | 1144 | # CONFIG_SENSORS_VIA686A is not set |
| 1144 | # CONFIG_SENSORS_VT1211 is not set | 1145 | # CONFIG_SENSORS_VT1211 is not set |
| 1145 | # CONFIG_SENSORS_VT8231 is not set | 1146 | # CONFIG_SENSORS_VT8231 is not set |
| 1146 | # CONFIG_SENSORS_W83781D is not set | 1147 | CONFIG_SENSORS_W83781D=y |
| 1147 | # CONFIG_SENSORS_W83791D is not set | 1148 | # CONFIG_SENSORS_W83791D is not set |
| 1148 | # CONFIG_SENSORS_W83792D is not set | 1149 | # CONFIG_SENSORS_W83792D is not set |
| 1149 | # CONFIG_SENSORS_W83793 is not set | 1150 | # CONFIG_SENSORS_W83793 is not set |
| @@ -1334,8 +1335,8 @@ CONFIG_LEDS_CLASS=y | |||
| 1334 | # | 1335 | # |
| 1335 | # LED drivers | 1336 | # LED drivers |
| 1336 | # | 1337 | # |
| 1337 | # CONFIG_LEDS_IXP4XX is not set | ||
| 1338 | CONFIG_LEDS_GPIO=y | 1338 | CONFIG_LEDS_GPIO=y |
| 1339 | CONFIG_LEDS_FSG=y | ||
| 1339 | 1340 | ||
| 1340 | # | 1341 | # |
| 1341 | # LED Triggers | 1342 | # LED Triggers |
| @@ -1367,7 +1368,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1367 | # CONFIG_RTC_DRV_DS1672 is not set | 1368 | # CONFIG_RTC_DRV_DS1672 is not set |
| 1368 | # CONFIG_RTC_DRV_MAX6900 is not set | 1369 | # CONFIG_RTC_DRV_MAX6900 is not set |
| 1369 | # CONFIG_RTC_DRV_RS5C372 is not set | 1370 | # CONFIG_RTC_DRV_RS5C372 is not set |
| 1370 | # CONFIG_RTC_DRV_ISL1208 is not set | 1371 | CONFIG_RTC_DRV_ISL1208=y |
| 1371 | CONFIG_RTC_DRV_X1205=y | 1372 | CONFIG_RTC_DRV_X1205=y |
| 1372 | CONFIG_RTC_DRV_PCF8563=y | 1373 | CONFIG_RTC_DRV_PCF8563=y |
| 1373 | # CONFIG_RTC_DRV_PCF8583 is not set | 1374 | # CONFIG_RTC_DRV_PCF8583 is not set |
diff --git a/arch/arm/configs/kafa_defconfig b/arch/arm/configs/kafa_defconfig index ae51a40db6f9..6dd95a2c8d5d 100644 --- a/arch/arm/configs/kafa_defconfig +++ b/arch/arm/configs/kafa_defconfig | |||
| @@ -162,7 +162,6 @@ CONFIG_CPU_TLB_V4WBI=y | |||
| 162 | # Kernel Features | 162 | # Kernel Features |
| 163 | # | 163 | # |
| 164 | CONFIG_PREEMPT=y | 164 | CONFIG_PREEMPT=y |
| 165 | # CONFIG_NO_IDLE_HZ is not set | ||
| 166 | CONFIG_HZ=100 | 165 | CONFIG_HZ=100 |
| 167 | # CONFIG_AEABI is not set | 166 | # CONFIG_AEABI is not set |
| 168 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 167 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/kb9202_defconfig b/arch/arm/configs/kb9202_defconfig index c16537d9d67a..8e74c66f239d 100644 --- a/arch/arm/configs/kb9202_defconfig +++ b/arch/arm/configs/kb9202_defconfig | |||
| @@ -126,7 +126,6 @@ CONFIG_ISA_DMA_API=y | |||
| 126 | # | 126 | # |
| 127 | # Kernel Features | 127 | # Kernel Features |
| 128 | # | 128 | # |
| 129 | # CONFIG_NO_IDLE_HZ is not set | ||
| 130 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 129 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 131 | CONFIG_FLATMEM=y | 130 | CONFIG_FLATMEM=y |
| 132 | CONFIG_FLAT_NODE_MEM_MAP=y | 131 | CONFIG_FLAT_NODE_MEM_MAP=y |
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig new file mode 100644 index 000000000000..e3357ba10f1f --- /dev/null +++ b/arch/arm/configs/kirkwood_defconfig | |||
| @@ -0,0 +1,1426 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.26-rc5 | ||
| 4 | # Sun Jun 22 15:51:25 2008 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | CONFIG_GENERIC_GPIO=y | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 16 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 23 | CONFIG_GENERIC_HWEIGHT=y | ||
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 29 | |||
| 30 | # | ||
| 31 | # General setup | ||
| 32 | # | ||
| 33 | CONFIG_EXPERIMENTAL=y | ||
| 34 | CONFIG_BROKEN_ON_SMP=y | ||
| 35 | CONFIG_LOCK_KERNEL=y | ||
| 36 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 37 | CONFIG_LOCALVERSION="" | ||
| 38 | CONFIG_LOCALVERSION_AUTO=y | ||
| 39 | CONFIG_SWAP=y | ||
| 40 | CONFIG_SYSVIPC=y | ||
| 41 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 42 | # CONFIG_POSIX_MQUEUE is not set | ||
| 43 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 44 | # CONFIG_TASKSTATS is not set | ||
| 45 | # CONFIG_AUDIT is not set | ||
| 46 | # CONFIG_IKCONFIG is not set | ||
| 47 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 48 | # CONFIG_CGROUPS is not set | ||
| 49 | # CONFIG_GROUP_SCHED is not set | ||
| 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 51 | # CONFIG_RELAY is not set | ||
| 52 | # CONFIG_NAMESPACES is not set | ||
| 53 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 55 | CONFIG_SYSCTL=y | ||
| 56 | CONFIG_EMBEDDED=y | ||
| 57 | CONFIG_UID16=y | ||
| 58 | CONFIG_SYSCTL_SYSCALL=y | ||
| 59 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 60 | CONFIG_KALLSYMS=y | ||
| 61 | # CONFIG_KALLSYMS_ALL is not set | ||
| 62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 63 | CONFIG_HOTPLUG=y | ||
| 64 | CONFIG_PRINTK=y | ||
| 65 | CONFIG_BUG=y | ||
| 66 | CONFIG_ELF_CORE=y | ||
| 67 | CONFIG_COMPAT_BRK=y | ||
| 68 | CONFIG_BASE_FULL=y | ||
| 69 | CONFIG_FUTEX=y | ||
| 70 | CONFIG_ANON_INODES=y | ||
| 71 | CONFIG_EPOLL=y | ||
| 72 | CONFIG_SIGNALFD=y | ||
| 73 | CONFIG_TIMERFD=y | ||
| 74 | CONFIG_EVENTFD=y | ||
| 75 | CONFIG_SHMEM=y | ||
| 76 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 77 | CONFIG_SLAB=y | ||
| 78 | # CONFIG_SLUB is not set | ||
| 79 | # CONFIG_SLOB is not set | ||
| 80 | CONFIG_PROFILING=y | ||
| 81 | # CONFIG_MARKERS is not set | ||
| 82 | CONFIG_OPROFILE=y | ||
| 83 | CONFIG_HAVE_OPROFILE=y | ||
| 84 | CONFIG_KPROBES=y | ||
| 85 | CONFIG_KRETPROBES=y | ||
| 86 | CONFIG_HAVE_KPROBES=y | ||
| 87 | CONFIG_HAVE_KRETPROBES=y | ||
| 88 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 89 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 90 | CONFIG_SLABINFO=y | ||
| 91 | CONFIG_RT_MUTEXES=y | ||
| 92 | # CONFIG_TINY_SHMEM is not set | ||
| 93 | CONFIG_BASE_SMALL=0 | ||
| 94 | CONFIG_MODULES=y | ||
| 95 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 96 | CONFIG_MODULE_UNLOAD=y | ||
| 97 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 98 | # CONFIG_MODVERSIONS is not set | ||
| 99 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 100 | # CONFIG_KMOD is not set | ||
| 101 | CONFIG_BLOCK=y | ||
| 102 | # CONFIG_LBD is not set | ||
| 103 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 104 | # CONFIG_LSF is not set | ||
| 105 | # CONFIG_BLK_DEV_BSG is not set | ||
| 106 | |||
| 107 | # | ||
| 108 | # IO Schedulers | ||
| 109 | # | ||
| 110 | CONFIG_IOSCHED_NOOP=y | ||
| 111 | CONFIG_IOSCHED_AS=y | ||
| 112 | CONFIG_IOSCHED_DEADLINE=y | ||
| 113 | CONFIG_IOSCHED_CFQ=y | ||
| 114 | # CONFIG_DEFAULT_AS is not set | ||
| 115 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 116 | CONFIG_DEFAULT_CFQ=y | ||
| 117 | # CONFIG_DEFAULT_NOOP is not set | ||
| 118 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 119 | CONFIG_CLASSIC_RCU=y | ||
| 120 | |||
| 121 | # | ||
| 122 | # System Type | ||
| 123 | # | ||
| 124 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 125 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 126 | # CONFIG_ARCH_REALVIEW is not set | ||
| 127 | # CONFIG_ARCH_VERSATILE is not set | ||
| 128 | # CONFIG_ARCH_AT91 is not set | ||
| 129 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 130 | # CONFIG_ARCH_CLPS711X is not set | ||
| 131 | # CONFIG_ARCH_CO285 is not set | ||
| 132 | # CONFIG_ARCH_EBSA110 is not set | ||
| 133 | # CONFIG_ARCH_EP93XX is not set | ||
| 134 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 135 | # CONFIG_ARCH_NETX is not set | ||
| 136 | # CONFIG_ARCH_H720X is not set | ||
| 137 | # CONFIG_ARCH_IMX is not set | ||
| 138 | # CONFIG_ARCH_IOP13XX is not set | ||
| 139 | # CONFIG_ARCH_IOP32X is not set | ||
| 140 | # CONFIG_ARCH_IOP33X is not set | ||
| 141 | # CONFIG_ARCH_IXP23XX is not set | ||
| 142 | # CONFIG_ARCH_IXP2000 is not set | ||
| 143 | # CONFIG_ARCH_IXP4XX is not set | ||
| 144 | # CONFIG_ARCH_L7200 is not set | ||
| 145 | CONFIG_ARCH_KIRKWOOD=y | ||
| 146 | # CONFIG_ARCH_KS8695 is not set | ||
| 147 | # CONFIG_ARCH_NS9XXX is not set | ||
| 148 | # CONFIG_ARCH_LOKI is not set | ||
| 149 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 150 | # CONFIG_ARCH_MXC is not set | ||
| 151 | # CONFIG_ARCH_ORION5X is not set | ||
| 152 | # CONFIG_ARCH_PNX4008 is not set | ||
| 153 | # CONFIG_ARCH_PXA is not set | ||
| 154 | # CONFIG_ARCH_RPC is not set | ||
| 155 | # CONFIG_ARCH_SA1100 is not set | ||
| 156 | # CONFIG_ARCH_S3C2410 is not set | ||
| 157 | # CONFIG_ARCH_SHARK is not set | ||
| 158 | # CONFIG_ARCH_LH7A40X is not set | ||
| 159 | # CONFIG_ARCH_DAVINCI is not set | ||
| 160 | # CONFIG_ARCH_OMAP is not set | ||
| 161 | # CONFIG_ARCH_MSM7X00A is not set | ||
| 162 | |||
| 163 | # | ||
| 164 | # Marvell Kirkwood Implementations | ||
| 165 | # | ||
| 166 | CONFIG_MACH_DB88F6281_BP=y | ||
| 167 | CONFIG_MACH_RD88F6192_NAS=y | ||
| 168 | CONFIG_MACH_RD88F6281=y | ||
| 169 | |||
| 170 | # | ||
| 171 | # Boot options | ||
| 172 | # | ||
| 173 | |||
| 174 | # | ||
| 175 | # Power management | ||
| 176 | # | ||
| 177 | CONFIG_PLAT_ORION=y | ||
| 178 | |||
| 179 | # | ||
| 180 | # Processor Type | ||
| 181 | # | ||
| 182 | CONFIG_CPU_32=y | ||
| 183 | CONFIG_CPU_FEROCEON=y | ||
| 184 | # CONFIG_CPU_FEROCEON_OLD_ID is not set | ||
| 185 | CONFIG_CPU_32v5=y | ||
| 186 | CONFIG_CPU_ABRT_EV5T=y | ||
| 187 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 188 | CONFIG_CPU_CACHE_VIVT=y | ||
| 189 | CONFIG_CPU_COPY_FEROCEON=y | ||
| 190 | CONFIG_CPU_TLB_FEROCEON=y | ||
| 191 | CONFIG_CPU_CP15=y | ||
| 192 | CONFIG_CPU_CP15_MMU=y | ||
| 193 | |||
| 194 | # | ||
| 195 | # Processor Features | ||
| 196 | # | ||
| 197 | CONFIG_ARM_THUMB=y | ||
| 198 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 199 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 200 | CONFIG_OUTER_CACHE=y | ||
| 201 | CONFIG_CACHE_FEROCEON_L2=y | ||
| 202 | |||
| 203 | # | ||
| 204 | # Bus support | ||
| 205 | # | ||
| 206 | CONFIG_PCI=y | ||
| 207 | CONFIG_PCI_SYSCALL=y | ||
| 208 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 209 | CONFIG_PCI_LEGACY=y | ||
| 210 | # CONFIG_PCI_DEBUG is not set | ||
| 211 | # CONFIG_PCCARD is not set | ||
| 212 | |||
| 213 | # | ||
| 214 | # Kernel Features | ||
| 215 | # | ||
| 216 | CONFIG_TICK_ONESHOT=y | ||
| 217 | CONFIG_NO_HZ=y | ||
| 218 | CONFIG_HIGH_RES_TIMERS=y | ||
| 219 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 220 | CONFIG_PREEMPT=y | ||
| 221 | CONFIG_HZ=100 | ||
| 222 | CONFIG_AEABI=y | ||
| 223 | # CONFIG_OABI_COMPAT is not set | ||
| 224 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 225 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 226 | CONFIG_FLATMEM_MANUAL=y | ||
| 227 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 228 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 229 | CONFIG_FLATMEM=y | ||
| 230 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 231 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 232 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 233 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 234 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 235 | # CONFIG_RESOURCES_64BIT is not set | ||
| 236 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 237 | CONFIG_BOUNCE=y | ||
| 238 | CONFIG_VIRT_TO_BUS=y | ||
| 239 | CONFIG_ALIGNMENT_TRAP=y | ||
| 240 | |||
| 241 | # | ||
| 242 | # Boot options | ||
| 243 | # | ||
| 244 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 245 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 246 | CONFIG_CMDLINE="" | ||
| 247 | # CONFIG_XIP_KERNEL is not set | ||
| 248 | # CONFIG_KEXEC is not set | ||
| 249 | |||
| 250 | # | ||
| 251 | # Floating point emulation | ||
| 252 | # | ||
| 253 | |||
| 254 | # | ||
| 255 | # At least one emulation must be selected | ||
| 256 | # | ||
| 257 | # CONFIG_VFP is not set | ||
| 258 | |||
| 259 | # | ||
| 260 | # Userspace binary formats | ||
| 261 | # | ||
| 262 | CONFIG_BINFMT_ELF=y | ||
| 263 | # CONFIG_BINFMT_AOUT is not set | ||
| 264 | # CONFIG_BINFMT_MISC is not set | ||
| 265 | |||
| 266 | # | ||
| 267 | # Power management options | ||
| 268 | # | ||
| 269 | # CONFIG_PM is not set | ||
| 270 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 271 | |||
| 272 | # | ||
| 273 | # Networking | ||
| 274 | # | ||
| 275 | CONFIG_NET=y | ||
| 276 | |||
| 277 | # | ||
| 278 | # Networking options | ||
| 279 | # | ||
| 280 | CONFIG_PACKET=y | ||
| 281 | CONFIG_PACKET_MMAP=y | ||
| 282 | CONFIG_UNIX=y | ||
| 283 | CONFIG_XFRM=y | ||
| 284 | # CONFIG_XFRM_USER is not set | ||
| 285 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 286 | # CONFIG_XFRM_MIGRATE is not set | ||
| 287 | # CONFIG_XFRM_STATISTICS is not set | ||
| 288 | # CONFIG_NET_KEY is not set | ||
| 289 | CONFIG_INET=y | ||
| 290 | CONFIG_IP_MULTICAST=y | ||
| 291 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 292 | CONFIG_IP_FIB_HASH=y | ||
| 293 | CONFIG_IP_PNP=y | ||
| 294 | CONFIG_IP_PNP_DHCP=y | ||
| 295 | CONFIG_IP_PNP_BOOTP=y | ||
| 296 | # CONFIG_IP_PNP_RARP is not set | ||
| 297 | # CONFIG_NET_IPIP is not set | ||
| 298 | # CONFIG_NET_IPGRE is not set | ||
| 299 | # CONFIG_IP_MROUTE is not set | ||
| 300 | # CONFIG_ARPD is not set | ||
| 301 | # CONFIG_SYN_COOKIES is not set | ||
| 302 | # CONFIG_INET_AH is not set | ||
| 303 | # CONFIG_INET_ESP is not set | ||
| 304 | # CONFIG_INET_IPCOMP is not set | ||
| 305 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 306 | # CONFIG_INET_TUNNEL is not set | ||
| 307 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 308 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 309 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 310 | # CONFIG_INET_LRO is not set | ||
| 311 | CONFIG_INET_DIAG=y | ||
| 312 | CONFIG_INET_TCP_DIAG=y | ||
| 313 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 314 | CONFIG_TCP_CONG_CUBIC=y | ||
| 315 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 316 | # CONFIG_TCP_MD5SIG is not set | ||
| 317 | # CONFIG_IPV6 is not set | ||
| 318 | # CONFIG_NETWORK_SECMARK is not set | ||
| 319 | # CONFIG_NETFILTER is not set | ||
| 320 | # CONFIG_IP_DCCP is not set | ||
| 321 | # CONFIG_IP_SCTP is not set | ||
| 322 | # CONFIG_TIPC is not set | ||
| 323 | # CONFIG_ATM is not set | ||
| 324 | # CONFIG_BRIDGE is not set | ||
| 325 | # CONFIG_VLAN_8021Q is not set | ||
| 326 | # CONFIG_DECNET is not set | ||
| 327 | # CONFIG_LLC2 is not set | ||
| 328 | # CONFIG_IPX is not set | ||
| 329 | # CONFIG_ATALK is not set | ||
| 330 | # CONFIG_X25 is not set | ||
| 331 | # CONFIG_LAPB is not set | ||
| 332 | # CONFIG_ECONET is not set | ||
| 333 | # CONFIG_WAN_ROUTER is not set | ||
| 334 | # CONFIG_NET_SCHED is not set | ||
| 335 | |||
| 336 | # | ||
| 337 | # Network testing | ||
| 338 | # | ||
| 339 | CONFIG_NET_PKTGEN=m | ||
| 340 | # CONFIG_NET_TCPPROBE is not set | ||
| 341 | # CONFIG_HAMRADIO is not set | ||
| 342 | # CONFIG_CAN is not set | ||
| 343 | # CONFIG_IRDA is not set | ||
| 344 | # CONFIG_BT is not set | ||
| 345 | # CONFIG_AF_RXRPC is not set | ||
| 346 | |||
| 347 | # | ||
| 348 | # Wireless | ||
| 349 | # | ||
| 350 | # CONFIG_CFG80211 is not set | ||
| 351 | CONFIG_WIRELESS_EXT=y | ||
| 352 | # CONFIG_MAC80211 is not set | ||
| 353 | # CONFIG_IEEE80211 is not set | ||
| 354 | # CONFIG_RFKILL is not set | ||
| 355 | # CONFIG_NET_9P is not set | ||
| 356 | |||
| 357 | # | ||
| 358 | # Device Drivers | ||
| 359 | # | ||
| 360 | |||
| 361 | # | ||
| 362 | # Generic Driver Options | ||
| 363 | # | ||
| 364 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 365 | CONFIG_STANDALONE=y | ||
| 366 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 367 | CONFIG_FW_LOADER=y | ||
| 368 | # CONFIG_DEBUG_DRIVER is not set | ||
| 369 | # CONFIG_DEBUG_DEVRES is not set | ||
| 370 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 371 | # CONFIG_CONNECTOR is not set | ||
| 372 | CONFIG_MTD=y | ||
| 373 | # CONFIG_MTD_DEBUG is not set | ||
| 374 | # CONFIG_MTD_CONCAT is not set | ||
| 375 | CONFIG_MTD_PARTITIONS=y | ||
| 376 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 377 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 378 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 379 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 380 | |||
| 381 | # | ||
| 382 | # User Modules And Translation Layers | ||
| 383 | # | ||
| 384 | CONFIG_MTD_CHAR=y | ||
| 385 | CONFIG_MTD_BLKDEVS=y | ||
| 386 | CONFIG_MTD_BLOCK=y | ||
| 387 | # CONFIG_FTL is not set | ||
| 388 | # CONFIG_NFTL is not set | ||
| 389 | # CONFIG_INFTL is not set | ||
| 390 | # CONFIG_RFD_FTL is not set | ||
| 391 | # CONFIG_SSFDC is not set | ||
| 392 | # CONFIG_MTD_OOPS is not set | ||
| 393 | |||
| 394 | # | ||
| 395 | # RAM/ROM/Flash chip drivers | ||
| 396 | # | ||
| 397 | CONFIG_MTD_CFI=y | ||
| 398 | CONFIG_MTD_JEDECPROBE=y | ||
| 399 | CONFIG_MTD_GEN_PROBE=y | ||
| 400 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
| 401 | CONFIG_MTD_CFI_NOSWAP=y | ||
| 402 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
| 403 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
| 404 | CONFIG_MTD_CFI_GEOMETRY=y | ||
| 405 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 406 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 407 | # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set | ||
| 408 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 409 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 410 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 411 | CONFIG_MTD_CFI_I1=y | ||
| 412 | CONFIG_MTD_CFI_I2=y | ||
| 413 | # CONFIG_MTD_CFI_I4 is not set | ||
| 414 | # CONFIG_MTD_CFI_I8 is not set | ||
| 415 | # CONFIG_MTD_OTP is not set | ||
| 416 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 417 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 418 | CONFIG_MTD_CFI_STAA=y | ||
| 419 | CONFIG_MTD_CFI_UTIL=y | ||
| 420 | # CONFIG_MTD_RAM is not set | ||
| 421 | # CONFIG_MTD_ROM is not set | ||
| 422 | # CONFIG_MTD_ABSENT is not set | ||
| 423 | |||
| 424 | # | ||
| 425 | # Mapping drivers for chip access | ||
| 426 | # | ||
| 427 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 428 | CONFIG_MTD_PHYSMAP=y | ||
| 429 | CONFIG_MTD_PHYSMAP_START=0x0 | ||
| 430 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 431 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
| 432 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 433 | # CONFIG_MTD_IMPA7 is not set | ||
| 434 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 435 | # CONFIG_MTD_PLATRAM is not set | ||
| 436 | |||
| 437 | # | ||
| 438 | # Self-contained MTD device drivers | ||
| 439 | # | ||
| 440 | # CONFIG_MTD_PMC551 is not set | ||
| 441 | # CONFIG_MTD_DATAFLASH is not set | ||
| 442 | CONFIG_MTD_M25P80=y | ||
| 443 | CONFIG_M25PXX_USE_FAST_READ=y | ||
| 444 | # CONFIG_MTD_SLRAM is not set | ||
| 445 | # CONFIG_MTD_PHRAM is not set | ||
| 446 | # CONFIG_MTD_MTDRAM is not set | ||
| 447 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 448 | |||
| 449 | # | ||
| 450 | # Disk-On-Chip Device Drivers | ||
| 451 | # | ||
| 452 | # CONFIG_MTD_DOC2000 is not set | ||
| 453 | # CONFIG_MTD_DOC2001 is not set | ||
| 454 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 455 | CONFIG_MTD_NAND=y | ||
| 456 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 457 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
| 458 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 459 | CONFIG_MTD_NAND_IDS=y | ||
| 460 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 461 | # CONFIG_MTD_NAND_CAFE is not set | ||
| 462 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 463 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
| 464 | # CONFIG_MTD_ALAUDA is not set | ||
| 465 | CONFIG_MTD_NAND_ORION=y | ||
| 466 | # CONFIG_MTD_ONENAND is not set | ||
| 467 | |||
| 468 | # | ||
| 469 | # UBI - Unsorted block images | ||
| 470 | # | ||
| 471 | # CONFIG_MTD_UBI is not set | ||
| 472 | # CONFIG_PARPORT is not set | ||
| 473 | CONFIG_BLK_DEV=y | ||
| 474 | # CONFIG_BLK_CPQ_DA is not set | ||
| 475 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 476 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 477 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 478 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 479 | CONFIG_BLK_DEV_LOOP=y | ||
| 480 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 481 | # CONFIG_BLK_DEV_NBD is not set | ||
| 482 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 483 | # CONFIG_BLK_DEV_UB is not set | ||
| 484 | # CONFIG_BLK_DEV_RAM is not set | ||
| 485 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 486 | # CONFIG_ATA_OVER_ETH is not set | ||
| 487 | # CONFIG_MISC_DEVICES is not set | ||
| 488 | CONFIG_HAVE_IDE=y | ||
| 489 | # CONFIG_IDE is not set | ||
| 490 | |||
| 491 | # | ||
| 492 | # SCSI device support | ||
| 493 | # | ||
| 494 | # CONFIG_RAID_ATTRS is not set | ||
| 495 | CONFIG_SCSI=y | ||
| 496 | CONFIG_SCSI_DMA=y | ||
| 497 | # CONFIG_SCSI_TGT is not set | ||
| 498 | # CONFIG_SCSI_NETLINK is not set | ||
| 499 | # CONFIG_SCSI_PROC_FS is not set | ||
| 500 | |||
| 501 | # | ||
| 502 | # SCSI support type (disk, tape, CD-ROM) | ||
| 503 | # | ||
| 504 | CONFIG_BLK_DEV_SD=y | ||
| 505 | # CONFIG_CHR_DEV_ST is not set | ||
| 506 | # CONFIG_CHR_DEV_OSST is not set | ||
| 507 | CONFIG_BLK_DEV_SR=m | ||
| 508 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 509 | CONFIG_CHR_DEV_SG=m | ||
| 510 | # CONFIG_CHR_DEV_SCH is not set | ||
| 511 | |||
| 512 | # | ||
| 513 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 514 | # | ||
| 515 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 516 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 517 | # CONFIG_SCSI_LOGGING is not set | ||
| 518 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 519 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 520 | |||
| 521 | # | ||
| 522 | # SCSI Transports | ||
| 523 | # | ||
| 524 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 525 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 526 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 527 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 528 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 529 | CONFIG_SCSI_LOWLEVEL=y | ||
| 530 | # CONFIG_ISCSI_TCP is not set | ||
| 531 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 532 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 533 | # CONFIG_SCSI_ACARD is not set | ||
| 534 | # CONFIG_SCSI_AACRAID is not set | ||
| 535 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 536 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 537 | # CONFIG_SCSI_AIC79XX is not set | ||
| 538 | # CONFIG_SCSI_AIC94XX is not set | ||
| 539 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 540 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 541 | # CONFIG_SCSI_ARCMSR is not set | ||
| 542 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 543 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 544 | # CONFIG_MEGARAID_SAS is not set | ||
| 545 | # CONFIG_SCSI_HPTIOP is not set | ||
| 546 | # CONFIG_SCSI_DMX3191D is not set | ||
| 547 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 548 | # CONFIG_SCSI_IPS is not set | ||
| 549 | # CONFIG_SCSI_INITIO is not set | ||
| 550 | # CONFIG_SCSI_INIA100 is not set | ||
| 551 | # CONFIG_SCSI_MVSAS is not set | ||
| 552 | # CONFIG_SCSI_STEX is not set | ||
| 553 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 554 | # CONFIG_SCSI_IPR is not set | ||
| 555 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 556 | # CONFIG_SCSI_QLA_FC is not set | ||
| 557 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 558 | # CONFIG_SCSI_LPFC is not set | ||
| 559 | # CONFIG_SCSI_DC395x is not set | ||
| 560 | # CONFIG_SCSI_DC390T is not set | ||
| 561 | # CONFIG_SCSI_NSP32 is not set | ||
| 562 | # CONFIG_SCSI_DEBUG is not set | ||
| 563 | # CONFIG_SCSI_SRP is not set | ||
| 564 | CONFIG_ATA=y | ||
| 565 | # CONFIG_ATA_NONSTANDARD is not set | ||
| 566 | CONFIG_SATA_PMP=y | ||
| 567 | # CONFIG_SATA_AHCI is not set | ||
| 568 | # CONFIG_SATA_SIL24 is not set | ||
| 569 | CONFIG_ATA_SFF=y | ||
| 570 | # CONFIG_SATA_SVW is not set | ||
| 571 | # CONFIG_ATA_PIIX is not set | ||
| 572 | CONFIG_SATA_MV=y | ||
| 573 | # CONFIG_SATA_NV is not set | ||
| 574 | # CONFIG_PDC_ADMA is not set | ||
| 575 | # CONFIG_SATA_QSTOR is not set | ||
| 576 | # CONFIG_SATA_PROMISE is not set | ||
| 577 | # CONFIG_SATA_SX4 is not set | ||
| 578 | # CONFIG_SATA_SIL is not set | ||
| 579 | # CONFIG_SATA_SIS is not set | ||
| 580 | # CONFIG_SATA_ULI is not set | ||
| 581 | # CONFIG_SATA_VIA is not set | ||
| 582 | # CONFIG_SATA_VITESSE is not set | ||
| 583 | # CONFIG_SATA_INIC162X is not set | ||
| 584 | # CONFIG_PATA_ALI is not set | ||
| 585 | # CONFIG_PATA_AMD is not set | ||
| 586 | # CONFIG_PATA_ARTOP is not set | ||
| 587 | # CONFIG_PATA_ATIIXP is not set | ||
| 588 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 589 | # CONFIG_PATA_CMD64X is not set | ||
| 590 | # CONFIG_PATA_CS5520 is not set | ||
| 591 | # CONFIG_PATA_CS5530 is not set | ||
| 592 | # CONFIG_PATA_CYPRESS is not set | ||
| 593 | # CONFIG_PATA_EFAR is not set | ||
| 594 | # CONFIG_ATA_GENERIC is not set | ||
| 595 | # CONFIG_PATA_HPT366 is not set | ||
| 596 | # CONFIG_PATA_HPT37X is not set | ||
| 597 | # CONFIG_PATA_HPT3X2N is not set | ||
| 598 | # CONFIG_PATA_HPT3X3 is not set | ||
| 599 | # CONFIG_PATA_IT821X is not set | ||
| 600 | # CONFIG_PATA_IT8213 is not set | ||
| 601 | # CONFIG_PATA_JMICRON is not set | ||
| 602 | # CONFIG_PATA_TRIFLEX is not set | ||
| 603 | # CONFIG_PATA_MARVELL is not set | ||
| 604 | # CONFIG_PATA_MPIIX is not set | ||
| 605 | # CONFIG_PATA_OLDPIIX is not set | ||
| 606 | # CONFIG_PATA_NETCELL is not set | ||
| 607 | # CONFIG_PATA_NINJA32 is not set | ||
| 608 | # CONFIG_PATA_NS87410 is not set | ||
| 609 | # CONFIG_PATA_NS87415 is not set | ||
| 610 | # CONFIG_PATA_OPTI is not set | ||
| 611 | # CONFIG_PATA_OPTIDMA is not set | ||
| 612 | # CONFIG_PATA_PDC_OLD is not set | ||
| 613 | # CONFIG_PATA_RADISYS is not set | ||
| 614 | # CONFIG_PATA_RZ1000 is not set | ||
| 615 | # CONFIG_PATA_SC1200 is not set | ||
| 616 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 617 | # CONFIG_PATA_PDC2027X is not set | ||
| 618 | # CONFIG_PATA_SIL680 is not set | ||
| 619 | # CONFIG_PATA_SIS is not set | ||
| 620 | # CONFIG_PATA_VIA is not set | ||
| 621 | # CONFIG_PATA_WINBOND is not set | ||
| 622 | # CONFIG_PATA_PLATFORM is not set | ||
| 623 | # CONFIG_PATA_SCH is not set | ||
| 624 | # CONFIG_MD is not set | ||
| 625 | # CONFIG_FUSION is not set | ||
| 626 | |||
| 627 | # | ||
| 628 | # IEEE 1394 (FireWire) support | ||
| 629 | # | ||
| 630 | # CONFIG_FIREWIRE is not set | ||
| 631 | # CONFIG_IEEE1394 is not set | ||
| 632 | # CONFIG_I2O is not set | ||
| 633 | CONFIG_NETDEVICES=y | ||
| 634 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 635 | # CONFIG_DUMMY is not set | ||
| 636 | # CONFIG_BONDING is not set | ||
| 637 | # CONFIG_MACVLAN is not set | ||
| 638 | # CONFIG_EQUALIZER is not set | ||
| 639 | # CONFIG_TUN is not set | ||
| 640 | # CONFIG_VETH is not set | ||
| 641 | # CONFIG_ARCNET is not set | ||
| 642 | # CONFIG_PHYLIB is not set | ||
| 643 | CONFIG_NET_ETHERNET=y | ||
| 644 | CONFIG_MII=y | ||
| 645 | # CONFIG_AX88796 is not set | ||
| 646 | # CONFIG_HAPPYMEAL is not set | ||
| 647 | # CONFIG_SUNGEM is not set | ||
| 648 | # CONFIG_CASSINI is not set | ||
| 649 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 650 | # CONFIG_SMC91X is not set | ||
| 651 | # CONFIG_DM9000 is not set | ||
| 652 | # CONFIG_ENC28J60 is not set | ||
| 653 | # CONFIG_NET_TULIP is not set | ||
| 654 | # CONFIG_HP100 is not set | ||
| 655 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 656 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 657 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 658 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 659 | CONFIG_NET_PCI=y | ||
| 660 | # CONFIG_PCNET32 is not set | ||
| 661 | # CONFIG_AMD8111_ETH is not set | ||
| 662 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
| 663 | # CONFIG_B44 is not set | ||
| 664 | # CONFIG_FORCEDETH is not set | ||
| 665 | # CONFIG_EEPRO100 is not set | ||
| 666 | # CONFIG_E100 is not set | ||
| 667 | # CONFIG_FEALNX is not set | ||
| 668 | # CONFIG_NATSEMI is not set | ||
| 669 | # CONFIG_NE2K_PCI is not set | ||
| 670 | # CONFIG_8139CP is not set | ||
| 671 | # CONFIG_8139TOO is not set | ||
| 672 | # CONFIG_R6040 is not set | ||
| 673 | # CONFIG_SIS900 is not set | ||
| 674 | # CONFIG_EPIC100 is not set | ||
| 675 | # CONFIG_SUNDANCE is not set | ||
| 676 | # CONFIG_TLAN is not set | ||
| 677 | # CONFIG_VIA_RHINE is not set | ||
| 678 | # CONFIG_SC92031 is not set | ||
| 679 | CONFIG_NETDEV_1000=y | ||
| 680 | # CONFIG_ACENIC is not set | ||
| 681 | # CONFIG_DL2K is not set | ||
| 682 | CONFIG_E1000=y | ||
| 683 | CONFIG_E1000_NAPI=y | ||
| 684 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 685 | # CONFIG_E1000E is not set | ||
| 686 | # CONFIG_E1000E_ENABLED is not set | ||
| 687 | # CONFIG_IP1000 is not set | ||
| 688 | # CONFIG_IGB is not set | ||
| 689 | # CONFIG_NS83820 is not set | ||
| 690 | # CONFIG_HAMACHI is not set | ||
| 691 | # CONFIG_YELLOWFIN is not set | ||
| 692 | # CONFIG_R8169 is not set | ||
| 693 | # CONFIG_SIS190 is not set | ||
| 694 | # CONFIG_SKGE is not set | ||
| 695 | # CONFIG_SKY2 is not set | ||
| 696 | # CONFIG_VIA_VELOCITY is not set | ||
| 697 | # CONFIG_TIGON3 is not set | ||
| 698 | # CONFIG_BNX2 is not set | ||
| 699 | CONFIG_MV643XX_ETH=y | ||
| 700 | # CONFIG_QLA3XXX is not set | ||
| 701 | # CONFIG_ATL1 is not set | ||
| 702 | # CONFIG_NETDEV_10000 is not set | ||
| 703 | # CONFIG_TR is not set | ||
| 704 | |||
| 705 | # | ||
| 706 | # Wireless LAN | ||
| 707 | # | ||
| 708 | # CONFIG_WLAN_PRE80211 is not set | ||
| 709 | # CONFIG_WLAN_80211 is not set | ||
| 710 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 711 | |||
| 712 | # | ||
| 713 | # USB Network Adapters | ||
| 714 | # | ||
| 715 | # CONFIG_USB_CATC is not set | ||
| 716 | # CONFIG_USB_KAWETH is not set | ||
| 717 | # CONFIG_USB_PEGASUS is not set | ||
| 718 | # CONFIG_USB_RTL8150 is not set | ||
| 719 | # CONFIG_USB_USBNET is not set | ||
| 720 | # CONFIG_WAN is not set | ||
| 721 | # CONFIG_FDDI is not set | ||
| 722 | # CONFIG_HIPPI is not set | ||
| 723 | # CONFIG_PPP is not set | ||
| 724 | # CONFIG_SLIP is not set | ||
| 725 | # CONFIG_NET_FC is not set | ||
| 726 | # CONFIG_NETCONSOLE is not set | ||
| 727 | # CONFIG_NETPOLL is not set | ||
| 728 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 729 | # CONFIG_ISDN is not set | ||
| 730 | |||
| 731 | # | ||
| 732 | # Input device support | ||
| 733 | # | ||
| 734 | CONFIG_INPUT=y | ||
| 735 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 736 | # CONFIG_INPUT_POLLDEV is not set | ||
| 737 | |||
| 738 | # | ||
| 739 | # Userland interfaces | ||
| 740 | # | ||
| 741 | CONFIG_INPUT_MOUSEDEV=y | ||
| 742 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 743 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 744 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 745 | # CONFIG_INPUT_JOYDEV is not set | ||
| 746 | # CONFIG_INPUT_EVDEV is not set | ||
| 747 | # CONFIG_INPUT_EVBUG is not set | ||
| 748 | |||
| 749 | # | ||
| 750 | # Input Device Drivers | ||
| 751 | # | ||
| 752 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 753 | # CONFIG_INPUT_MOUSE is not set | ||
| 754 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 755 | # CONFIG_INPUT_TABLET is not set | ||
| 756 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 757 | # CONFIG_INPUT_MISC is not set | ||
| 758 | |||
| 759 | # | ||
| 760 | # Hardware I/O ports | ||
| 761 | # | ||
| 762 | # CONFIG_SERIO is not set | ||
| 763 | # CONFIG_GAMEPORT is not set | ||
| 764 | |||
| 765 | # | ||
| 766 | # Character devices | ||
| 767 | # | ||
| 768 | # CONFIG_VT is not set | ||
| 769 | # CONFIG_DEVKMEM is not set | ||
| 770 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 771 | # CONFIG_NOZOMI is not set | ||
| 772 | |||
| 773 | # | ||
| 774 | # Serial drivers | ||
| 775 | # | ||
| 776 | CONFIG_SERIAL_8250=y | ||
| 777 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 778 | # CONFIG_SERIAL_8250_PCI is not set | ||
| 779 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 780 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | ||
| 781 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 782 | |||
| 783 | # | ||
| 784 | # Non-8250 serial port support | ||
| 785 | # | ||
| 786 | CONFIG_SERIAL_CORE=y | ||
| 787 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 788 | # CONFIG_SERIAL_JSM is not set | ||
| 789 | CONFIG_UNIX98_PTYS=y | ||
| 790 | CONFIG_LEGACY_PTYS=y | ||
| 791 | CONFIG_LEGACY_PTY_COUNT=16 | ||
| 792 | # CONFIG_IPMI_HANDLER is not set | ||
| 793 | # CONFIG_HW_RANDOM is not set | ||
| 794 | # CONFIG_NVRAM is not set | ||
| 795 | # CONFIG_R3964 is not set | ||
| 796 | # CONFIG_APPLICOM is not set | ||
| 797 | # CONFIG_RAW_DRIVER is not set | ||
| 798 | # CONFIG_TCG_TPM is not set | ||
| 799 | CONFIG_DEVPORT=y | ||
| 800 | CONFIG_I2C=y | ||
| 801 | CONFIG_I2C_BOARDINFO=y | ||
| 802 | CONFIG_I2C_CHARDEV=y | ||
| 803 | |||
| 804 | # | ||
| 805 | # I2C Hardware Bus support | ||
| 806 | # | ||
| 807 | # CONFIG_I2C_ALI1535 is not set | ||
| 808 | # CONFIG_I2C_ALI1563 is not set | ||
| 809 | # CONFIG_I2C_ALI15X3 is not set | ||
| 810 | # CONFIG_I2C_AMD756 is not set | ||
| 811 | # CONFIG_I2C_AMD8111 is not set | ||
| 812 | # CONFIG_I2C_GPIO is not set | ||
| 813 | # CONFIG_I2C_I801 is not set | ||
| 814 | # CONFIG_I2C_I810 is not set | ||
| 815 | # CONFIG_I2C_PIIX4 is not set | ||
| 816 | # CONFIG_I2C_NFORCE2 is not set | ||
| 817 | # CONFIG_I2C_OCORES is not set | ||
| 818 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 819 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 820 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 821 | # CONFIG_I2C_SIMTEC is not set | ||
| 822 | # CONFIG_I2C_SIS5595 is not set | ||
| 823 | # CONFIG_I2C_SIS630 is not set | ||
| 824 | # CONFIG_I2C_SIS96X is not set | ||
| 825 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 826 | # CONFIG_I2C_STUB is not set | ||
| 827 | # CONFIG_I2C_TINY_USB is not set | ||
| 828 | # CONFIG_I2C_VIA is not set | ||
| 829 | # CONFIG_I2C_VIAPRO is not set | ||
| 830 | # CONFIG_I2C_VOODOO3 is not set | ||
| 831 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 832 | CONFIG_I2C_MV64XXX=y | ||
| 833 | |||
| 834 | # | ||
| 835 | # Miscellaneous I2C Chip support | ||
| 836 | # | ||
| 837 | # CONFIG_DS1682 is not set | ||
| 838 | # CONFIG_SENSORS_EEPROM is not set | ||
| 839 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 840 | # CONFIG_PCF8575 is not set | ||
| 841 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 842 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 843 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 844 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 845 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 846 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 847 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 848 | CONFIG_SPI=y | ||
| 849 | # CONFIG_SPI_DEBUG is not set | ||
| 850 | CONFIG_SPI_MASTER=y | ||
| 851 | |||
| 852 | # | ||
| 853 | # SPI Master Controller Drivers | ||
| 854 | # | ||
| 855 | # CONFIG_SPI_BITBANG is not set | ||
| 856 | CONFIG_SPI_ORION=y | ||
| 857 | |||
| 858 | # | ||
| 859 | # SPI Protocol Masters | ||
| 860 | # | ||
| 861 | # CONFIG_SPI_AT25 is not set | ||
| 862 | # CONFIG_SPI_SPIDEV is not set | ||
| 863 | # CONFIG_SPI_TLE62X0 is not set | ||
| 864 | # CONFIG_W1 is not set | ||
| 865 | # CONFIG_POWER_SUPPLY is not set | ||
| 866 | # CONFIG_HWMON is not set | ||
| 867 | # CONFIG_WATCHDOG is not set | ||
| 868 | |||
| 869 | # | ||
| 870 | # Sonics Silicon Backplane | ||
| 871 | # | ||
| 872 | CONFIG_SSB_POSSIBLE=y | ||
| 873 | # CONFIG_SSB is not set | ||
| 874 | |||
| 875 | # | ||
| 876 | # Multifunction device drivers | ||
| 877 | # | ||
| 878 | # CONFIG_MFD_SM501 is not set | ||
| 879 | # CONFIG_MFD_ASIC3 is not set | ||
| 880 | # CONFIG_HTC_PASIC3 is not set | ||
| 881 | |||
| 882 | # | ||
| 883 | # Multimedia devices | ||
| 884 | # | ||
| 885 | |||
| 886 | # | ||
| 887 | # Multimedia core support | ||
| 888 | # | ||
| 889 | # CONFIG_VIDEO_DEV is not set | ||
| 890 | # CONFIG_DVB_CORE is not set | ||
| 891 | # CONFIG_VIDEO_MEDIA is not set | ||
| 892 | |||
| 893 | # | ||
| 894 | # Multimedia drivers | ||
| 895 | # | ||
| 896 | # CONFIG_DAB is not set | ||
| 897 | |||
| 898 | # | ||
| 899 | # Graphics support | ||
| 900 | # | ||
| 901 | # CONFIG_DRM is not set | ||
| 902 | # CONFIG_VGASTATE is not set | ||
| 903 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 904 | # CONFIG_FB is not set | ||
| 905 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 906 | |||
| 907 | # | ||
| 908 | # Display device support | ||
| 909 | # | ||
| 910 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 911 | |||
| 912 | # | ||
| 913 | # Sound | ||
| 914 | # | ||
| 915 | # CONFIG_SOUND is not set | ||
| 916 | CONFIG_HID_SUPPORT=y | ||
| 917 | CONFIG_HID=y | ||
| 918 | # CONFIG_HID_DEBUG is not set | ||
| 919 | # CONFIG_HIDRAW is not set | ||
| 920 | |||
| 921 | # | ||
| 922 | # USB Input Devices | ||
| 923 | # | ||
| 924 | CONFIG_USB_HID=y | ||
| 925 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 926 | # CONFIG_HID_FF is not set | ||
| 927 | # CONFIG_USB_HIDDEV is not set | ||
| 928 | CONFIG_USB_SUPPORT=y | ||
| 929 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 930 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 931 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 932 | CONFIG_USB=y | ||
| 933 | # CONFIG_USB_DEBUG is not set | ||
| 934 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 935 | |||
| 936 | # | ||
| 937 | # Miscellaneous USB options | ||
| 938 | # | ||
| 939 | CONFIG_USB_DEVICEFS=y | ||
| 940 | CONFIG_USB_DEVICE_CLASS=y | ||
| 941 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 942 | # CONFIG_USB_OTG is not set | ||
| 943 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 944 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 945 | |||
| 946 | # | ||
| 947 | # USB Host Controller Drivers | ||
| 948 | # | ||
| 949 | # CONFIG_USB_C67X00_HCD is not set | ||
| 950 | CONFIG_USB_EHCI_HCD=y | ||
| 951 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | ||
| 952 | CONFIG_USB_EHCI_TT_NEWSCHED=y | ||
| 953 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 954 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 955 | # CONFIG_USB_OHCI_HCD is not set | ||
| 956 | # CONFIG_USB_UHCI_HCD is not set | ||
| 957 | # CONFIG_USB_SL811_HCD is not set | ||
| 958 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 959 | |||
| 960 | # | ||
| 961 | # USB Device Class drivers | ||
| 962 | # | ||
| 963 | # CONFIG_USB_ACM is not set | ||
| 964 | CONFIG_USB_PRINTER=y | ||
| 965 | # CONFIG_USB_WDM is not set | ||
| 966 | |||
| 967 | # | ||
| 968 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 969 | # | ||
| 970 | |||
| 971 | # | ||
| 972 | # may also be needed; see USB_STORAGE Help for more information | ||
| 973 | # | ||
| 974 | CONFIG_USB_STORAGE=y | ||
| 975 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 976 | CONFIG_USB_STORAGE_DATAFAB=y | ||
| 977 | CONFIG_USB_STORAGE_FREECOM=y | ||
| 978 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 979 | CONFIG_USB_STORAGE_DPCM=y | ||
| 980 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 981 | CONFIG_USB_STORAGE_SDDR09=y | ||
| 982 | CONFIG_USB_STORAGE_SDDR55=y | ||
| 983 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
| 984 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 985 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 986 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 987 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 988 | # CONFIG_USB_LIBUSUAL is not set | ||
| 989 | |||
| 990 | # | ||
| 991 | # USB Imaging devices | ||
| 992 | # | ||
| 993 | # CONFIG_USB_MDC800 is not set | ||
| 994 | # CONFIG_USB_MICROTEK is not set | ||
| 995 | # CONFIG_USB_MON is not set | ||
| 996 | |||
| 997 | # | ||
| 998 | # USB port drivers | ||
| 999 | # | ||
| 1000 | # CONFIG_USB_SERIAL is not set | ||
| 1001 | |||
| 1002 | # | ||
| 1003 | # USB Miscellaneous drivers | ||
| 1004 | # | ||
| 1005 | # CONFIG_USB_EMI62 is not set | ||
| 1006 | # CONFIG_USB_EMI26 is not set | ||
| 1007 | # CONFIG_USB_ADUTUX is not set | ||
| 1008 | # CONFIG_USB_AUERSWALD is not set | ||
| 1009 | # CONFIG_USB_RIO500 is not set | ||
| 1010 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1011 | # CONFIG_USB_LCD is not set | ||
| 1012 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1013 | # CONFIG_USB_LED is not set | ||
| 1014 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1015 | # CONFIG_USB_CYTHERM is not set | ||
| 1016 | # CONFIG_USB_PHIDGET is not set | ||
| 1017 | # CONFIG_USB_IDMOUSE is not set | ||
| 1018 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1019 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1020 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1021 | # CONFIG_USB_LD is not set | ||
| 1022 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1023 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1024 | # CONFIG_USB_TEST is not set | ||
| 1025 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1026 | # CONFIG_USB_GADGET is not set | ||
| 1027 | # CONFIG_MMC is not set | ||
| 1028 | CONFIG_NEW_LEDS=y | ||
| 1029 | # CONFIG_LEDS_CLASS is not set | ||
| 1030 | |||
| 1031 | # | ||
| 1032 | # LED drivers | ||
| 1033 | # | ||
| 1034 | |||
| 1035 | # | ||
| 1036 | # LED Triggers | ||
| 1037 | # | ||
| 1038 | # CONFIG_LEDS_TRIGGERS is not set | ||
| 1039 | CONFIG_RTC_LIB=y | ||
| 1040 | CONFIG_RTC_CLASS=y | ||
| 1041 | # CONFIG_RTC_DEBUG is not set | ||
| 1042 | |||
| 1043 | # | ||
| 1044 | # RTC interfaces | ||
| 1045 | # | ||
| 1046 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1047 | CONFIG_RTC_INTF_PROC=y | ||
| 1048 | CONFIG_RTC_INTF_DEV=y | ||
| 1049 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1050 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1051 | |||
| 1052 | # | ||
| 1053 | # I2C RTC drivers | ||
| 1054 | # | ||
| 1055 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 1056 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1057 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1058 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1059 | CONFIG_RTC_DRV_MV=y | ||
| 1060 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1061 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1062 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1063 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1064 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1065 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1066 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1067 | |||
| 1068 | # | ||
| 1069 | # SPI RTC drivers | ||
| 1070 | # | ||
| 1071 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 1072 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 1073 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 1074 | |||
| 1075 | # | ||
| 1076 | # Platform RTC drivers | ||
| 1077 | # | ||
| 1078 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1079 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1080 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1081 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1082 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1083 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1084 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1085 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1086 | |||
| 1087 | # | ||
| 1088 | # on-CPU RTC drivers | ||
| 1089 | # | ||
| 1090 | CONFIG_DMADEVICES=y | ||
| 1091 | |||
| 1092 | # | ||
| 1093 | # DMA Devices | ||
| 1094 | # | ||
| 1095 | CONFIG_MV_XOR=y | ||
| 1096 | CONFIG_DMA_ENGINE=y | ||
| 1097 | |||
| 1098 | # | ||
| 1099 | # DMA Clients | ||
| 1100 | # | ||
| 1101 | # CONFIG_NET_DMA is not set | ||
| 1102 | # CONFIG_UIO is not set | ||
| 1103 | |||
| 1104 | # | ||
| 1105 | # File systems | ||
| 1106 | # | ||
| 1107 | CONFIG_EXT2_FS=y | ||
| 1108 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1109 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1110 | CONFIG_EXT3_FS=y | ||
| 1111 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 1112 | # CONFIG_EXT4DEV_FS is not set | ||
| 1113 | CONFIG_JBD=y | ||
| 1114 | # CONFIG_REISERFS_FS is not set | ||
| 1115 | # CONFIG_JFS_FS is not set | ||
| 1116 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1117 | CONFIG_XFS_FS=y | ||
| 1118 | # CONFIG_XFS_QUOTA is not set | ||
| 1119 | # CONFIG_XFS_POSIX_ACL is not set | ||
| 1120 | # CONFIG_XFS_RT is not set | ||
| 1121 | # CONFIG_XFS_DEBUG is not set | ||
| 1122 | # CONFIG_OCFS2_FS is not set | ||
| 1123 | CONFIG_DNOTIFY=y | ||
| 1124 | CONFIG_INOTIFY=y | ||
| 1125 | CONFIG_INOTIFY_USER=y | ||
| 1126 | # CONFIG_QUOTA is not set | ||
| 1127 | # CONFIG_AUTOFS_FS is not set | ||
| 1128 | # CONFIG_AUTOFS4_FS is not set | ||
| 1129 | # CONFIG_FUSE_FS is not set | ||
| 1130 | |||
| 1131 | # | ||
| 1132 | # CD-ROM/DVD Filesystems | ||
| 1133 | # | ||
| 1134 | CONFIG_ISO9660_FS=y | ||
| 1135 | CONFIG_JOLIET=y | ||
| 1136 | # CONFIG_ZISOFS is not set | ||
| 1137 | CONFIG_UDF_FS=m | ||
| 1138 | CONFIG_UDF_NLS=y | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # DOS/FAT/NT Filesystems | ||
| 1142 | # | ||
| 1143 | CONFIG_FAT_FS=y | ||
| 1144 | CONFIG_MSDOS_FS=y | ||
| 1145 | CONFIG_VFAT_FS=y | ||
| 1146 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1147 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1148 | # CONFIG_NTFS_FS is not set | ||
| 1149 | |||
| 1150 | # | ||
| 1151 | # Pseudo filesystems | ||
| 1152 | # | ||
| 1153 | CONFIG_PROC_FS=y | ||
| 1154 | CONFIG_PROC_SYSCTL=y | ||
| 1155 | CONFIG_SYSFS=y | ||
| 1156 | CONFIG_TMPFS=y | ||
| 1157 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1158 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1159 | # CONFIG_CONFIGFS_FS is not set | ||
| 1160 | |||
| 1161 | # | ||
| 1162 | # Miscellaneous filesystems | ||
| 1163 | # | ||
| 1164 | # CONFIG_ADFS_FS is not set | ||
| 1165 | # CONFIG_AFFS_FS is not set | ||
| 1166 | # CONFIG_HFS_FS is not set | ||
| 1167 | # CONFIG_HFSPLUS_FS is not set | ||
| 1168 | # CONFIG_BEFS_FS is not set | ||
| 1169 | # CONFIG_BFS_FS is not set | ||
| 1170 | # CONFIG_EFS_FS is not set | ||
| 1171 | CONFIG_JFFS2_FS=y | ||
| 1172 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 1173 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 1174 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1175 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 1176 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 1177 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 1178 | CONFIG_JFFS2_ZLIB=y | ||
| 1179 | # CONFIG_JFFS2_LZO is not set | ||
| 1180 | CONFIG_JFFS2_RTIME=y | ||
| 1181 | # CONFIG_JFFS2_RUBIN is not set | ||
| 1182 | CONFIG_CRAMFS=y | ||
| 1183 | # CONFIG_VXFS_FS is not set | ||
| 1184 | # CONFIG_MINIX_FS is not set | ||
| 1185 | # CONFIG_HPFS_FS is not set | ||
| 1186 | # CONFIG_QNX4FS_FS is not set | ||
| 1187 | # CONFIG_ROMFS_FS is not set | ||
| 1188 | # CONFIG_SYSV_FS is not set | ||
| 1189 | # CONFIG_UFS_FS is not set | ||
| 1190 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1191 | CONFIG_NFS_FS=y | ||
| 1192 | CONFIG_NFS_V3=y | ||
| 1193 | # CONFIG_NFS_V3_ACL is not set | ||
| 1194 | # CONFIG_NFS_V4 is not set | ||
| 1195 | # CONFIG_NFSD is not set | ||
| 1196 | CONFIG_ROOT_NFS=y | ||
| 1197 | CONFIG_LOCKD=y | ||
| 1198 | CONFIG_LOCKD_V4=y | ||
| 1199 | CONFIG_NFS_COMMON=y | ||
| 1200 | CONFIG_SUNRPC=y | ||
| 1201 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1202 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1203 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1204 | # CONFIG_SMB_FS is not set | ||
| 1205 | # CONFIG_CIFS is not set | ||
| 1206 | # CONFIG_NCP_FS is not set | ||
| 1207 | # CONFIG_CODA_FS is not set | ||
| 1208 | # CONFIG_AFS_FS is not set | ||
| 1209 | |||
| 1210 | # | ||
| 1211 | # Partition Types | ||
| 1212 | # | ||
| 1213 | CONFIG_PARTITION_ADVANCED=y | ||
| 1214 | # CONFIG_ACORN_PARTITION is not set | ||
| 1215 | # CONFIG_OSF_PARTITION is not set | ||
| 1216 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1217 | # CONFIG_ATARI_PARTITION is not set | ||
| 1218 | # CONFIG_MAC_PARTITION is not set | ||
| 1219 | CONFIG_MSDOS_PARTITION=y | ||
| 1220 | # CONFIG_BSD_DISKLABEL is not set | ||
| 1221 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1222 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1223 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1224 | # CONFIG_LDM_PARTITION is not set | ||
| 1225 | # CONFIG_SGI_PARTITION is not set | ||
| 1226 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1227 | # CONFIG_SUN_PARTITION is not set | ||
| 1228 | # CONFIG_KARMA_PARTITION is not set | ||
| 1229 | # CONFIG_EFI_PARTITION is not set | ||
| 1230 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1231 | CONFIG_NLS=y | ||
| 1232 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1233 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1234 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1235 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1236 | CONFIG_NLS_CODEPAGE_850=y | ||
| 1237 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1238 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1239 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1240 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1241 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1242 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1243 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1244 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1245 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1246 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1247 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1248 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1249 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1250 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1251 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1252 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1253 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1254 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1255 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1256 | # CONFIG_NLS_ASCII is not set | ||
| 1257 | CONFIG_NLS_ISO8859_1=y | ||
| 1258 | CONFIG_NLS_ISO8859_2=y | ||
| 1259 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1260 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1261 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1262 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1263 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1264 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1265 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1266 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1267 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1268 | # CONFIG_NLS_KOI8_R is not set | ||
| 1269 | # CONFIG_NLS_KOI8_U is not set | ||
| 1270 | CONFIG_NLS_UTF8=y | ||
| 1271 | # CONFIG_DLM is not set | ||
| 1272 | |||
| 1273 | # | ||
| 1274 | # Kernel hacking | ||
| 1275 | # | ||
| 1276 | # CONFIG_PRINTK_TIME is not set | ||
| 1277 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1278 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1279 | CONFIG_FRAME_WARN=1024 | ||
| 1280 | CONFIG_MAGIC_SYSRQ=y | ||
| 1281 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1282 | # CONFIG_DEBUG_FS is not set | ||
| 1283 | # CONFIG_HEADERS_CHECK is not set | ||
| 1284 | CONFIG_DEBUG_KERNEL=y | ||
| 1285 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1286 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1287 | # CONFIG_SCHED_DEBUG is not set | ||
| 1288 | # CONFIG_SCHEDSTATS is not set | ||
| 1289 | # CONFIG_TIMER_STATS is not set | ||
| 1290 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1291 | # CONFIG_DEBUG_SLAB is not set | ||
| 1292 | # CONFIG_DEBUG_PREEMPT is not set | ||
| 1293 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1294 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1295 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1296 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1297 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1298 | # CONFIG_PROVE_LOCKING is not set | ||
| 1299 | # CONFIG_LOCK_STAT is not set | ||
| 1300 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1301 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1302 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1303 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1304 | CONFIG_DEBUG_INFO=y | ||
| 1305 | # CONFIG_DEBUG_VM is not set | ||
| 1306 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1307 | # CONFIG_DEBUG_LIST is not set | ||
| 1308 | # CONFIG_DEBUG_SG is not set | ||
| 1309 | CONFIG_FRAME_POINTER=y | ||
| 1310 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1311 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1312 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 1313 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1314 | # CONFIG_LKDTM is not set | ||
| 1315 | # CONFIG_FAULT_INJECTION is not set | ||
| 1316 | # CONFIG_LATENCYTOP is not set | ||
| 1317 | # CONFIG_SAMPLES is not set | ||
| 1318 | CONFIG_DEBUG_USER=y | ||
| 1319 | CONFIG_DEBUG_ERRORS=y | ||
| 1320 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1321 | CONFIG_DEBUG_LL=y | ||
| 1322 | # CONFIG_DEBUG_ICEDCC is not set | ||
| 1323 | |||
| 1324 | # | ||
| 1325 | # Security options | ||
| 1326 | # | ||
| 1327 | # CONFIG_KEYS is not set | ||
| 1328 | # CONFIG_SECURITY is not set | ||
| 1329 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1330 | CONFIG_ASYNC_CORE=y | ||
| 1331 | CONFIG_CRYPTO=y | ||
| 1332 | |||
| 1333 | # | ||
| 1334 | # Crypto core or helper | ||
| 1335 | # | ||
| 1336 | CONFIG_CRYPTO_ALGAPI=m | ||
| 1337 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1338 | CONFIG_CRYPTO_MANAGER=m | ||
| 1339 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1340 | # CONFIG_CRYPTO_NULL is not set | ||
| 1341 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1342 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1343 | # CONFIG_CRYPTO_TEST is not set | ||
| 1344 | |||
| 1345 | # | ||
| 1346 | # Authenticated Encryption with Associated Data | ||
| 1347 | # | ||
| 1348 | # CONFIG_CRYPTO_CCM is not set | ||
| 1349 | # CONFIG_CRYPTO_GCM is not set | ||
| 1350 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1351 | |||
| 1352 | # | ||
| 1353 | # Block modes | ||
| 1354 | # | ||
| 1355 | CONFIG_CRYPTO_CBC=m | ||
| 1356 | # CONFIG_CRYPTO_CTR is not set | ||
| 1357 | # CONFIG_CRYPTO_CTS is not set | ||
| 1358 | CONFIG_CRYPTO_ECB=m | ||
| 1359 | # CONFIG_CRYPTO_LRW is not set | ||
| 1360 | CONFIG_CRYPTO_PCBC=m | ||
| 1361 | # CONFIG_CRYPTO_XTS is not set | ||
| 1362 | |||
| 1363 | # | ||
| 1364 | # Hash modes | ||
| 1365 | # | ||
| 1366 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1367 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1368 | |||
| 1369 | # | ||
| 1370 | # Digest | ||
| 1371 | # | ||
| 1372 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1373 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1374 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1375 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1376 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1377 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1378 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1379 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1380 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1381 | |||
| 1382 | # | ||
| 1383 | # Ciphers | ||
| 1384 | # | ||
| 1385 | # CONFIG_CRYPTO_AES is not set | ||
| 1386 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1387 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1388 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1389 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1390 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1391 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1392 | # CONFIG_CRYPTO_DES is not set | ||
| 1393 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1394 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1395 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1396 | # CONFIG_CRYPTO_SEED is not set | ||
| 1397 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1398 | # CONFIG_CRYPTO_TEA is not set | ||
| 1399 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1400 | |||
| 1401 | # | ||
| 1402 | # Compression | ||
| 1403 | # | ||
| 1404 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1405 | # CONFIG_CRYPTO_LZO is not set | ||
| 1406 | CONFIG_CRYPTO_HW=y | ||
| 1407 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1408 | |||
| 1409 | # | ||
| 1410 | # Library routines | ||
| 1411 | # | ||
| 1412 | CONFIG_BITREVERSE=y | ||
| 1413 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1414 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1415 | CONFIG_CRC_CCITT=y | ||
| 1416 | CONFIG_CRC16=y | ||
| 1417 | CONFIG_CRC_ITU_T=m | ||
| 1418 | CONFIG_CRC32=y | ||
| 1419 | # CONFIG_CRC7 is not set | ||
| 1420 | CONFIG_LIBCRC32C=y | ||
| 1421 | CONFIG_ZLIB_INFLATE=y | ||
| 1422 | CONFIG_ZLIB_DEFLATE=y | ||
| 1423 | CONFIG_PLIST=y | ||
| 1424 | CONFIG_HAS_IOMEM=y | ||
| 1425 | CONFIG_HAS_IOPORT=y | ||
| 1426 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/ks8695_defconfig b/arch/arm/configs/ks8695_defconfig index 8ab21a0719e9..6077f2cb88e4 100644 --- a/arch/arm/configs/ks8695_defconfig +++ b/arch/arm/configs/ks8695_defconfig | |||
| @@ -174,7 +174,6 @@ CONFIG_PCCARD_NONSTATIC=y | |||
| 174 | # Kernel Features | 174 | # Kernel Features |
| 175 | # | 175 | # |
| 176 | # CONFIG_PREEMPT is not set | 176 | # CONFIG_PREEMPT is not set |
| 177 | # CONFIG_NO_IDLE_HZ is not set | ||
| 178 | CONFIG_HZ=100 | 177 | CONFIG_HZ=100 |
| 179 | # CONFIG_AEABI is not set | 178 | # CONFIG_AEABI is not set |
| 180 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 179 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/loki_defconfig b/arch/arm/configs/loki_defconfig new file mode 100644 index 000000000000..17da7c3b3d53 --- /dev/null +++ b/arch/arm/configs/loki_defconfig | |||
| @@ -0,0 +1,1147 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.26-rc5 | ||
| 4 | # Fri Jun 13 03:07:49 2008 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | # CONFIG_GENERIC_GPIO is not set | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 16 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 23 | CONFIG_GENERIC_HWEIGHT=y | ||
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 29 | |||
| 30 | # | ||
| 31 | # General setup | ||
| 32 | # | ||
| 33 | CONFIG_EXPERIMENTAL=y | ||
| 34 | CONFIG_BROKEN_ON_SMP=y | ||
| 35 | CONFIG_LOCK_KERNEL=y | ||
| 36 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 37 | CONFIG_LOCALVERSION="" | ||
| 38 | CONFIG_LOCALVERSION_AUTO=y | ||
| 39 | CONFIG_SWAP=y | ||
| 40 | CONFIG_SYSVIPC=y | ||
| 41 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 42 | # CONFIG_POSIX_MQUEUE is not set | ||
| 43 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 44 | # CONFIG_TASKSTATS is not set | ||
| 45 | # CONFIG_AUDIT is not set | ||
| 46 | # CONFIG_IKCONFIG is not set | ||
| 47 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 48 | # CONFIG_CGROUPS is not set | ||
| 49 | # CONFIG_GROUP_SCHED is not set | ||
| 50 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 51 | # CONFIG_RELAY is not set | ||
| 52 | # CONFIG_NAMESPACES is not set | ||
| 53 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 55 | CONFIG_SYSCTL=y | ||
| 56 | CONFIG_EMBEDDED=y | ||
| 57 | CONFIG_UID16=y | ||
| 58 | CONFIG_SYSCTL_SYSCALL=y | ||
| 59 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 60 | CONFIG_KALLSYMS=y | ||
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 62 | CONFIG_HOTPLUG=y | ||
| 63 | CONFIG_PRINTK=y | ||
| 64 | CONFIG_BUG=y | ||
| 65 | CONFIG_ELF_CORE=y | ||
| 66 | CONFIG_COMPAT_BRK=y | ||
| 67 | CONFIG_BASE_FULL=y | ||
| 68 | CONFIG_FUTEX=y | ||
| 69 | CONFIG_ANON_INODES=y | ||
| 70 | CONFIG_EPOLL=y | ||
| 71 | CONFIG_SIGNALFD=y | ||
| 72 | CONFIG_TIMERFD=y | ||
| 73 | CONFIG_EVENTFD=y | ||
| 74 | CONFIG_SHMEM=y | ||
| 75 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 76 | CONFIG_SLAB=y | ||
| 77 | # CONFIG_SLUB is not set | ||
| 78 | # CONFIG_SLOB is not set | ||
| 79 | # CONFIG_PROFILING is not set | ||
| 80 | # CONFIG_MARKERS is not set | ||
| 81 | CONFIG_HAVE_OPROFILE=y | ||
| 82 | # CONFIG_KPROBES is not set | ||
| 83 | CONFIG_HAVE_KPROBES=y | ||
| 84 | CONFIG_HAVE_KRETPROBES=y | ||
| 85 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 86 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 87 | CONFIG_SLABINFO=y | ||
| 88 | CONFIG_RT_MUTEXES=y | ||
| 89 | # CONFIG_TINY_SHMEM is not set | ||
| 90 | CONFIG_BASE_SMALL=0 | ||
| 91 | CONFIG_MODULES=y | ||
| 92 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 93 | CONFIG_MODULE_UNLOAD=y | ||
| 94 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 95 | # CONFIG_MODVERSIONS is not set | ||
| 96 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 97 | # CONFIG_KMOD is not set | ||
| 98 | CONFIG_BLOCK=y | ||
| 99 | # CONFIG_LBD is not set | ||
| 100 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 101 | # CONFIG_LSF is not set | ||
| 102 | # CONFIG_BLK_DEV_BSG is not set | ||
| 103 | |||
| 104 | # | ||
| 105 | # IO Schedulers | ||
| 106 | # | ||
| 107 | CONFIG_IOSCHED_NOOP=y | ||
| 108 | CONFIG_IOSCHED_AS=y | ||
| 109 | CONFIG_IOSCHED_DEADLINE=y | ||
| 110 | CONFIG_IOSCHED_CFQ=y | ||
| 111 | # CONFIG_DEFAULT_AS is not set | ||
| 112 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 113 | CONFIG_DEFAULT_CFQ=y | ||
| 114 | # CONFIG_DEFAULT_NOOP is not set | ||
| 115 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 116 | CONFIG_CLASSIC_RCU=y | ||
| 117 | |||
| 118 | # | ||
| 119 | # System Type | ||
| 120 | # | ||
| 121 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 122 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 123 | # CONFIG_ARCH_REALVIEW is not set | ||
| 124 | # CONFIG_ARCH_VERSATILE is not set | ||
| 125 | # CONFIG_ARCH_AT91 is not set | ||
| 126 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 127 | # CONFIG_ARCH_CLPS711X is not set | ||
| 128 | # CONFIG_ARCH_CO285 is not set | ||
| 129 | # CONFIG_ARCH_EBSA110 is not set | ||
| 130 | # CONFIG_ARCH_EP93XX is not set | ||
| 131 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 132 | # CONFIG_ARCH_NETX is not set | ||
| 133 | # CONFIG_ARCH_H720X is not set | ||
| 134 | # CONFIG_ARCH_IMX is not set | ||
| 135 | # CONFIG_ARCH_IOP13XX is not set | ||
| 136 | # CONFIG_ARCH_IOP32X is not set | ||
| 137 | # CONFIG_ARCH_IOP33X is not set | ||
| 138 | # CONFIG_ARCH_IXP23XX is not set | ||
| 139 | # CONFIG_ARCH_IXP2000 is not set | ||
| 140 | # CONFIG_ARCH_IXP4XX is not set | ||
| 141 | # CONFIG_ARCH_L7200 is not set | ||
| 142 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 143 | # CONFIG_ARCH_KS8695 is not set | ||
| 144 | # CONFIG_ARCH_NS9XXX is not set | ||
| 145 | CONFIG_ARCH_LOKI=y | ||
| 146 | # CONFIG_ARCH_MV78XX0 is not set | ||
| 147 | # CONFIG_ARCH_MXC is not set | ||
| 148 | # CONFIG_ARCH_ORION5X is not set | ||
| 149 | # CONFIG_ARCH_PNX4008 is not set | ||
| 150 | # CONFIG_ARCH_PXA is not set | ||
| 151 | # CONFIG_ARCH_RPC is not set | ||
| 152 | # CONFIG_ARCH_SA1100 is not set | ||
| 153 | # CONFIG_ARCH_S3C2410 is not set | ||
| 154 | # CONFIG_ARCH_SHARK is not set | ||
| 155 | # CONFIG_ARCH_LH7A40X is not set | ||
| 156 | # CONFIG_ARCH_DAVINCI is not set | ||
| 157 | # CONFIG_ARCH_OMAP is not set | ||
| 158 | # CONFIG_ARCH_MSM7X00A is not set | ||
| 159 | |||
| 160 | # | ||
| 161 | # Marvell Loki (88RC8480) Implementations | ||
| 162 | # | ||
| 163 | CONFIG_MACH_LB88RC8480=y | ||
| 164 | |||
| 165 | # | ||
| 166 | # Boot options | ||
| 167 | # | ||
| 168 | |||
| 169 | # | ||
| 170 | # Power management | ||
| 171 | # | ||
| 172 | CONFIG_PLAT_ORION=y | ||
| 173 | |||
| 174 | # | ||
| 175 | # Processor Type | ||
| 176 | # | ||
| 177 | CONFIG_CPU_32=y | ||
| 178 | CONFIG_CPU_FEROCEON=y | ||
| 179 | # CONFIG_CPU_FEROCEON_OLD_ID is not set | ||
| 180 | CONFIG_CPU_32v5=y | ||
| 181 | CONFIG_CPU_ABRT_EV5T=y | ||
| 182 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 183 | CONFIG_CPU_CACHE_VIVT=y | ||
| 184 | CONFIG_CPU_COPY_FEROCEON=y | ||
| 185 | CONFIG_CPU_TLB_FEROCEON=y | ||
| 186 | CONFIG_CPU_CP15=y | ||
| 187 | CONFIG_CPU_CP15_MMU=y | ||
| 188 | |||
| 189 | # | ||
| 190 | # Processor Features | ||
| 191 | # | ||
| 192 | CONFIG_ARM_THUMB=y | ||
| 193 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 194 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 195 | # CONFIG_OUTER_CACHE is not set | ||
| 196 | |||
| 197 | # | ||
| 198 | # Bus support | ||
| 199 | # | ||
| 200 | # CONFIG_PCI_SYSCALL is not set | ||
| 201 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 202 | # CONFIG_PCCARD is not set | ||
| 203 | |||
| 204 | # | ||
| 205 | # Kernel Features | ||
| 206 | # | ||
| 207 | CONFIG_TICK_ONESHOT=y | ||
| 208 | CONFIG_NO_HZ=y | ||
| 209 | CONFIG_HIGH_RES_TIMERS=y | ||
| 210 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 211 | CONFIG_PREEMPT=y | ||
| 212 | CONFIG_HZ=100 | ||
| 213 | CONFIG_AEABI=y | ||
| 214 | CONFIG_OABI_COMPAT=y | ||
| 215 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 216 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 217 | CONFIG_FLATMEM_MANUAL=y | ||
| 218 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 219 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 220 | CONFIG_FLATMEM=y | ||
| 221 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 222 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 225 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 226 | # CONFIG_RESOURCES_64BIT is not set | ||
| 227 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 228 | CONFIG_BOUNCE=y | ||
| 229 | CONFIG_VIRT_TO_BUS=y | ||
| 230 | CONFIG_ALIGNMENT_TRAP=y | ||
| 231 | |||
| 232 | # | ||
| 233 | # Boot options | ||
| 234 | # | ||
| 235 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 236 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 237 | CONFIG_CMDLINE="" | ||
| 238 | # CONFIG_XIP_KERNEL is not set | ||
| 239 | # CONFIG_KEXEC is not set | ||
| 240 | |||
| 241 | # | ||
| 242 | # Floating point emulation | ||
| 243 | # | ||
| 244 | |||
| 245 | # | ||
| 246 | # At least one emulation must be selected | ||
| 247 | # | ||
| 248 | # CONFIG_FPE_NWFPE is not set | ||
| 249 | # CONFIG_FPE_FASTFPE is not set | ||
| 250 | # CONFIG_VFP is not set | ||
| 251 | |||
| 252 | # | ||
| 253 | # Userspace binary formats | ||
| 254 | # | ||
| 255 | CONFIG_BINFMT_ELF=y | ||
| 256 | # CONFIG_BINFMT_AOUT is not set | ||
| 257 | # CONFIG_BINFMT_MISC is not set | ||
| 258 | |||
| 259 | # | ||
| 260 | # Power management options | ||
| 261 | # | ||
| 262 | # CONFIG_PM is not set | ||
| 263 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 264 | |||
| 265 | # | ||
| 266 | # Networking | ||
| 267 | # | ||
| 268 | CONFIG_NET=y | ||
| 269 | |||
| 270 | # | ||
| 271 | # Networking options | ||
| 272 | # | ||
| 273 | CONFIG_PACKET=y | ||
| 274 | CONFIG_PACKET_MMAP=y | ||
| 275 | CONFIG_UNIX=y | ||
| 276 | CONFIG_XFRM=y | ||
| 277 | # CONFIG_XFRM_USER is not set | ||
| 278 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 279 | # CONFIG_XFRM_MIGRATE is not set | ||
| 280 | # CONFIG_XFRM_STATISTICS is not set | ||
| 281 | # CONFIG_NET_KEY is not set | ||
| 282 | CONFIG_INET=y | ||
| 283 | CONFIG_IP_MULTICAST=y | ||
| 284 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 285 | CONFIG_IP_FIB_HASH=y | ||
| 286 | CONFIG_IP_PNP=y | ||
| 287 | CONFIG_IP_PNP_DHCP=y | ||
| 288 | CONFIG_IP_PNP_BOOTP=y | ||
| 289 | # CONFIG_IP_PNP_RARP is not set | ||
| 290 | # CONFIG_NET_IPIP is not set | ||
| 291 | # CONFIG_NET_IPGRE is not set | ||
| 292 | # CONFIG_IP_MROUTE is not set | ||
| 293 | # CONFIG_ARPD is not set | ||
| 294 | # CONFIG_SYN_COOKIES is not set | ||
| 295 | # CONFIG_INET_AH is not set | ||
| 296 | # CONFIG_INET_ESP is not set | ||
| 297 | # CONFIG_INET_IPCOMP is not set | ||
| 298 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET_TUNNEL is not set | ||
| 300 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 301 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 302 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 303 | # CONFIG_INET_LRO is not set | ||
| 304 | CONFIG_INET_DIAG=y | ||
| 305 | CONFIG_INET_TCP_DIAG=y | ||
| 306 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 307 | CONFIG_TCP_CONG_CUBIC=y | ||
| 308 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 309 | # CONFIG_TCP_MD5SIG is not set | ||
| 310 | # CONFIG_IPV6 is not set | ||
| 311 | # CONFIG_NETWORK_SECMARK is not set | ||
| 312 | # CONFIG_NETFILTER is not set | ||
| 313 | # CONFIG_IP_DCCP is not set | ||
| 314 | # CONFIG_IP_SCTP is not set | ||
| 315 | # CONFIG_TIPC is not set | ||
| 316 | # CONFIG_ATM is not set | ||
| 317 | # CONFIG_BRIDGE is not set | ||
| 318 | # CONFIG_VLAN_8021Q is not set | ||
| 319 | # CONFIG_DECNET is not set | ||
| 320 | # CONFIG_LLC2 is not set | ||
| 321 | # CONFIG_IPX is not set | ||
| 322 | # CONFIG_ATALK is not set | ||
| 323 | # CONFIG_X25 is not set | ||
| 324 | # CONFIG_LAPB is not set | ||
| 325 | # CONFIG_ECONET is not set | ||
| 326 | # CONFIG_WAN_ROUTER is not set | ||
| 327 | # CONFIG_NET_SCHED is not set | ||
| 328 | |||
| 329 | # | ||
| 330 | # Network testing | ||
| 331 | # | ||
| 332 | CONFIG_NET_PKTGEN=m | ||
| 333 | # CONFIG_HAMRADIO is not set | ||
| 334 | # CONFIG_CAN is not set | ||
| 335 | # CONFIG_IRDA is not set | ||
| 336 | # CONFIG_BT is not set | ||
| 337 | # CONFIG_AF_RXRPC is not set | ||
| 338 | |||
| 339 | # | ||
| 340 | # Wireless | ||
| 341 | # | ||
| 342 | # CONFIG_CFG80211 is not set | ||
| 343 | CONFIG_WIRELESS_EXT=y | ||
| 344 | # CONFIG_MAC80211 is not set | ||
| 345 | # CONFIG_IEEE80211 is not set | ||
| 346 | # CONFIG_RFKILL is not set | ||
| 347 | # CONFIG_NET_9P is not set | ||
| 348 | |||
| 349 | # | ||
| 350 | # Device Drivers | ||
| 351 | # | ||
| 352 | |||
| 353 | # | ||
| 354 | # Generic Driver Options | ||
| 355 | # | ||
| 356 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 357 | CONFIG_STANDALONE=y | ||
| 358 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 359 | CONFIG_FW_LOADER=y | ||
| 360 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 361 | # CONFIG_CONNECTOR is not set | ||
| 362 | CONFIG_MTD=y | ||
| 363 | # CONFIG_MTD_DEBUG is not set | ||
| 364 | # CONFIG_MTD_CONCAT is not set | ||
| 365 | CONFIG_MTD_PARTITIONS=y | ||
| 366 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 367 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 368 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 369 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 370 | |||
| 371 | # | ||
| 372 | # User Modules And Translation Layers | ||
| 373 | # | ||
| 374 | CONFIG_MTD_CHAR=y | ||
| 375 | CONFIG_MTD_BLKDEVS=y | ||
| 376 | CONFIG_MTD_BLOCK=y | ||
| 377 | CONFIG_FTL=y | ||
| 378 | CONFIG_NFTL=y | ||
| 379 | # CONFIG_NFTL_RW is not set | ||
| 380 | # CONFIG_INFTL is not set | ||
| 381 | # CONFIG_RFD_FTL is not set | ||
| 382 | # CONFIG_SSFDC is not set | ||
| 383 | # CONFIG_MTD_OOPS is not set | ||
| 384 | |||
| 385 | # | ||
| 386 | # RAM/ROM/Flash chip drivers | ||
| 387 | # | ||
| 388 | CONFIG_MTD_CFI=y | ||
| 389 | CONFIG_MTD_JEDECPROBE=y | ||
| 390 | CONFIG_MTD_GEN_PROBE=y | ||
| 391 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
| 392 | CONFIG_MTD_CFI_NOSWAP=y | ||
| 393 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
| 394 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
| 395 | CONFIG_MTD_CFI_GEOMETRY=y | ||
| 396 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 397 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 398 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 399 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 400 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 401 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 402 | CONFIG_MTD_CFI_I1=y | ||
| 403 | CONFIG_MTD_CFI_I2=y | ||
| 404 | CONFIG_MTD_CFI_I4=y | ||
| 405 | # CONFIG_MTD_CFI_I8 is not set | ||
| 406 | # CONFIG_MTD_OTP is not set | ||
| 407 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 408 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 409 | CONFIG_MTD_CFI_STAA=y | ||
| 410 | CONFIG_MTD_CFI_UTIL=y | ||
| 411 | # CONFIG_MTD_RAM is not set | ||
| 412 | # CONFIG_MTD_ROM is not set | ||
| 413 | # CONFIG_MTD_ABSENT is not set | ||
| 414 | |||
| 415 | # | ||
| 416 | # Mapping drivers for chip access | ||
| 417 | # | ||
| 418 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 419 | CONFIG_MTD_PHYSMAP=y | ||
| 420 | CONFIG_MTD_PHYSMAP_START=0x0 | ||
| 421 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 422 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
| 423 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 424 | # CONFIG_MTD_IMPA7 is not set | ||
| 425 | # CONFIG_MTD_PLATRAM is not set | ||
| 426 | |||
| 427 | # | ||
| 428 | # Self-contained MTD device drivers | ||
| 429 | # | ||
| 430 | # CONFIG_MTD_DATAFLASH is not set | ||
| 431 | CONFIG_MTD_M25P80=y | ||
| 432 | CONFIG_M25PXX_USE_FAST_READ=y | ||
| 433 | # CONFIG_MTD_SLRAM is not set | ||
| 434 | # CONFIG_MTD_PHRAM is not set | ||
| 435 | # CONFIG_MTD_MTDRAM is not set | ||
| 436 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 437 | |||
| 438 | # | ||
| 439 | # Disk-On-Chip Device Drivers | ||
| 440 | # | ||
| 441 | # CONFIG_MTD_DOC2000 is not set | ||
| 442 | # CONFIG_MTD_DOC2001 is not set | ||
| 443 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 444 | CONFIG_MTD_NAND=y | ||
| 445 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 446 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
| 447 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 448 | CONFIG_MTD_NAND_IDS=y | ||
| 449 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 450 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 451 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
| 452 | # CONFIG_MTD_ALAUDA is not set | ||
| 453 | CONFIG_MTD_NAND_ORION=y | ||
| 454 | # CONFIG_MTD_ONENAND is not set | ||
| 455 | |||
| 456 | # | ||
| 457 | # UBI - Unsorted block images | ||
| 458 | # | ||
| 459 | # CONFIG_MTD_UBI is not set | ||
| 460 | # CONFIG_PARPORT is not set | ||
| 461 | CONFIG_BLK_DEV=y | ||
| 462 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 463 | CONFIG_BLK_DEV_LOOP=y | ||
| 464 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 465 | # CONFIG_BLK_DEV_NBD is not set | ||
| 466 | # CONFIG_BLK_DEV_UB is not set | ||
| 467 | # CONFIG_BLK_DEV_RAM is not set | ||
| 468 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 469 | # CONFIG_ATA_OVER_ETH is not set | ||
| 470 | # CONFIG_MISC_DEVICES is not set | ||
| 471 | CONFIG_HAVE_IDE=y | ||
| 472 | # CONFIG_IDE is not set | ||
| 473 | |||
| 474 | # | ||
| 475 | # SCSI device support | ||
| 476 | # | ||
| 477 | # CONFIG_RAID_ATTRS is not set | ||
| 478 | CONFIG_SCSI=y | ||
| 479 | CONFIG_SCSI_DMA=y | ||
| 480 | # CONFIG_SCSI_TGT is not set | ||
| 481 | # CONFIG_SCSI_NETLINK is not set | ||
| 482 | # CONFIG_SCSI_PROC_FS is not set | ||
| 483 | |||
| 484 | # | ||
| 485 | # SCSI support type (disk, tape, CD-ROM) | ||
| 486 | # | ||
| 487 | CONFIG_BLK_DEV_SD=y | ||
| 488 | # CONFIG_CHR_DEV_ST is not set | ||
| 489 | # CONFIG_CHR_DEV_OSST is not set | ||
| 490 | CONFIG_BLK_DEV_SR=m | ||
| 491 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 492 | CONFIG_CHR_DEV_SG=m | ||
| 493 | # CONFIG_CHR_DEV_SCH is not set | ||
| 494 | |||
| 495 | # | ||
| 496 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 497 | # | ||
| 498 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 499 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 500 | # CONFIG_SCSI_LOGGING is not set | ||
| 501 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 502 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 503 | |||
| 504 | # | ||
| 505 | # SCSI Transports | ||
| 506 | # | ||
| 507 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 508 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 509 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 510 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 511 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 512 | CONFIG_SCSI_LOWLEVEL=y | ||
| 513 | # CONFIG_ISCSI_TCP is not set | ||
| 514 | # CONFIG_SCSI_DEBUG is not set | ||
| 515 | CONFIG_ATA=y | ||
| 516 | # CONFIG_ATA_NONSTANDARD is not set | ||
| 517 | CONFIG_SATA_PMP=y | ||
| 518 | CONFIG_ATA_SFF=y | ||
| 519 | CONFIG_SATA_MV=y | ||
| 520 | # CONFIG_PATA_PLATFORM is not set | ||
| 521 | # CONFIG_MD is not set | ||
| 522 | CONFIG_NETDEVICES=y | ||
| 523 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 524 | # CONFIG_DUMMY is not set | ||
| 525 | # CONFIG_BONDING is not set | ||
| 526 | # CONFIG_MACVLAN is not set | ||
| 527 | # CONFIG_EQUALIZER is not set | ||
| 528 | # CONFIG_TUN is not set | ||
| 529 | # CONFIG_VETH is not set | ||
| 530 | # CONFIG_PHYLIB is not set | ||
| 531 | CONFIG_NET_ETHERNET=y | ||
| 532 | CONFIG_MII=y | ||
| 533 | # CONFIG_AX88796 is not set | ||
| 534 | # CONFIG_SMC91X is not set | ||
| 535 | # CONFIG_DM9000 is not set | ||
| 536 | # CONFIG_ENC28J60 is not set | ||
| 537 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 538 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 539 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 540 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 541 | # CONFIG_B44 is not set | ||
| 542 | CONFIG_NETDEV_1000=y | ||
| 543 | # CONFIG_E1000E_ENABLED is not set | ||
| 544 | CONFIG_MV643XX_ETH=y | ||
| 545 | # CONFIG_NETDEV_10000 is not set | ||
| 546 | |||
| 547 | # | ||
| 548 | # Wireless LAN | ||
| 549 | # | ||
| 550 | # CONFIG_WLAN_PRE80211 is not set | ||
| 551 | # CONFIG_WLAN_80211 is not set | ||
| 552 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 553 | |||
| 554 | # | ||
| 555 | # USB Network Adapters | ||
| 556 | # | ||
| 557 | # CONFIG_USB_CATC is not set | ||
| 558 | # CONFIG_USB_KAWETH is not set | ||
| 559 | # CONFIG_USB_PEGASUS is not set | ||
| 560 | # CONFIG_USB_RTL8150 is not set | ||
| 561 | # CONFIG_USB_USBNET is not set | ||
| 562 | # CONFIG_WAN is not set | ||
| 563 | # CONFIG_PPP is not set | ||
| 564 | # CONFIG_SLIP is not set | ||
| 565 | # CONFIG_NETCONSOLE is not set | ||
| 566 | # CONFIG_NETPOLL is not set | ||
| 567 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 568 | # CONFIG_ISDN is not set | ||
| 569 | |||
| 570 | # | ||
| 571 | # Input device support | ||
| 572 | # | ||
| 573 | CONFIG_INPUT=y | ||
| 574 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 575 | # CONFIG_INPUT_POLLDEV is not set | ||
| 576 | |||
| 577 | # | ||
| 578 | # Userland interfaces | ||
| 579 | # | ||
| 580 | CONFIG_INPUT_MOUSEDEV=y | ||
| 581 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 582 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 583 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 584 | # CONFIG_INPUT_JOYDEV is not set | ||
| 585 | # CONFIG_INPUT_EVDEV is not set | ||
| 586 | # CONFIG_INPUT_EVBUG is not set | ||
| 587 | |||
| 588 | # | ||
| 589 | # Input Device Drivers | ||
| 590 | # | ||
| 591 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 592 | # CONFIG_INPUT_MOUSE is not set | ||
| 593 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 594 | # CONFIG_INPUT_TABLET is not set | ||
| 595 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 596 | # CONFIG_INPUT_MISC is not set | ||
| 597 | |||
| 598 | # | ||
| 599 | # Hardware I/O ports | ||
| 600 | # | ||
| 601 | # CONFIG_SERIO is not set | ||
| 602 | # CONFIG_GAMEPORT is not set | ||
| 603 | |||
| 604 | # | ||
| 605 | # Character devices | ||
| 606 | # | ||
| 607 | CONFIG_VT=y | ||
| 608 | CONFIG_VT_CONSOLE=y | ||
| 609 | CONFIG_HW_CONSOLE=y | ||
| 610 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 611 | CONFIG_DEVKMEM=y | ||
| 612 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 613 | |||
| 614 | # | ||
| 615 | # Serial drivers | ||
| 616 | # | ||
| 617 | CONFIG_SERIAL_8250=y | ||
| 618 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 619 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 620 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | ||
| 621 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 622 | |||
| 623 | # | ||
| 624 | # Non-8250 serial port support | ||
| 625 | # | ||
| 626 | CONFIG_SERIAL_CORE=y | ||
| 627 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 628 | CONFIG_UNIX98_PTYS=y | ||
| 629 | CONFIG_LEGACY_PTYS=y | ||
| 630 | CONFIG_LEGACY_PTY_COUNT=16 | ||
| 631 | # CONFIG_IPMI_HANDLER is not set | ||
| 632 | CONFIG_HW_RANDOM=m | ||
| 633 | # CONFIG_NVRAM is not set | ||
| 634 | # CONFIG_R3964 is not set | ||
| 635 | # CONFIG_RAW_DRIVER is not set | ||
| 636 | # CONFIG_TCG_TPM is not set | ||
| 637 | CONFIG_I2C=y | ||
| 638 | CONFIG_I2C_BOARDINFO=y | ||
| 639 | CONFIG_I2C_CHARDEV=y | ||
| 640 | |||
| 641 | # | ||
| 642 | # I2C Hardware Bus support | ||
| 643 | # | ||
| 644 | # CONFIG_I2C_OCORES is not set | ||
| 645 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 646 | # CONFIG_I2C_SIMTEC is not set | ||
| 647 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 648 | # CONFIG_I2C_STUB is not set | ||
| 649 | # CONFIG_I2C_TINY_USB is not set | ||
| 650 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 651 | CONFIG_I2C_MV64XXX=y | ||
| 652 | |||
| 653 | # | ||
| 654 | # Miscellaneous I2C Chip support | ||
| 655 | # | ||
| 656 | # CONFIG_DS1682 is not set | ||
| 657 | # CONFIG_SENSORS_EEPROM is not set | ||
| 658 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 659 | # CONFIG_PCF8575 is not set | ||
| 660 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 661 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 662 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 663 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 664 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 665 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 666 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 667 | CONFIG_SPI=y | ||
| 668 | CONFIG_SPI_MASTER=y | ||
| 669 | |||
| 670 | # | ||
| 671 | # SPI Master Controller Drivers | ||
| 672 | # | ||
| 673 | # CONFIG_SPI_BITBANG is not set | ||
| 674 | |||
| 675 | # | ||
| 676 | # SPI Protocol Masters | ||
| 677 | # | ||
| 678 | # CONFIG_SPI_AT25 is not set | ||
| 679 | # CONFIG_SPI_SPIDEV is not set | ||
| 680 | # CONFIG_SPI_TLE62X0 is not set | ||
| 681 | # CONFIG_W1 is not set | ||
| 682 | # CONFIG_POWER_SUPPLY is not set | ||
| 683 | # CONFIG_HWMON is not set | ||
| 684 | # CONFIG_WATCHDOG is not set | ||
| 685 | |||
| 686 | # | ||
| 687 | # Sonics Silicon Backplane | ||
| 688 | # | ||
| 689 | CONFIG_SSB_POSSIBLE=y | ||
| 690 | # CONFIG_SSB is not set | ||
| 691 | |||
| 692 | # | ||
| 693 | # Multifunction device drivers | ||
| 694 | # | ||
| 695 | # CONFIG_MFD_SM501 is not set | ||
| 696 | # CONFIG_MFD_ASIC3 is not set | ||
| 697 | # CONFIG_HTC_PASIC3 is not set | ||
| 698 | |||
| 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 | |||
| 715 | # | ||
| 716 | # Graphics support | ||
| 717 | # | ||
| 718 | # CONFIG_VGASTATE is not set | ||
| 719 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 720 | # CONFIG_FB is not set | ||
| 721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 722 | |||
| 723 | # | ||
| 724 | # Display device support | ||
| 725 | # | ||
| 726 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 727 | |||
| 728 | # | ||
| 729 | # Console display driver support | ||
| 730 | # | ||
| 731 | # CONFIG_VGA_CONSOLE is not set | ||
| 732 | CONFIG_DUMMY_CONSOLE=y | ||
| 733 | |||
| 734 | # | ||
| 735 | # Sound | ||
| 736 | # | ||
| 737 | # CONFIG_SOUND is not set | ||
| 738 | CONFIG_HID_SUPPORT=y | ||
| 739 | CONFIG_HID=y | ||
| 740 | # CONFIG_HID_DEBUG is not set | ||
| 741 | # CONFIG_HIDRAW is not set | ||
| 742 | |||
| 743 | # | ||
| 744 | # USB Input Devices | ||
| 745 | # | ||
| 746 | CONFIG_USB_HID=y | ||
| 747 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 748 | # CONFIG_HID_FF is not set | ||
| 749 | # CONFIG_USB_HIDDEV is not set | ||
| 750 | CONFIG_USB_SUPPORT=y | ||
| 751 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 752 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
| 753 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 754 | CONFIG_USB=y | ||
| 755 | # CONFIG_USB_DEBUG is not set | ||
| 756 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 757 | |||
| 758 | # | ||
| 759 | # Miscellaneous USB options | ||
| 760 | # | ||
| 761 | CONFIG_USB_DEVICEFS=y | ||
| 762 | CONFIG_USB_DEVICE_CLASS=y | ||
| 763 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 764 | # CONFIG_USB_OTG is not set | ||
| 765 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 766 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 767 | |||
| 768 | # | ||
| 769 | # USB Host Controller Drivers | ||
| 770 | # | ||
| 771 | # CONFIG_USB_C67X00_HCD is not set | ||
| 772 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 773 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 774 | # CONFIG_USB_SL811_HCD is not set | ||
| 775 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 776 | |||
| 777 | # | ||
| 778 | # USB Device Class drivers | ||
| 779 | # | ||
| 780 | # CONFIG_USB_ACM is not set | ||
| 781 | CONFIG_USB_PRINTER=y | ||
| 782 | # CONFIG_USB_WDM is not set | ||
| 783 | |||
| 784 | # | ||
| 785 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 786 | # | ||
| 787 | |||
| 788 | # | ||
| 789 | # may also be needed; see USB_STORAGE Help for more information | ||
| 790 | # | ||
| 791 | CONFIG_USB_STORAGE=y | ||
| 792 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 793 | CONFIG_USB_STORAGE_DATAFAB=y | ||
| 794 | CONFIG_USB_STORAGE_FREECOM=y | ||
| 795 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 796 | CONFIG_USB_STORAGE_DPCM=y | ||
| 797 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 798 | CONFIG_USB_STORAGE_SDDR09=y | ||
| 799 | CONFIG_USB_STORAGE_SDDR55=y | ||
| 800 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
| 801 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 802 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 803 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 804 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 805 | # CONFIG_USB_LIBUSUAL is not set | ||
| 806 | |||
| 807 | # | ||
| 808 | # USB Imaging devices | ||
| 809 | # | ||
| 810 | # CONFIG_USB_MDC800 is not set | ||
| 811 | # CONFIG_USB_MICROTEK is not set | ||
| 812 | # CONFIG_USB_MON is not set | ||
| 813 | |||
| 814 | # | ||
| 815 | # USB port drivers | ||
| 816 | # | ||
| 817 | # CONFIG_USB_SERIAL is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # USB Miscellaneous drivers | ||
| 821 | # | ||
| 822 | # CONFIG_USB_EMI62 is not set | ||
| 823 | # CONFIG_USB_EMI26 is not set | ||
| 824 | # CONFIG_USB_ADUTUX is not set | ||
| 825 | # CONFIG_USB_AUERSWALD is not set | ||
| 826 | # CONFIG_USB_RIO500 is not set | ||
| 827 | # CONFIG_USB_LEGOTOWER is not set | ||
| 828 | # CONFIG_USB_LCD is not set | ||
| 829 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 830 | # CONFIG_USB_LED is not set | ||
| 831 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 832 | # CONFIG_USB_CYTHERM is not set | ||
| 833 | # CONFIG_USB_PHIDGET is not set | ||
| 834 | # CONFIG_USB_IDMOUSE is not set | ||
| 835 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 836 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 837 | # CONFIG_USB_LD is not set | ||
| 838 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 839 | # CONFIG_USB_IOWARRIOR is not set | ||
| 840 | # CONFIG_USB_TEST is not set | ||
| 841 | # CONFIG_USB_ISIGHTFW is not set | ||
| 842 | # CONFIG_USB_GADGET is not set | ||
| 843 | # CONFIG_MMC is not set | ||
| 844 | CONFIG_NEW_LEDS=y | ||
| 845 | # CONFIG_LEDS_CLASS is not set | ||
| 846 | |||
| 847 | # | ||
| 848 | # LED drivers | ||
| 849 | # | ||
| 850 | |||
| 851 | # | ||
| 852 | # LED Triggers | ||
| 853 | # | ||
| 854 | # CONFIG_LEDS_TRIGGERS is not set | ||
| 855 | CONFIG_RTC_LIB=y | ||
| 856 | # CONFIG_RTC_CLASS is not set | ||
| 857 | # CONFIG_UIO is not set | ||
| 858 | |||
| 859 | # | ||
| 860 | # File systems | ||
| 861 | # | ||
| 862 | CONFIG_EXT2_FS=y | ||
| 863 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 864 | # CONFIG_EXT2_FS_XIP is not set | ||
| 865 | CONFIG_EXT3_FS=y | ||
| 866 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 867 | # CONFIG_EXT4DEV_FS is not set | ||
| 868 | CONFIG_JBD=y | ||
| 869 | # CONFIG_REISERFS_FS is not set | ||
| 870 | # CONFIG_JFS_FS is not set | ||
| 871 | # CONFIG_FS_POSIX_ACL is not set | ||
| 872 | CONFIG_XFS_FS=y | ||
| 873 | # CONFIG_XFS_QUOTA is not set | ||
| 874 | # CONFIG_XFS_POSIX_ACL is not set | ||
| 875 | # CONFIG_XFS_RT is not set | ||
| 876 | # CONFIG_XFS_DEBUG is not set | ||
| 877 | # CONFIG_OCFS2_FS is not set | ||
| 878 | CONFIG_DNOTIFY=y | ||
| 879 | CONFIG_INOTIFY=y | ||
| 880 | CONFIG_INOTIFY_USER=y | ||
| 881 | # CONFIG_QUOTA is not set | ||
| 882 | # CONFIG_AUTOFS_FS is not set | ||
| 883 | # CONFIG_AUTOFS4_FS is not set | ||
| 884 | # CONFIG_FUSE_FS is not set | ||
| 885 | |||
| 886 | # | ||
| 887 | # CD-ROM/DVD Filesystems | ||
| 888 | # | ||
| 889 | CONFIG_ISO9660_FS=y | ||
| 890 | # CONFIG_JOLIET is not set | ||
| 891 | # CONFIG_ZISOFS is not set | ||
| 892 | CONFIG_UDF_FS=m | ||
| 893 | CONFIG_UDF_NLS=y | ||
| 894 | |||
| 895 | # | ||
| 896 | # DOS/FAT/NT Filesystems | ||
| 897 | # | ||
| 898 | CONFIG_FAT_FS=y | ||
| 899 | CONFIG_MSDOS_FS=y | ||
| 900 | CONFIG_VFAT_FS=y | ||
| 901 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 902 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 903 | # CONFIG_NTFS_FS is not set | ||
| 904 | |||
| 905 | # | ||
| 906 | # Pseudo filesystems | ||
| 907 | # | ||
| 908 | CONFIG_PROC_FS=y | ||
| 909 | CONFIG_PROC_SYSCTL=y | ||
| 910 | CONFIG_SYSFS=y | ||
| 911 | CONFIG_TMPFS=y | ||
| 912 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 913 | # CONFIG_HUGETLB_PAGE is not set | ||
| 914 | # CONFIG_CONFIGFS_FS is not set | ||
| 915 | |||
| 916 | # | ||
| 917 | # Miscellaneous filesystems | ||
| 918 | # | ||
| 919 | # CONFIG_ADFS_FS is not set | ||
| 920 | # CONFIG_AFFS_FS is not set | ||
| 921 | # CONFIG_HFS_FS is not set | ||
| 922 | # CONFIG_HFSPLUS_FS is not set | ||
| 923 | # CONFIG_BEFS_FS is not set | ||
| 924 | # CONFIG_BFS_FS is not set | ||
| 925 | # CONFIG_EFS_FS is not set | ||
| 926 | CONFIG_JFFS2_FS=y | ||
| 927 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 928 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 929 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 930 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 931 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 932 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 933 | CONFIG_JFFS2_ZLIB=y | ||
| 934 | # CONFIG_JFFS2_LZO is not set | ||
| 935 | CONFIG_JFFS2_RTIME=y | ||
| 936 | # CONFIG_JFFS2_RUBIN is not set | ||
| 937 | CONFIG_CRAMFS=y | ||
| 938 | # CONFIG_VXFS_FS is not set | ||
| 939 | # CONFIG_MINIX_FS is not set | ||
| 940 | # CONFIG_HPFS_FS is not set | ||
| 941 | # CONFIG_QNX4FS_FS is not set | ||
| 942 | # CONFIG_ROMFS_FS is not set | ||
| 943 | # CONFIG_SYSV_FS is not set | ||
| 944 | # CONFIG_UFS_FS is not set | ||
| 945 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 946 | CONFIG_NFS_FS=y | ||
| 947 | CONFIG_NFS_V3=y | ||
| 948 | # CONFIG_NFS_V3_ACL is not set | ||
| 949 | # CONFIG_NFS_V4 is not set | ||
| 950 | # CONFIG_NFSD is not set | ||
| 951 | CONFIG_ROOT_NFS=y | ||
| 952 | CONFIG_LOCKD=y | ||
| 953 | CONFIG_LOCKD_V4=y | ||
| 954 | CONFIG_NFS_COMMON=y | ||
| 955 | CONFIG_SUNRPC=y | ||
| 956 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 957 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 958 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 959 | # CONFIG_SMB_FS is not set | ||
| 960 | # CONFIG_CIFS is not set | ||
| 961 | # CONFIG_NCP_FS is not set | ||
| 962 | # CONFIG_CODA_FS is not set | ||
| 963 | # CONFIG_AFS_FS is not set | ||
| 964 | |||
| 965 | # | ||
| 966 | # Partition Types | ||
| 967 | # | ||
| 968 | CONFIG_PARTITION_ADVANCED=y | ||
| 969 | # CONFIG_ACORN_PARTITION is not set | ||
| 970 | # CONFIG_OSF_PARTITION is not set | ||
| 971 | # CONFIG_AMIGA_PARTITION is not set | ||
| 972 | # CONFIG_ATARI_PARTITION is not set | ||
| 973 | # CONFIG_MAC_PARTITION is not set | ||
| 974 | CONFIG_MSDOS_PARTITION=y | ||
| 975 | CONFIG_BSD_DISKLABEL=y | ||
| 976 | CONFIG_MINIX_SUBPARTITION=y | ||
| 977 | CONFIG_SOLARIS_X86_PARTITION=y | ||
| 978 | CONFIG_UNIXWARE_DISKLABEL=y | ||
| 979 | CONFIG_LDM_PARTITION=y | ||
| 980 | CONFIG_LDM_DEBUG=y | ||
| 981 | # CONFIG_SGI_PARTITION is not set | ||
| 982 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 983 | CONFIG_SUN_PARTITION=y | ||
| 984 | # CONFIG_KARMA_PARTITION is not set | ||
| 985 | # CONFIG_EFI_PARTITION is not set | ||
| 986 | # CONFIG_SYSV68_PARTITION is not set | ||
| 987 | CONFIG_NLS=y | ||
| 988 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 989 | CONFIG_NLS_CODEPAGE_437=y | ||
| 990 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 991 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 992 | CONFIG_NLS_CODEPAGE_850=y | ||
| 993 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 994 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 995 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 996 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 997 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 998 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 999 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1000 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1001 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1002 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1003 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1004 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1005 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1006 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1007 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1008 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1009 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1010 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1011 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1012 | # CONFIG_NLS_ASCII is not set | ||
| 1013 | CONFIG_NLS_ISO8859_1=y | ||
| 1014 | CONFIG_NLS_ISO8859_2=y | ||
| 1015 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1016 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1017 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1018 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1019 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1020 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1021 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1022 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1023 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1024 | # CONFIG_NLS_KOI8_R is not set | ||
| 1025 | # CONFIG_NLS_KOI8_U is not set | ||
| 1026 | # CONFIG_NLS_UTF8 is not set | ||
| 1027 | # CONFIG_DLM is not set | ||
| 1028 | |||
| 1029 | # | ||
| 1030 | # Kernel hacking | ||
| 1031 | # | ||
| 1032 | # CONFIG_PRINTK_TIME is not set | ||
| 1033 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1034 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1035 | CONFIG_FRAME_WARN=1024 | ||
| 1036 | CONFIG_MAGIC_SYSRQ=y | ||
| 1037 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1038 | # CONFIG_DEBUG_FS is not set | ||
| 1039 | # CONFIG_HEADERS_CHECK is not set | ||
| 1040 | # CONFIG_DEBUG_KERNEL is not set | ||
| 1041 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1042 | CONFIG_FRAME_POINTER=y | ||
| 1043 | # CONFIG_LATENCYTOP is not set | ||
| 1044 | # CONFIG_SAMPLES is not set | ||
| 1045 | CONFIG_DEBUG_USER=y | ||
| 1046 | |||
| 1047 | # | ||
| 1048 | # Security options | ||
| 1049 | # | ||
| 1050 | # CONFIG_KEYS is not set | ||
| 1051 | # CONFIG_SECURITY is not set | ||
| 1052 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1053 | CONFIG_CRYPTO=y | ||
| 1054 | |||
| 1055 | # | ||
| 1056 | # Crypto core or helper | ||
| 1057 | # | ||
| 1058 | CONFIG_CRYPTO_ALGAPI=m | ||
| 1059 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1060 | CONFIG_CRYPTO_MANAGER=m | ||
| 1061 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1062 | # CONFIG_CRYPTO_NULL is not set | ||
| 1063 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1064 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1065 | # CONFIG_CRYPTO_TEST is not set | ||
| 1066 | |||
| 1067 | # | ||
| 1068 | # Authenticated Encryption with Associated Data | ||
| 1069 | # | ||
| 1070 | # CONFIG_CRYPTO_CCM is not set | ||
| 1071 | # CONFIG_CRYPTO_GCM is not set | ||
| 1072 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1073 | |||
| 1074 | # | ||
| 1075 | # Block modes | ||
| 1076 | # | ||
| 1077 | CONFIG_CRYPTO_CBC=m | ||
| 1078 | # CONFIG_CRYPTO_CTR is not set | ||
| 1079 | # CONFIG_CRYPTO_CTS is not set | ||
| 1080 | CONFIG_CRYPTO_ECB=m | ||
| 1081 | # CONFIG_CRYPTO_LRW is not set | ||
| 1082 | CONFIG_CRYPTO_PCBC=m | ||
| 1083 | # CONFIG_CRYPTO_XTS is not set | ||
| 1084 | |||
| 1085 | # | ||
| 1086 | # Hash modes | ||
| 1087 | # | ||
| 1088 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1089 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Digest | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1095 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1096 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1097 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1098 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1099 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1100 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1101 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1102 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1103 | |||
| 1104 | # | ||
| 1105 | # Ciphers | ||
| 1106 | # | ||
| 1107 | # CONFIG_CRYPTO_AES is not set | ||
| 1108 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1109 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1110 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1111 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1112 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1113 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1114 | # CONFIG_CRYPTO_DES is not set | ||
| 1115 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1116 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1117 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1118 | # CONFIG_CRYPTO_SEED is not set | ||
| 1119 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1120 | # CONFIG_CRYPTO_TEA is not set | ||
| 1121 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1122 | |||
| 1123 | # | ||
| 1124 | # Compression | ||
| 1125 | # | ||
| 1126 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1127 | # CONFIG_CRYPTO_LZO is not set | ||
| 1128 | CONFIG_CRYPTO_HW=y | ||
| 1129 | |||
| 1130 | # | ||
| 1131 | # Library routines | ||
| 1132 | # | ||
| 1133 | CONFIG_BITREVERSE=y | ||
| 1134 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1135 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1136 | CONFIG_CRC_CCITT=y | ||
| 1137 | CONFIG_CRC16=y | ||
| 1138 | CONFIG_CRC_ITU_T=m | ||
| 1139 | CONFIG_CRC32=y | ||
| 1140 | # CONFIG_CRC7 is not set | ||
| 1141 | CONFIG_LIBCRC32C=y | ||
| 1142 | CONFIG_ZLIB_INFLATE=y | ||
| 1143 | CONFIG_ZLIB_DEFLATE=y | ||
| 1144 | CONFIG_PLIST=y | ||
| 1145 | CONFIG_HAS_IOMEM=y | ||
| 1146 | CONFIG_HAS_IOPORT=y | ||
| 1147 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig index a3bf5833b87a..1a38d8e3fe66 100644 --- a/arch/arm/configs/lpd270_defconfig +++ b/arch/arm/configs/lpd270_defconfig | |||
| @@ -173,7 +173,6 @@ CONFIG_XSCALE_PMU=y | |||
| 173 | # Kernel Features | 173 | # Kernel Features |
| 174 | # | 174 | # |
| 175 | # CONFIG_PREEMPT is not set | 175 | # CONFIG_PREEMPT is not set |
| 176 | # CONFIG_NO_IDLE_HZ is not set | ||
| 177 | CONFIG_HZ=100 | 176 | CONFIG_HZ=100 |
| 178 | # CONFIG_AEABI is not set | 177 | # CONFIG_AEABI is not set |
| 179 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 178 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/lpd7a404_defconfig b/arch/arm/configs/lpd7a404_defconfig index 46a0f7fe1fa5..7a2e932da1c6 100644 --- a/arch/arm/configs/lpd7a404_defconfig +++ b/arch/arm/configs/lpd7a404_defconfig | |||
| @@ -148,7 +148,6 @@ CONFIG_ARM_AMBA=y | |||
| 148 | # Kernel Features | 148 | # Kernel Features |
| 149 | # | 149 | # |
| 150 | CONFIG_PREEMPT=y | 150 | CONFIG_PREEMPT=y |
| 151 | # CONFIG_NO_IDLE_HZ is not set | ||
| 152 | # CONFIG_AEABI is not set | 151 | # CONFIG_AEABI is not set |
| 153 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 152 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
| 154 | CONFIG_SELECT_MEMORY_MODEL=y | 153 | CONFIG_SELECT_MEMORY_MODEL=y |
diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig new file mode 100644 index 000000000000..d38ebf8721a4 --- /dev/null +++ b/arch/arm/configs/mv78xx0_defconfig | |||
| @@ -0,0 +1,1445 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.26-rc5 | ||
| 4 | # Fri Jun 13 02:57:32 2008 | ||
| 5 | # | ||
| 6 | CONFIG_ARM=y | ||
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
| 8 | # CONFIG_GENERIC_GPIO is not set | ||
| 9 | CONFIG_GENERIC_TIME=y | ||
| 10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 11 | CONFIG_MMU=y | ||
| 12 | # CONFIG_NO_IOPORT is not set | ||
| 13 | CONFIG_GENERIC_HARDIRQS=y | ||
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
| 16 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 18 | CONFIG_HARDIRQS_SW_RESEND=y | ||
| 19 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 22 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 23 | CONFIG_GENERIC_HWEIGHT=y | ||
| 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 25 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 26 | CONFIG_ZONE_DMA=y | ||
| 27 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 28 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 29 | |||
| 30 | # | ||
| 31 | # General setup | ||
| 32 | # | ||
| 33 | CONFIG_EXPERIMENTAL=y | ||
| 34 | CONFIG_BROKEN_ON_SMP=y | ||
| 35 | CONFIG_LOCK_KERNEL=y | ||
| 36 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 37 | CONFIG_LOCALVERSION="" | ||
| 38 | CONFIG_LOCALVERSION_AUTO=y | ||
| 39 | CONFIG_SWAP=y | ||
| 40 | CONFIG_SYSVIPC=y | ||
| 41 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 42 | # CONFIG_POSIX_MQUEUE is not set | ||
| 43 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 44 | # CONFIG_TASKSTATS is not set | ||
| 45 | # CONFIG_AUDIT is not set | ||
| 46 | # CONFIG_IKCONFIG is not set | ||
| 47 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 48 | # CONFIG_CGROUPS is not set | ||
| 49 | # CONFIG_GROUP_SCHED is not set | ||
| 50 | CONFIG_SYSFS_DEPRECATED=y | ||
| 51 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 52 | # CONFIG_RELAY is not set | ||
| 53 | # CONFIG_NAMESPACES is not set | ||
| 54 | # CONFIG_BLK_DEV_INITRD is not set | ||
| 55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 56 | CONFIG_SYSCTL=y | ||
| 57 | CONFIG_EMBEDDED=y | ||
| 58 | CONFIG_UID16=y | ||
| 59 | CONFIG_SYSCTL_SYSCALL=y | ||
| 60 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 61 | CONFIG_KALLSYMS=y | ||
| 62 | CONFIG_KALLSYMS_ALL=y | ||
| 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 64 | CONFIG_HOTPLUG=y | ||
| 65 | CONFIG_PRINTK=y | ||
| 66 | CONFIG_BUG=y | ||
| 67 | CONFIG_ELF_CORE=y | ||
| 68 | CONFIG_COMPAT_BRK=y | ||
| 69 | CONFIG_BASE_FULL=y | ||
| 70 | CONFIG_FUTEX=y | ||
| 71 | CONFIG_ANON_INODES=y | ||
| 72 | CONFIG_EPOLL=y | ||
| 73 | CONFIG_SIGNALFD=y | ||
| 74 | CONFIG_TIMERFD=y | ||
| 75 | CONFIG_EVENTFD=y | ||
| 76 | CONFIG_SHMEM=y | ||
| 77 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 78 | # CONFIG_SLUB_DEBUG is not set | ||
| 79 | # CONFIG_SLAB is not set | ||
| 80 | CONFIG_SLUB=y | ||
| 81 | # CONFIG_SLOB is not set | ||
| 82 | CONFIG_PROFILING=y | ||
| 83 | # CONFIG_MARKERS is not set | ||
| 84 | CONFIG_OPROFILE=y | ||
| 85 | CONFIG_HAVE_OPROFILE=y | ||
| 86 | CONFIG_KPROBES=y | ||
| 87 | CONFIG_KRETPROBES=y | ||
| 88 | CONFIG_HAVE_KPROBES=y | ||
| 89 | CONFIG_HAVE_KRETPROBES=y | ||
| 90 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 91 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 92 | CONFIG_RT_MUTEXES=y | ||
| 93 | # CONFIG_TINY_SHMEM is not set | ||
| 94 | CONFIG_BASE_SMALL=0 | ||
| 95 | CONFIG_MODULES=y | ||
| 96 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 97 | CONFIG_MODULE_UNLOAD=y | ||
| 98 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 99 | # CONFIG_MODVERSIONS is not set | ||
| 100 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 101 | # CONFIG_KMOD is not set | ||
| 102 | CONFIG_BLOCK=y | ||
| 103 | # CONFIG_LBD is not set | ||
| 104 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 105 | # CONFIG_LSF is not set | ||
| 106 | # CONFIG_BLK_DEV_BSG is not set | ||
| 107 | |||
| 108 | # | ||
| 109 | # IO Schedulers | ||
| 110 | # | ||
| 111 | CONFIG_IOSCHED_NOOP=y | ||
| 112 | CONFIG_IOSCHED_AS=y | ||
| 113 | CONFIG_IOSCHED_DEADLINE=y | ||
| 114 | CONFIG_IOSCHED_CFQ=y | ||
| 115 | # CONFIG_DEFAULT_AS is not set | ||
| 116 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 117 | CONFIG_DEFAULT_CFQ=y | ||
| 118 | # CONFIG_DEFAULT_NOOP is not set | ||
| 119 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
| 120 | CONFIG_CLASSIC_RCU=y | ||
| 121 | |||
| 122 | # | ||
| 123 | # System Type | ||
| 124 | # | ||
| 125 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 126 | # CONFIG_ARCH_INTEGRATOR is not set | ||
| 127 | # CONFIG_ARCH_REALVIEW is not set | ||
| 128 | # CONFIG_ARCH_VERSATILE is not set | ||
| 129 | # CONFIG_ARCH_AT91 is not set | ||
| 130 | # CONFIG_ARCH_CLPS7500 is not set | ||
| 131 | # CONFIG_ARCH_CLPS711X is not set | ||
| 132 | # CONFIG_ARCH_CO285 is not set | ||
| 133 | # CONFIG_ARCH_EBSA110 is not set | ||
| 134 | # CONFIG_ARCH_EP93XX is not set | ||
| 135 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
| 136 | # CONFIG_ARCH_NETX is not set | ||
| 137 | # CONFIG_ARCH_H720X is not set | ||
| 138 | # CONFIG_ARCH_IMX is not set | ||
| 139 | # CONFIG_ARCH_IOP13XX is not set | ||
| 140 | # CONFIG_ARCH_IOP32X is not set | ||
| 141 | # CONFIG_ARCH_IOP33X is not set | ||
| 142 | # CONFIG_ARCH_IXP23XX is not set | ||
| 143 | # CONFIG_ARCH_IXP2000 is not set | ||
| 144 | # CONFIG_ARCH_IXP4XX is not set | ||
| 145 | # CONFIG_ARCH_L7200 is not set | ||
| 146 | # CONFIG_ARCH_KIRKWOOD is not set | ||
| 147 | # CONFIG_ARCH_KS8695 is not set | ||
| 148 | # CONFIG_ARCH_NS9XXX is not set | ||
| 149 | # CONFIG_ARCH_LOKI is not set | ||
| 150 | CONFIG_ARCH_MV78XX0=y | ||
| 151 | # CONFIG_ARCH_MXC is not set | ||
| 152 | # CONFIG_ARCH_ORION5X is not set | ||
| 153 | # CONFIG_ARCH_PNX4008 is not set | ||
| 154 | # CONFIG_ARCH_PXA is not set | ||
| 155 | # CONFIG_ARCH_RPC is not set | ||
| 156 | # CONFIG_ARCH_SA1100 is not set | ||
| 157 | # CONFIG_ARCH_S3C2410 is not set | ||
| 158 | # CONFIG_ARCH_SHARK is not set | ||
| 159 | # CONFIG_ARCH_LH7A40X is not set | ||
| 160 | # CONFIG_ARCH_DAVINCI is not set | ||
| 161 | # CONFIG_ARCH_OMAP is not set | ||
| 162 | # CONFIG_ARCH_MSM7X00A is not set | ||
| 163 | |||
| 164 | # | ||
| 165 | # Marvell MV78xx0 Implementations | ||
| 166 | # | ||
| 167 | CONFIG_MACH_DB78X00_BP=y | ||
| 168 | |||
| 169 | # | ||
| 170 | # Boot options | ||
| 171 | # | ||
| 172 | |||
| 173 | # | ||
| 174 | # Power management | ||
| 175 | # | ||
| 176 | CONFIG_PLAT_ORION=y | ||
| 177 | |||
| 178 | # | ||
| 179 | # Processor Type | ||
| 180 | # | ||
| 181 | CONFIG_CPU_32=y | ||
| 182 | CONFIG_CPU_FEROCEON=y | ||
| 183 | CONFIG_CPU_FEROCEON_OLD_ID=y | ||
| 184 | CONFIG_CPU_32v5=y | ||
| 185 | CONFIG_CPU_ABRT_EV5T=y | ||
| 186 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 187 | CONFIG_CPU_CACHE_VIVT=y | ||
| 188 | CONFIG_CPU_COPY_FEROCEON=y | ||
| 189 | CONFIG_CPU_TLB_FEROCEON=y | ||
| 190 | CONFIG_CPU_CP15=y | ||
| 191 | CONFIG_CPU_CP15_MMU=y | ||
| 192 | |||
| 193 | # | ||
| 194 | # Processor Features | ||
| 195 | # | ||
| 196 | CONFIG_ARM_THUMB=y | ||
| 197 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
| 198 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
| 199 | CONFIG_OUTER_CACHE=y | ||
| 200 | CONFIG_CACHE_FEROCEON_L2=y | ||
| 201 | |||
| 202 | # | ||
| 203 | # Bus support | ||
| 204 | # | ||
| 205 | CONFIG_PCI=y | ||
| 206 | CONFIG_PCI_SYSCALL=y | ||
| 207 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 208 | CONFIG_PCI_LEGACY=y | ||
| 209 | # CONFIG_PCI_DEBUG is not set | ||
| 210 | # CONFIG_PCCARD is not set | ||
| 211 | |||
| 212 | # | ||
| 213 | # Kernel Features | ||
| 214 | # | ||
| 215 | CONFIG_TICK_ONESHOT=y | ||
| 216 | CONFIG_NO_HZ=y | ||
| 217 | CONFIG_HIGH_RES_TIMERS=y | ||
| 218 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 219 | CONFIG_PREEMPT=y | ||
| 220 | CONFIG_HZ=100 | ||
| 221 | CONFIG_AEABI=y | ||
| 222 | CONFIG_OABI_COMPAT=y | ||
| 223 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 224 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 225 | CONFIG_FLATMEM_MANUAL=y | ||
| 226 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 227 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 228 | CONFIG_FLATMEM=y | ||
| 229 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 230 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 231 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 232 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 233 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 234 | # CONFIG_RESOURCES_64BIT is not set | ||
| 235 | CONFIG_ZONE_DMA_FLAG=1 | ||
| 236 | CONFIG_BOUNCE=y | ||
| 237 | CONFIG_VIRT_TO_BUS=y | ||
| 238 | CONFIG_ALIGNMENT_TRAP=y | ||
| 239 | |||
| 240 | # | ||
| 241 | # Boot options | ||
| 242 | # | ||
| 243 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
| 244 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
| 245 | CONFIG_CMDLINE="" | ||
| 246 | # CONFIG_XIP_KERNEL is not set | ||
| 247 | # CONFIG_KEXEC is not set | ||
| 248 | |||
| 249 | # | ||
| 250 | # Floating point emulation | ||
| 251 | # | ||
| 252 | |||
| 253 | # | ||
| 254 | # At least one emulation must be selected | ||
| 255 | # | ||
| 256 | CONFIG_FPE_NWFPE=y | ||
| 257 | # CONFIG_FPE_NWFPE_XP is not set | ||
| 258 | # CONFIG_FPE_FASTFPE is not set | ||
| 259 | CONFIG_VFP=y | ||
| 260 | |||
| 261 | # | ||
| 262 | # Userspace binary formats | ||
| 263 | # | ||
| 264 | CONFIG_BINFMT_ELF=y | ||
| 265 | # CONFIG_BINFMT_AOUT is not set | ||
| 266 | # CONFIG_BINFMT_MISC is not set | ||
| 267 | |||
| 268 | # | ||
| 269 | # Power management options | ||
| 270 | # | ||
| 271 | # CONFIG_PM is not set | ||
| 272 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 273 | |||
| 274 | # | ||
| 275 | # Networking | ||
| 276 | # | ||
| 277 | CONFIG_NET=y | ||
| 278 | |||
| 279 | # | ||
| 280 | # Networking options | ||
| 281 | # | ||
| 282 | CONFIG_PACKET=y | ||
| 283 | CONFIG_PACKET_MMAP=y | ||
| 284 | CONFIG_UNIX=y | ||
| 285 | CONFIG_XFRM=y | ||
| 286 | # CONFIG_XFRM_USER is not set | ||
| 287 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 288 | # CONFIG_XFRM_MIGRATE is not set | ||
| 289 | # CONFIG_XFRM_STATISTICS is not set | ||
| 290 | # CONFIG_NET_KEY is not set | ||
| 291 | CONFIG_INET=y | ||
| 292 | CONFIG_IP_MULTICAST=y | ||
| 293 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 294 | CONFIG_IP_FIB_HASH=y | ||
| 295 | CONFIG_IP_PNP=y | ||
| 296 | CONFIG_IP_PNP_DHCP=y | ||
| 297 | CONFIG_IP_PNP_BOOTP=y | ||
| 298 | # CONFIG_IP_PNP_RARP is not set | ||
| 299 | # CONFIG_NET_IPIP is not set | ||
| 300 | # CONFIG_NET_IPGRE is not set | ||
| 301 | # CONFIG_IP_MROUTE is not set | ||
| 302 | # CONFIG_ARPD is not set | ||
| 303 | # CONFIG_SYN_COOKIES is not set | ||
| 304 | # CONFIG_INET_AH is not set | ||
| 305 | # CONFIG_INET_ESP is not set | ||
| 306 | # CONFIG_INET_IPCOMP is not set | ||
| 307 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 308 | # CONFIG_INET_TUNNEL is not set | ||
| 309 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
| 310 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
| 311 | CONFIG_INET_XFRM_MODE_BEET=y | ||
| 312 | # CONFIG_INET_LRO is not set | ||
| 313 | CONFIG_INET_DIAG=y | ||
| 314 | CONFIG_INET_TCP_DIAG=y | ||
| 315 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 316 | CONFIG_TCP_CONG_CUBIC=y | ||
| 317 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 318 | # CONFIG_TCP_MD5SIG is not set | ||
| 319 | # CONFIG_IPV6 is not set | ||
| 320 | # CONFIG_NETWORK_SECMARK is not set | ||
| 321 | # CONFIG_NETFILTER is not set | ||
| 322 | # CONFIG_IP_DCCP is not set | ||
| 323 | # CONFIG_IP_SCTP is not set | ||
| 324 | # CONFIG_TIPC is not set | ||
| 325 | # CONFIG_ATM is not set | ||
| 326 | # CONFIG_BRIDGE is not set | ||
| 327 | # CONFIG_VLAN_8021Q is not set | ||
| 328 | # CONFIG_DECNET is not set | ||
| 329 | # CONFIG_LLC2 is not set | ||
| 330 | # CONFIG_IPX is not set | ||
| 331 | # CONFIG_ATALK is not set | ||
| 332 | # CONFIG_X25 is not set | ||
| 333 | # CONFIG_LAPB is not set | ||
| 334 | # CONFIG_ECONET is not set | ||
| 335 | # CONFIG_WAN_ROUTER is not set | ||
| 336 | # CONFIG_NET_SCHED is not set | ||
| 337 | |||
| 338 | # | ||
| 339 | # Network testing | ||
| 340 | # | ||
| 341 | CONFIG_NET_PKTGEN=m | ||
| 342 | # CONFIG_NET_TCPPROBE is not set | ||
| 343 | # CONFIG_HAMRADIO is not set | ||
| 344 | # CONFIG_CAN is not set | ||
| 345 | # CONFIG_IRDA is not set | ||
| 346 | # CONFIG_BT is not set | ||
| 347 | # CONFIG_AF_RXRPC is not set | ||
| 348 | |||
| 349 | # | ||
| 350 | # Wireless | ||
| 351 | # | ||
| 352 | # CONFIG_CFG80211 is not set | ||
| 353 | CONFIG_WIRELESS_EXT=y | ||
| 354 | # CONFIG_MAC80211 is not set | ||
| 355 | # CONFIG_IEEE80211 is not set | ||
| 356 | # CONFIG_RFKILL is not set | ||
| 357 | # CONFIG_NET_9P is not set | ||
| 358 | |||
| 359 | # | ||
| 360 | # Device Drivers | ||
| 361 | # | ||
| 362 | |||
| 363 | # | ||
| 364 | # Generic Driver Options | ||
| 365 | # | ||
| 366 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 367 | CONFIG_STANDALONE=y | ||
| 368 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
| 369 | CONFIG_FW_LOADER=y | ||
| 370 | # CONFIG_DEBUG_DRIVER is not set | ||
| 371 | # CONFIG_DEBUG_DEVRES is not set | ||
| 372 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 373 | # CONFIG_CONNECTOR is not set | ||
| 374 | CONFIG_MTD=y | ||
| 375 | # CONFIG_MTD_DEBUG is not set | ||
| 376 | # CONFIG_MTD_CONCAT is not set | ||
| 377 | CONFIG_MTD_PARTITIONS=y | ||
| 378 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 379 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 380 | # CONFIG_MTD_AFS_PARTS is not set | ||
| 381 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 382 | |||
| 383 | # | ||
| 384 | # User Modules And Translation Layers | ||
| 385 | # | ||
| 386 | CONFIG_MTD_CHAR=y | ||
| 387 | CONFIG_MTD_BLKDEVS=y | ||
| 388 | CONFIG_MTD_BLOCK=y | ||
| 389 | # CONFIG_FTL is not set | ||
| 390 | # CONFIG_NFTL is not set | ||
| 391 | # CONFIG_INFTL is not set | ||
| 392 | # CONFIG_RFD_FTL is not set | ||
| 393 | # CONFIG_SSFDC is not set | ||
| 394 | # CONFIG_MTD_OOPS is not set | ||
| 395 | |||
| 396 | # | ||
| 397 | # RAM/ROM/Flash chip drivers | ||
| 398 | # | ||
| 399 | CONFIG_MTD_CFI=y | ||
| 400 | CONFIG_MTD_JEDECPROBE=y | ||
| 401 | CONFIG_MTD_GEN_PROBE=y | ||
| 402 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
| 403 | CONFIG_MTD_CFI_NOSWAP=y | ||
| 404 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
| 405 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
| 406 | CONFIG_MTD_CFI_GEOMETRY=y | ||
| 407 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 408 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 409 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 410 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 411 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 412 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 413 | CONFIG_MTD_CFI_I1=y | ||
| 414 | CONFIG_MTD_CFI_I2=y | ||
| 415 | # CONFIG_MTD_CFI_I4 is not set | ||
| 416 | # CONFIG_MTD_CFI_I8 is not set | ||
| 417 | # CONFIG_MTD_OTP is not set | ||
| 418 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 419 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 420 | # CONFIG_MTD_CFI_STAA is not set | ||
| 421 | CONFIG_MTD_CFI_UTIL=y | ||
| 422 | # CONFIG_MTD_RAM is not set | ||
| 423 | # CONFIG_MTD_ROM is not set | ||
| 424 | # CONFIG_MTD_ABSENT is not set | ||
| 425 | |||
| 426 | # | ||
| 427 | # Mapping drivers for chip access | ||
| 428 | # | ||
| 429 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 430 | CONFIG_MTD_PHYSMAP=y | ||
| 431 | CONFIG_MTD_PHYSMAP_START=0x0 | ||
| 432 | CONFIG_MTD_PHYSMAP_LEN=0x0 | ||
| 433 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
| 434 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 435 | # CONFIG_MTD_IMPA7 is not set | ||
| 436 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
| 437 | # CONFIG_MTD_PLATRAM is not set | ||
| 438 | |||
| 439 | # | ||
| 440 | # Self-contained MTD device drivers | ||
| 441 | # | ||
| 442 | # CONFIG_MTD_PMC551 is not set | ||
| 443 | # CONFIG_MTD_SLRAM is not set | ||
| 444 | # CONFIG_MTD_PHRAM is not set | ||
| 445 | # CONFIG_MTD_MTDRAM is not set | ||
| 446 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 447 | |||
| 448 | # | ||
| 449 | # Disk-On-Chip Device Drivers | ||
| 450 | # | ||
| 451 | # CONFIG_MTD_DOC2000 is not set | ||
| 452 | # CONFIG_MTD_DOC2001 is not set | ||
| 453 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 454 | CONFIG_MTD_NAND=y | ||
| 455 | CONFIG_MTD_NAND_VERIFY_WRITE=y | ||
| 456 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
| 457 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 458 | CONFIG_MTD_NAND_IDS=y | ||
| 459 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 460 | # CONFIG_MTD_NAND_CAFE is not set | ||
| 461 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 462 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
| 463 | # CONFIG_MTD_ALAUDA is not set | ||
| 464 | CONFIG_MTD_NAND_ORION=y | ||
| 465 | # CONFIG_MTD_ONENAND is not set | ||
| 466 | |||
| 467 | # | ||
| 468 | # UBI - Unsorted block images | ||
| 469 | # | ||
| 470 | # CONFIG_MTD_UBI is not set | ||
| 471 | # CONFIG_PARPORT is not set | ||
| 472 | CONFIG_BLK_DEV=y | ||
| 473 | # CONFIG_BLK_CPQ_DA is not set | ||
| 474 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
| 475 | # CONFIG_BLK_DEV_DAC960 is not set | ||
| 476 | # CONFIG_BLK_DEV_UMEM is not set | ||
| 477 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 478 | CONFIG_BLK_DEV_LOOP=y | ||
| 479 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 480 | # CONFIG_BLK_DEV_NBD is not set | ||
| 481 | # CONFIG_BLK_DEV_SX8 is not set | ||
| 482 | # CONFIG_BLK_DEV_UB is not set | ||
| 483 | # CONFIG_BLK_DEV_RAM is not set | ||
| 484 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 485 | # CONFIG_ATA_OVER_ETH is not set | ||
| 486 | CONFIG_MISC_DEVICES=y | ||
| 487 | # CONFIG_PHANTOM is not set | ||
| 488 | # CONFIG_EEPROM_93CX6 is not set | ||
| 489 | # CONFIG_SGI_IOC4 is not set | ||
| 490 | # CONFIG_TIFM_CORE is not set | ||
| 491 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 492 | CONFIG_HAVE_IDE=y | ||
| 493 | # CONFIG_IDE is not set | ||
| 494 | |||
| 495 | # | ||
| 496 | # SCSI device support | ||
| 497 | # | ||
| 498 | # CONFIG_RAID_ATTRS is not set | ||
| 499 | CONFIG_SCSI=y | ||
| 500 | CONFIG_SCSI_DMA=y | ||
| 501 | # CONFIG_SCSI_TGT is not set | ||
| 502 | # CONFIG_SCSI_NETLINK is not set | ||
| 503 | # CONFIG_SCSI_PROC_FS is not set | ||
| 504 | |||
| 505 | # | ||
| 506 | # SCSI support type (disk, tape, CD-ROM) | ||
| 507 | # | ||
| 508 | CONFIG_BLK_DEV_SD=y | ||
| 509 | # CONFIG_CHR_DEV_ST is not set | ||
| 510 | # CONFIG_CHR_DEV_OSST is not set | ||
| 511 | CONFIG_BLK_DEV_SR=m | ||
| 512 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
| 513 | CONFIG_CHR_DEV_SG=m | ||
| 514 | # CONFIG_CHR_DEV_SCH is not set | ||
| 515 | |||
| 516 | # | ||
| 517 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 518 | # | ||
| 519 | # CONFIG_SCSI_MULTI_LUN is not set | ||
| 520 | # CONFIG_SCSI_CONSTANTS is not set | ||
| 521 | # CONFIG_SCSI_LOGGING is not set | ||
| 522 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
| 523 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 524 | |||
| 525 | # | ||
| 526 | # SCSI Transports | ||
| 527 | # | ||
| 528 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 529 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 530 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 531 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 532 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 533 | CONFIG_SCSI_LOWLEVEL=y | ||
| 534 | # CONFIG_ISCSI_TCP is not set | ||
| 535 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 536 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 537 | # CONFIG_SCSI_ACARD is not set | ||
| 538 | # CONFIG_SCSI_AACRAID is not set | ||
| 539 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 540 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 541 | # CONFIG_SCSI_AIC79XX is not set | ||
| 542 | # CONFIG_SCSI_AIC94XX is not set | ||
| 543 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 544 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 545 | # CONFIG_SCSI_ARCMSR is not set | ||
| 546 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 547 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 548 | # CONFIG_MEGARAID_SAS is not set | ||
| 549 | # CONFIG_SCSI_HPTIOP is not set | ||
| 550 | # CONFIG_SCSI_DMX3191D is not set | ||
| 551 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 552 | # CONFIG_SCSI_IPS is not set | ||
| 553 | # CONFIG_SCSI_INITIO is not set | ||
| 554 | # CONFIG_SCSI_INIA100 is not set | ||
| 555 | # CONFIG_SCSI_MVSAS is not set | ||
| 556 | # CONFIG_SCSI_STEX is not set | ||
| 557 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 558 | # CONFIG_SCSI_IPR is not set | ||
| 559 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 560 | # CONFIG_SCSI_QLA_FC is not set | ||
| 561 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 562 | # CONFIG_SCSI_LPFC is not set | ||
| 563 | # CONFIG_SCSI_DC395x is not set | ||
| 564 | # CONFIG_SCSI_DC390T is not set | ||
| 565 | # CONFIG_SCSI_NSP32 is not set | ||
| 566 | # CONFIG_SCSI_DEBUG is not set | ||
| 567 | # CONFIG_SCSI_SRP is not set | ||
| 568 | CONFIG_ATA=y | ||
| 569 | # CONFIG_ATA_NONSTANDARD is not set | ||
| 570 | CONFIG_SATA_PMP=y | ||
| 571 | # CONFIG_SATA_AHCI is not set | ||
| 572 | # CONFIG_SATA_SIL24 is not set | ||
| 573 | CONFIG_ATA_SFF=y | ||
| 574 | # CONFIG_SATA_SVW is not set | ||
| 575 | # CONFIG_ATA_PIIX is not set | ||
| 576 | CONFIG_SATA_MV=y | ||
| 577 | # CONFIG_SATA_NV is not set | ||
| 578 | # CONFIG_PDC_ADMA is not set | ||
| 579 | # CONFIG_SATA_QSTOR is not set | ||
| 580 | # CONFIG_SATA_PROMISE is not set | ||
| 581 | # CONFIG_SATA_SX4 is not set | ||
| 582 | # CONFIG_SATA_SIL is not set | ||
| 583 | # CONFIG_SATA_SIS is not set | ||
| 584 | # CONFIG_SATA_ULI is not set | ||
| 585 | # CONFIG_SATA_VIA is not set | ||
| 586 | # CONFIG_SATA_VITESSE is not set | ||
| 587 | # CONFIG_SATA_INIC162X is not set | ||
| 588 | # CONFIG_PATA_ALI is not set | ||
| 589 | # CONFIG_PATA_AMD is not set | ||
| 590 | # CONFIG_PATA_ARTOP is not set | ||
| 591 | # CONFIG_PATA_ATIIXP is not set | ||
| 592 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 593 | # CONFIG_PATA_CMD64X is not set | ||
| 594 | # CONFIG_PATA_CS5520 is not set | ||
| 595 | # CONFIG_PATA_CS5530 is not set | ||
| 596 | # CONFIG_PATA_CYPRESS is not set | ||
| 597 | # CONFIG_PATA_EFAR is not set | ||
| 598 | # CONFIG_ATA_GENERIC is not set | ||
| 599 | # CONFIG_PATA_HPT366 is not set | ||
| 600 | # CONFIG_PATA_HPT37X is not set | ||
| 601 | # CONFIG_PATA_HPT3X2N is not set | ||
| 602 | # CONFIG_PATA_HPT3X3 is not set | ||
| 603 | # CONFIG_PATA_IT821X is not set | ||
| 604 | # CONFIG_PATA_IT8213 is not set | ||
| 605 | # CONFIG_PATA_JMICRON is not set | ||
| 606 | # CONFIG_PATA_TRIFLEX is not set | ||
| 607 | # CONFIG_PATA_MARVELL is not set | ||
| 608 | # CONFIG_PATA_MPIIX is not set | ||
| 609 | # CONFIG_PATA_OLDPIIX is not set | ||
| 610 | # CONFIG_PATA_NETCELL is not set | ||
| 611 | # CONFIG_PATA_NINJA32 is not set | ||
| 612 | # CONFIG_PATA_NS87410 is not set | ||
| 613 | # CONFIG_PATA_NS87415 is not set | ||
| 614 | # CONFIG_PATA_OPTI is not set | ||
| 615 | # CONFIG_PATA_OPTIDMA is not set | ||
| 616 | # CONFIG_PATA_PDC_OLD is not set | ||
| 617 | # CONFIG_PATA_RADISYS is not set | ||
| 618 | # CONFIG_PATA_RZ1000 is not set | ||
| 619 | # CONFIG_PATA_SC1200 is not set | ||
| 620 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 621 | # CONFIG_PATA_PDC2027X is not set | ||
| 622 | # CONFIG_PATA_SIL680 is not set | ||
| 623 | # CONFIG_PATA_SIS is not set | ||
| 624 | # CONFIG_PATA_VIA is not set | ||
| 625 | # CONFIG_PATA_WINBOND is not set | ||
| 626 | # CONFIG_PATA_PLATFORM is not set | ||
| 627 | # CONFIG_PATA_SCH is not set | ||
| 628 | # CONFIG_MD is not set | ||
| 629 | # CONFIG_FUSION is not set | ||
| 630 | |||
| 631 | # | ||
| 632 | # IEEE 1394 (FireWire) support | ||
| 633 | # | ||
| 634 | # CONFIG_FIREWIRE is not set | ||
| 635 | # CONFIG_IEEE1394 is not set | ||
| 636 | # CONFIG_I2O is not set | ||
| 637 | CONFIG_NETDEVICES=y | ||
| 638 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 639 | # CONFIG_DUMMY is not set | ||
| 640 | # CONFIG_BONDING is not set | ||
| 641 | # CONFIG_MACVLAN is not set | ||
| 642 | # CONFIG_EQUALIZER is not set | ||
| 643 | # CONFIG_TUN is not set | ||
| 644 | # CONFIG_VETH is not set | ||
| 645 | # CONFIG_ARCNET is not set | ||
| 646 | # CONFIG_PHYLIB is not set | ||
| 647 | CONFIG_NET_ETHERNET=y | ||
| 648 | CONFIG_MII=y | ||
| 649 | # CONFIG_AX88796 is not set | ||
| 650 | # CONFIG_HAPPYMEAL is not set | ||
| 651 | # CONFIG_SUNGEM is not set | ||
| 652 | # CONFIG_CASSINI is not set | ||
| 653 | # CONFIG_NET_VENDOR_3COM is not set | ||
| 654 | # CONFIG_SMC91X is not set | ||
| 655 | # CONFIG_DM9000 is not set | ||
| 656 | # CONFIG_NET_TULIP is not set | ||
| 657 | # CONFIG_HP100 is not set | ||
| 658 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 659 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 660 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 661 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 662 | CONFIG_NET_PCI=y | ||
| 663 | # CONFIG_PCNET32 is not set | ||
| 664 | # CONFIG_AMD8111_ETH is not set | ||
| 665 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
| 666 | # CONFIG_B44 is not set | ||
| 667 | # CONFIG_FORCEDETH is not set | ||
| 668 | # CONFIG_EEPRO100 is not set | ||
| 669 | # CONFIG_E100 is not set | ||
| 670 | # CONFIG_FEALNX is not set | ||
| 671 | # CONFIG_NATSEMI is not set | ||
| 672 | # CONFIG_NE2K_PCI is not set | ||
| 673 | # CONFIG_8139CP is not set | ||
| 674 | # CONFIG_8139TOO is not set | ||
| 675 | # CONFIG_R6040 is not set | ||
| 676 | # CONFIG_SIS900 is not set | ||
| 677 | # CONFIG_EPIC100 is not set | ||
| 678 | # CONFIG_SUNDANCE is not set | ||
| 679 | # CONFIG_TLAN is not set | ||
| 680 | # CONFIG_VIA_RHINE is not set | ||
| 681 | # CONFIG_SC92031 is not set | ||
| 682 | CONFIG_NETDEV_1000=y | ||
| 683 | # CONFIG_ACENIC is not set | ||
| 684 | # CONFIG_DL2K is not set | ||
| 685 | # CONFIG_E1000 is not set | ||
| 686 | # CONFIG_E1000E is not set | ||
| 687 | # CONFIG_E1000E_ENABLED is not set | ||
| 688 | # CONFIG_IP1000 is not set | ||
| 689 | # CONFIG_IGB is not set | ||
| 690 | # CONFIG_NS83820 is not set | ||
| 691 | # CONFIG_HAMACHI is not set | ||
| 692 | # CONFIG_YELLOWFIN is not set | ||
| 693 | # CONFIG_R8169 is not set | ||
| 694 | # CONFIG_SIS190 is not set | ||
| 695 | # CONFIG_SKGE is not set | ||
| 696 | # CONFIG_SKY2 is not set | ||
| 697 | # CONFIG_VIA_VELOCITY is not set | ||
| 698 | # CONFIG_TIGON3 is not set | ||
| 699 | # CONFIG_BNX2 is not set | ||
| 700 | CONFIG_MV643XX_ETH=y | ||
| 701 | # CONFIG_QLA3XXX is not set | ||
| 702 | # CONFIG_ATL1 is not set | ||
| 703 | # CONFIG_NETDEV_10000 is not set | ||
| 704 | # CONFIG_TR is not set | ||
| 705 | |||
| 706 | # | ||
| 707 | # Wireless LAN | ||
| 708 | # | ||
| 709 | # CONFIG_WLAN_PRE80211 is not set | ||
| 710 | # CONFIG_WLAN_80211 is not set | ||
| 711 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 712 | |||
| 713 | # | ||
| 714 | # USB Network Adapters | ||
| 715 | # | ||
| 716 | # CONFIG_USB_CATC is not set | ||
| 717 | # CONFIG_USB_KAWETH is not set | ||
| 718 | # CONFIG_USB_PEGASUS is not set | ||
| 719 | # CONFIG_USB_RTL8150 is not set | ||
| 720 | # CONFIG_USB_USBNET is not set | ||
| 721 | # CONFIG_WAN is not set | ||
| 722 | # CONFIG_FDDI is not set | ||
| 723 | # CONFIG_HIPPI is not set | ||
| 724 | # CONFIG_PPP is not set | ||
| 725 | # CONFIG_SLIP is not set | ||
| 726 | # CONFIG_NET_FC is not set | ||
| 727 | # CONFIG_NETCONSOLE is not set | ||
| 728 | # CONFIG_NETPOLL is not set | ||
| 729 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 730 | # CONFIG_ISDN is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # Input device support | ||
| 734 | # | ||
| 735 | CONFIG_INPUT=y | ||
| 736 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 737 | # CONFIG_INPUT_POLLDEV is not set | ||
| 738 | |||
| 739 | # | ||
| 740 | # Userland interfaces | ||
| 741 | # | ||
| 742 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 743 | # CONFIG_INPUT_JOYDEV is not set | ||
| 744 | CONFIG_INPUT_EVDEV=y | ||
| 745 | # CONFIG_INPUT_EVBUG is not set | ||
| 746 | |||
| 747 | # | ||
| 748 | # Input Device Drivers | ||
| 749 | # | ||
| 750 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 751 | # CONFIG_INPUT_MOUSE is not set | ||
| 752 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 753 | # CONFIG_INPUT_TABLET is not set | ||
| 754 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 755 | # CONFIG_INPUT_MISC is not set | ||
| 756 | |||
| 757 | # | ||
| 758 | # Hardware I/O ports | ||
| 759 | # | ||
| 760 | # CONFIG_SERIO is not set | ||
| 761 | # CONFIG_GAMEPORT is not set | ||
| 762 | |||
| 763 | # | ||
| 764 | # Character devices | ||
| 765 | # | ||
| 766 | # CONFIG_VT is not set | ||
| 767 | CONFIG_DEVKMEM=y | ||
| 768 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 769 | # CONFIG_NOZOMI is not set | ||
| 770 | |||
| 771 | # | ||
| 772 | # Serial drivers | ||
| 773 | # | ||
| 774 | CONFIG_SERIAL_8250=y | ||
| 775 | CONFIG_SERIAL_8250_CONSOLE=y | ||
| 776 | # CONFIG_SERIAL_8250_PCI is not set | ||
| 777 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 778 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | ||
| 779 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
| 780 | |||
| 781 | # | ||
| 782 | # Non-8250 serial port support | ||
| 783 | # | ||
| 784 | CONFIG_SERIAL_CORE=y | ||
| 785 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 786 | # CONFIG_SERIAL_JSM is not set | ||
| 787 | CONFIG_UNIX98_PTYS=y | ||
| 788 | CONFIG_LEGACY_PTYS=y | ||
| 789 | CONFIG_LEGACY_PTY_COUNT=16 | ||
| 790 | # CONFIG_IPMI_HANDLER is not set | ||
| 791 | # CONFIG_HW_RANDOM is not set | ||
| 792 | # CONFIG_NVRAM is not set | ||
| 793 | # CONFIG_R3964 is not set | ||
| 794 | # CONFIG_APPLICOM is not set | ||
| 795 | # CONFIG_RAW_DRIVER is not set | ||
| 796 | # CONFIG_TCG_TPM is not set | ||
| 797 | CONFIG_DEVPORT=y | ||
| 798 | CONFIG_I2C=y | ||
| 799 | CONFIG_I2C_BOARDINFO=y | ||
| 800 | CONFIG_I2C_CHARDEV=y | ||
| 801 | |||
| 802 | # | ||
| 803 | # I2C Hardware Bus support | ||
| 804 | # | ||
| 805 | # CONFIG_I2C_ALI1535 is not set | ||
| 806 | # CONFIG_I2C_ALI1563 is not set | ||
| 807 | # CONFIG_I2C_ALI15X3 is not set | ||
| 808 | # CONFIG_I2C_AMD756 is not set | ||
| 809 | # CONFIG_I2C_AMD8111 is not set | ||
| 810 | # CONFIG_I2C_I801 is not set | ||
| 811 | # CONFIG_I2C_I810 is not set | ||
| 812 | # CONFIG_I2C_PIIX4 is not set | ||
| 813 | # CONFIG_I2C_NFORCE2 is not set | ||
| 814 | # CONFIG_I2C_OCORES is not set | ||
| 815 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 816 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 817 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 818 | # CONFIG_I2C_SIMTEC is not set | ||
| 819 | # CONFIG_I2C_SIS5595 is not set | ||
| 820 | # CONFIG_I2C_SIS630 is not set | ||
| 821 | # CONFIG_I2C_SIS96X is not set | ||
| 822 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 823 | # CONFIG_I2C_STUB is not set | ||
| 824 | # CONFIG_I2C_TINY_USB is not set | ||
| 825 | # CONFIG_I2C_VIA is not set | ||
| 826 | # CONFIG_I2C_VIAPRO is not set | ||
| 827 | # CONFIG_I2C_VOODOO3 is not set | ||
| 828 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 829 | CONFIG_I2C_MV64XXX=y | ||
| 830 | |||
| 831 | # | ||
| 832 | # Miscellaneous I2C Chip support | ||
| 833 | # | ||
| 834 | # CONFIG_DS1682 is not set | ||
| 835 | # CONFIG_SENSORS_EEPROM is not set | ||
| 836 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 837 | # CONFIG_PCF8575 is not set | ||
| 838 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 839 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 840 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 841 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 842 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 843 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 844 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 845 | # CONFIG_SPI is not set | ||
| 846 | # CONFIG_W1 is not set | ||
| 847 | # CONFIG_POWER_SUPPLY is not set | ||
| 848 | CONFIG_HWMON=y | ||
| 849 | # CONFIG_HWMON_VID is not set | ||
| 850 | # CONFIG_SENSORS_AD7418 is not set | ||
| 851 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 852 | # CONFIG_SENSORS_ADM1025 is not set | ||
| 853 | # CONFIG_SENSORS_ADM1026 is not set | ||
| 854 | # CONFIG_SENSORS_ADM1029 is not set | ||
| 855 | # CONFIG_SENSORS_ADM1031 is not set | ||
| 856 | # CONFIG_SENSORS_ADM9240 is not set | ||
| 857 | # CONFIG_SENSORS_ADT7470 is not set | ||
| 858 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 859 | # CONFIG_SENSORS_ATXP1 is not set | ||
| 860 | # CONFIG_SENSORS_DS1621 is not set | ||
| 861 | # CONFIG_SENSORS_I5K_AMB is not set | ||
| 862 | # CONFIG_SENSORS_F71805F is not set | ||
| 863 | # CONFIG_SENSORS_F71882FG is not set | ||
| 864 | # CONFIG_SENSORS_F75375S is not set | ||
| 865 | # CONFIG_SENSORS_GL518SM is not set | ||
| 866 | # CONFIG_SENSORS_GL520SM is not set | ||
| 867 | # CONFIG_SENSORS_IT87 is not set | ||
| 868 | # CONFIG_SENSORS_LM63 is not set | ||
| 869 | # CONFIG_SENSORS_LM75 is not set | ||
| 870 | # CONFIG_SENSORS_LM77 is not set | ||
| 871 | # CONFIG_SENSORS_LM78 is not set | ||
| 872 | # CONFIG_SENSORS_LM80 is not set | ||
| 873 | # CONFIG_SENSORS_LM83 is not set | ||
| 874 | # CONFIG_SENSORS_LM85 is not set | ||
| 875 | # CONFIG_SENSORS_LM87 is not set | ||
| 876 | # CONFIG_SENSORS_LM90 is not set | ||
| 877 | # CONFIG_SENSORS_LM92 is not set | ||
| 878 | # CONFIG_SENSORS_LM93 is not set | ||
| 879 | # CONFIG_SENSORS_MAX1619 is not set | ||
| 880 | # CONFIG_SENSORS_MAX6650 is not set | ||
| 881 | # CONFIG_SENSORS_PC87360 is not set | ||
| 882 | # CONFIG_SENSORS_PC87427 is not set | ||
| 883 | # CONFIG_SENSORS_SIS5595 is not set | ||
| 884 | # CONFIG_SENSORS_DME1737 is not set | ||
| 885 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 886 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
| 887 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 888 | # CONFIG_SENSORS_ADS7828 is not set | ||
| 889 | # CONFIG_SENSORS_THMC50 is not set | ||
| 890 | # CONFIG_SENSORS_VIA686A is not set | ||
| 891 | # CONFIG_SENSORS_VT1211 is not set | ||
| 892 | # CONFIG_SENSORS_VT8231 is not set | ||
| 893 | # CONFIG_SENSORS_W83781D is not set | ||
| 894 | # CONFIG_SENSORS_W83791D is not set | ||
| 895 | # CONFIG_SENSORS_W83792D is not set | ||
| 896 | # CONFIG_SENSORS_W83793 is not set | ||
| 897 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 898 | # CONFIG_SENSORS_W83L786NG is not set | ||
| 899 | # CONFIG_SENSORS_W83627HF is not set | ||
| 900 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 901 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 902 | # CONFIG_WATCHDOG is not set | ||
| 903 | |||
| 904 | # | ||
| 905 | # Sonics Silicon Backplane | ||
| 906 | # | ||
| 907 | CONFIG_SSB_POSSIBLE=y | ||
| 908 | # CONFIG_SSB is not set | ||
| 909 | |||
| 910 | # | ||
| 911 | # Multifunction device drivers | ||
| 912 | # | ||
| 913 | # CONFIG_MFD_SM501 is not set | ||
| 914 | # CONFIG_MFD_ASIC3 is not set | ||
| 915 | # CONFIG_HTC_PASIC3 is not set | ||
| 916 | |||
| 917 | # | ||
| 918 | # Multimedia devices | ||
| 919 | # | ||
| 920 | |||
| 921 | # | ||
| 922 | # Multimedia core support | ||
| 923 | # | ||
| 924 | # CONFIG_VIDEO_DEV is not set | ||
| 925 | # CONFIG_DVB_CORE is not set | ||
| 926 | # CONFIG_VIDEO_MEDIA is not set | ||
| 927 | |||
| 928 | # | ||
| 929 | # Multimedia drivers | ||
| 930 | # | ||
| 931 | # CONFIG_DAB is not set | ||
| 932 | |||
| 933 | # | ||
| 934 | # Graphics support | ||
| 935 | # | ||
| 936 | # CONFIG_DRM is not set | ||
| 937 | # CONFIG_VGASTATE is not set | ||
| 938 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 939 | # CONFIG_FB is not set | ||
| 940 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 941 | |||
| 942 | # | ||
| 943 | # Display device support | ||
| 944 | # | ||
| 945 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 946 | |||
| 947 | # | ||
| 948 | # Sound | ||
| 949 | # | ||
| 950 | # CONFIG_SOUND is not set | ||
| 951 | CONFIG_HID_SUPPORT=y | ||
| 952 | CONFIG_HID=y | ||
| 953 | # CONFIG_HID_DEBUG is not set | ||
| 954 | # CONFIG_HIDRAW is not set | ||
| 955 | |||
| 956 | # | ||
| 957 | # USB Input Devices | ||
| 958 | # | ||
| 959 | CONFIG_USB_HID=y | ||
| 960 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 961 | # CONFIG_HID_FF is not set | ||
| 962 | # CONFIG_USB_HIDDEV is not set | ||
| 963 | CONFIG_USB_SUPPORT=y | ||
| 964 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 965 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
| 966 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
| 967 | CONFIG_USB=y | ||
| 968 | # CONFIG_USB_DEBUG is not set | ||
| 969 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 970 | |||
| 971 | # | ||
| 972 | # Miscellaneous USB options | ||
| 973 | # | ||
| 974 | CONFIG_USB_DEVICEFS=y | ||
| 975 | CONFIG_USB_DEVICE_CLASS=y | ||
| 976 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 977 | # CONFIG_USB_OTG is not set | ||
| 978 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 979 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 980 | |||
| 981 | # | ||
| 982 | # USB Host Controller Drivers | ||
| 983 | # | ||
| 984 | # CONFIG_USB_C67X00_HCD is not set | ||
| 985 | CONFIG_USB_EHCI_HCD=y | ||
| 986 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | ||
| 987 | CONFIG_USB_EHCI_TT_NEWSCHED=y | ||
| 988 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 989 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 990 | # CONFIG_USB_OHCI_HCD is not set | ||
| 991 | # CONFIG_USB_UHCI_HCD is not set | ||
| 992 | # CONFIG_USB_SL811_HCD is not set | ||
| 993 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 994 | |||
| 995 | # | ||
| 996 | # USB Device Class drivers | ||
| 997 | # | ||
| 998 | # CONFIG_USB_ACM is not set | ||
| 999 | CONFIG_USB_PRINTER=y | ||
| 1000 | # CONFIG_USB_WDM is not set | ||
| 1001 | |||
| 1002 | # | ||
| 1003 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 1004 | # | ||
| 1005 | |||
| 1006 | # | ||
| 1007 | # may also be needed; see USB_STORAGE Help for more information | ||
| 1008 | # | ||
| 1009 | CONFIG_USB_STORAGE=y | ||
| 1010 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
| 1011 | CONFIG_USB_STORAGE_DATAFAB=y | ||
| 1012 | CONFIG_USB_STORAGE_FREECOM=y | ||
| 1013 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 1014 | CONFIG_USB_STORAGE_DPCM=y | ||
| 1015 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1016 | CONFIG_USB_STORAGE_SDDR09=y | ||
| 1017 | CONFIG_USB_STORAGE_SDDR55=y | ||
| 1018 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
| 1019 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1020 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1021 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1022 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1023 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1024 | |||
| 1025 | # | ||
| 1026 | # USB Imaging devices | ||
| 1027 | # | ||
| 1028 | # CONFIG_USB_MDC800 is not set | ||
| 1029 | # CONFIG_USB_MICROTEK is not set | ||
| 1030 | # CONFIG_USB_MON is not set | ||
| 1031 | |||
| 1032 | # | ||
| 1033 | # USB port drivers | ||
| 1034 | # | ||
| 1035 | # CONFIG_USB_SERIAL is not set | ||
| 1036 | |||
| 1037 | # | ||
| 1038 | # USB Miscellaneous drivers | ||
| 1039 | # | ||
| 1040 | # CONFIG_USB_EMI62 is not set | ||
| 1041 | # CONFIG_USB_EMI26 is not set | ||
| 1042 | # CONFIG_USB_ADUTUX is not set | ||
| 1043 | # CONFIG_USB_AUERSWALD is not set | ||
| 1044 | # CONFIG_USB_RIO500 is not set | ||
| 1045 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1046 | # CONFIG_USB_LCD is not set | ||
| 1047 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1048 | # CONFIG_USB_LED is not set | ||
| 1049 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1050 | # CONFIG_USB_CYTHERM is not set | ||
| 1051 | # CONFIG_USB_PHIDGET is not set | ||
| 1052 | # CONFIG_USB_IDMOUSE is not set | ||
| 1053 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1054 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1055 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1056 | # CONFIG_USB_LD is not set | ||
| 1057 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1058 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1059 | # CONFIG_USB_TEST is not set | ||
| 1060 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1061 | # CONFIG_USB_GADGET is not set | ||
| 1062 | # CONFIG_MMC is not set | ||
| 1063 | CONFIG_NEW_LEDS=y | ||
| 1064 | CONFIG_LEDS_CLASS=y | ||
| 1065 | |||
| 1066 | # | ||
| 1067 | # LED drivers | ||
| 1068 | # | ||
| 1069 | |||
| 1070 | # | ||
| 1071 | # LED Triggers | ||
| 1072 | # | ||
| 1073 | CONFIG_LEDS_TRIGGERS=y | ||
| 1074 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
| 1075 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
| 1076 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
| 1077 | CONFIG_RTC_LIB=y | ||
| 1078 | CONFIG_RTC_CLASS=y | ||
| 1079 | CONFIG_RTC_HCTOSYS=y | ||
| 1080 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 1081 | # CONFIG_RTC_DEBUG is not set | ||
| 1082 | |||
| 1083 | # | ||
| 1084 | # RTC interfaces | ||
| 1085 | # | ||
| 1086 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1087 | CONFIG_RTC_INTF_PROC=y | ||
| 1088 | CONFIG_RTC_INTF_DEV=y | ||
| 1089 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1090 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1091 | |||
| 1092 | # | ||
| 1093 | # I2C RTC drivers | ||
| 1094 | # | ||
| 1095 | CONFIG_RTC_DRV_DS1307=y | ||
| 1096 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1097 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1098 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1099 | CONFIG_RTC_DRV_RS5C372=y | ||
| 1100 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1101 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1102 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1103 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1104 | CONFIG_RTC_DRV_M41T80=y | ||
| 1105 | # CONFIG_RTC_DRV_M41T80_WDT is not set | ||
| 1106 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1107 | |||
| 1108 | # | ||
| 1109 | # SPI RTC drivers | ||
| 1110 | # | ||
| 1111 | |||
| 1112 | # | ||
| 1113 | # Platform RTC drivers | ||
| 1114 | # | ||
| 1115 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1116 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1117 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1118 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1119 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1120 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1121 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1122 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1123 | |||
| 1124 | # | ||
| 1125 | # on-CPU RTC drivers | ||
| 1126 | # | ||
| 1127 | # CONFIG_UIO is not set | ||
| 1128 | |||
| 1129 | # | ||
| 1130 | # File systems | ||
| 1131 | # | ||
| 1132 | CONFIG_EXT2_FS=y | ||
| 1133 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 1134 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1135 | CONFIG_EXT3_FS=y | ||
| 1136 | # CONFIG_EXT3_FS_XATTR is not set | ||
| 1137 | # CONFIG_EXT4DEV_FS is not set | ||
| 1138 | CONFIG_JBD=y | ||
| 1139 | # CONFIG_REISERFS_FS is not set | ||
| 1140 | # CONFIG_JFS_FS is not set | ||
| 1141 | # CONFIG_FS_POSIX_ACL is not set | ||
| 1142 | # CONFIG_XFS_FS is not set | ||
| 1143 | # CONFIG_OCFS2_FS is not set | ||
| 1144 | CONFIG_DNOTIFY=y | ||
| 1145 | CONFIG_INOTIFY=y | ||
| 1146 | CONFIG_INOTIFY_USER=y | ||
| 1147 | # CONFIG_QUOTA is not set | ||
| 1148 | # CONFIG_AUTOFS_FS is not set | ||
| 1149 | # CONFIG_AUTOFS4_FS is not set | ||
| 1150 | # CONFIG_FUSE_FS is not set | ||
| 1151 | |||
| 1152 | # | ||
| 1153 | # CD-ROM/DVD Filesystems | ||
| 1154 | # | ||
| 1155 | CONFIG_ISO9660_FS=m | ||
| 1156 | CONFIG_JOLIET=y | ||
| 1157 | # CONFIG_ZISOFS is not set | ||
| 1158 | CONFIG_UDF_FS=m | ||
| 1159 | CONFIG_UDF_NLS=y | ||
| 1160 | |||
| 1161 | # | ||
| 1162 | # DOS/FAT/NT Filesystems | ||
| 1163 | # | ||
| 1164 | CONFIG_FAT_FS=y | ||
| 1165 | CONFIG_MSDOS_FS=y | ||
| 1166 | CONFIG_VFAT_FS=y | ||
| 1167 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
| 1168 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
| 1169 | # CONFIG_NTFS_FS is not set | ||
| 1170 | |||
| 1171 | # | ||
| 1172 | # Pseudo filesystems | ||
| 1173 | # | ||
| 1174 | CONFIG_PROC_FS=y | ||
| 1175 | CONFIG_PROC_SYSCTL=y | ||
| 1176 | CONFIG_SYSFS=y | ||
| 1177 | CONFIG_TMPFS=y | ||
| 1178 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 1179 | # CONFIG_HUGETLB_PAGE is not set | ||
| 1180 | # CONFIG_CONFIGFS_FS is not set | ||
| 1181 | |||
| 1182 | # | ||
| 1183 | # Miscellaneous filesystems | ||
| 1184 | # | ||
| 1185 | # CONFIG_ADFS_FS is not set | ||
| 1186 | # CONFIG_AFFS_FS is not set | ||
| 1187 | # CONFIG_HFS_FS is not set | ||
| 1188 | # CONFIG_HFSPLUS_FS is not set | ||
| 1189 | # CONFIG_BEFS_FS is not set | ||
| 1190 | # CONFIG_BFS_FS is not set | ||
| 1191 | # CONFIG_EFS_FS is not set | ||
| 1192 | CONFIG_JFFS2_FS=y | ||
| 1193 | CONFIG_JFFS2_FS_DEBUG=0 | ||
| 1194 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
| 1195 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1196 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 1197 | # CONFIG_JFFS2_FS_XATTR is not set | ||
| 1198 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
| 1199 | CONFIG_JFFS2_ZLIB=y | ||
| 1200 | # CONFIG_JFFS2_LZO is not set | ||
| 1201 | CONFIG_JFFS2_RTIME=y | ||
| 1202 | # CONFIG_JFFS2_RUBIN is not set | ||
| 1203 | CONFIG_CRAMFS=y | ||
| 1204 | # CONFIG_VXFS_FS is not set | ||
| 1205 | # CONFIG_MINIX_FS is not set | ||
| 1206 | # CONFIG_HPFS_FS is not set | ||
| 1207 | # CONFIG_QNX4FS_FS is not set | ||
| 1208 | # CONFIG_ROMFS_FS is not set | ||
| 1209 | # CONFIG_SYSV_FS is not set | ||
| 1210 | # CONFIG_UFS_FS is not set | ||
| 1211 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 1212 | CONFIG_NFS_FS=y | ||
| 1213 | CONFIG_NFS_V3=y | ||
| 1214 | # CONFIG_NFS_V3_ACL is not set | ||
| 1215 | # CONFIG_NFS_V4 is not set | ||
| 1216 | # CONFIG_NFSD is not set | ||
| 1217 | CONFIG_ROOT_NFS=y | ||
| 1218 | CONFIG_LOCKD=y | ||
| 1219 | CONFIG_LOCKD_V4=y | ||
| 1220 | CONFIG_NFS_COMMON=y | ||
| 1221 | CONFIG_SUNRPC=y | ||
| 1222 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1223 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1224 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1225 | # CONFIG_SMB_FS is not set | ||
| 1226 | # CONFIG_CIFS is not set | ||
| 1227 | # CONFIG_NCP_FS is not set | ||
| 1228 | # CONFIG_CODA_FS is not set | ||
| 1229 | # CONFIG_AFS_FS is not set | ||
| 1230 | |||
| 1231 | # | ||
| 1232 | # Partition Types | ||
| 1233 | # | ||
| 1234 | CONFIG_PARTITION_ADVANCED=y | ||
| 1235 | # CONFIG_ACORN_PARTITION is not set | ||
| 1236 | # CONFIG_OSF_PARTITION is not set | ||
| 1237 | # CONFIG_AMIGA_PARTITION is not set | ||
| 1238 | # CONFIG_ATARI_PARTITION is not set | ||
| 1239 | # CONFIG_MAC_PARTITION is not set | ||
| 1240 | CONFIG_MSDOS_PARTITION=y | ||
| 1241 | CONFIG_BSD_DISKLABEL=y | ||
| 1242 | # CONFIG_MINIX_SUBPARTITION is not set | ||
| 1243 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
| 1244 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
| 1245 | # CONFIG_LDM_PARTITION is not set | ||
| 1246 | # CONFIG_SGI_PARTITION is not set | ||
| 1247 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1248 | # CONFIG_SUN_PARTITION is not set | ||
| 1249 | # CONFIG_KARMA_PARTITION is not set | ||
| 1250 | # CONFIG_EFI_PARTITION is not set | ||
| 1251 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1252 | CONFIG_NLS=y | ||
| 1253 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
| 1254 | CONFIG_NLS_CODEPAGE_437=y | ||
| 1255 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
| 1256 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
| 1257 | CONFIG_NLS_CODEPAGE_850=y | ||
| 1258 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
| 1259 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
| 1260 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
| 1261 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
| 1262 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
| 1263 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
| 1264 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
| 1265 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
| 1266 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
| 1267 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
| 1268 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
| 1269 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
| 1270 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
| 1271 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
| 1272 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
| 1273 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
| 1274 | # CONFIG_NLS_ISO8859_8 is not set | ||
| 1275 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
| 1276 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
| 1277 | # CONFIG_NLS_ASCII is not set | ||
| 1278 | CONFIG_NLS_ISO8859_1=y | ||
| 1279 | CONFIG_NLS_ISO8859_2=y | ||
| 1280 | # CONFIG_NLS_ISO8859_3 is not set | ||
| 1281 | # CONFIG_NLS_ISO8859_4 is not set | ||
| 1282 | # CONFIG_NLS_ISO8859_5 is not set | ||
| 1283 | # CONFIG_NLS_ISO8859_6 is not set | ||
| 1284 | # CONFIG_NLS_ISO8859_7 is not set | ||
| 1285 | # CONFIG_NLS_ISO8859_9 is not set | ||
| 1286 | # CONFIG_NLS_ISO8859_13 is not set | ||
| 1287 | # CONFIG_NLS_ISO8859_14 is not set | ||
| 1288 | # CONFIG_NLS_ISO8859_15 is not set | ||
| 1289 | # CONFIG_NLS_KOI8_R is not set | ||
| 1290 | # CONFIG_NLS_KOI8_U is not set | ||
| 1291 | # CONFIG_NLS_UTF8 is not set | ||
| 1292 | # CONFIG_DLM is not set | ||
| 1293 | |||
| 1294 | # | ||
| 1295 | # Kernel hacking | ||
| 1296 | # | ||
| 1297 | # CONFIG_PRINTK_TIME is not set | ||
| 1298 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1299 | CONFIG_ENABLE_MUST_CHECK=y | ||
| 1300 | CONFIG_FRAME_WARN=1024 | ||
| 1301 | CONFIG_MAGIC_SYSRQ=y | ||
| 1302 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 1303 | # CONFIG_DEBUG_FS is not set | ||
| 1304 | # CONFIG_HEADERS_CHECK is not set | ||
| 1305 | CONFIG_DEBUG_KERNEL=y | ||
| 1306 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1307 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1308 | CONFIG_SCHED_DEBUG=y | ||
| 1309 | CONFIG_SCHEDSTATS=y | ||
| 1310 | # CONFIG_TIMER_STATS is not set | ||
| 1311 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1312 | CONFIG_DEBUG_PREEMPT=y | ||
| 1313 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1314 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1315 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1316 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1317 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1318 | # CONFIG_PROVE_LOCKING is not set | ||
| 1319 | # CONFIG_LOCK_STAT is not set | ||
| 1320 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1321 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1322 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1323 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
| 1324 | CONFIG_DEBUG_INFO=y | ||
| 1325 | # CONFIG_DEBUG_VM is not set | ||
| 1326 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1327 | # CONFIG_DEBUG_LIST is not set | ||
| 1328 | # CONFIG_DEBUG_SG is not set | ||
| 1329 | CONFIG_FRAME_POINTER=y | ||
| 1330 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1331 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1332 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 1333 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1334 | # CONFIG_LKDTM is not set | ||
| 1335 | # CONFIG_FAULT_INJECTION is not set | ||
| 1336 | # CONFIG_LATENCYTOP is not set | ||
| 1337 | # CONFIG_SAMPLES is not set | ||
| 1338 | CONFIG_DEBUG_USER=y | ||
| 1339 | CONFIG_DEBUG_ERRORS=y | ||
| 1340 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1341 | CONFIG_DEBUG_LL=y | ||
| 1342 | # CONFIG_DEBUG_ICEDCC is not set | ||
| 1343 | |||
| 1344 | # | ||
| 1345 | # Security options | ||
| 1346 | # | ||
| 1347 | # CONFIG_KEYS is not set | ||
| 1348 | # CONFIG_SECURITY is not set | ||
| 1349 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1350 | CONFIG_CRYPTO=y | ||
| 1351 | |||
| 1352 | # | ||
| 1353 | # Crypto core or helper | ||
| 1354 | # | ||
| 1355 | CONFIG_CRYPTO_ALGAPI=m | ||
| 1356 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1357 | CONFIG_CRYPTO_MANAGER=m | ||
| 1358 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1359 | # CONFIG_CRYPTO_NULL is not set | ||
| 1360 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1361 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1362 | # CONFIG_CRYPTO_TEST is not set | ||
| 1363 | |||
| 1364 | # | ||
| 1365 | # Authenticated Encryption with Associated Data | ||
| 1366 | # | ||
| 1367 | # CONFIG_CRYPTO_CCM is not set | ||
| 1368 | # CONFIG_CRYPTO_GCM is not set | ||
| 1369 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1370 | |||
| 1371 | # | ||
| 1372 | # Block modes | ||
| 1373 | # | ||
| 1374 | CONFIG_CRYPTO_CBC=m | ||
| 1375 | # CONFIG_CRYPTO_CTR is not set | ||
| 1376 | # CONFIG_CRYPTO_CTS is not set | ||
| 1377 | CONFIG_CRYPTO_ECB=m | ||
| 1378 | # CONFIG_CRYPTO_LRW is not set | ||
| 1379 | CONFIG_CRYPTO_PCBC=m | ||
| 1380 | # CONFIG_CRYPTO_XTS is not set | ||
| 1381 | |||
| 1382 | # | ||
| 1383 | # Hash modes | ||
| 1384 | # | ||
| 1385 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1386 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1387 | |||
| 1388 | # | ||
| 1389 | # Digest | ||
| 1390 | # | ||
| 1391 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1392 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1393 | # CONFIG_CRYPTO_MD5 is not set | ||
| 1394 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1395 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 1396 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1397 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1398 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1399 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1400 | |||
| 1401 | # | ||
| 1402 | # Ciphers | ||
| 1403 | # | ||
| 1404 | # CONFIG_CRYPTO_AES is not set | ||
| 1405 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1406 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1407 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1408 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1409 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1410 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1411 | # CONFIG_CRYPTO_DES is not set | ||
| 1412 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1413 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1414 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1415 | # CONFIG_CRYPTO_SEED is not set | ||
| 1416 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1417 | # CONFIG_CRYPTO_TEA is not set | ||
| 1418 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1419 | |||
| 1420 | # | ||
| 1421 | # Compression | ||
| 1422 | # | ||
| 1423 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 1424 | # CONFIG_CRYPTO_LZO is not set | ||
| 1425 | CONFIG_CRYPTO_HW=y | ||
| 1426 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 1427 | |||
| 1428 | # | ||
| 1429 | # Library routines | ||
| 1430 | # | ||
| 1431 | CONFIG_BITREVERSE=y | ||
| 1432 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1433 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1434 | # CONFIG_CRC_CCITT is not set | ||
| 1435 | # CONFIG_CRC16 is not set | ||
| 1436 | CONFIG_CRC_ITU_T=m | ||
| 1437 | CONFIG_CRC32=y | ||
| 1438 | # CONFIG_CRC7 is not set | ||
| 1439 | # CONFIG_LIBCRC32C is not set | ||
| 1440 | CONFIG_ZLIB_INFLATE=y | ||
| 1441 | CONFIG_ZLIB_DEFLATE=y | ||
| 1442 | CONFIG_PLIST=y | ||
| 1443 | CONFIG_HAS_IOMEM=y | ||
| 1444 | CONFIG_HAS_IOPORT=y | ||
| 1445 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/netx_defconfig b/arch/arm/configs/netx_defconfig index 57f32f39d0ff..0884f2370c3a 100644 --- a/arch/arm/configs/netx_defconfig +++ b/arch/arm/configs/netx_defconfig | |||
| @@ -154,7 +154,6 @@ CONFIG_ARM_AMBA=y | |||
| 154 | # Kernel Features | 154 | # Kernel Features |
| 155 | # | 155 | # |
| 156 | CONFIG_PREEMPT=y | 156 | CONFIG_PREEMPT=y |
| 157 | # CONFIG_NO_IDLE_HZ is not set | ||
| 158 | CONFIG_HZ=100 | 157 | CONFIG_HZ=100 |
| 159 | # CONFIG_AEABI is not set | 158 | # CONFIG_AEABI is not set |
| 160 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 159 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/onearm_defconfig b/arch/arm/configs/onearm_defconfig index 650a248613e5..418ca2febbe3 100644 --- a/arch/arm/configs/onearm_defconfig +++ b/arch/arm/configs/onearm_defconfig | |||
| @@ -202,7 +202,6 @@ CONFIG_AT91_CF=y | |||
| 202 | # Kernel Features | 202 | # Kernel Features |
| 203 | # | 203 | # |
| 204 | # CONFIG_PREEMPT is not set | 204 | # CONFIG_PREEMPT is not set |
| 205 | # CONFIG_NO_IDLE_HZ is not set | ||
| 206 | CONFIG_HZ=100 | 205 | CONFIG_HZ=100 |
| 207 | # CONFIG_AEABI is not set | 206 | # CONFIG_AEABI is not set |
| 208 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 207 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 52cd99bd52fb..9578b5d9f9c7 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_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.24 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Thu Feb 7 14:10:30 2008 | 4 | # Mon Jun 2 23:54:48 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| @@ -21,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 22 | CONFIG_GENERIC_HWEIGHT=y | 22 | CONFIG_GENERIC_HWEIGHT=y |
| 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 24 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 24 | CONFIG_ZONE_DMA=y | 25 | CONFIG_ZONE_DMA=y |
| 25 | CONFIG_VECTORS_BASE=0xffff0000 | 26 | CONFIG_VECTORS_BASE=0xffff0000 |
| 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| @@ -40,24 +41,24 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 40 | # CONFIG_POSIX_MQUEUE is not set | 41 | # CONFIG_POSIX_MQUEUE is not set |
| 41 | # CONFIG_BSD_PROCESS_ACCT is not set | 42 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 42 | # CONFIG_TASKSTATS is not set | 43 | # CONFIG_TASKSTATS is not set |
| 43 | # CONFIG_USER_NS is not set | ||
| 44 | # CONFIG_PID_NS is not set | ||
| 45 | # CONFIG_AUDIT is not set | 44 | # CONFIG_AUDIT is not set |
| 46 | # CONFIG_IKCONFIG is not set | 45 | # CONFIG_IKCONFIG is not set |
| 47 | CONFIG_LOG_BUF_SHIFT=14 | 46 | CONFIG_LOG_BUF_SHIFT=14 |
| 48 | # CONFIG_CGROUPS is not set | 47 | # CONFIG_CGROUPS is not set |
| 49 | CONFIG_FAIR_GROUP_SCHED=y | 48 | # CONFIG_GROUP_SCHED is not set |
| 50 | CONFIG_FAIR_USER_SCHED=y | ||
| 51 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 52 | CONFIG_SYSFS_DEPRECATED=y | 49 | CONFIG_SYSFS_DEPRECATED=y |
| 50 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 53 | # CONFIG_RELAY is not set | 51 | # CONFIG_RELAY is not set |
| 52 | # CONFIG_NAMESPACES is not set | ||
| 54 | # CONFIG_BLK_DEV_INITRD is not set | 53 | # CONFIG_BLK_DEV_INITRD is not set |
| 55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 56 | CONFIG_SYSCTL=y | 55 | CONFIG_SYSCTL=y |
| 57 | CONFIG_EMBEDDED=y | 56 | CONFIG_EMBEDDED=y |
| 58 | CONFIG_UID16=y | 57 | CONFIG_UID16=y |
| 59 | CONFIG_SYSCTL_SYSCALL=y | 58 | CONFIG_SYSCTL_SYSCALL=y |
| 59 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 60 | CONFIG_KALLSYMS=y | 60 | CONFIG_KALLSYMS=y |
| 61 | CONFIG_KALLSYMS_ALL=y | ||
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 62 | CONFIG_HOTPLUG=y | 63 | CONFIG_HOTPLUG=y |
| 63 | CONFIG_PRINTK=y | 64 | CONFIG_PRINTK=y |
| @@ -73,20 +74,25 @@ CONFIG_TIMERFD=y | |||
| 73 | CONFIG_EVENTFD=y | 74 | CONFIG_EVENTFD=y |
| 74 | CONFIG_SHMEM=y | 75 | CONFIG_SHMEM=y |
| 75 | CONFIG_VM_EVENT_COUNTERS=y | 76 | CONFIG_VM_EVENT_COUNTERS=y |
| 76 | CONFIG_SLAB=y | 77 | # CONFIG_SLUB_DEBUG is not set |
| 77 | # CONFIG_SLUB is not set | 78 | # CONFIG_SLAB is not set |
| 79 | CONFIG_SLUB=y | ||
| 78 | # CONFIG_SLOB is not set | 80 | # CONFIG_SLOB is not set |
| 79 | # CONFIG_PROFILING is not set | 81 | CONFIG_PROFILING=y |
| 80 | # CONFIG_MARKERS is not set | 82 | # CONFIG_MARKERS is not set |
| 83 | CONFIG_OPROFILE=y | ||
| 81 | CONFIG_HAVE_OPROFILE=y | 84 | CONFIG_HAVE_OPROFILE=y |
| 82 | # CONFIG_KPROBES is not set | 85 | CONFIG_KPROBES=y |
| 86 | CONFIG_KRETPROBES=y | ||
| 83 | CONFIG_HAVE_KPROBES=y | 87 | CONFIG_HAVE_KPROBES=y |
| 88 | CONFIG_HAVE_KRETPROBES=y | ||
| 89 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 84 | CONFIG_PROC_PAGE_MONITOR=y | 90 | CONFIG_PROC_PAGE_MONITOR=y |
| 85 | CONFIG_SLABINFO=y | ||
| 86 | CONFIG_RT_MUTEXES=y | 91 | CONFIG_RT_MUTEXES=y |
| 87 | # CONFIG_TINY_SHMEM is not set | 92 | # CONFIG_TINY_SHMEM is not set |
| 88 | CONFIG_BASE_SMALL=0 | 93 | CONFIG_BASE_SMALL=0 |
| 89 | CONFIG_MODULES=y | 94 | CONFIG_MODULES=y |
| 95 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 90 | CONFIG_MODULE_UNLOAD=y | 96 | CONFIG_MODULE_UNLOAD=y |
| 91 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 97 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 92 | # CONFIG_MODVERSIONS is not set | 98 | # CONFIG_MODVERSIONS is not set |
| @@ -111,7 +117,6 @@ CONFIG_DEFAULT_CFQ=y | |||
| 111 | # CONFIG_DEFAULT_NOOP is not set | 117 | # CONFIG_DEFAULT_NOOP is not set |
| 112 | CONFIG_DEFAULT_IOSCHED="cfq" | 118 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 113 | CONFIG_CLASSIC_RCU=y | 119 | CONFIG_CLASSIC_RCU=y |
| 114 | # CONFIG_PREEMPT_RCU is not set | ||
| 115 | 120 | ||
| 116 | # | 121 | # |
| 117 | # System Type | 122 | # System Type |
| @@ -160,6 +165,15 @@ CONFIG_MACH_RD88F5182=y | |||
| 160 | CONFIG_MACH_KUROBOX_PRO=y | 165 | CONFIG_MACH_KUROBOX_PRO=y |
| 161 | CONFIG_MACH_DNS323=y | 166 | CONFIG_MACH_DNS323=y |
| 162 | CONFIG_MACH_TS209=y | 167 | CONFIG_MACH_TS209=y |
| 168 | CONFIG_MACH_LINKSTATION_PRO=y | ||
| 169 | CONFIG_MACH_TS409=y | ||
| 170 | CONFIG_MACH_WRT350N_V2=y | ||
| 171 | CONFIG_MACH_TS78XX=y | ||
| 172 | CONFIG_MACH_MV2120=y | ||
| 173 | CONFIG_MACH_MSS2=y | ||
| 174 | CONFIG_MACH_WNR854T=y | ||
| 175 | CONFIG_MACH_RD88F5181L_GE=y | ||
| 176 | CONFIG_MACH_RD88F5181L_FXO=y | ||
| 163 | 177 | ||
| 164 | # | 178 | # |
| 165 | # Boot options | 179 | # Boot options |
| @@ -168,6 +182,7 @@ CONFIG_MACH_TS209=y | |||
| 168 | # | 182 | # |
| 169 | # Power management | 183 | # Power management |
| 170 | # | 184 | # |
| 185 | CONFIG_PLAT_ORION=y | ||
| 171 | 186 | ||
| 172 | # | 187 | # |
| 173 | # Processor Type | 188 | # Processor Type |
| @@ -177,8 +192,9 @@ CONFIG_CPU_FEROCEON=y | |||
| 177 | CONFIG_CPU_FEROCEON_OLD_ID=y | 192 | CONFIG_CPU_FEROCEON_OLD_ID=y |
| 178 | CONFIG_CPU_32v5=y | 193 | CONFIG_CPU_32v5=y |
| 179 | CONFIG_CPU_ABRT_EV5T=y | 194 | CONFIG_CPU_ABRT_EV5T=y |
| 195 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 180 | CONFIG_CPU_CACHE_VIVT=y | 196 | CONFIG_CPU_CACHE_VIVT=y |
| 181 | CONFIG_CPU_COPY_V4WB=y | 197 | CONFIG_CPU_COPY_FEROCEON=y |
| 182 | CONFIG_CPU_TLB_V4WBI=y | 198 | CONFIG_CPU_TLB_V4WBI=y |
| 183 | CONFIG_CPU_CP15=y | 199 | CONFIG_CPU_CP15=y |
| 184 | CONFIG_CPU_CP15_MMU=y | 200 | CONFIG_CPU_CP15_MMU=y |
| @@ -189,7 +205,6 @@ CONFIG_CPU_CP15_MMU=y | |||
| 189 | CONFIG_ARM_THUMB=y | 205 | CONFIG_ARM_THUMB=y |
| 190 | # CONFIG_CPU_ICACHE_DISABLE is not set | 206 | # CONFIG_CPU_ICACHE_DISABLE is not set |
| 191 | # CONFIG_CPU_DCACHE_DISABLE is not set | 207 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 192 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
| 193 | # CONFIG_OUTER_CACHE is not set | 208 | # CONFIG_OUTER_CACHE is not set |
| 194 | 209 | ||
| 195 | # | 210 | # |
| @@ -199,6 +214,7 @@ CONFIG_PCI=y | |||
| 199 | CONFIG_PCI_SYSCALL=y | 214 | CONFIG_PCI_SYSCALL=y |
| 200 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 215 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 201 | CONFIG_PCI_LEGACY=y | 216 | CONFIG_PCI_LEGACY=y |
| 217 | # CONFIG_PCI_DEBUG is not set | ||
| 202 | # CONFIG_PCCARD is not set | 218 | # CONFIG_PCCARD is not set |
| 203 | 219 | ||
| 204 | # | 220 | # |
| @@ -221,6 +237,7 @@ CONFIG_FLATMEM=y | |||
| 221 | CONFIG_FLAT_NODE_MEM_MAP=y | 237 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 222 | # CONFIG_SPARSEMEM_STATIC is not set | 238 | # CONFIG_SPARSEMEM_STATIC is not set |
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 239 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 240 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 224 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 241 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
| 225 | # CONFIG_RESOURCES_64BIT is not set | 242 | # CONFIG_RESOURCES_64BIT is not set |
| 226 | CONFIG_ZONE_DMA_FLAG=1 | 243 | CONFIG_ZONE_DMA_FLAG=1 |
| @@ -238,7 +255,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0 | |||
| 238 | CONFIG_CMDLINE="" | 255 | CONFIG_CMDLINE="" |
| 239 | # CONFIG_XIP_KERNEL is not set | 256 | # CONFIG_XIP_KERNEL is not set |
| 240 | # CONFIG_KEXEC is not set | 257 | # CONFIG_KEXEC is not set |
| 241 | # CONFIG_ATAGS_PROC is not set | ||
| 242 | 258 | ||
| 243 | # | 259 | # |
| 244 | # Floating point emulation | 260 | # Floating point emulation |
| @@ -311,8 +327,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 311 | CONFIG_DEFAULT_TCP_CONG="cubic" | 327 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 312 | # CONFIG_TCP_MD5SIG is not set | 328 | # CONFIG_TCP_MD5SIG is not set |
| 313 | # CONFIG_IPV6 is not set | 329 | # CONFIG_IPV6 is not set |
| 314 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 315 | # CONFIG_INET6_TUNNEL is not set | ||
| 316 | # CONFIG_NETWORK_SECMARK is not set | 330 | # CONFIG_NETWORK_SECMARK is not set |
| 317 | # CONFIG_NETFILTER is not set | 331 | # CONFIG_NETFILTER is not set |
| 318 | # CONFIG_IP_DCCP is not set | 332 | # CONFIG_IP_DCCP is not set |
| @@ -335,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 335 | # Network testing | 349 | # Network testing |
| 336 | # | 350 | # |
| 337 | CONFIG_NET_PKTGEN=m | 351 | CONFIG_NET_PKTGEN=m |
| 352 | # CONFIG_NET_TCPPROBE is not set | ||
| 338 | # CONFIG_HAMRADIO is not set | 353 | # CONFIG_HAMRADIO is not set |
| 339 | # CONFIG_CAN is not set | 354 | # CONFIG_CAN is not set |
| 340 | # CONFIG_IRDA is not set | 355 | # CONFIG_IRDA is not set |
| @@ -362,6 +377,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
| 362 | CONFIG_STANDALONE=y | 377 | CONFIG_STANDALONE=y |
| 363 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 378 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 364 | CONFIG_FW_LOADER=y | 379 | CONFIG_FW_LOADER=y |
| 380 | # CONFIG_DEBUG_DRIVER is not set | ||
| 381 | # CONFIG_DEBUG_DEVRES is not set | ||
| 365 | # CONFIG_SYS_HYPERVISOR is not set | 382 | # CONFIG_SYS_HYPERVISOR is not set |
| 366 | # CONFIG_CONNECTOR is not set | 383 | # CONFIG_CONNECTOR is not set |
| 367 | CONFIG_MTD=y | 384 | CONFIG_MTD=y |
| @@ -371,6 +388,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 371 | # CONFIG_MTD_REDBOOT_PARTS is not set | 388 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 372 | CONFIG_MTD_CMDLINE_PARTS=y | 389 | CONFIG_MTD_CMDLINE_PARTS=y |
| 373 | # CONFIG_MTD_AFS_PARTS is not set | 390 | # CONFIG_MTD_AFS_PARTS is not set |
| 391 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 374 | 392 | ||
| 375 | # | 393 | # |
| 376 | # User Modules And Translation Layers | 394 | # User Modules And Translation Layers |
| @@ -378,9 +396,8 @@ CONFIG_MTD_CMDLINE_PARTS=y | |||
| 378 | CONFIG_MTD_CHAR=y | 396 | CONFIG_MTD_CHAR=y |
| 379 | CONFIG_MTD_BLKDEVS=y | 397 | CONFIG_MTD_BLKDEVS=y |
| 380 | CONFIG_MTD_BLOCK=y | 398 | CONFIG_MTD_BLOCK=y |
| 381 | CONFIG_FTL=y | 399 | # CONFIG_FTL is not set |
| 382 | CONFIG_NFTL=y | 400 | # CONFIG_NFTL is not set |
| 383 | # CONFIG_NFTL_RW is not set | ||
| 384 | # CONFIG_INFTL is not set | 401 | # CONFIG_INFTL is not set |
| 385 | # CONFIG_RFD_FTL is not set | 402 | # CONFIG_RFD_FTL is not set |
| 386 | # CONFIG_SSFDC is not set | 403 | # CONFIG_SSFDC is not set |
| @@ -405,12 +422,12 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y | |||
| 405 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | 422 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set |
| 406 | CONFIG_MTD_CFI_I1=y | 423 | CONFIG_MTD_CFI_I1=y |
| 407 | CONFIG_MTD_CFI_I2=y | 424 | CONFIG_MTD_CFI_I2=y |
| 408 | CONFIG_MTD_CFI_I4=y | 425 | # CONFIG_MTD_CFI_I4 is not set |
| 409 | # CONFIG_MTD_CFI_I8 is not set | 426 | # CONFIG_MTD_CFI_I8 is not set |
| 410 | # CONFIG_MTD_OTP is not set | 427 | # CONFIG_MTD_OTP is not set |
| 411 | CONFIG_MTD_CFI_INTELEXT=y | 428 | CONFIG_MTD_CFI_INTELEXT=y |
| 412 | CONFIG_MTD_CFI_AMDSTD=y | 429 | CONFIG_MTD_CFI_AMDSTD=y |
| 413 | CONFIG_MTD_CFI_STAA=y | 430 | # CONFIG_MTD_CFI_STAA is not set |
| 414 | CONFIG_MTD_CFI_UTIL=y | 431 | CONFIG_MTD_CFI_UTIL=y |
| 415 | # CONFIG_MTD_RAM is not set | 432 | # CONFIG_MTD_RAM is not set |
| 416 | # CONFIG_MTD_ROM is not set | 433 | # CONFIG_MTD_ROM is not set |
| @@ -481,6 +498,9 @@ CONFIG_MISC_DEVICES=y | |||
| 481 | # CONFIG_EEPROM_93CX6 is not set | 498 | # CONFIG_EEPROM_93CX6 is not set |
| 482 | # CONFIG_SGI_IOC4 is not set | 499 | # CONFIG_SGI_IOC4 is not set |
| 483 | # CONFIG_TIFM_CORE is not set | 500 | # CONFIG_TIFM_CORE is not set |
| 501 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 502 | CONFIG_HAVE_IDE=y | ||
| 503 | # CONFIG_IDE is not set | ||
| 484 | 504 | ||
| 485 | # | 505 | # |
| 486 | # SCSI device support | 506 | # SCSI device support |
| @@ -542,6 +562,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 542 | # CONFIG_SCSI_IPS is not set | 562 | # CONFIG_SCSI_IPS is not set |
| 543 | # CONFIG_SCSI_INITIO is not set | 563 | # CONFIG_SCSI_INITIO is not set |
| 544 | # CONFIG_SCSI_INIA100 is not set | 564 | # CONFIG_SCSI_INIA100 is not set |
| 565 | # CONFIG_SCSI_MVSAS is not set | ||
| 545 | # CONFIG_SCSI_STEX is not set | 566 | # CONFIG_SCSI_STEX is not set |
| 546 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 567 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
| 547 | # CONFIG_SCSI_IPR is not set | 568 | # CONFIG_SCSI_IPR is not set |
| @@ -556,7 +577,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 556 | # CONFIG_SCSI_SRP is not set | 577 | # CONFIG_SCSI_SRP is not set |
| 557 | CONFIG_ATA=y | 578 | CONFIG_ATA=y |
| 558 | # CONFIG_ATA_NONSTANDARD is not set | 579 | # CONFIG_ATA_NONSTANDARD is not set |
| 580 | CONFIG_SATA_PMP=y | ||
| 559 | # CONFIG_SATA_AHCI is not set | 581 | # CONFIG_SATA_AHCI is not set |
| 582 | # CONFIG_SATA_SIL24 is not set | ||
| 583 | CONFIG_ATA_SFF=y | ||
| 560 | # CONFIG_SATA_SVW is not set | 584 | # CONFIG_SATA_SVW is not set |
| 561 | # CONFIG_ATA_PIIX is not set | 585 | # CONFIG_ATA_PIIX is not set |
| 562 | CONFIG_SATA_MV=y | 586 | CONFIG_SATA_MV=y |
| @@ -566,7 +590,6 @@ CONFIG_SATA_MV=y | |||
| 566 | # CONFIG_SATA_PROMISE is not set | 590 | # CONFIG_SATA_PROMISE is not set |
| 567 | # CONFIG_SATA_SX4 is not set | 591 | # CONFIG_SATA_SX4 is not set |
| 568 | # CONFIG_SATA_SIL is not set | 592 | # CONFIG_SATA_SIL is not set |
| 569 | # CONFIG_SATA_SIL24 is not set | ||
| 570 | # CONFIG_SATA_SIS is not set | 593 | # CONFIG_SATA_SIS is not set |
| 571 | # CONFIG_SATA_ULI is not set | 594 | # CONFIG_SATA_ULI is not set |
| 572 | # CONFIG_SATA_VIA is not set | 595 | # CONFIG_SATA_VIA is not set |
| @@ -611,6 +634,7 @@ CONFIG_SATA_MV=y | |||
| 611 | # CONFIG_PATA_VIA is not set | 634 | # CONFIG_PATA_VIA is not set |
| 612 | # CONFIG_PATA_WINBOND is not set | 635 | # CONFIG_PATA_WINBOND is not set |
| 613 | # CONFIG_PATA_PLATFORM is not set | 636 | # CONFIG_PATA_PLATFORM is not set |
| 637 | # CONFIG_PATA_SCH is not set | ||
| 614 | # CONFIG_MD is not set | 638 | # CONFIG_MD is not set |
| 615 | # CONFIG_FUSION is not set | 639 | # CONFIG_FUSION is not set |
| 616 | 640 | ||
| @@ -652,7 +676,7 @@ CONFIG_NET_PCI=y | |||
| 652 | # CONFIG_B44 is not set | 676 | # CONFIG_B44 is not set |
| 653 | # CONFIG_FORCEDETH is not set | 677 | # CONFIG_FORCEDETH is not set |
| 654 | # CONFIG_EEPRO100 is not set | 678 | # CONFIG_EEPRO100 is not set |
| 655 | CONFIG_E100=y | 679 | # CONFIG_E100 is not set |
| 656 | # CONFIG_FEALNX is not set | 680 | # CONFIG_FEALNX is not set |
| 657 | # CONFIG_NATSEMI is not set | 681 | # CONFIG_NATSEMI is not set |
| 658 | # CONFIG_NE2K_PCI is not set | 682 | # CONFIG_NE2K_PCI is not set |
| @@ -668,9 +692,7 @@ CONFIG_E100=y | |||
| 668 | CONFIG_NETDEV_1000=y | 692 | CONFIG_NETDEV_1000=y |
| 669 | # CONFIG_ACENIC is not set | 693 | # CONFIG_ACENIC is not set |
| 670 | # CONFIG_DL2K is not set | 694 | # CONFIG_DL2K is not set |
| 671 | CONFIG_E1000=y | 695 | # CONFIG_E1000 is not set |
| 672 | CONFIG_E1000_NAPI=y | ||
| 673 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 674 | # CONFIG_E1000E is not set | 696 | # CONFIG_E1000E is not set |
| 675 | # CONFIG_E1000E_ENABLED is not set | 697 | # CONFIG_E1000E_ENABLED is not set |
| 676 | # CONFIG_IP1000 is not set | 698 | # CONFIG_IP1000 is not set |
| @@ -680,27 +702,15 @@ CONFIG_E1000_NAPI=y | |||
| 680 | # CONFIG_YELLOWFIN is not set | 702 | # CONFIG_YELLOWFIN is not set |
| 681 | # CONFIG_R8169 is not set | 703 | # CONFIG_R8169 is not set |
| 682 | # CONFIG_SIS190 is not set | 704 | # CONFIG_SIS190 is not set |
| 683 | CONFIG_SKGE=y | 705 | # CONFIG_SKGE is not set |
| 684 | CONFIG_SKY2=y | 706 | # CONFIG_SKY2 is not set |
| 685 | # CONFIG_SK98LIN is not set | ||
| 686 | # CONFIG_VIA_VELOCITY is not set | 707 | # CONFIG_VIA_VELOCITY is not set |
| 687 | CONFIG_TIGON3=y | 708 | # CONFIG_TIGON3 is not set |
| 688 | # CONFIG_BNX2 is not set | 709 | # CONFIG_BNX2 is not set |
| 689 | CONFIG_MV643XX_ETH=y | 710 | CONFIG_MV643XX_ETH=y |
| 690 | # CONFIG_QLA3XXX is not set | 711 | # CONFIG_QLA3XXX is not set |
| 691 | # CONFIG_ATL1 is not set | 712 | # CONFIG_ATL1 is not set |
| 692 | CONFIG_NETDEV_10000=y | 713 | # CONFIG_NETDEV_10000 is not set |
| 693 | # CONFIG_CHELSIO_T1 is not set | ||
| 694 | # CONFIG_CHELSIO_T3 is not set | ||
| 695 | # CONFIG_IXGBE is not set | ||
| 696 | # CONFIG_IXGB is not set | ||
| 697 | # CONFIG_S2IO is not set | ||
| 698 | # CONFIG_MYRI10GE is not set | ||
| 699 | # CONFIG_NETXEN_NIC is not set | ||
| 700 | # CONFIG_NIU is not set | ||
| 701 | # CONFIG_MLX4_CORE is not set | ||
| 702 | # CONFIG_TEHUTI is not set | ||
| 703 | # CONFIG_BNX2X is not set | ||
| 704 | # CONFIG_TR is not set | 714 | # CONFIG_TR is not set |
| 705 | 715 | ||
| 706 | # | 716 | # |
| @@ -708,6 +718,7 @@ CONFIG_NETDEV_10000=y | |||
| 708 | # | 718 | # |
| 709 | # CONFIG_WLAN_PRE80211 is not set | 719 | # CONFIG_WLAN_PRE80211 is not set |
| 710 | # CONFIG_WLAN_80211 is not set | 720 | # CONFIG_WLAN_80211 is not set |
| 721 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 711 | 722 | ||
| 712 | # | 723 | # |
| 713 | # USB Network Adapters | 724 | # USB Network Adapters |
| @@ -738,12 +749,9 @@ CONFIG_INPUT=y | |||
| 738 | # | 749 | # |
| 739 | # Userland interfaces | 750 | # Userland interfaces |
| 740 | # | 751 | # |
| 741 | CONFIG_INPUT_MOUSEDEV=y | 752 | # CONFIG_INPUT_MOUSEDEV is not set |
| 742 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
| 743 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
| 744 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
| 745 | # CONFIG_INPUT_JOYDEV is not set | 753 | # CONFIG_INPUT_JOYDEV is not set |
| 746 | # CONFIG_INPUT_EVDEV is not set | 754 | CONFIG_INPUT_EVDEV=y |
| 747 | # CONFIG_INPUT_EVBUG is not set | 755 | # CONFIG_INPUT_EVBUG is not set |
| 748 | 756 | ||
| 749 | # | 757 | # |
| @@ -765,10 +773,8 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
| 765 | # | 773 | # |
| 766 | # Character devices | 774 | # Character devices |
| 767 | # | 775 | # |
| 768 | CONFIG_VT=y | 776 | # CONFIG_VT is not set |
| 769 | CONFIG_VT_CONSOLE=y | 777 | CONFIG_DEVKMEM=y |
| 770 | CONFIG_HW_CONSOLE=y | ||
| 771 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
| 772 | # CONFIG_SERIAL_NONSTANDARD is not set | 778 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 773 | # CONFIG_NOZOMI is not set | 779 | # CONFIG_NOZOMI is not set |
| 774 | 780 | ||
| @@ -777,7 +783,7 @@ CONFIG_HW_CONSOLE=y | |||
| 777 | # | 783 | # |
| 778 | CONFIG_SERIAL_8250=y | 784 | CONFIG_SERIAL_8250=y |
| 779 | CONFIG_SERIAL_8250_CONSOLE=y | 785 | CONFIG_SERIAL_8250_CONSOLE=y |
| 780 | CONFIG_SERIAL_8250_PCI=y | 786 | # CONFIG_SERIAL_8250_PCI is not set |
| 781 | CONFIG_SERIAL_8250_NR_UARTS=4 | 787 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 782 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | 788 | CONFIG_SERIAL_8250_RUNTIME_UARTS=2 |
| 783 | # CONFIG_SERIAL_8250_EXTENDED is not set | 789 | # CONFIG_SERIAL_8250_EXTENDED is not set |
| @@ -792,7 +798,7 @@ CONFIG_UNIX98_PTYS=y | |||
| 792 | CONFIG_LEGACY_PTYS=y | 798 | CONFIG_LEGACY_PTYS=y |
| 793 | CONFIG_LEGACY_PTY_COUNT=16 | 799 | CONFIG_LEGACY_PTY_COUNT=16 |
| 794 | # CONFIG_IPMI_HANDLER is not set | 800 | # CONFIG_IPMI_HANDLER is not set |
| 795 | CONFIG_HW_RANDOM=m | 801 | # CONFIG_HW_RANDOM is not set |
| 796 | # CONFIG_NVRAM is not set | 802 | # CONFIG_NVRAM is not set |
| 797 | # CONFIG_R3964 is not set | 803 | # CONFIG_R3964 is not set |
| 798 | # CONFIG_APPLICOM is not set | 804 | # CONFIG_APPLICOM is not set |
| @@ -804,13 +810,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 804 | CONFIG_I2C_CHARDEV=y | 810 | CONFIG_I2C_CHARDEV=y |
| 805 | 811 | ||
| 806 | # | 812 | # |
| 807 | # I2C Algorithms | ||
| 808 | # | ||
| 809 | # CONFIG_I2C_ALGOBIT is not set | ||
| 810 | # CONFIG_I2C_ALGOPCF is not set | ||
| 811 | # CONFIG_I2C_ALGOPCA is not set | ||
| 812 | |||
| 813 | # | ||
| 814 | # I2C Hardware Bus support | 813 | # I2C Hardware Bus support |
| 815 | # | 814 | # |
| 816 | # CONFIG_I2C_ALI1535 is not set | 815 | # CONFIG_I2C_ALI1535 is not set |
| @@ -837,6 +836,7 @@ CONFIG_I2C_CHARDEV=y | |||
| 837 | # CONFIG_I2C_VIA is not set | 836 | # CONFIG_I2C_VIA is not set |
| 838 | # CONFIG_I2C_VIAPRO is not set | 837 | # CONFIG_I2C_VIAPRO is not set |
| 839 | # CONFIG_I2C_VOODOO3 is not set | 838 | # CONFIG_I2C_VOODOO3 is not set |
| 839 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 840 | CONFIG_I2C_MV64XXX=y | 840 | CONFIG_I2C_MV64XXX=y |
| 841 | 841 | ||
| 842 | # | 842 | # |
| @@ -847,19 +847,13 @@ CONFIG_I2C_MV64XXX=y | |||
| 847 | # CONFIG_SENSORS_PCF8574 is not set | 847 | # CONFIG_SENSORS_PCF8574 is not set |
| 848 | # CONFIG_PCF8575 is not set | 848 | # CONFIG_PCF8575 is not set |
| 849 | # CONFIG_SENSORS_PCF8591 is not set | 849 | # CONFIG_SENSORS_PCF8591 is not set |
| 850 | # CONFIG_TPS65010 is not set | ||
| 851 | # CONFIG_SENSORS_MAX6875 is not set | 850 | # CONFIG_SENSORS_MAX6875 is not set |
| 852 | # CONFIG_SENSORS_TSL2550 is not set | 851 | # CONFIG_SENSORS_TSL2550 is not set |
| 853 | # CONFIG_I2C_DEBUG_CORE is not set | 852 | # CONFIG_I2C_DEBUG_CORE is not set |
| 854 | # CONFIG_I2C_DEBUG_ALGO is not set | 853 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 855 | # CONFIG_I2C_DEBUG_BUS is not set | 854 | # CONFIG_I2C_DEBUG_BUS is not set |
| 856 | # CONFIG_I2C_DEBUG_CHIP is not set | 855 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 857 | |||
| 858 | # | ||
| 859 | # SPI support | ||
| 860 | # | ||
| 861 | # CONFIG_SPI is not set | 856 | # CONFIG_SPI is not set |
| 862 | # CONFIG_SPI_MASTER is not set | ||
| 863 | # CONFIG_W1 is not set | 857 | # CONFIG_W1 is not set |
| 864 | # CONFIG_POWER_SUPPLY is not set | 858 | # CONFIG_POWER_SUPPLY is not set |
| 865 | CONFIG_HWMON=y | 859 | CONFIG_HWMON=y |
| @@ -872,6 +866,7 @@ CONFIG_HWMON=y | |||
| 872 | # CONFIG_SENSORS_ADM1031 is not set | 866 | # CONFIG_SENSORS_ADM1031 is not set |
| 873 | # CONFIG_SENSORS_ADM9240 is not set | 867 | # CONFIG_SENSORS_ADM9240 is not set |
| 874 | # CONFIG_SENSORS_ADT7470 is not set | 868 | # CONFIG_SENSORS_ADT7470 is not set |
| 869 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 875 | # CONFIG_SENSORS_ATXP1 is not set | 870 | # CONFIG_SENSORS_ATXP1 is not set |
| 876 | # CONFIG_SENSORS_DS1621 is not set | 871 | # CONFIG_SENSORS_DS1621 is not set |
| 877 | # CONFIG_SENSORS_I5K_AMB is not set | 872 | # CONFIG_SENSORS_I5K_AMB is not set |
| @@ -901,6 +896,7 @@ CONFIG_HWMON=y | |||
| 901 | # CONFIG_SENSORS_SMSC47M1 is not set | 896 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 902 | # CONFIG_SENSORS_SMSC47M192 is not set | 897 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 903 | # CONFIG_SENSORS_SMSC47B397 is not set | 898 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 899 | # CONFIG_SENSORS_ADS7828 is not set | ||
| 904 | # CONFIG_SENSORS_THMC50 is not set | 900 | # CONFIG_SENSORS_THMC50 is not set |
| 905 | # CONFIG_SENSORS_VIA686A is not set | 901 | # CONFIG_SENSORS_VIA686A is not set |
| 906 | # CONFIG_SENSORS_VT1211 is not set | 902 | # CONFIG_SENSORS_VT1211 is not set |
| @@ -910,6 +906,7 @@ CONFIG_HWMON=y | |||
| 910 | # CONFIG_SENSORS_W83792D is not set | 906 | # CONFIG_SENSORS_W83792D is not set |
| 911 | # CONFIG_SENSORS_W83793 is not set | 907 | # CONFIG_SENSORS_W83793 is not set |
| 912 | # CONFIG_SENSORS_W83L785TS is not set | 908 | # CONFIG_SENSORS_W83L785TS is not set |
| 909 | # CONFIG_SENSORS_W83L786NG is not set | ||
| 913 | # CONFIG_SENSORS_W83627HF is not set | 910 | # CONFIG_SENSORS_W83627HF is not set |
| 914 | # CONFIG_SENSORS_W83627EHF is not set | 911 | # CONFIG_SENSORS_W83627EHF is not set |
| 915 | # CONFIG_HWMON_DEBUG_CHIP is not set | 912 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| @@ -925,14 +922,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 925 | # Multifunction device drivers | 922 | # Multifunction device drivers |
| 926 | # | 923 | # |
| 927 | # CONFIG_MFD_SM501 is not set | 924 | # CONFIG_MFD_SM501 is not set |
| 925 | # CONFIG_MFD_ASIC3 is not set | ||
| 926 | # CONFIG_HTC_PASIC3 is not set | ||
| 928 | 927 | ||
| 929 | # | 928 | # |
| 930 | # Multimedia devices | 929 | # Multimedia devices |
| 931 | # | 930 | # |
| 931 | |||
| 932 | # | ||
| 933 | # Multimedia core support | ||
| 934 | # | ||
| 932 | # CONFIG_VIDEO_DEV is not set | 935 | # CONFIG_VIDEO_DEV is not set |
| 933 | # CONFIG_DVB_CORE is not set | 936 | # CONFIG_DVB_CORE is not set |
| 934 | CONFIG_DAB=y | 937 | # CONFIG_VIDEO_MEDIA is not set |
| 935 | # CONFIG_USB_DABUSB is not set | 938 | |
| 939 | # | ||
| 940 | # Multimedia drivers | ||
| 941 | # | ||
| 942 | # CONFIG_DAB is not set | ||
| 936 | 943 | ||
| 937 | # | 944 | # |
| 938 | # Graphics support | 945 | # Graphics support |
| @@ -949,12 +956,6 @@ CONFIG_DAB=y | |||
| 949 | # CONFIG_DISPLAY_SUPPORT is not set | 956 | # CONFIG_DISPLAY_SUPPORT is not set |
| 950 | 957 | ||
| 951 | # | 958 | # |
| 952 | # Console display driver support | ||
| 953 | # | ||
| 954 | # CONFIG_VGA_CONSOLE is not set | ||
| 955 | CONFIG_DUMMY_CONSOLE=y | ||
| 956 | |||
| 957 | # | ||
| 958 | # Sound | 959 | # Sound |
| 959 | # | 960 | # |
| 960 | # CONFIG_SOUND is not set | 961 | # CONFIG_SOUND is not set |
| @@ -985,14 +986,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 985 | CONFIG_USB_DEVICE_CLASS=y | 986 | CONFIG_USB_DEVICE_CLASS=y |
| 986 | # CONFIG_USB_DYNAMIC_MINORS is not set | 987 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 987 | # CONFIG_USB_OTG is not set | 988 | # CONFIG_USB_OTG is not set |
| 989 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 990 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 988 | 991 | ||
| 989 | # | 992 | # |
| 990 | # USB Host Controller Drivers | 993 | # USB Host Controller Drivers |
| 991 | # | 994 | # |
| 995 | # CONFIG_USB_C67X00_HCD is not set | ||
| 992 | CONFIG_USB_EHCI_HCD=y | 996 | CONFIG_USB_EHCI_HCD=y |
| 993 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 997 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 994 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 998 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
| 995 | # CONFIG_USB_ISP116X_HCD is not set | 999 | # CONFIG_USB_ISP116X_HCD is not set |
| 1000 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 996 | # CONFIG_USB_OHCI_HCD is not set | 1001 | # CONFIG_USB_OHCI_HCD is not set |
| 997 | # CONFIG_USB_UHCI_HCD is not set | 1002 | # CONFIG_USB_UHCI_HCD is not set |
| 998 | # CONFIG_USB_SL811_HCD is not set | 1003 | # CONFIG_USB_SL811_HCD is not set |
| @@ -1003,6 +1008,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y | |||
| 1003 | # | 1008 | # |
| 1004 | # CONFIG_USB_ACM is not set | 1009 | # CONFIG_USB_ACM is not set |
| 1005 | CONFIG_USB_PRINTER=y | 1010 | CONFIG_USB_PRINTER=y |
| 1011 | # CONFIG_USB_WDM is not set | ||
| 1006 | 1012 | ||
| 1007 | # | 1013 | # |
| 1008 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1014 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1022,7 +1028,9 @@ CONFIG_USB_STORAGE_SDDR09=y | |||
| 1022 | CONFIG_USB_STORAGE_SDDR55=y | 1028 | CONFIG_USB_STORAGE_SDDR55=y |
| 1023 | CONFIG_USB_STORAGE_JUMPSHOT=y | 1029 | CONFIG_USB_STORAGE_JUMPSHOT=y |
| 1024 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1030 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1031 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1025 | # CONFIG_USB_STORAGE_KARMA is not set | 1032 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1033 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1026 | # CONFIG_USB_LIBUSUAL is not set | 1034 | # CONFIG_USB_LIBUSUAL is not set |
| 1027 | 1035 | ||
| 1028 | # | 1036 | # |
| @@ -1060,6 +1068,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1060 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1068 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1061 | # CONFIG_USB_IOWARRIOR is not set | 1069 | # CONFIG_USB_IOWARRIOR is not set |
| 1062 | # CONFIG_USB_TEST is not set | 1070 | # CONFIG_USB_TEST is not set |
| 1071 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1063 | # CONFIG_USB_GADGET is not set | 1072 | # CONFIG_USB_GADGET is not set |
| 1064 | # CONFIG_MMC is not set | 1073 | # CONFIG_MMC is not set |
| 1065 | CONFIG_NEW_LEDS=y | 1074 | CONFIG_NEW_LEDS=y |
| @@ -1068,7 +1077,7 @@ CONFIG_LEDS_CLASS=y | |||
| 1068 | # | 1077 | # |
| 1069 | # LED drivers | 1078 | # LED drivers |
| 1070 | # | 1079 | # |
| 1071 | # CONFIG_LEDS_GPIO is not set | 1080 | CONFIG_LEDS_GPIO=y |
| 1072 | 1081 | ||
| 1073 | # | 1082 | # |
| 1074 | # LED Triggers | 1083 | # LED Triggers |
| @@ -1076,6 +1085,7 @@ CONFIG_LEDS_CLASS=y | |||
| 1076 | CONFIG_LEDS_TRIGGERS=y | 1085 | CONFIG_LEDS_TRIGGERS=y |
| 1077 | CONFIG_LEDS_TRIGGER_TIMER=y | 1086 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 1078 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 1087 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 1088 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
| 1079 | CONFIG_RTC_LIB=y | 1089 | CONFIG_RTC_LIB=y |
| 1080 | CONFIG_RTC_CLASS=y | 1090 | CONFIG_RTC_CLASS=y |
| 1081 | CONFIG_RTC_HCTOSYS=y | 1091 | CONFIG_RTC_HCTOSYS=y |
| @@ -1105,6 +1115,7 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1105 | # CONFIG_RTC_DRV_PCF8583 is not set | 1115 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1106 | CONFIG_RTC_DRV_M41T80=y | 1116 | CONFIG_RTC_DRV_M41T80=y |
| 1107 | # CONFIG_RTC_DRV_M41T80_WDT is not set | 1117 | # CONFIG_RTC_DRV_M41T80_WDT is not set |
| 1118 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1108 | 1119 | ||
| 1109 | # | 1120 | # |
| 1110 | # SPI RTC drivers | 1121 | # SPI RTC drivers |
| @@ -1125,6 +1136,7 @@ CONFIG_RTC_DRV_M41T80=y | |||
| 1125 | # | 1136 | # |
| 1126 | # on-CPU RTC drivers | 1137 | # on-CPU RTC drivers |
| 1127 | # | 1138 | # |
| 1139 | # CONFIG_UIO is not set | ||
| 1128 | 1140 | ||
| 1129 | # | 1141 | # |
| 1130 | # File systems | 1142 | # File systems |
| @@ -1140,14 +1152,11 @@ CONFIG_JBD=y | |||
| 1140 | # CONFIG_JFS_FS is not set | 1152 | # CONFIG_JFS_FS is not set |
| 1141 | # CONFIG_FS_POSIX_ACL is not set | 1153 | # CONFIG_FS_POSIX_ACL is not set |
| 1142 | # CONFIG_XFS_FS is not set | 1154 | # CONFIG_XFS_FS is not set |
| 1143 | # CONFIG_GFS2_FS is not set | ||
| 1144 | # CONFIG_OCFS2_FS is not set | 1155 | # CONFIG_OCFS2_FS is not set |
| 1145 | # CONFIG_MINIX_FS is not set | 1156 | CONFIG_DNOTIFY=y |
| 1146 | # CONFIG_ROMFS_FS is not set | ||
| 1147 | CONFIG_INOTIFY=y | 1157 | CONFIG_INOTIFY=y |
| 1148 | CONFIG_INOTIFY_USER=y | 1158 | CONFIG_INOTIFY_USER=y |
| 1149 | # CONFIG_QUOTA is not set | 1159 | # CONFIG_QUOTA is not set |
| 1150 | CONFIG_DNOTIFY=y | ||
| 1151 | # CONFIG_AUTOFS_FS is not set | 1160 | # CONFIG_AUTOFS_FS is not set |
| 1152 | # CONFIG_AUTOFS4_FS is not set | 1161 | # CONFIG_AUTOFS4_FS is not set |
| 1153 | # CONFIG_FUSE_FS is not set | 1162 | # CONFIG_FUSE_FS is not set |
| @@ -1155,8 +1164,8 @@ CONFIG_DNOTIFY=y | |||
| 1155 | # | 1164 | # |
| 1156 | # CD-ROM/DVD Filesystems | 1165 | # CD-ROM/DVD Filesystems |
| 1157 | # | 1166 | # |
| 1158 | CONFIG_ISO9660_FS=y | 1167 | CONFIG_ISO9660_FS=m |
| 1159 | # CONFIG_JOLIET is not set | 1168 | CONFIG_JOLIET=y |
| 1160 | # CONFIG_ZISOFS is not set | 1169 | # CONFIG_ZISOFS is not set |
| 1161 | CONFIG_UDF_FS=m | 1170 | CONFIG_UDF_FS=m |
| 1162 | CONFIG_UDF_NLS=y | 1171 | CONFIG_UDF_NLS=y |
| @@ -1205,8 +1214,10 @@ CONFIG_JFFS2_RTIME=y | |||
| 1205 | # CONFIG_JFFS2_RUBIN is not set | 1214 | # CONFIG_JFFS2_RUBIN is not set |
| 1206 | CONFIG_CRAMFS=y | 1215 | CONFIG_CRAMFS=y |
| 1207 | # CONFIG_VXFS_FS is not set | 1216 | # CONFIG_VXFS_FS is not set |
| 1217 | # CONFIG_MINIX_FS is not set | ||
| 1208 | # CONFIG_HPFS_FS is not set | 1218 | # CONFIG_HPFS_FS is not set |
| 1209 | # CONFIG_QNX4FS_FS is not set | 1219 | # CONFIG_QNX4FS_FS is not set |
| 1220 | # CONFIG_ROMFS_FS is not set | ||
| 1210 | # CONFIG_SYSV_FS is not set | 1221 | # CONFIG_SYSV_FS is not set |
| 1211 | # CONFIG_UFS_FS is not set | 1222 | # CONFIG_UFS_FS is not set |
| 1212 | CONFIG_NETWORK_FILESYSTEMS=y | 1223 | CONFIG_NETWORK_FILESYSTEMS=y |
| @@ -1214,7 +1225,6 @@ CONFIG_NFS_FS=y | |||
| 1214 | CONFIG_NFS_V3=y | 1225 | CONFIG_NFS_V3=y |
| 1215 | # CONFIG_NFS_V3_ACL is not set | 1226 | # CONFIG_NFS_V3_ACL is not set |
| 1216 | # CONFIG_NFS_V4 is not set | 1227 | # CONFIG_NFS_V4 is not set |
| 1217 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1218 | # CONFIG_NFSD is not set | 1228 | # CONFIG_NFSD is not set |
| 1219 | CONFIG_ROOT_NFS=y | 1229 | CONFIG_ROOT_NFS=y |
| 1220 | CONFIG_LOCKD=y | 1230 | CONFIG_LOCKD=y |
| @@ -1241,14 +1251,13 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1241 | # CONFIG_MAC_PARTITION is not set | 1251 | # CONFIG_MAC_PARTITION is not set |
| 1242 | CONFIG_MSDOS_PARTITION=y | 1252 | CONFIG_MSDOS_PARTITION=y |
| 1243 | CONFIG_BSD_DISKLABEL=y | 1253 | CONFIG_BSD_DISKLABEL=y |
| 1244 | CONFIG_MINIX_SUBPARTITION=y | 1254 | # CONFIG_MINIX_SUBPARTITION is not set |
| 1245 | CONFIG_SOLARIS_X86_PARTITION=y | 1255 | # CONFIG_SOLARIS_X86_PARTITION is not set |
| 1246 | CONFIG_UNIXWARE_DISKLABEL=y | 1256 | # CONFIG_UNIXWARE_DISKLABEL is not set |
| 1247 | CONFIG_LDM_PARTITION=y | 1257 | # CONFIG_LDM_PARTITION is not set |
| 1248 | CONFIG_LDM_DEBUG=y | ||
| 1249 | # CONFIG_SGI_PARTITION is not set | 1258 | # CONFIG_SGI_PARTITION is not set |
| 1250 | # CONFIG_ULTRIX_PARTITION is not set | 1259 | # CONFIG_ULTRIX_PARTITION is not set |
| 1251 | CONFIG_SUN_PARTITION=y | 1260 | # CONFIG_SUN_PARTITION is not set |
| 1252 | # CONFIG_KARMA_PARTITION is not set | 1261 | # CONFIG_KARMA_PARTITION is not set |
| 1253 | # CONFIG_EFI_PARTITION is not set | 1262 | # CONFIG_EFI_PARTITION is not set |
| 1254 | # CONFIG_SYSV68_PARTITION is not set | 1263 | # CONFIG_SYSV68_PARTITION is not set |
| @@ -1300,15 +1309,48 @@ CONFIG_NLS_ISO8859_2=y | |||
| 1300 | # CONFIG_PRINTK_TIME is not set | 1309 | # CONFIG_PRINTK_TIME is not set |
| 1301 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1310 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1302 | CONFIG_ENABLE_MUST_CHECK=y | 1311 | CONFIG_ENABLE_MUST_CHECK=y |
| 1303 | # CONFIG_MAGIC_SYSRQ is not set | 1312 | CONFIG_FRAME_WARN=1024 |
| 1313 | CONFIG_MAGIC_SYSRQ=y | ||
| 1304 | # CONFIG_UNUSED_SYMBOLS is not set | 1314 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1305 | # CONFIG_DEBUG_FS is not set | 1315 | # CONFIG_DEBUG_FS is not set |
| 1306 | # CONFIG_HEADERS_CHECK is not set | 1316 | # CONFIG_HEADERS_CHECK is not set |
| 1307 | # CONFIG_DEBUG_KERNEL is not set | 1317 | CONFIG_DEBUG_KERNEL=y |
| 1318 | # CONFIG_DEBUG_SHIRQ is not set | ||
| 1319 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 1320 | CONFIG_SCHED_DEBUG=y | ||
| 1321 | CONFIG_SCHEDSTATS=y | ||
| 1322 | # CONFIG_TIMER_STATS is not set | ||
| 1323 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1324 | CONFIG_DEBUG_PREEMPT=y | ||
| 1325 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 1326 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 1327 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 1328 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 1329 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1330 | # CONFIG_PROVE_LOCKING is not set | ||
| 1331 | # CONFIG_LOCK_STAT is not set | ||
| 1332 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
| 1333 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 1334 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 1308 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1335 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1336 | CONFIG_DEBUG_INFO=y | ||
| 1337 | # CONFIG_DEBUG_VM is not set | ||
| 1338 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1339 | # CONFIG_DEBUG_LIST is not set | ||
| 1340 | # CONFIG_DEBUG_SG is not set | ||
| 1309 | CONFIG_FRAME_POINTER=y | 1341 | CONFIG_FRAME_POINTER=y |
| 1342 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1343 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1344 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 1345 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1346 | # CONFIG_LKDTM is not set | ||
| 1347 | # CONFIG_FAULT_INJECTION is not set | ||
| 1310 | # CONFIG_SAMPLES is not set | 1348 | # CONFIG_SAMPLES is not set |
| 1311 | CONFIG_DEBUG_USER=y | 1349 | CONFIG_DEBUG_USER=y |
| 1350 | CONFIG_DEBUG_ERRORS=y | ||
| 1351 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1352 | CONFIG_DEBUG_LL=y | ||
| 1353 | # CONFIG_DEBUG_ICEDCC is not set | ||
| 1312 | 1354 | ||
| 1313 | # | 1355 | # |
| 1314 | # Security options | 1356 | # Security options |
| @@ -1317,50 +1359,79 @@ CONFIG_DEBUG_USER=y | |||
| 1317 | # CONFIG_SECURITY is not set | 1359 | # CONFIG_SECURITY is not set |
| 1318 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1360 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1319 | CONFIG_CRYPTO=y | 1361 | CONFIG_CRYPTO=y |
| 1362 | |||
| 1363 | # | ||
| 1364 | # Crypto core or helper | ||
| 1365 | # | ||
| 1320 | CONFIG_CRYPTO_ALGAPI=m | 1366 | CONFIG_CRYPTO_ALGAPI=m |
| 1321 | CONFIG_CRYPTO_BLKCIPHER=m | 1367 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1322 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1323 | CONFIG_CRYPTO_MANAGER=m | 1368 | CONFIG_CRYPTO_MANAGER=m |
| 1369 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1370 | # CONFIG_CRYPTO_NULL is not set | ||
| 1371 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1372 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1373 | # CONFIG_CRYPTO_TEST is not set | ||
| 1374 | |||
| 1375 | # | ||
| 1376 | # Authenticated Encryption with Associated Data | ||
| 1377 | # | ||
| 1378 | # CONFIG_CRYPTO_CCM is not set | ||
| 1379 | # CONFIG_CRYPTO_GCM is not set | ||
| 1380 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1381 | |||
| 1382 | # | ||
| 1383 | # Block modes | ||
| 1384 | # | ||
| 1385 | CONFIG_CRYPTO_CBC=m | ||
| 1386 | # CONFIG_CRYPTO_CTR is not set | ||
| 1387 | # CONFIG_CRYPTO_CTS is not set | ||
| 1388 | CONFIG_CRYPTO_ECB=m | ||
| 1389 | # CONFIG_CRYPTO_LRW is not set | ||
| 1390 | CONFIG_CRYPTO_PCBC=m | ||
| 1391 | # CONFIG_CRYPTO_XTS is not set | ||
| 1392 | |||
| 1393 | # | ||
| 1394 | # Hash modes | ||
| 1395 | # | ||
| 1324 | # CONFIG_CRYPTO_HMAC is not set | 1396 | # CONFIG_CRYPTO_HMAC is not set |
| 1325 | # CONFIG_CRYPTO_XCBC is not set | 1397 | # CONFIG_CRYPTO_XCBC is not set |
| 1326 | # CONFIG_CRYPTO_NULL is not set | 1398 | |
| 1399 | # | ||
| 1400 | # Digest | ||
| 1401 | # | ||
| 1402 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1327 | # CONFIG_CRYPTO_MD4 is not set | 1403 | # CONFIG_CRYPTO_MD4 is not set |
| 1328 | # CONFIG_CRYPTO_MD5 is not set | 1404 | # CONFIG_CRYPTO_MD5 is not set |
| 1405 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1329 | # CONFIG_CRYPTO_SHA1 is not set | 1406 | # CONFIG_CRYPTO_SHA1 is not set |
| 1330 | # CONFIG_CRYPTO_SHA256 is not set | 1407 | # CONFIG_CRYPTO_SHA256 is not set |
| 1331 | # CONFIG_CRYPTO_SHA512 is not set | 1408 | # CONFIG_CRYPTO_SHA512 is not set |
| 1332 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1333 | # CONFIG_CRYPTO_TGR192 is not set | 1409 | # CONFIG_CRYPTO_TGR192 is not set |
| 1334 | # CONFIG_CRYPTO_GF128MUL is not set | 1410 | # CONFIG_CRYPTO_WP512 is not set |
| 1335 | CONFIG_CRYPTO_ECB=m | 1411 | |
| 1336 | CONFIG_CRYPTO_CBC=m | 1412 | # |
| 1337 | CONFIG_CRYPTO_PCBC=m | 1413 | # Ciphers |
| 1338 | # CONFIG_CRYPTO_LRW is not set | 1414 | # |
| 1339 | # CONFIG_CRYPTO_XTS is not set | ||
| 1340 | # CONFIG_CRYPTO_CTR is not set | ||
| 1341 | # CONFIG_CRYPTO_GCM is not set | ||
| 1342 | # CONFIG_CRYPTO_CCM is not set | ||
| 1343 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1344 | # CONFIG_CRYPTO_DES is not set | ||
| 1345 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1346 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1347 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1348 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1349 | # CONFIG_CRYPTO_AES is not set | 1415 | # CONFIG_CRYPTO_AES is not set |
| 1416 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1417 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1418 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1419 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1350 | # CONFIG_CRYPTO_CAST5 is not set | 1420 | # CONFIG_CRYPTO_CAST5 is not set |
| 1351 | # CONFIG_CRYPTO_CAST6 is not set | 1421 | # CONFIG_CRYPTO_CAST6 is not set |
| 1352 | # CONFIG_CRYPTO_TEA is not set | 1422 | # CONFIG_CRYPTO_DES is not set |
| 1353 | # CONFIG_CRYPTO_ARC4 is not set | 1423 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1354 | # CONFIG_CRYPTO_KHAZAD is not set | 1424 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1355 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1356 | # CONFIG_CRYPTO_SEED is not set | ||
| 1357 | # CONFIG_CRYPTO_SALSA20 is not set | 1425 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1426 | # CONFIG_CRYPTO_SEED is not set | ||
| 1427 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1428 | # CONFIG_CRYPTO_TEA is not set | ||
| 1429 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1430 | |||
| 1431 | # | ||
| 1432 | # Compression | ||
| 1433 | # | ||
| 1358 | # CONFIG_CRYPTO_DEFLATE is not set | 1434 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1359 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1360 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1361 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1362 | # CONFIG_CRYPTO_TEST is not set | ||
| 1363 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1364 | # CONFIG_CRYPTO_LZO is not set | 1435 | # CONFIG_CRYPTO_LZO is not set |
| 1365 | CONFIG_CRYPTO_HW=y | 1436 | CONFIG_CRYPTO_HW=y |
| 1366 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1437 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| @@ -1369,12 +1440,14 @@ CONFIG_CRYPTO_HW=y | |||
| 1369 | # Library routines | 1440 | # Library routines |
| 1370 | # | 1441 | # |
| 1371 | CONFIG_BITREVERSE=y | 1442 | CONFIG_BITREVERSE=y |
| 1372 | CONFIG_CRC_CCITT=y | 1443 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 1373 | CONFIG_CRC16=y | 1444 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
| 1374 | # CONFIG_CRC_ITU_T is not set | 1445 | # CONFIG_CRC_CCITT is not set |
| 1446 | # CONFIG_CRC16 is not set | ||
| 1447 | CONFIG_CRC_ITU_T=m | ||
| 1375 | CONFIG_CRC32=y | 1448 | CONFIG_CRC32=y |
| 1376 | # CONFIG_CRC7 is not set | 1449 | # CONFIG_CRC7 is not set |
| 1377 | CONFIG_LIBCRC32C=y | 1450 | # CONFIG_LIBCRC32C is not set |
| 1378 | CONFIG_ZLIB_INFLATE=y | 1451 | CONFIG_ZLIB_INFLATE=y |
| 1379 | CONFIG_ZLIB_DEFLATE=y | 1452 | CONFIG_ZLIB_DEFLATE=y |
| 1380 | CONFIG_PLIST=y | 1453 | CONFIG_PLIST=y |
diff --git a/arch/arm/configs/picotux200_defconfig b/arch/arm/configs/picotux200_defconfig index 95a22f512805..14826f0dabde 100644 --- a/arch/arm/configs/picotux200_defconfig +++ b/arch/arm/configs/picotux200_defconfig | |||
| @@ -201,7 +201,6 @@ CONFIG_ARM_THUMB=y | |||
| 201 | # Kernel Features | 201 | # Kernel Features |
| 202 | # | 202 | # |
| 203 | # CONFIG_PREEMPT is not set | 203 | # CONFIG_PREEMPT is not set |
| 204 | CONFIG_NO_IDLE_HZ=y | ||
| 205 | CONFIG_HZ=100 | 204 | CONFIG_HZ=100 |
| 206 | CONFIG_AEABI=y | 205 | CONFIG_AEABI=y |
| 207 | CONFIG_OABI_COMPAT=y | 206 | CONFIG_OABI_COMPAT=y |
diff --git a/arch/arm/configs/pnx4008_defconfig b/arch/arm/configs/pnx4008_defconfig index b5e11aa2e290..811b8f60d19d 100644 --- a/arch/arm/configs/pnx4008_defconfig +++ b/arch/arm/configs/pnx4008_defconfig | |||
| @@ -151,7 +151,6 @@ CONFIG_ARM_THUMB=y | |||
| 151 | # Kernel Features | 151 | # Kernel Features |
| 152 | # | 152 | # |
| 153 | CONFIG_PREEMPT=y | 153 | CONFIG_PREEMPT=y |
| 154 | # CONFIG_NO_IDLE_HZ is not set | ||
| 155 | CONFIG_HZ=100 | 154 | CONFIG_HZ=100 |
| 156 | # CONFIG_AEABI is not set | 155 | # CONFIG_AEABI is not set |
| 157 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 156 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig index fc39ba1a89f3..0c09b23167ec 100644 --- a/arch/arm/configs/realview-smp_defconfig +++ b/arch/arm/configs/realview-smp_defconfig | |||
| @@ -177,7 +177,6 @@ CONFIG_NR_CPUS=4 | |||
| 177 | CONFIG_HOTPLUG_CPU=y | 177 | CONFIG_HOTPLUG_CPU=y |
| 178 | CONFIG_LOCAL_TIMERS=y | 178 | CONFIG_LOCAL_TIMERS=y |
| 179 | # CONFIG_PREEMPT is not set | 179 | # CONFIG_PREEMPT is not set |
| 180 | # CONFIG_NO_IDLE_HZ is not set | ||
| 181 | CONFIG_HZ=100 | 180 | CONFIG_HZ=100 |
| 182 | # CONFIG_AEABI is not set | 181 | # CONFIG_AEABI is not set |
| 183 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 182 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig index accbf529ce5b..907e54344dad 100644 --- a/arch/arm/configs/realview_defconfig +++ b/arch/arm/configs/realview_defconfig | |||
| @@ -126,7 +126,6 @@ CONFIG_ISA_DMA_API=y | |||
| 126 | # | 126 | # |
| 127 | # Kernel Features | 127 | # Kernel Features |
| 128 | # | 128 | # |
| 129 | # CONFIG_NO_IDLE_HZ is not set | ||
| 130 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 129 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 131 | CONFIG_FLATMEM=y | 130 | CONFIG_FLATMEM=y |
| 132 | CONFIG_FLAT_NODE_MEM_MAP=y | 131 | CONFIG_FLAT_NODE_MEM_MAP=y |
diff --git a/arch/arm/configs/rpc_defconfig b/arch/arm/configs/rpc_defconfig index 5ddecb9ddf01..f62d1817d2c6 100644 --- a/arch/arm/configs/rpc_defconfig +++ b/arch/arm/configs/rpc_defconfig | |||
| @@ -190,7 +190,6 @@ CONFIG_ISA_DMA_API=y | |||
| 190 | # | 190 | # |
| 191 | # CONFIG_TICK_ONESHOT is not set | 191 | # CONFIG_TICK_ONESHOT is not set |
| 192 | # CONFIG_PREEMPT is not set | 192 | # CONFIG_PREEMPT is not set |
| 193 | # CONFIG_NO_IDLE_HZ is not set | ||
| 194 | CONFIG_HZ=100 | 193 | CONFIG_HZ=100 |
| 195 | # CONFIG_AEABI is not set | 194 | # CONFIG_AEABI is not set |
| 196 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 195 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index f8a1645b3d4a..35faaea8623e 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
| @@ -1,15 +1,18 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.21-rc6 | 3 | # Linux kernel version: 2.6.26-rc8 |
| 4 | # Mon Apr 9 10:12:58 2007 | 4 | # Mon Jul 7 16:59:23 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
| 8 | CONFIG_GENERIC_GPIO=y | 8 | CONFIG_GENERIC_GPIO=y |
| 9 | # CONFIG_GENERIC_TIME is not set | 9 | # CONFIG_GENERIC_TIME is not set |
| 10 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
| 10 | CONFIG_MMU=y | 11 | CONFIG_MMU=y |
| 11 | CONFIG_NO_IOPORT=y | 12 | CONFIG_NO_IOPORT=y |
| 12 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
| 14 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 15 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 13 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 14 | CONFIG_HARDIRQS_SW_RESEND=y | 17 | CONFIG_HARDIRQS_SW_RESEND=y |
| 15 | CONFIG_GENERIC_IRQ_PROBE=y | 18 | CONFIG_GENERIC_IRQ_PROBE=y |
| @@ -18,34 +21,39 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
| 18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 19 | CONFIG_GENERIC_HWEIGHT=y | 22 | CONFIG_GENERIC_HWEIGHT=y |
| 20 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 24 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 21 | CONFIG_ZONE_DMA=y | 25 | CONFIG_ZONE_DMA=y |
| 22 | CONFIG_VECTORS_BASE=0xffff0000 | 26 | CONFIG_VECTORS_BASE=0xffff0000 |
| 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 24 | 28 | ||
| 25 | # | 29 | # |
| 26 | # Code maturity level options | 30 | # General setup |
| 27 | # | 31 | # |
| 28 | CONFIG_EXPERIMENTAL=y | 32 | CONFIG_EXPERIMENTAL=y |
| 29 | CONFIG_BROKEN_ON_SMP=y | 33 | CONFIG_BROKEN_ON_SMP=y |
| 30 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 31 | |||
| 32 | # | ||
| 33 | # General setup | ||
| 34 | # | ||
| 35 | CONFIG_LOCALVERSION="" | 35 | CONFIG_LOCALVERSION="" |
| 36 | CONFIG_LOCALVERSION_AUTO=y | 36 | CONFIG_LOCALVERSION_AUTO=y |
| 37 | CONFIG_SWAP=y | 37 | CONFIG_SWAP=y |
| 38 | CONFIG_SYSVIPC=y | 38 | CONFIG_SYSVIPC=y |
| 39 | # CONFIG_IPC_NS is not set | ||
| 40 | CONFIG_SYSVIPC_SYSCTL=y | 39 | CONFIG_SYSVIPC_SYSCTL=y |
| 41 | # CONFIG_POSIX_MQUEUE is not set | 40 | # CONFIG_POSIX_MQUEUE is not set |
| 42 | # CONFIG_BSD_PROCESS_ACCT is not set | 41 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 43 | # CONFIG_TASKSTATS is not set | 42 | # CONFIG_TASKSTATS is not set |
| 44 | # CONFIG_UTS_NS is not set | ||
| 45 | # CONFIG_AUDIT is not set | 43 | # CONFIG_AUDIT is not set |
| 46 | # CONFIG_IKCONFIG is not set | 44 | CONFIG_IKCONFIG=m |
| 45 | CONFIG_IKCONFIG_PROC=y | ||
| 46 | CONFIG_LOG_BUF_SHIFT=16 | ||
| 47 | # CONFIG_CGROUPS is not set | ||
| 48 | # CONFIG_GROUP_SCHED is not set | ||
| 47 | CONFIG_SYSFS_DEPRECATED=y | 49 | CONFIG_SYSFS_DEPRECATED=y |
| 50 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 48 | # CONFIG_RELAY is not set | 51 | # CONFIG_RELAY is not set |
| 52 | CONFIG_NAMESPACES=y | ||
| 53 | # CONFIG_UTS_NS is not set | ||
| 54 | # CONFIG_IPC_NS is not set | ||
| 55 | # CONFIG_USER_NS is not set | ||
| 56 | # CONFIG_PID_NS is not set | ||
| 49 | CONFIG_BLK_DEV_INITRD=y | 57 | CONFIG_BLK_DEV_INITRD=y |
| 50 | CONFIG_INITRAMFS_SOURCE="" | 58 | CONFIG_INITRAMFS_SOURCE="" |
| 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 59 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -53,6 +61,7 @@ CONFIG_SYSCTL=y | |||
| 53 | # CONFIG_EMBEDDED is not set | 61 | # CONFIG_EMBEDDED is not set |
| 54 | CONFIG_UID16=y | 62 | CONFIG_UID16=y |
| 55 | CONFIG_SYSCTL_SYSCALL=y | 63 | CONFIG_SYSCTL_SYSCALL=y |
| 64 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 56 | CONFIG_KALLSYMS=y | 65 | CONFIG_KALLSYMS=y |
| 57 | # CONFIG_KALLSYMS_ALL is not set | 66 | # CONFIG_KALLSYMS_ALL is not set |
| 58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 67 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -60,34 +69,43 @@ CONFIG_HOTPLUG=y | |||
| 60 | CONFIG_PRINTK=y | 69 | CONFIG_PRINTK=y |
| 61 | CONFIG_BUG=y | 70 | CONFIG_BUG=y |
| 62 | CONFIG_ELF_CORE=y | 71 | CONFIG_ELF_CORE=y |
| 72 | CONFIG_COMPAT_BRK=y | ||
| 63 | CONFIG_BASE_FULL=y | 73 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 74 | CONFIG_FUTEX=y |
| 75 | CONFIG_ANON_INODES=y | ||
| 65 | CONFIG_EPOLL=y | 76 | CONFIG_EPOLL=y |
| 77 | CONFIG_SIGNALFD=y | ||
| 78 | CONFIG_TIMERFD=y | ||
| 79 | CONFIG_EVENTFD=y | ||
| 66 | CONFIG_SHMEM=y | 80 | CONFIG_SHMEM=y |
| 67 | CONFIG_SLAB=y | ||
| 68 | CONFIG_VM_EVENT_COUNTERS=y | 81 | CONFIG_VM_EVENT_COUNTERS=y |
| 82 | CONFIG_SLAB=y | ||
| 83 | # CONFIG_SLUB is not set | ||
| 84 | # CONFIG_SLOB is not set | ||
| 85 | # CONFIG_PROFILING is not set | ||
| 86 | # CONFIG_MARKERS is not set | ||
| 87 | CONFIG_HAVE_OPROFILE=y | ||
| 88 | # CONFIG_KPROBES is not set | ||
| 89 | CONFIG_HAVE_KPROBES=y | ||
| 90 | CONFIG_HAVE_KRETPROBES=y | ||
| 91 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 92 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 93 | CONFIG_SLABINFO=y | ||
| 69 | CONFIG_RT_MUTEXES=y | 94 | CONFIG_RT_MUTEXES=y |
| 70 | # CONFIG_TINY_SHMEM is not set | 95 | # CONFIG_TINY_SHMEM is not set |
| 71 | CONFIG_BASE_SMALL=0 | 96 | CONFIG_BASE_SMALL=0 |
| 72 | # CONFIG_SLOB is not set | ||
| 73 | |||
| 74 | # | ||
| 75 | # Loadable module support | ||
| 76 | # | ||
| 77 | CONFIG_MODULES=y | 97 | CONFIG_MODULES=y |
| 98 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 78 | CONFIG_MODULE_UNLOAD=y | 99 | CONFIG_MODULE_UNLOAD=y |
| 79 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 100 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 80 | # CONFIG_MODVERSIONS is not set | 101 | # CONFIG_MODVERSIONS is not set |
| 81 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 102 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 82 | CONFIG_KMOD=y | 103 | CONFIG_KMOD=y |
| 83 | |||
| 84 | # | ||
| 85 | # Block layer | ||
| 86 | # | ||
| 87 | CONFIG_BLOCK=y | 104 | CONFIG_BLOCK=y |
| 88 | # CONFIG_LBD is not set | 105 | # CONFIG_LBD is not set |
| 89 | # CONFIG_BLK_DEV_IO_TRACE is not set | 106 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 90 | # CONFIG_LSF is not set | 107 | # CONFIG_LSF is not set |
| 108 | # CONFIG_BLK_DEV_BSG is not set | ||
| 91 | 109 | ||
| 92 | # | 110 | # |
| 93 | # IO Schedulers | 111 | # IO Schedulers |
| @@ -101,6 +119,7 @@ CONFIG_DEFAULT_AS=y | |||
| 101 | # CONFIG_DEFAULT_CFQ is not set | 119 | # CONFIG_DEFAULT_CFQ is not set |
| 102 | # CONFIG_DEFAULT_NOOP is not set | 120 | # CONFIG_DEFAULT_NOOP is not set |
| 103 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 121 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 122 | CONFIG_CLASSIC_RCU=y | ||
| 104 | 123 | ||
| 105 | # | 124 | # |
| 106 | # System Type | 125 | # System Type |
| @@ -119,14 +138,17 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 119 | # CONFIG_ARCH_NETX is not set | 138 | # CONFIG_ARCH_NETX is not set |
| 120 | # CONFIG_ARCH_H720X is not set | 139 | # CONFIG_ARCH_H720X is not set |
| 121 | # CONFIG_ARCH_IMX is not set | 140 | # CONFIG_ARCH_IMX is not set |
| 141 | # CONFIG_ARCH_IOP13XX is not set | ||
| 122 | # CONFIG_ARCH_IOP32X is not set | 142 | # CONFIG_ARCH_IOP32X is not set |
| 123 | # CONFIG_ARCH_IOP33X is not set | 143 | # CONFIG_ARCH_IOP33X is not set |
| 124 | # CONFIG_ARCH_IOP13XX is not set | ||
| 125 | # CONFIG_ARCH_IXP4XX is not set | ||
| 126 | # CONFIG_ARCH_IXP2000 is not set | ||
| 127 | # CONFIG_ARCH_IXP23XX is not set | 144 | # CONFIG_ARCH_IXP23XX is not set |
| 145 | # CONFIG_ARCH_IXP2000 is not set | ||
| 146 | # CONFIG_ARCH_IXP4XX is not set | ||
| 128 | # CONFIG_ARCH_L7200 is not set | 147 | # CONFIG_ARCH_L7200 is not set |
| 148 | # CONFIG_ARCH_KS8695 is not set | ||
| 129 | # CONFIG_ARCH_NS9XXX is not set | 149 | # CONFIG_ARCH_NS9XXX is not set |
| 150 | # CONFIG_ARCH_MXC is not set | ||
| 151 | # CONFIG_ARCH_ORION5X is not set | ||
| 130 | # CONFIG_ARCH_PNX4008 is not set | 152 | # CONFIG_ARCH_PNX4008 is not set |
| 131 | # CONFIG_ARCH_PXA is not set | 153 | # CONFIG_ARCH_PXA is not set |
| 132 | # CONFIG_ARCH_RPC is not set | 154 | # CONFIG_ARCH_RPC is not set |
| @@ -134,18 +156,32 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 134 | CONFIG_ARCH_S3C2410=y | 156 | CONFIG_ARCH_S3C2410=y |
| 135 | # CONFIG_ARCH_SHARK is not set | 157 | # CONFIG_ARCH_SHARK is not set |
| 136 | # CONFIG_ARCH_LH7A40X is not set | 158 | # CONFIG_ARCH_LH7A40X is not set |
| 159 | # CONFIG_ARCH_DAVINCI is not set | ||
| 137 | # CONFIG_ARCH_OMAP is not set | 160 | # CONFIG_ARCH_OMAP is not set |
| 161 | # CONFIG_ARCH_MSM7X00A is not set | ||
| 138 | CONFIG_PLAT_S3C24XX=y | 162 | CONFIG_PLAT_S3C24XX=y |
| 139 | CONFIG_CPU_S3C244X=y | 163 | CONFIG_CPU_S3C244X=y |
| 164 | # CONFIG_S3C24XX_PWM is not set | ||
| 140 | CONFIG_PM_SIMTEC=y | 165 | CONFIG_PM_SIMTEC=y |
| 166 | CONFIG_S3C2410_DMA=y | ||
| 167 | # CONFIG_S3C2410_DMA_DEBUG is not set | ||
| 168 | CONFIG_MACH_SMDK=y | ||
| 169 | CONFIG_PLAT_S3C=y | ||
| 170 | CONFIG_CPU_LLSERIAL_S3C2410=y | ||
| 171 | CONFIG_CPU_LLSERIAL_S3C2440=y | ||
| 172 | |||
| 173 | # | ||
| 174 | # Boot options | ||
| 175 | # | ||
| 141 | # CONFIG_S3C_BOOT_WATCHDOG is not set | 176 | # CONFIG_S3C_BOOT_WATCHDOG is not set |
| 142 | # CONFIG_S3C_BOOT_ERROR_RESET is not set | 177 | # CONFIG_S3C_BOOT_ERROR_RESET is not set |
| 178 | |||
| 179 | # | ||
| 180 | # Power management | ||
| 181 | # | ||
| 143 | # CONFIG_S3C2410_PM_DEBUG is not set | 182 | # CONFIG_S3C2410_PM_DEBUG is not set |
| 144 | # CONFIG_S3C2410_PM_CHECK is not set | 183 | # CONFIG_S3C2410_PM_CHECK is not set |
| 145 | CONFIG_S3C_LOWLEVEL_UART_PORT=0 | 184 | CONFIG_S3C_LOWLEVEL_UART_PORT=0 |
| 146 | CONFIG_S3C2410_DMA=y | ||
| 147 | # CONFIG_S3C2410_DMA_DEBUG is not set | ||
| 148 | CONFIG_MACH_SMDK=y | ||
| 149 | 185 | ||
| 150 | # | 186 | # |
| 151 | # S3C2400 Machines | 187 | # S3C2400 Machines |
| @@ -155,6 +191,8 @@ CONFIG_CPU_S3C2410_DMA=y | |||
| 155 | CONFIG_S3C2410_PM=y | 191 | CONFIG_S3C2410_PM=y |
| 156 | CONFIG_S3C2410_GPIO=y | 192 | CONFIG_S3C2410_GPIO=y |
| 157 | CONFIG_S3C2410_CLOCK=y | 193 | CONFIG_S3C2410_CLOCK=y |
| 194 | CONFIG_SIMTEC_NOR=y | ||
| 195 | CONFIG_MACH_BAST_IDE=y | ||
| 158 | 196 | ||
| 159 | # | 197 | # |
| 160 | # S3C2410 Machines | 198 | # S3C2410 Machines |
| @@ -167,6 +205,7 @@ CONFIG_ARCH_BAST=y | |||
| 167 | CONFIG_MACH_OTOM=y | 205 | CONFIG_MACH_OTOM=y |
| 168 | CONFIG_MACH_AML_M5900=y | 206 | CONFIG_MACH_AML_M5900=y |
| 169 | CONFIG_BAST_PC104_IRQ=y | 207 | CONFIG_BAST_PC104_IRQ=y |
| 208 | # CONFIG_MACH_TCT_HAMMER is not set | ||
| 170 | CONFIG_MACH_VR1000=y | 209 | CONFIG_MACH_VR1000=y |
| 171 | CONFIG_MACH_QT2410=y | 210 | CONFIG_MACH_QT2410=y |
| 172 | CONFIG_CPU_S3C2412=y | 211 | CONFIG_CPU_S3C2412=y |
| @@ -176,8 +215,10 @@ CONFIG_S3C2412_PM=y | |||
| 176 | # | 215 | # |
| 177 | # S3C2412 Machines | 216 | # S3C2412 Machines |
| 178 | # | 217 | # |
| 218 | # CONFIG_MACH_JIVE is not set | ||
| 179 | CONFIG_MACH_SMDK2413=y | 219 | CONFIG_MACH_SMDK2413=y |
| 180 | CONFIG_MACH_S3C2413=y | 220 | CONFIG_MACH_S3C2413=y |
| 221 | # CONFIG_MACH_SMDK2412 is not set | ||
| 181 | CONFIG_MACH_VSTMS=y | 222 | CONFIG_MACH_VSTMS=y |
| 182 | CONFIG_CPU_S3C2440=y | 223 | CONFIG_CPU_S3C2440=y |
| 183 | CONFIG_S3C2440_DMA=y | 224 | CONFIG_S3C2440_DMA=y |
| @@ -191,6 +232,7 @@ CONFIG_MACH_RX3715=y | |||
| 191 | CONFIG_ARCH_S3C2440=y | 232 | CONFIG_ARCH_S3C2440=y |
| 192 | CONFIG_MACH_NEXCODER_2440=y | 233 | CONFIG_MACH_NEXCODER_2440=y |
| 193 | CONFIG_SMDK2440_CPU2440=y | 234 | CONFIG_SMDK2440_CPU2440=y |
| 235 | # CONFIG_MACH_AT2440EVB is not set | ||
| 194 | CONFIG_CPU_S3C2442=y | 236 | CONFIG_CPU_S3C2442=y |
| 195 | 237 | ||
| 196 | # | 238 | # |
| @@ -215,6 +257,7 @@ CONFIG_CPU_32v4T=y | |||
| 215 | CONFIG_CPU_32v5=y | 257 | CONFIG_CPU_32v5=y |
| 216 | CONFIG_CPU_ABRT_EV4T=y | 258 | CONFIG_CPU_ABRT_EV4T=y |
| 217 | CONFIG_CPU_ABRT_EV5TJ=y | 259 | CONFIG_CPU_ABRT_EV5TJ=y |
| 260 | CONFIG_CPU_PABRT_NOIFAR=y | ||
| 218 | CONFIG_CPU_CACHE_V4WT=y | 261 | CONFIG_CPU_CACHE_V4WT=y |
| 219 | CONFIG_CPU_CACHE_VIVT=y | 262 | CONFIG_CPU_CACHE_VIVT=y |
| 220 | CONFIG_CPU_COPY_V4WB=y | 263 | CONFIG_CPU_COPY_V4WB=y |
| @@ -236,17 +279,15 @@ CONFIG_CPU_CP15_MMU=y | |||
| 236 | # Bus support | 279 | # Bus support |
| 237 | # | 280 | # |
| 238 | CONFIG_ISA=y | 281 | CONFIG_ISA=y |
| 239 | 282 | # CONFIG_PCI_SYSCALL is not set | |
| 240 | # | 283 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 241 | # PCCARD (PCMCIA/CardBus) support | ||
| 242 | # | ||
| 243 | # CONFIG_PCCARD is not set | 284 | # CONFIG_PCCARD is not set |
| 244 | 285 | ||
| 245 | # | 286 | # |
| 246 | # Kernel Features | 287 | # Kernel Features |
| 247 | # | 288 | # |
| 289 | # CONFIG_TICK_ONESHOT is not set | ||
| 248 | # CONFIG_PREEMPT is not set | 290 | # CONFIG_PREEMPT is not set |
| 249 | # CONFIG_NO_IDLE_HZ is not set | ||
| 250 | CONFIG_HZ=200 | 291 | CONFIG_HZ=200 |
| 251 | # CONFIG_AEABI is not set | 292 | # CONFIG_AEABI is not set |
| 252 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 293 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| @@ -257,9 +298,13 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 257 | CONFIG_FLATMEM=y | 298 | CONFIG_FLATMEM=y |
| 258 | CONFIG_FLAT_NODE_MEM_MAP=y | 299 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 259 | # CONFIG_SPARSEMEM_STATIC is not set | 300 | # CONFIG_SPARSEMEM_STATIC is not set |
| 301 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 302 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 260 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 303 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
| 261 | # CONFIG_RESOURCES_64BIT is not set | 304 | # CONFIG_RESOURCES_64BIT is not set |
| 262 | CONFIG_ZONE_DMA_FLAG=1 | 305 | CONFIG_ZONE_DMA_FLAG=1 |
| 306 | CONFIG_BOUNCE=y | ||
| 307 | CONFIG_VIRT_TO_BUS=y | ||
| 263 | CONFIG_ALIGNMENT_TRAP=y | 308 | CONFIG_ALIGNMENT_TRAP=y |
| 264 | 309 | ||
| 265 | # | 310 | # |
| @@ -279,7 +324,7 @@ CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0" | |||
| 279 | # At least one emulation must be selected | 324 | # At least one emulation must be selected |
| 280 | # | 325 | # |
| 281 | CONFIG_FPE_NWFPE=y | 326 | CONFIG_FPE_NWFPE=y |
| 282 | # CONFIG_FPE_NWFPE_XP is not set | 327 | CONFIG_FPE_NWFPE_XP=y |
| 283 | # CONFIG_FPE_FASTFPE is not set | 328 | # CONFIG_FPE_FASTFPE is not set |
| 284 | # CONFIG_VFP is not set | 329 | # CONFIG_VFP is not set |
| 285 | 330 | ||
| @@ -295,10 +340,12 @@ CONFIG_BINFMT_AOUT=y | |||
| 295 | # Power management options | 340 | # Power management options |
| 296 | # | 341 | # |
| 297 | CONFIG_PM=y | 342 | CONFIG_PM=y |
| 298 | # CONFIG_PM_LEGACY is not set | ||
| 299 | # CONFIG_PM_DEBUG is not set | 343 | # CONFIG_PM_DEBUG is not set |
| 300 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 344 | CONFIG_PM_SLEEP=y |
| 301 | # CONFIG_APM_EMULATION is not set | 345 | CONFIG_SUSPEND=y |
| 346 | CONFIG_SUSPEND_FREEZER=y | ||
| 347 | CONFIG_APM_EMULATION=m | ||
| 348 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 302 | 349 | ||
| 303 | # | 350 | # |
| 304 | # Networking | 351 | # Networking |
| @@ -308,59 +355,67 @@ CONFIG_NET=y | |||
| 308 | # | 355 | # |
| 309 | # Networking options | 356 | # Networking options |
| 310 | # | 357 | # |
| 311 | # CONFIG_NETDEBUG is not set | 358 | CONFIG_PACKET=y |
| 312 | # CONFIG_PACKET is not set | 359 | # CONFIG_PACKET_MMAP is not set |
| 313 | CONFIG_UNIX=y | 360 | CONFIG_UNIX=y |
| 314 | CONFIG_XFRM=y | 361 | CONFIG_XFRM=y |
| 315 | # CONFIG_XFRM_USER is not set | 362 | # CONFIG_XFRM_USER is not set |
| 316 | # CONFIG_XFRM_SUB_POLICY is not set | 363 | # CONFIG_XFRM_SUB_POLICY is not set |
| 317 | # CONFIG_XFRM_MIGRATE is not set | 364 | # CONFIG_XFRM_MIGRATE is not set |
| 365 | # CONFIG_XFRM_STATISTICS is not set | ||
| 318 | # CONFIG_NET_KEY is not set | 366 | # CONFIG_NET_KEY is not set |
| 319 | CONFIG_INET=y | 367 | CONFIG_INET=y |
| 320 | # CONFIG_IP_MULTICAST is not set | 368 | CONFIG_IP_MULTICAST=y |
| 321 | # CONFIG_IP_ADVANCED_ROUTER is not set | 369 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 322 | CONFIG_IP_FIB_HASH=y | 370 | CONFIG_IP_FIB_HASH=y |
| 323 | CONFIG_IP_PNP=y | 371 | CONFIG_IP_PNP=y |
| 324 | # CONFIG_IP_PNP_DHCP is not set | 372 | CONFIG_IP_PNP_DHCP=y |
| 325 | CONFIG_IP_PNP_BOOTP=y | 373 | CONFIG_IP_PNP_BOOTP=y |
| 326 | # CONFIG_IP_PNP_RARP is not set | 374 | # CONFIG_IP_PNP_RARP is not set |
| 327 | # CONFIG_NET_IPIP is not set | 375 | # CONFIG_NET_IPIP is not set |
| 328 | # CONFIG_NET_IPGRE is not set | 376 | # CONFIG_NET_IPGRE is not set |
| 377 | # CONFIG_IP_MROUTE is not set | ||
| 329 | # CONFIG_ARPD is not set | 378 | # CONFIG_ARPD is not set |
| 330 | # CONFIG_SYN_COOKIES is not set | 379 | # CONFIG_SYN_COOKIES is not set |
| 331 | # CONFIG_INET_AH is not set | 380 | # CONFIG_INET_AH is not set |
| 332 | # CONFIG_INET_ESP is not set | 381 | # CONFIG_INET_ESP is not set |
| 333 | # CONFIG_INET_IPCOMP is not set | 382 | # CONFIG_INET_IPCOMP is not set |
| 334 | # CONFIG_INET_XFRM_TUNNEL is not set | 383 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 335 | # CONFIG_INET_TUNNEL is not set | 384 | CONFIG_INET_TUNNEL=m |
| 336 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 385 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 337 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 386 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 338 | CONFIG_INET_XFRM_MODE_BEET=y | 387 | CONFIG_INET_XFRM_MODE_BEET=y |
| 388 | # CONFIG_INET_LRO is not set | ||
| 339 | CONFIG_INET_DIAG=y | 389 | CONFIG_INET_DIAG=y |
| 340 | CONFIG_INET_TCP_DIAG=y | 390 | CONFIG_INET_TCP_DIAG=y |
| 341 | # CONFIG_TCP_CONG_ADVANCED is not set | 391 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 342 | CONFIG_TCP_CONG_CUBIC=y | 392 | CONFIG_TCP_CONG_CUBIC=y |
| 343 | CONFIG_DEFAULT_TCP_CONG="cubic" | 393 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 344 | # CONFIG_TCP_MD5SIG is not set | 394 | # CONFIG_TCP_MD5SIG is not set |
| 345 | # CONFIG_IPV6 is not set | 395 | CONFIG_IPV6=m |
| 346 | # CONFIG_INET6_XFRM_TUNNEL is not set | 396 | CONFIG_IPV6_PRIVACY=y |
| 347 | # CONFIG_INET6_TUNNEL is not set | 397 | CONFIG_IPV6_ROUTER_PREF=y |
| 398 | # CONFIG_IPV6_ROUTE_INFO is not set | ||
| 399 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
| 400 | CONFIG_INET6_AH=m | ||
| 401 | CONFIG_INET6_ESP=m | ||
| 402 | CONFIG_INET6_IPCOMP=m | ||
| 403 | CONFIG_IPV6_MIP6=m | ||
| 404 | CONFIG_INET6_XFRM_TUNNEL=m | ||
| 405 | CONFIG_INET6_TUNNEL=m | ||
| 406 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
| 407 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
| 408 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
| 409 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
| 410 | CONFIG_IPV6_SIT=m | ||
| 411 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 412 | CONFIG_IPV6_TUNNEL=m | ||
| 413 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
| 414 | # CONFIG_IPV6_MROUTE is not set | ||
| 348 | # CONFIG_NETWORK_SECMARK is not set | 415 | # CONFIG_NETWORK_SECMARK is not set |
| 349 | # CONFIG_NETFILTER is not set | 416 | # CONFIG_NETFILTER is not set |
| 350 | |||
| 351 | # | ||
| 352 | # DCCP Configuration (EXPERIMENTAL) | ||
| 353 | # | ||
| 354 | # CONFIG_IP_DCCP is not set | 417 | # CONFIG_IP_DCCP is not set |
| 355 | |||
| 356 | # | ||
| 357 | # SCTP Configuration (EXPERIMENTAL) | ||
| 358 | # | ||
| 359 | # CONFIG_IP_SCTP is not set | 418 | # CONFIG_IP_SCTP is not set |
| 360 | |||
| 361 | # | ||
| 362 | # TIPC Configuration (EXPERIMENTAL) | ||
| 363 | # | ||
| 364 | # CONFIG_TIPC is not set | 419 | # CONFIG_TIPC is not set |
| 365 | # CONFIG_ATM is not set | 420 | # CONFIG_ATM is not set |
| 366 | # CONFIG_BRIDGE is not set | 421 | # CONFIG_BRIDGE is not set |
| @@ -373,20 +428,71 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 373 | # CONFIG_LAPB is not set | 428 | # CONFIG_LAPB is not set |
| 374 | # CONFIG_ECONET is not set | 429 | # CONFIG_ECONET is not set |
| 375 | # CONFIG_WAN_ROUTER is not set | 430 | # CONFIG_WAN_ROUTER is not set |
| 376 | |||
| 377 | # | ||
| 378 | # QoS and/or fair queueing | ||
| 379 | # | ||
| 380 | # CONFIG_NET_SCHED is not set | 431 | # CONFIG_NET_SCHED is not set |
| 432 | CONFIG_NET_SCH_FIFO=y | ||
| 381 | 433 | ||
| 382 | # | 434 | # |
| 383 | # Network testing | 435 | # Network testing |
| 384 | # | 436 | # |
| 385 | # CONFIG_NET_PKTGEN is not set | 437 | # CONFIG_NET_PKTGEN is not set |
| 386 | # CONFIG_HAMRADIO is not set | 438 | # CONFIG_HAMRADIO is not set |
| 439 | # CONFIG_CAN is not set | ||
| 387 | # CONFIG_IRDA is not set | 440 | # CONFIG_IRDA is not set |
| 388 | # CONFIG_BT is not set | 441 | CONFIG_BT=m |
| 442 | CONFIG_BT_L2CAP=m | ||
| 443 | CONFIG_BT_SCO=m | ||
| 444 | CONFIG_BT_RFCOMM=m | ||
| 445 | CONFIG_BT_RFCOMM_TTY=y | ||
| 446 | CONFIG_BT_BNEP=m | ||
| 447 | CONFIG_BT_BNEP_MC_FILTER=y | ||
| 448 | CONFIG_BT_BNEP_PROTO_FILTER=y | ||
| 449 | CONFIG_BT_HIDP=m | ||
| 450 | |||
| 451 | # | ||
| 452 | # Bluetooth device drivers | ||
| 453 | # | ||
| 454 | CONFIG_BT_HCIUSB=m | ||
| 455 | CONFIG_BT_HCIUSB_SCO=y | ||
| 456 | CONFIG_BT_HCIUART=m | ||
| 457 | CONFIG_BT_HCIUART_H4=y | ||
| 458 | CONFIG_BT_HCIUART_BCSP=y | ||
| 459 | CONFIG_BT_HCIUART_LL=y | ||
| 460 | CONFIG_BT_HCIBCM203X=m | ||
| 461 | CONFIG_BT_HCIBPA10X=m | ||
| 462 | CONFIG_BT_HCIBFUSB=m | ||
| 463 | CONFIG_BT_HCIVHCI=m | ||
| 464 | # CONFIG_AF_RXRPC is not set | ||
| 465 | |||
| 466 | # | ||
| 467 | # Wireless | ||
| 468 | # | ||
| 469 | CONFIG_CFG80211=m | ||
| 470 | CONFIG_NL80211=y | ||
| 471 | CONFIG_WIRELESS_EXT=y | ||
| 472 | CONFIG_MAC80211=m | ||
| 473 | |||
| 474 | # | ||
| 475 | # Rate control algorithm selection | ||
| 476 | # | ||
| 477 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 478 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 479 | |||
| 480 | # | ||
| 481 | # Selecting 'y' for an algorithm will | ||
| 482 | # | ||
| 483 | |||
| 484 | # | ||
| 485 | # build the algorithm into mac80211. | ||
| 486 | # | ||
| 487 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 488 | CONFIG_MAC80211_RC_PID=y | ||
| 489 | CONFIG_MAC80211_MESH=y | ||
| 490 | CONFIG_MAC80211_LEDS=y | ||
| 491 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
| 492 | # CONFIG_MAC80211_DEBUG is not set | ||
| 389 | # CONFIG_IEEE80211 is not set | 493 | # CONFIG_IEEE80211 is not set |
| 494 | # CONFIG_RFKILL is not set | ||
| 495 | # CONFIG_NET_9P is not set | ||
| 390 | 496 | ||
| 391 | # | 497 | # |
| 392 | # Device Drivers | 498 | # Device Drivers |
| @@ -395,21 +501,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 395 | # | 501 | # |
| 396 | # Generic Driver Options | 502 | # Generic Driver Options |
| 397 | # | 503 | # |
| 504 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 398 | CONFIG_STANDALONE=y | 505 | CONFIG_STANDALONE=y |
| 399 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 506 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 400 | # CONFIG_FW_LOADER is not set | 507 | CONFIG_FW_LOADER=m |
| 401 | # CONFIG_DEBUG_DRIVER is not set | 508 | # CONFIG_DEBUG_DRIVER is not set |
| 402 | # CONFIG_DEBUG_DEVRES is not set | 509 | # CONFIG_DEBUG_DEVRES is not set |
| 403 | # CONFIG_SYS_HYPERVISOR is not set | 510 | # CONFIG_SYS_HYPERVISOR is not set |
| 404 | |||
| 405 | # | ||
| 406 | # Connector - unified userspace <-> kernelspace linker | ||
| 407 | # | ||
| 408 | # CONFIG_CONNECTOR is not set | 511 | # CONFIG_CONNECTOR is not set |
| 409 | |||
| 410 | # | ||
| 411 | # Memory Technology Devices (MTD) | ||
| 412 | # | ||
| 413 | CONFIG_MTD=y | 512 | CONFIG_MTD=y |
| 414 | # CONFIG_MTD_DEBUG is not set | 513 | # CONFIG_MTD_DEBUG is not set |
| 415 | # CONFIG_MTD_CONCAT is not set | 514 | # CONFIG_MTD_CONCAT is not set |
| @@ -420,6 +519,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y | |||
| 420 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | 519 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set |
| 421 | CONFIG_MTD_CMDLINE_PARTS=y | 520 | CONFIG_MTD_CMDLINE_PARTS=y |
| 422 | # CONFIG_MTD_AFS_PARTS is not set | 521 | # CONFIG_MTD_AFS_PARTS is not set |
| 522 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 423 | 523 | ||
| 424 | # | 524 | # |
| 425 | # User Modules And Translation Layers | 525 | # User Modules And Translation Layers |
| @@ -432,6 +532,7 @@ CONFIG_MTD_BLOCK=y | |||
| 432 | # CONFIG_INFTL is not set | 532 | # CONFIG_INFTL is not set |
| 433 | # CONFIG_RFD_FTL is not set | 533 | # CONFIG_RFD_FTL is not set |
| 434 | # CONFIG_SSFDC is not set | 534 | # CONFIG_SSFDC is not set |
| 535 | # CONFIG_MTD_OOPS is not set | ||
| 435 | 536 | ||
| 436 | # | 537 | # |
| 437 | # RAM/ROM/Flash chip drivers | 538 | # RAM/ROM/Flash chip drivers |
| @@ -457,7 +558,6 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 457 | # CONFIG_MTD_RAM is not set | 558 | # CONFIG_MTD_RAM is not set |
| 458 | CONFIG_MTD_ROM=y | 559 | CONFIG_MTD_ROM=y |
| 459 | # CONFIG_MTD_ABSENT is not set | 560 | # CONFIG_MTD_ABSENT is not set |
| 460 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
| 461 | 561 | ||
| 462 | # | 562 | # |
| 463 | # Mapping drivers for chip access | 563 | # Mapping drivers for chip access |
| @@ -486,13 +586,10 @@ CONFIG_MTD_BAST_MAXSIZE=4 | |||
| 486 | # CONFIG_MTD_DOC2000 is not set | 586 | # CONFIG_MTD_DOC2000 is not set |
| 487 | # CONFIG_MTD_DOC2001 is not set | 587 | # CONFIG_MTD_DOC2001 is not set |
| 488 | # CONFIG_MTD_DOC2001PLUS is not set | 588 | # CONFIG_MTD_DOC2001PLUS is not set |
| 489 | |||
| 490 | # | ||
| 491 | # NAND Flash Device Drivers | ||
| 492 | # | ||
| 493 | CONFIG_MTD_NAND=y | 589 | CONFIG_MTD_NAND=y |
| 494 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | 590 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set |
| 495 | # CONFIG_MTD_NAND_ECC_SMC is not set | 591 | # CONFIG_MTD_NAND_ECC_SMC is not set |
| 592 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 496 | CONFIG_MTD_NAND_IDS=y | 593 | CONFIG_MTD_NAND_IDS=y |
| 497 | CONFIG_MTD_NAND_S3C2410=y | 594 | CONFIG_MTD_NAND_S3C2410=y |
| 498 | # CONFIG_MTD_NAND_S3C2410_DEBUG is not set | 595 | # CONFIG_MTD_NAND_S3C2410_DEBUG is not set |
| @@ -500,30 +597,25 @@ CONFIG_MTD_NAND_S3C2410=y | |||
| 500 | # CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set | 597 | # CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set |
| 501 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 598 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 502 | # CONFIG_MTD_NAND_NANDSIM is not set | 599 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 503 | 600 | # CONFIG_MTD_NAND_PLATFORM is not set | |
| 504 | # | 601 | # CONFIG_MTD_ALAUDA is not set |
| 505 | # OneNAND Flash Device Drivers | ||
| 506 | # | ||
| 507 | # CONFIG_MTD_ONENAND is not set | 602 | # CONFIG_MTD_ONENAND is not set |
| 508 | 603 | ||
| 509 | # | 604 | # |
| 510 | # Parallel port support | 605 | # UBI - Unsorted block images |
| 511 | # | 606 | # |
| 607 | # CONFIG_MTD_UBI is not set | ||
| 512 | CONFIG_PARPORT=y | 608 | CONFIG_PARPORT=y |
| 513 | # CONFIG_PARPORT_PC is not set | 609 | CONFIG_PARPORT_PC=m |
| 610 | # CONFIG_PARPORT_PC_FIFO is not set | ||
| 611 | # CONFIG_PARPORT_PC_SUPERIO is not set | ||
| 514 | # CONFIG_PARPORT_GSC is not set | 612 | # CONFIG_PARPORT_GSC is not set |
| 515 | # CONFIG_PARPORT_AX88796 is not set | 613 | CONFIG_PARPORT_AX88796=m |
| 516 | CONFIG_PARPORT_1284=y | 614 | CONFIG_PARPORT_1284=y |
| 517 | 615 | CONFIG_PARPORT_NOT_PC=y | |
| 518 | # | ||
| 519 | # Plug and Play support | ||
| 520 | # | ||
| 521 | # CONFIG_PNP is not set | 616 | # CONFIG_PNP is not set |
| 522 | # CONFIG_PNPACPI is not set | 617 | CONFIG_BLK_DEV=y |
| 523 | 618 | # CONFIG_PARIDE is not set | |
| 524 | # | ||
| 525 | # Block devices | ||
| 526 | # | ||
| 527 | # CONFIG_BLK_DEV_COW_COMMON is not set | 619 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 528 | CONFIG_BLK_DEV_LOOP=y | 620 | CONFIG_BLK_DEV_LOOP=y |
| 529 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 621 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -532,34 +624,34 @@ CONFIG_BLK_DEV_NBD=m | |||
| 532 | CONFIG_BLK_DEV_RAM=y | 624 | CONFIG_BLK_DEV_RAM=y |
| 533 | CONFIG_BLK_DEV_RAM_COUNT=16 | 625 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 534 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 626 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 535 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 627 | # CONFIG_BLK_DEV_XIP is not set |
| 536 | # CONFIG_CDROM_PKTCDVD is not set | 628 | # CONFIG_CDROM_PKTCDVD is not set |
| 537 | CONFIG_ATA_OVER_ETH=m | 629 | CONFIG_ATA_OVER_ETH=m |
| 538 | 630 | CONFIG_MISC_DEVICES=y | |
| 539 | # | 631 | # CONFIG_EEPROM_93CX6 is not set |
| 540 | # ATA/ATAPI/MFM/RLL support | 632 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 541 | # | 633 | CONFIG_HAVE_IDE=y |
| 542 | CONFIG_IDE=y | 634 | CONFIG_IDE=y |
| 543 | CONFIG_BLK_DEV_IDE=y | 635 | CONFIG_BLK_DEV_IDE=y |
| 544 | 636 | ||
| 545 | # | 637 | # |
| 546 | # Please see Documentation/ide.txt for help/info on IDE drives | 638 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 547 | # | 639 | # |
| 548 | # CONFIG_BLK_DEV_IDE_SATA is not set | 640 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 549 | CONFIG_BLK_DEV_IDEDISK=y | 641 | CONFIG_BLK_DEV_IDEDISK=y |
| 550 | # CONFIG_IDEDISK_MULTI_MODE is not set | 642 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| 551 | CONFIG_BLK_DEV_IDECD=y | 643 | CONFIG_BLK_DEV_IDECD=y |
| 644 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 552 | CONFIG_BLK_DEV_IDETAPE=m | 645 | CONFIG_BLK_DEV_IDETAPE=m |
| 553 | CONFIG_BLK_DEV_IDEFLOPPY=m | 646 | CONFIG_BLK_DEV_IDEFLOPPY=m |
| 647 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 554 | # CONFIG_IDE_TASK_IOCTL is not set | 648 | # CONFIG_IDE_TASK_IOCTL is not set |
| 649 | CONFIG_IDE_PROC_FS=y | ||
| 555 | 650 | ||
| 556 | # | 651 | # |
| 557 | # IDE chipset support/bugfixes | 652 | # IDE chipset support/bugfixes |
| 558 | # | 653 | # |
| 559 | CONFIG_IDE_GENERIC=y | 654 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 560 | # CONFIG_IDE_ARM is not set | ||
| 561 | CONFIG_BLK_DEV_IDE_BAST=y | ||
| 562 | # CONFIG_IDE_CHIPSETS is not set | ||
| 563 | # CONFIG_BLK_DEV_IDEDMA is not set | 655 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 564 | # CONFIG_BLK_DEV_HD is not set | 656 | # CONFIG_BLK_DEV_HD is not set |
| 565 | 657 | ||
| @@ -567,101 +659,119 @@ CONFIG_BLK_DEV_IDE_BAST=y | |||
| 567 | # SCSI device support | 659 | # SCSI device support |
| 568 | # | 660 | # |
| 569 | # CONFIG_RAID_ATTRS is not set | 661 | # CONFIG_RAID_ATTRS is not set |
| 570 | # CONFIG_SCSI is not set | 662 | CONFIG_SCSI=y |
| 663 | CONFIG_SCSI_DMA=y | ||
| 664 | CONFIG_SCSI_TGT=m | ||
| 571 | # CONFIG_SCSI_NETLINK is not set | 665 | # CONFIG_SCSI_NETLINK is not set |
| 572 | 666 | CONFIG_SCSI_PROC_FS=y | |
| 573 | # | 667 | |
| 574 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | 668 | # |
| 575 | # | 669 | # SCSI support type (disk, tape, CD-ROM) |
| 670 | # | ||
| 671 | CONFIG_BLK_DEV_SD=y | ||
| 672 | CONFIG_CHR_DEV_ST=m | ||
| 673 | # CONFIG_CHR_DEV_OSST is not set | ||
| 674 | CONFIG_BLK_DEV_SR=m | ||
| 675 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
| 676 | CONFIG_CHR_DEV_SG=y | ||
| 677 | CONFIG_CHR_DEV_SCH=m | ||
| 678 | |||
| 679 | # | ||
| 680 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
| 681 | # | ||
| 682 | CONFIG_SCSI_MULTI_LUN=y | ||
| 683 | CONFIG_SCSI_CONSTANTS=y | ||
| 684 | # CONFIG_SCSI_LOGGING is not set | ||
| 685 | CONFIG_SCSI_SCAN_ASYNC=y | ||
| 686 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 687 | |||
| 688 | # | ||
| 689 | # SCSI Transports | ||
| 690 | # | ||
| 691 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
| 692 | # CONFIG_SCSI_FC_ATTRS is not set | ||
| 693 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
| 694 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
| 695 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 696 | CONFIG_SCSI_LOWLEVEL=y | ||
| 697 | # CONFIG_ISCSI_TCP is not set | ||
| 698 | # CONFIG_SCSI_AHA152X is not set | ||
| 699 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 700 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 701 | # CONFIG_SCSI_IN2000 is not set | ||
| 702 | # CONFIG_SCSI_DTC3280 is not set | ||
| 703 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 704 | # CONFIG_SCSI_GENERIC_NCR5380 is not set | ||
| 705 | # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set | ||
| 706 | # CONFIG_SCSI_PPA is not set | ||
| 707 | # CONFIG_SCSI_IMM is not set | ||
| 708 | # CONFIG_SCSI_NCR53C406A is not set | ||
| 709 | # CONFIG_SCSI_PAS16 is not set | ||
| 710 | # CONFIG_SCSI_QLOGIC_FAS is not set | ||
| 711 | # CONFIG_SCSI_SYM53C416 is not set | ||
| 712 | # CONFIG_SCSI_T128 is not set | ||
| 713 | # CONFIG_SCSI_DEBUG is not set | ||
| 576 | # CONFIG_ATA is not set | 714 | # CONFIG_ATA is not set |
| 577 | 715 | CONFIG_HAVE_PATA_PLATFORM=y | |
| 578 | # | ||
| 579 | # Multi-device support (RAID and LVM) | ||
| 580 | # | ||
| 581 | # CONFIG_MD is not set | 716 | # CONFIG_MD is not set |
| 582 | |||
| 583 | # | ||
| 584 | # Fusion MPT device support | ||
| 585 | # | ||
| 586 | # CONFIG_FUSION is not set | ||
| 587 | |||
| 588 | # | ||
| 589 | # IEEE 1394 (FireWire) support | ||
| 590 | # | ||
| 591 | |||
| 592 | # | ||
| 593 | # I2O device support | ||
| 594 | # | ||
| 595 | |||
| 596 | # | ||
| 597 | # Network device support | ||
| 598 | # | ||
| 599 | CONFIG_NETDEVICES=y | 717 | CONFIG_NETDEVICES=y |
| 718 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 600 | # CONFIG_DUMMY is not set | 719 | # CONFIG_DUMMY is not set |
| 601 | # CONFIG_BONDING is not set | 720 | # CONFIG_BONDING is not set |
| 721 | # CONFIG_MACVLAN is not set | ||
| 602 | # CONFIG_EQUALIZER is not set | 722 | # CONFIG_EQUALIZER is not set |
| 603 | # CONFIG_TUN is not set | 723 | # CONFIG_TUN is not set |
| 604 | 724 | # CONFIG_VETH is not set | |
| 605 | # | ||
| 606 | # ARCnet devices | ||
| 607 | # | ||
| 608 | # CONFIG_ARCNET is not set | 725 | # CONFIG_ARCNET is not set |
| 609 | |||
| 610 | # | ||
| 611 | # PHY device support | ||
| 612 | # | ||
| 613 | # CONFIG_PHYLIB is not set | 726 | # CONFIG_PHYLIB is not set |
| 614 | |||
| 615 | # | ||
| 616 | # Ethernet (10 or 100Mbit) | ||
| 617 | # | ||
| 618 | CONFIG_NET_ETHERNET=y | 727 | CONFIG_NET_ETHERNET=y |
| 619 | CONFIG_MII=y | 728 | CONFIG_MII=y |
| 729 | # CONFIG_AX88796 is not set | ||
| 620 | # CONFIG_NET_VENDOR_3COM is not set | 730 | # CONFIG_NET_VENDOR_3COM is not set |
| 621 | # CONFIG_NET_VENDOR_SMC is not set | 731 | # CONFIG_NET_VENDOR_SMC is not set |
| 622 | # CONFIG_SMC91X is not set | 732 | # CONFIG_SMC91X is not set |
| 623 | CONFIG_DM9000=y | 733 | CONFIG_DM9000=y |
| 734 | # CONFIG_ENC28J60 is not set | ||
| 735 | CONFIG_DM9000_DEBUGLEVEL=4 | ||
| 624 | # CONFIG_NET_VENDOR_RACAL is not set | 736 | # CONFIG_NET_VENDOR_RACAL is not set |
| 625 | # CONFIG_AT1700 is not set | 737 | # CONFIG_AT1700 is not set |
| 626 | # CONFIG_DEPCA is not set | 738 | # CONFIG_DEPCA is not set |
| 627 | # CONFIG_HP100 is not set | 739 | # CONFIG_HP100 is not set |
| 628 | # CONFIG_NET_ISA is not set | 740 | # CONFIG_NET_ISA is not set |
| 741 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 742 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 743 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 744 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 629 | # CONFIG_NET_PCI is not set | 745 | # CONFIG_NET_PCI is not set |
| 746 | # CONFIG_B44 is not set | ||
| 630 | # CONFIG_NET_POCKET is not set | 747 | # CONFIG_NET_POCKET is not set |
| 631 | 748 | CONFIG_NETDEV_1000=y | |
| 632 | # | 749 | # CONFIG_E1000E_ENABLED is not set |
| 633 | # Ethernet (1000 Mbit) | 750 | CONFIG_NETDEV_10000=y |
| 634 | # | ||
| 635 | |||
| 636 | # | ||
| 637 | # Ethernet (10000 Mbit) | ||
| 638 | # | ||
| 639 | |||
| 640 | # | ||
| 641 | # Token Ring devices | ||
| 642 | # | ||
| 643 | # CONFIG_TR is not set | 751 | # CONFIG_TR is not set |
| 644 | 752 | ||
| 645 | # | 753 | # |
| 646 | # Wireless LAN (non-hamradio) | 754 | # Wireless LAN |
| 647 | # | 755 | # |
| 648 | # CONFIG_NET_RADIO is not set | 756 | # CONFIG_WLAN_PRE80211 is not set |
| 757 | # CONFIG_WLAN_80211 is not set | ||
| 758 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 649 | 759 | ||
| 650 | # | 760 | # |
| 651 | # Wan interfaces | 761 | # USB Network Adapters |
| 652 | # | 762 | # |
| 763 | # CONFIG_USB_CATC is not set | ||
| 764 | # CONFIG_USB_KAWETH is not set | ||
| 765 | # CONFIG_USB_PEGASUS is not set | ||
| 766 | # CONFIG_USB_RTL8150 is not set | ||
| 767 | # CONFIG_USB_USBNET is not set | ||
| 653 | # CONFIG_WAN is not set | 768 | # CONFIG_WAN is not set |
| 654 | # CONFIG_PLIP is not set | 769 | # CONFIG_PLIP is not set |
| 655 | # CONFIG_PPP is not set | 770 | # CONFIG_PPP is not set |
| 656 | # CONFIG_SLIP is not set | 771 | # CONFIG_SLIP is not set |
| 657 | # CONFIG_SHAPER is not set | ||
| 658 | # CONFIG_NETCONSOLE is not set | 772 | # CONFIG_NETCONSOLE is not set |
| 659 | # CONFIG_NETPOLL is not set | 773 | # CONFIG_NETPOLL is not set |
| 660 | # CONFIG_NET_POLL_CONTROLLER is not set | 774 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 661 | |||
| 662 | # | ||
| 663 | # ISDN subsystem | ||
| 664 | # | ||
| 665 | # CONFIG_ISDN is not set | 775 | # CONFIG_ISDN is not set |
| 666 | 776 | ||
| 667 | # | 777 | # |
| @@ -669,6 +779,7 @@ CONFIG_DM9000=y | |||
| 669 | # | 779 | # |
| 670 | CONFIG_INPUT=y | 780 | CONFIG_INPUT=y |
| 671 | # CONFIG_INPUT_FF_MEMLESS is not set | 781 | # CONFIG_INPUT_FF_MEMLESS is not set |
| 782 | # CONFIG_INPUT_POLLDEV is not set | ||
| 672 | 783 | ||
| 673 | # | 784 | # |
| 674 | # Userland interfaces | 785 | # Userland interfaces |
| @@ -678,7 +789,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 678 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 789 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 679 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 790 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 680 | # CONFIG_INPUT_JOYDEV is not set | 791 | # CONFIG_INPUT_JOYDEV is not set |
| 681 | # CONFIG_INPUT_TSDEV is not set | ||
| 682 | # CONFIG_INPUT_EVDEV is not set | 792 | # CONFIG_INPUT_EVDEV is not set |
| 683 | # CONFIG_INPUT_EVBUG is not set | 793 | # CONFIG_INPUT_EVBUG is not set |
| 684 | 794 | ||
| @@ -695,12 +805,21 @@ CONFIG_KEYBOARD_ATKBD=y | |||
| 695 | # CONFIG_KEYBOARD_GPIO is not set | 805 | # CONFIG_KEYBOARD_GPIO is not set |
| 696 | CONFIG_INPUT_MOUSE=y | 806 | CONFIG_INPUT_MOUSE=y |
| 697 | CONFIG_MOUSE_PS2=y | 807 | CONFIG_MOUSE_PS2=y |
| 808 | CONFIG_MOUSE_PS2_ALPS=y | ||
| 809 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
| 810 | CONFIG_MOUSE_PS2_SYNAPTICS=y | ||
| 811 | CONFIG_MOUSE_PS2_LIFEBOOK=y | ||
| 812 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
| 813 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
| 698 | # CONFIG_MOUSE_SERIAL is not set | 814 | # CONFIG_MOUSE_SERIAL is not set |
| 815 | # CONFIG_MOUSE_APPLETOUCH is not set | ||
| 699 | # CONFIG_MOUSE_INPORT is not set | 816 | # CONFIG_MOUSE_INPORT is not set |
| 700 | # CONFIG_MOUSE_LOGIBM is not set | 817 | # CONFIG_MOUSE_LOGIBM is not set |
| 701 | # CONFIG_MOUSE_PC110PAD is not set | 818 | # CONFIG_MOUSE_PC110PAD is not set |
| 702 | # CONFIG_MOUSE_VSXXXAA is not set | 819 | # CONFIG_MOUSE_VSXXXAA is not set |
| 820 | # CONFIG_MOUSE_GPIO is not set | ||
| 703 | # CONFIG_INPUT_JOYSTICK is not set | 821 | # CONFIG_INPUT_JOYSTICK is not set |
| 822 | # CONFIG_INPUT_TABLET is not set | ||
| 704 | # CONFIG_INPUT_TOUCHSCREEN is not set | 823 | # CONFIG_INPUT_TOUCHSCREEN is not set |
| 705 | # CONFIG_INPUT_MISC is not set | 824 | # CONFIG_INPUT_MISC is not set |
| 706 | 825 | ||
| @@ -721,6 +840,7 @@ CONFIG_VT=y | |||
| 721 | CONFIG_VT_CONSOLE=y | 840 | CONFIG_VT_CONSOLE=y |
| 722 | CONFIG_HW_CONSOLE=y | 841 | CONFIG_HW_CONSOLE=y |
| 723 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 842 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 843 | CONFIG_DEVKMEM=y | ||
| 724 | CONFIG_SERIAL_NONSTANDARD=y | 844 | CONFIG_SERIAL_NONSTANDARD=y |
| 725 | # CONFIG_COMPUTONE is not set | 845 | # CONFIG_COMPUTONE is not set |
| 726 | # CONFIG_ROCKETPORT is not set | 846 | # CONFIG_ROCKETPORT is not set |
| @@ -728,8 +848,6 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
| 728 | # CONFIG_DIGIEPCA is not set | 848 | # CONFIG_DIGIEPCA is not set |
| 729 | # CONFIG_MOXA_INTELLIO is not set | 849 | # CONFIG_MOXA_INTELLIO is not set |
| 730 | # CONFIG_MOXA_SMARTIO is not set | 850 | # CONFIG_MOXA_SMARTIO is not set |
| 731 | # CONFIG_MOXA_SMARTIO_NEW is not set | ||
| 732 | # CONFIG_SYNCLINKMP is not set | ||
| 733 | # CONFIG_N_HDLC is not set | 851 | # CONFIG_N_HDLC is not set |
| 734 | # CONFIG_RISCOM8 is not set | 852 | # CONFIG_RISCOM8 is not set |
| 735 | # CONFIG_SPECIALIX is not set | 853 | # CONFIG_SPECIALIX is not set |
| @@ -758,8 +876,12 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
| 758 | # | 876 | # |
| 759 | # Non-8250 serial port support | 877 | # Non-8250 serial port support |
| 760 | # | 878 | # |
| 879 | CONFIG_SERIAL_SAMSUNG=y | ||
| 880 | # CONFIG_SERIAL_SAMSUNG_DEBUG is not set | ||
| 881 | CONFIG_SERIAL_SAMSUNG_CONSOLE=y | ||
| 761 | CONFIG_SERIAL_S3C2410=y | 882 | CONFIG_SERIAL_S3C2410=y |
| 762 | CONFIG_SERIAL_S3C2410_CONSOLE=y | 883 | CONFIG_SERIAL_S3C2412=y |
| 884 | CONFIG_SERIAL_S3C2440=y | ||
| 763 | CONFIG_SERIAL_CORE=y | 885 | CONFIG_SERIAL_CORE=y |
| 764 | CONFIG_SERIAL_CORE_CONSOLE=y | 886 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 765 | CONFIG_UNIX98_PTYS=y | 887 | CONFIG_UNIX98_PTYS=y |
| @@ -768,89 +890,50 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 768 | CONFIG_PRINTER=y | 890 | CONFIG_PRINTER=y |
| 769 | # CONFIG_LP_CONSOLE is not set | 891 | # CONFIG_LP_CONSOLE is not set |
| 770 | CONFIG_PPDEV=y | 892 | CONFIG_PPDEV=y |
| 771 | # CONFIG_TIPAR is not set | ||
| 772 | |||
| 773 | # | ||
| 774 | # IPMI | ||
| 775 | # | ||
| 776 | # CONFIG_IPMI_HANDLER is not set | 893 | # CONFIG_IPMI_HANDLER is not set |
| 777 | |||
| 778 | # | ||
| 779 | # Watchdog Cards | ||
| 780 | # | ||
| 781 | CONFIG_WATCHDOG=y | ||
| 782 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 783 | |||
| 784 | # | ||
| 785 | # Watchdog Device Drivers | ||
| 786 | # | ||
| 787 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 788 | CONFIG_S3C2410_WATCHDOG=y | ||
| 789 | |||
| 790 | # | ||
| 791 | # ISA-based Watchdog Cards | ||
| 792 | # | ||
| 793 | # CONFIG_PCWATCHDOG is not set | ||
| 794 | # CONFIG_MIXCOMWD is not set | ||
| 795 | # CONFIG_WDT is not set | ||
| 796 | |||
| 797 | # | ||
| 798 | # USB-based Watchdog Cards | ||
| 799 | # | ||
| 800 | # CONFIG_USBPCWATCHDOG is not set | ||
| 801 | CONFIG_HW_RANDOM=y | 894 | CONFIG_HW_RANDOM=y |
| 802 | # CONFIG_NVRAM is not set | 895 | # CONFIG_NVRAM is not set |
| 803 | # CONFIG_DTLK is not set | 896 | # CONFIG_DTLK is not set |
| 804 | # CONFIG_R3964 is not set | 897 | # CONFIG_R3964 is not set |
| 805 | # CONFIG_RAW_DRIVER is not set | 898 | # CONFIG_RAW_DRIVER is not set |
| 806 | |||
| 807 | # | ||
| 808 | # TPM devices | ||
| 809 | # | ||
| 810 | # CONFIG_TCG_TPM is not set | 899 | # CONFIG_TCG_TPM is not set |
| 811 | 900 | CONFIG_DEVPORT=y | |
| 812 | # | ||
| 813 | # I2C support | ||
| 814 | # | ||
| 815 | CONFIG_I2C=y | 901 | CONFIG_I2C=y |
| 902 | CONFIG_I2C_BOARDINFO=y | ||
| 816 | CONFIG_I2C_CHARDEV=m | 903 | CONFIG_I2C_CHARDEV=m |
| 817 | 904 | CONFIG_I2C_ALGOBIT=y | |
| 818 | # | ||
| 819 | # I2C Algorithms | ||
| 820 | # | ||
| 821 | CONFIG_I2C_ALGOBIT=m | ||
| 822 | # CONFIG_I2C_ALGOPCF is not set | ||
| 823 | # CONFIG_I2C_ALGOPCA is not set | ||
| 824 | 905 | ||
| 825 | # | 906 | # |
| 826 | # I2C Hardware Bus support | 907 | # I2C Hardware Bus support |
| 827 | # | 908 | # |
| 828 | # CONFIG_I2C_ELEKTOR is not set | 909 | # CONFIG_I2C_ELEKTOR is not set |
| 910 | # CONFIG_I2C_GPIO is not set | ||
| 829 | # CONFIG_I2C_OCORES is not set | 911 | # CONFIG_I2C_OCORES is not set |
| 830 | # CONFIG_I2C_PARPORT is not set | 912 | # CONFIG_I2C_PARPORT is not set |
| 831 | # CONFIG_I2C_PARPORT_LIGHT is not set | 913 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 832 | CONFIG_I2C_S3C2410=y | 914 | CONFIG_I2C_S3C2410=y |
| 915 | CONFIG_I2C_SIMTEC=y | ||
| 916 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 833 | # CONFIG_I2C_STUB is not set | 917 | # CONFIG_I2C_STUB is not set |
| 918 | # CONFIG_I2C_TINY_USB is not set | ||
| 834 | # CONFIG_I2C_PCA_ISA is not set | 919 | # CONFIG_I2C_PCA_ISA is not set |
| 920 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 835 | 921 | ||
| 836 | # | 922 | # |
| 837 | # Miscellaneous I2C Chip support | 923 | # Miscellaneous I2C Chip support |
| 838 | # | 924 | # |
| 839 | # CONFIG_SENSORS_DS1337 is not set | 925 | # CONFIG_DS1682 is not set |
| 840 | # CONFIG_SENSORS_DS1374 is not set | ||
| 841 | CONFIG_SENSORS_EEPROM=m | 926 | CONFIG_SENSORS_EEPROM=m |
| 842 | # CONFIG_SENSORS_PCF8574 is not set | 927 | # CONFIG_SENSORS_PCF8574 is not set |
| 843 | # CONFIG_SENSORS_PCA9539 is not set | 928 | # CONFIG_PCF8575 is not set |
| 844 | # CONFIG_SENSORS_PCF8591 is not set | 929 | # CONFIG_SENSORS_PCF8591 is not set |
| 930 | # CONFIG_TPS65010 is not set | ||
| 845 | # CONFIG_SENSORS_MAX6875 is not set | 931 | # CONFIG_SENSORS_MAX6875 is not set |
| 932 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 846 | # CONFIG_I2C_DEBUG_CORE is not set | 933 | # CONFIG_I2C_DEBUG_CORE is not set |
| 847 | # CONFIG_I2C_DEBUG_ALGO is not set | 934 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 848 | # CONFIG_I2C_DEBUG_BUS is not set | 935 | # CONFIG_I2C_DEBUG_BUS is not set |
| 849 | # CONFIG_I2C_DEBUG_CHIP is not set | 936 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 850 | |||
| 851 | # | ||
| 852 | # SPI support | ||
| 853 | # | ||
| 854 | CONFIG_SPI=y | 937 | CONFIG_SPI=y |
| 855 | # CONFIG_SPI_DEBUG is not set | 938 | # CONFIG_SPI_DEBUG is not set |
| 856 | CONFIG_SPI_MASTER=y | 939 | CONFIG_SPI_MASTER=y |
| @@ -860,6 +943,7 @@ CONFIG_SPI_MASTER=y | |||
| 860 | # | 943 | # |
| 861 | CONFIG_SPI_BITBANG=m | 944 | CONFIG_SPI_BITBANG=m |
| 862 | # CONFIG_SPI_BUTTERFLY is not set | 945 | # CONFIG_SPI_BUTTERFLY is not set |
| 946 | # CONFIG_SPI_LM70_LLP is not set | ||
| 863 | CONFIG_SPI_S3C24XX=m | 947 | CONFIG_SPI_S3C24XX=m |
| 864 | CONFIG_SPI_S3C24XX_GPIO=m | 948 | CONFIG_SPI_S3C24XX_GPIO=m |
| 865 | 949 | ||
| @@ -867,30 +951,43 @@ CONFIG_SPI_S3C24XX_GPIO=m | |||
| 867 | # SPI Protocol Masters | 951 | # SPI Protocol Masters |
| 868 | # | 952 | # |
| 869 | # CONFIG_SPI_AT25 is not set | 953 | # CONFIG_SPI_AT25 is not set |
| 954 | # CONFIG_SPI_SPIDEV is not set | ||
| 955 | # CONFIG_SPI_TLE62X0 is not set | ||
| 956 | CONFIG_HAVE_GPIO_LIB=y | ||
| 870 | 957 | ||
| 871 | # | 958 | # |
| 872 | # Dallas's 1-wire bus | 959 | # GPIO Support |
| 873 | # | 960 | # |
| 874 | # CONFIG_W1 is not set | 961 | # CONFIG_DEBUG_GPIO is not set |
| 875 | 962 | ||
| 876 | # | 963 | # |
| 877 | # Hardware Monitoring support | 964 | # I2C GPIO expanders: |
| 965 | # | ||
| 966 | # CONFIG_GPIO_PCA953X is not set | ||
| 967 | # CONFIG_GPIO_PCF857X is not set | ||
| 968 | |||
| 878 | # | 969 | # |
| 970 | # SPI GPIO expanders: | ||
| 971 | # | ||
| 972 | # CONFIG_GPIO_MCP23S08 is not set | ||
| 973 | # CONFIG_W1 is not set | ||
| 974 | # CONFIG_POWER_SUPPLY is not set | ||
| 879 | CONFIG_HWMON=y | 975 | CONFIG_HWMON=y |
| 880 | CONFIG_HWMON_VID=m | 976 | CONFIG_HWMON_VID=m |
| 881 | # CONFIG_SENSORS_ABITUGURU is not set | 977 | # CONFIG_SENSORS_AD7418 is not set |
| 882 | # CONFIG_SENSORS_ADM1021 is not set | 978 | # CONFIG_SENSORS_ADM1021 is not set |
| 883 | # CONFIG_SENSORS_ADM1025 is not set | 979 | # CONFIG_SENSORS_ADM1025 is not set |
| 884 | # CONFIG_SENSORS_ADM1026 is not set | 980 | # CONFIG_SENSORS_ADM1026 is not set |
| 885 | # CONFIG_SENSORS_ADM1029 is not set | 981 | # CONFIG_SENSORS_ADM1029 is not set |
| 886 | # CONFIG_SENSORS_ADM1031 is not set | 982 | # CONFIG_SENSORS_ADM1031 is not set |
| 887 | # CONFIG_SENSORS_ADM9240 is not set | 983 | # CONFIG_SENSORS_ADM9240 is not set |
| 888 | # CONFIG_SENSORS_ASB100 is not set | 984 | # CONFIG_SENSORS_ADT7470 is not set |
| 985 | # CONFIG_SENSORS_ADT7473 is not set | ||
| 889 | # CONFIG_SENSORS_ATXP1 is not set | 986 | # CONFIG_SENSORS_ATXP1 is not set |
| 890 | # CONFIG_SENSORS_DS1621 is not set | 987 | # CONFIG_SENSORS_DS1621 is not set |
| 891 | # CONFIG_SENSORS_F71805F is not set | 988 | # CONFIG_SENSORS_F71805F is not set |
| 892 | # CONFIG_SENSORS_FSCHER is not set | 989 | # CONFIG_SENSORS_F71882FG is not set |
| 893 | # CONFIG_SENSORS_FSCPOS is not set | 990 | # CONFIG_SENSORS_F75375S is not set |
| 894 | # CONFIG_SENSORS_GL518SM is not set | 991 | # CONFIG_SENSORS_GL518SM is not set |
| 895 | # CONFIG_SENSORS_GL520SM is not set | 992 | # CONFIG_SENSORS_GL520SM is not set |
| 896 | # CONFIG_SENSORS_IT87 is not set | 993 | # CONFIG_SENSORS_IT87 is not set |
| @@ -905,72 +1002,95 @@ CONFIG_SENSORS_LM85=m | |||
| 905 | # CONFIG_SENSORS_LM87 is not set | 1002 | # CONFIG_SENSORS_LM87 is not set |
| 906 | # CONFIG_SENSORS_LM90 is not set | 1003 | # CONFIG_SENSORS_LM90 is not set |
| 907 | # CONFIG_SENSORS_LM92 is not set | 1004 | # CONFIG_SENSORS_LM92 is not set |
| 1005 | # CONFIG_SENSORS_LM93 is not set | ||
| 908 | # CONFIG_SENSORS_MAX1619 is not set | 1006 | # CONFIG_SENSORS_MAX1619 is not set |
| 1007 | # CONFIG_SENSORS_MAX6650 is not set | ||
| 909 | # CONFIG_SENSORS_PC87360 is not set | 1008 | # CONFIG_SENSORS_PC87360 is not set |
| 910 | # CONFIG_SENSORS_PC87427 is not set | 1009 | # CONFIG_SENSORS_PC87427 is not set |
| 1010 | # CONFIG_SENSORS_DME1737 is not set | ||
| 911 | # CONFIG_SENSORS_SMSC47M1 is not set | 1011 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 912 | # CONFIG_SENSORS_SMSC47M192 is not set | 1012 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 913 | # CONFIG_SENSORS_SMSC47B397 is not set | 1013 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 1014 | # CONFIG_SENSORS_ADS7828 is not set | ||
| 1015 | # CONFIG_SENSORS_THMC50 is not set | ||
| 914 | # CONFIG_SENSORS_VT1211 is not set | 1016 | # CONFIG_SENSORS_VT1211 is not set |
| 915 | # CONFIG_SENSORS_W83781D is not set | 1017 | # CONFIG_SENSORS_W83781D is not set |
| 916 | # CONFIG_SENSORS_W83791D is not set | 1018 | # CONFIG_SENSORS_W83791D is not set |
| 917 | # CONFIG_SENSORS_W83792D is not set | 1019 | # CONFIG_SENSORS_W83792D is not set |
| 918 | # CONFIG_SENSORS_W83793 is not set | 1020 | # CONFIG_SENSORS_W83793 is not set |
| 919 | # CONFIG_SENSORS_W83L785TS is not set | 1021 | # CONFIG_SENSORS_W83L785TS is not set |
| 1022 | # CONFIG_SENSORS_W83L786NG is not set | ||
| 920 | # CONFIG_SENSORS_W83627HF is not set | 1023 | # CONFIG_SENSORS_W83627HF is not set |
| 921 | # CONFIG_SENSORS_W83627EHF is not set | 1024 | # CONFIG_SENSORS_W83627EHF is not set |
| 922 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1025 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 1026 | CONFIG_WATCHDOG=y | ||
| 1027 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 923 | 1028 | ||
| 924 | # | 1029 | # |
| 925 | # Misc devices | 1030 | # Watchdog Device Drivers |
| 926 | # | 1031 | # |
| 1032 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 1033 | CONFIG_S3C2410_WATCHDOG=y | ||
| 927 | 1034 | ||
| 928 | # | 1035 | # |
| 929 | # Multifunction device drivers | 1036 | # ISA-based Watchdog Cards |
| 930 | # | 1037 | # |
| 931 | # CONFIG_MFD_SM501 is not set | 1038 | # CONFIG_PCWATCHDOG is not set |
| 1039 | # CONFIG_MIXCOMWD is not set | ||
| 1040 | # CONFIG_WDT is not set | ||
| 932 | 1041 | ||
| 933 | # | 1042 | # |
| 934 | # LED devices | 1043 | # USB-based Watchdog Cards |
| 935 | # | 1044 | # |
| 936 | CONFIG_NEW_LEDS=y | 1045 | # CONFIG_USBPCWATCHDOG is not set |
| 937 | CONFIG_LEDS_CLASS=m | ||
| 938 | 1046 | ||
| 939 | # | 1047 | # |
| 940 | # LED drivers | 1048 | # Sonics Silicon Backplane |
| 941 | # | 1049 | # |
| 942 | CONFIG_LEDS_S3C24XX=m | 1050 | CONFIG_SSB_POSSIBLE=y |
| 943 | CONFIG_LEDS_H1940=m | 1051 | # CONFIG_SSB is not set |
| 944 | 1052 | ||
| 945 | # | 1053 | # |
| 946 | # LED Triggers | 1054 | # Multifunction device drivers |
| 947 | # | 1055 | # |
| 948 | CONFIG_LEDS_TRIGGERS=y | 1056 | CONFIG_MFD_SM501=y |
| 949 | CONFIG_LEDS_TRIGGER_TIMER=m | 1057 | # CONFIG_MFD_ASIC3 is not set |
| 950 | # CONFIG_LEDS_TRIGGER_IDE_DISK is not set | 1058 | # CONFIG_HTC_EGPIO is not set |
| 951 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 1059 | # CONFIG_HTC_PASIC3 is not set |
| 952 | 1060 | ||
| 953 | # | 1061 | # |
| 954 | # Multimedia devices | 1062 | # Multimedia devices |
| 955 | # | 1063 | # |
| 1064 | |||
| 1065 | # | ||
| 1066 | # Multimedia core support | ||
| 1067 | # | ||
| 956 | # CONFIG_VIDEO_DEV is not set | 1068 | # CONFIG_VIDEO_DEV is not set |
| 1069 | # CONFIG_DVB_CORE is not set | ||
| 1070 | # CONFIG_VIDEO_MEDIA is not set | ||
| 957 | 1071 | ||
| 958 | # | 1072 | # |
| 959 | # Digital Video Broadcasting Devices | 1073 | # Multimedia drivers |
| 960 | # | 1074 | # |
| 961 | # CONFIG_DVB is not set | 1075 | # CONFIG_DAB is not set |
| 962 | # CONFIG_USB_DABUSB is not set | ||
| 963 | 1076 | ||
| 964 | # | 1077 | # |
| 965 | # Graphics support | 1078 | # Graphics support |
| 966 | # | 1079 | # |
| 967 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1080 | # CONFIG_VGASTATE is not set |
| 1081 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 968 | CONFIG_FB=y | 1082 | CONFIG_FB=y |
| 969 | CONFIG_FIRMWARE_EDID=y | 1083 | CONFIG_FIRMWARE_EDID=y |
| 970 | # CONFIG_FB_DDC is not set | 1084 | # CONFIG_FB_DDC is not set |
| 971 | CONFIG_FB_CFB_FILLRECT=y | 1085 | CONFIG_FB_CFB_FILLRECT=y |
| 972 | CONFIG_FB_CFB_COPYAREA=y | 1086 | CONFIG_FB_CFB_COPYAREA=y |
| 973 | CONFIG_FB_CFB_IMAGEBLIT=y | 1087 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 1088 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 1089 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 1090 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 1091 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 1092 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1093 | # CONFIG_FB_SYS_FOPS is not set | ||
| 974 | # CONFIG_FB_SVGALIB is not set | 1094 | # CONFIG_FB_SVGALIB is not set |
| 975 | # CONFIG_FB_MACMODES is not set | 1095 | # CONFIG_FB_MACMODES is not set |
| 976 | # CONFIG_FB_BACKLIGHT is not set | 1096 | # CONFIG_FB_BACKLIGHT is not set |
| @@ -978,12 +1098,19 @@ CONFIG_FB_MODE_HELPERS=y | |||
| 978 | # CONFIG_FB_TILEBLITTING is not set | 1098 | # CONFIG_FB_TILEBLITTING is not set |
| 979 | 1099 | ||
| 980 | # | 1100 | # |
| 981 | # Frambuffer hardware drivers | 1101 | # Frame buffer hardware drivers |
| 982 | # | 1102 | # |
| 983 | # CONFIG_FB_S1D13XXX is not set | 1103 | # CONFIG_FB_S1D13XXX is not set |
| 984 | CONFIG_FB_S3C2410=y | 1104 | CONFIG_FB_S3C2410=y |
| 985 | # CONFIG_FB_S3C2410_DEBUG is not set | 1105 | # CONFIG_FB_S3C2410_DEBUG is not set |
| 1106 | CONFIG_FB_SM501=y | ||
| 986 | # CONFIG_FB_VIRTUAL is not set | 1107 | # CONFIG_FB_VIRTUAL is not set |
| 1108 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 1109 | |||
| 1110 | # | ||
| 1111 | # Display device support | ||
| 1112 | # | ||
| 1113 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 987 | 1114 | ||
| 988 | # | 1115 | # |
| 989 | # Console display driver support | 1116 | # Console display driver support |
| @@ -992,40 +1119,45 @@ CONFIG_FB_S3C2410=y | |||
| 992 | # CONFIG_MDA_CONSOLE is not set | 1119 | # CONFIG_MDA_CONSOLE is not set |
| 993 | CONFIG_DUMMY_CONSOLE=y | 1120 | CONFIG_DUMMY_CONSOLE=y |
| 994 | CONFIG_FRAMEBUFFER_CONSOLE=y | 1121 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 1122 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 995 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 1123 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 996 | # CONFIG_FONTS is not set | 1124 | # CONFIG_FONTS is not set |
| 997 | CONFIG_FONT_8x8=y | 1125 | CONFIG_FONT_8x8=y |
| 998 | CONFIG_FONT_8x16=y | 1126 | CONFIG_FONT_8x16=y |
| 999 | |||
| 1000 | # | ||
| 1001 | # Logo configuration | ||
| 1002 | # | ||
| 1003 | # CONFIG_LOGO is not set | 1127 | # CONFIG_LOGO is not set |
| 1004 | 1128 | ||
| 1005 | # | 1129 | # |
| 1006 | # Sound | 1130 | # Sound |
| 1007 | # | 1131 | # |
| 1008 | # CONFIG_SOUND is not set | 1132 | # CONFIG_SOUND is not set |
| 1133 | CONFIG_HID_SUPPORT=y | ||
| 1134 | CONFIG_HID=y | ||
| 1135 | # CONFIG_HID_DEBUG is not set | ||
| 1136 | # CONFIG_HIDRAW is not set | ||
| 1009 | 1137 | ||
| 1010 | # | 1138 | # |
| 1011 | # HID Devices | 1139 | # USB Input Devices |
| 1012 | # | 1140 | # |
| 1013 | CONFIG_HID=y | 1141 | # CONFIG_USB_HID is not set |
| 1014 | # CONFIG_HID_DEBUG is not set | ||
| 1015 | 1142 | ||
| 1016 | # | 1143 | # |
| 1017 | # USB support | 1144 | # USB HID Boot Protocol drivers |
| 1018 | # | 1145 | # |
| 1146 | # CONFIG_USB_KBD is not set | ||
| 1147 | # CONFIG_USB_MOUSE is not set | ||
| 1148 | CONFIG_USB_SUPPORT=y | ||
| 1019 | CONFIG_USB_ARCH_HAS_HCD=y | 1149 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1020 | CONFIG_USB_ARCH_HAS_OHCI=y | 1150 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1021 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 1151 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 1022 | CONFIG_USB=y | 1152 | CONFIG_USB=y |
| 1023 | # CONFIG_USB_DEBUG is not set | 1153 | # CONFIG_USB_DEBUG is not set |
| 1154 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 1024 | 1155 | ||
| 1025 | # | 1156 | # |
| 1026 | # Miscellaneous USB options | 1157 | # Miscellaneous USB options |
| 1027 | # | 1158 | # |
| 1028 | CONFIG_USB_DEVICEFS=y | 1159 | CONFIG_USB_DEVICEFS=y |
| 1160 | CONFIG_USB_DEVICE_CLASS=y | ||
| 1029 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1161 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1030 | # CONFIG_USB_SUSPEND is not set | 1162 | # CONFIG_USB_SUSPEND is not set |
| 1031 | # CONFIG_USB_OTG is not set | 1163 | # CONFIG_USB_OTG is not set |
| @@ -1033,18 +1165,22 @@ CONFIG_USB_DEVICEFS=y | |||
| 1033 | # | 1165 | # |
| 1034 | # USB Host Controller Drivers | 1166 | # USB Host Controller Drivers |
| 1035 | # | 1167 | # |
| 1168 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1036 | # CONFIG_USB_ISP116X_HCD is not set | 1169 | # CONFIG_USB_ISP116X_HCD is not set |
| 1170 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1037 | CONFIG_USB_OHCI_HCD=y | 1171 | CONFIG_USB_OHCI_HCD=y |
| 1038 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1172 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 1039 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1173 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| 1040 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1174 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
| 1041 | # CONFIG_USB_SL811_HCD is not set | 1175 | # CONFIG_USB_SL811_HCD is not set |
| 1176 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1042 | 1177 | ||
| 1043 | # | 1178 | # |
| 1044 | # USB Device Class drivers | 1179 | # USB Device Class drivers |
| 1045 | # | 1180 | # |
| 1046 | # CONFIG_USB_ACM is not set | 1181 | CONFIG_USB_ACM=m |
| 1047 | # CONFIG_USB_PRINTER is not set | 1182 | CONFIG_USB_PRINTER=m |
| 1183 | CONFIG_USB_WDM=m | ||
| 1048 | 1184 | ||
| 1049 | # | 1185 | # |
| 1050 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1186 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1053,57 +1189,78 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1053 | # | 1189 | # |
| 1054 | # may also be needed; see USB_STORAGE Help for more information | 1190 | # may also be needed; see USB_STORAGE Help for more information |
| 1055 | # | 1191 | # |
| 1056 | # CONFIG_USB_LIBUSUAL is not set | 1192 | CONFIG_USB_STORAGE=m |
| 1057 | 1193 | # CONFIG_USB_STORAGE_DEBUG is not set | |
| 1058 | # | 1194 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 1059 | # USB Input Devices | 1195 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 1060 | # | 1196 | # CONFIG_USB_STORAGE_ISD200 is not set |
| 1061 | # CONFIG_USB_HID is not set | 1197 | # CONFIG_USB_STORAGE_DPCM is not set |
| 1062 | 1198 | # CONFIG_USB_STORAGE_USBAT is not set | |
| 1063 | # | 1199 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 1064 | # USB HID Boot Protocol drivers | 1200 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1065 | # | 1201 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1066 | # CONFIG_USB_KBD is not set | 1202 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1067 | # CONFIG_USB_MOUSE is not set | 1203 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1068 | # CONFIG_USB_AIPTEK is not set | 1204 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1069 | # CONFIG_USB_WACOM is not set | 1205 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1070 | # CONFIG_USB_ACECAD is not set | 1206 | CONFIG_USB_LIBUSUAL=y |
| 1071 | # CONFIG_USB_KBTAB is not set | ||
| 1072 | # CONFIG_USB_POWERMATE is not set | ||
| 1073 | # CONFIG_USB_TOUCHSCREEN is not set | ||
| 1074 | # CONFIG_USB_YEALINK is not set | ||
| 1075 | # CONFIG_USB_XPAD is not set | ||
| 1076 | # CONFIG_USB_ATI_REMOTE is not set | ||
| 1077 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
| 1078 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
| 1079 | # CONFIG_USB_APPLETOUCH is not set | ||
| 1080 | # CONFIG_USB_GTCO is not set | ||
| 1081 | 1207 | ||
| 1082 | # | 1208 | # |
| 1083 | # USB Imaging devices | 1209 | # USB Imaging devices |
| 1084 | # | 1210 | # |
| 1085 | # CONFIG_USB_MDC800 is not set | 1211 | # CONFIG_USB_MDC800 is not set |
| 1086 | 1212 | # CONFIG_USB_MICROTEK is not set | |
| 1087 | # | ||
| 1088 | # USB Network Adapters | ||
| 1089 | # | ||
| 1090 | # CONFIG_USB_CATC is not set | ||
| 1091 | # CONFIG_USB_KAWETH is not set | ||
| 1092 | # CONFIG_USB_PEGASUS is not set | ||
| 1093 | # CONFIG_USB_RTL8150 is not set | ||
| 1094 | # CONFIG_USB_USBNET_MII is not set | ||
| 1095 | # CONFIG_USB_USBNET is not set | ||
| 1096 | CONFIG_USB_MON=y | 1213 | CONFIG_USB_MON=y |
| 1097 | 1214 | ||
| 1098 | # | 1215 | # |
| 1099 | # USB port drivers | 1216 | # USB port drivers |
| 1100 | # | 1217 | # |
| 1101 | # CONFIG_USB_USS720 is not set | 1218 | # CONFIG_USB_USS720 is not set |
| 1102 | 1219 | CONFIG_USB_SERIAL=y | |
| 1103 | # | 1220 | # CONFIG_USB_SERIAL_CONSOLE is not set |
| 1104 | # USB Serial Converter support | 1221 | # CONFIG_USB_EZUSB is not set |
| 1105 | # | 1222 | CONFIG_USB_SERIAL_GENERIC=y |
| 1106 | # CONFIG_USB_SERIAL is not set | 1223 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
| 1224 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
| 1225 | # CONFIG_USB_SERIAL_ARK3116 is not set | ||
| 1226 | # CONFIG_USB_SERIAL_BELKIN is not set | ||
| 1227 | # CONFIG_USB_SERIAL_CH341 is not set | ||
| 1228 | # CONFIG_USB_SERIAL_WHITEHEAT is not set | ||
| 1229 | # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set | ||
| 1230 | # CONFIG_USB_SERIAL_CP2101 is not set | ||
| 1231 | # CONFIG_USB_SERIAL_CYPRESS_M8 is not set | ||
| 1232 | # CONFIG_USB_SERIAL_EMPEG is not set | ||
| 1233 | CONFIG_USB_SERIAL_FTDI_SIO=y | ||
| 1234 | # CONFIG_USB_SERIAL_FUNSOFT is not set | ||
| 1235 | # CONFIG_USB_SERIAL_VISOR is not set | ||
| 1236 | # CONFIG_USB_SERIAL_IPAQ is not set | ||
| 1237 | # CONFIG_USB_SERIAL_IR is not set | ||
| 1238 | # CONFIG_USB_SERIAL_EDGEPORT is not set | ||
| 1239 | # CONFIG_USB_SERIAL_EDGEPORT_TI is not set | ||
| 1240 | # CONFIG_USB_SERIAL_GARMIN is not set | ||
| 1241 | # CONFIG_USB_SERIAL_IPW is not set | ||
| 1242 | # CONFIG_USB_SERIAL_IUU is not set | ||
| 1243 | # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set | ||
| 1244 | # CONFIG_USB_SERIAL_KEYSPAN is not set | ||
| 1245 | # CONFIG_USB_SERIAL_KLSI is not set | ||
| 1246 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set | ||
| 1247 | # CONFIG_USB_SERIAL_MCT_U232 is not set | ||
| 1248 | # CONFIG_USB_SERIAL_MOS7720 is not set | ||
| 1249 | # CONFIG_USB_SERIAL_MOS7840 is not set | ||
| 1250 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 1251 | CONFIG_USB_SERIAL_NAVMAN=m | ||
| 1252 | CONFIG_USB_SERIAL_PL2303=y | ||
| 1253 | # CONFIG_USB_SERIAL_OTI6858 is not set | ||
| 1254 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
| 1255 | # CONFIG_USB_SERIAL_HP4X is not set | ||
| 1256 | # CONFIG_USB_SERIAL_SAFE is not set | ||
| 1257 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | ||
| 1258 | # CONFIG_USB_SERIAL_TI is not set | ||
| 1259 | # CONFIG_USB_SERIAL_CYBERJACK is not set | ||
| 1260 | # CONFIG_USB_SERIAL_XIRCOM is not set | ||
| 1261 | CONFIG_USB_SERIAL_OPTION=m | ||
| 1262 | # CONFIG_USB_SERIAL_OMNINET is not set | ||
| 1263 | # CONFIG_USB_SERIAL_DEBUG is not set | ||
| 1107 | 1264 | ||
| 1108 | # | 1265 | # |
| 1109 | # USB Miscellaneous drivers | 1266 | # USB Miscellaneous drivers |
| @@ -1116,35 +1273,38 @@ CONFIG_USB_MON=y | |||
| 1116 | # CONFIG_USB_LEGOTOWER is not set | 1273 | # CONFIG_USB_LEGOTOWER is not set |
| 1117 | # CONFIG_USB_LCD is not set | 1274 | # CONFIG_USB_LCD is not set |
| 1118 | # CONFIG_USB_BERRY_CHARGE is not set | 1275 | # CONFIG_USB_BERRY_CHARGE is not set |
| 1119 | # CONFIG_USB_LED is not set | 1276 | CONFIG_USB_LED=m |
| 1120 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1277 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1121 | # CONFIG_USB_CYTHERM is not set | 1278 | # CONFIG_USB_CYTHERM is not set |
| 1122 | # CONFIG_USB_PHIDGET is not set | 1279 | # CONFIG_USB_PHIDGET is not set |
| 1123 | # CONFIG_USB_IDMOUSE is not set | 1280 | # CONFIG_USB_IDMOUSE is not set |
| 1124 | # CONFIG_USB_FTDI_ELAN is not set | 1281 | # CONFIG_USB_FTDI_ELAN is not set |
| 1125 | # CONFIG_USB_APPLEDISPLAY is not set | 1282 | # CONFIG_USB_APPLEDISPLAY is not set |
| 1126 | # CONFIG_USB_LD is not set | 1283 | CONFIG_USB_LD=m |
| 1127 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1284 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1128 | # CONFIG_USB_IOWARRIOR is not set | 1285 | # CONFIG_USB_IOWARRIOR is not set |
| 1129 | # CONFIG_USB_TEST is not set | 1286 | # CONFIG_USB_TEST is not set |
| 1130 | 1287 | # CONFIG_USB_ISIGHTFW is not set | |
| 1131 | # | ||
| 1132 | # USB DSL modem support | ||
| 1133 | # | ||
| 1134 | |||
| 1135 | # | ||
| 1136 | # USB Gadget Support | ||
| 1137 | # | ||
| 1138 | # CONFIG_USB_GADGET is not set | 1288 | # CONFIG_USB_GADGET is not set |
| 1289 | # CONFIG_MMC is not set | ||
| 1290 | CONFIG_NEW_LEDS=y | ||
| 1291 | CONFIG_LEDS_CLASS=m | ||
| 1139 | 1292 | ||
| 1140 | # | 1293 | # |
| 1141 | # MMC/SD Card support | 1294 | # LED drivers |
| 1142 | # | 1295 | # |
| 1143 | # CONFIG_MMC is not set | 1296 | CONFIG_LEDS_S3C24XX=m |
| 1297 | CONFIG_LEDS_H1940=m | ||
| 1298 | # CONFIG_LEDS_GPIO is not set | ||
| 1144 | 1299 | ||
| 1145 | # | 1300 | # |
| 1146 | # Real Time Clock | 1301 | # LED Triggers |
| 1147 | # | 1302 | # |
| 1303 | CONFIG_LEDS_TRIGGERS=y | ||
| 1304 | CONFIG_LEDS_TRIGGER_TIMER=m | ||
| 1305 | # CONFIG_LEDS_TRIGGER_IDE_DISK is not set | ||
| 1306 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | ||
| 1307 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
| 1148 | CONFIG_RTC_LIB=y | 1308 | CONFIG_RTC_LIB=y |
| 1149 | CONFIG_RTC_CLASS=y | 1309 | CONFIG_RTC_CLASS=y |
| 1150 | CONFIG_RTC_HCTOSYS=y | 1310 | CONFIG_RTC_HCTOSYS=y |
| @@ -1158,61 +1318,86 @@ CONFIG_RTC_INTF_SYSFS=y | |||
| 1158 | CONFIG_RTC_INTF_PROC=y | 1318 | CONFIG_RTC_INTF_PROC=y |
| 1159 | CONFIG_RTC_INTF_DEV=y | 1319 | CONFIG_RTC_INTF_DEV=y |
| 1160 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | 1320 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set |
| 1321 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1161 | 1322 | ||
| 1162 | # | 1323 | # |
| 1163 | # RTC drivers | 1324 | # I2C RTC drivers |
| 1164 | # | 1325 | # |
| 1165 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1166 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1167 | # CONFIG_RTC_DRV_DS1307 is not set | 1326 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1168 | # CONFIG_RTC_DRV_DS1553 is not set | 1327 | # CONFIG_RTC_DRV_DS1374 is not set |
| 1169 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1170 | # CONFIG_RTC_DRV_DS1672 is not set | 1328 | # CONFIG_RTC_DRV_DS1672 is not set |
| 1171 | # CONFIG_RTC_DRV_DS1742 is not set | 1329 | # CONFIG_RTC_DRV_MAX6900 is not set |
| 1330 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1331 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1332 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1172 | # CONFIG_RTC_DRV_PCF8563 is not set | 1333 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1334 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1335 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1336 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1337 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1338 | |||
| 1339 | # | ||
| 1340 | # SPI RTC drivers | ||
| 1341 | # | ||
| 1342 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 1343 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 1173 | # CONFIG_RTC_DRV_RS5C348 is not set | 1344 | # CONFIG_RTC_DRV_RS5C348 is not set |
| 1174 | # CONFIG_RTC_DRV_RS5C372 is not set | 1345 | |
| 1175 | CONFIG_RTC_DRV_S3C=y | 1346 | # |
| 1347 | # Platform RTC drivers | ||
| 1348 | # | ||
| 1349 | # CONFIG_RTC_DRV_CMOS is not set | ||
| 1350 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1351 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1352 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1353 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1176 | # CONFIG_RTC_DRV_M48T86 is not set | 1354 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1177 | # CONFIG_RTC_DRV_TEST is not set | 1355 | # CONFIG_RTC_DRV_M48T59 is not set |
| 1178 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
| 1179 | # CONFIG_RTC_DRV_V3020 is not set | 1356 | # CONFIG_RTC_DRV_V3020 is not set |
| 1180 | 1357 | ||
| 1181 | # | 1358 | # |
| 1359 | # on-CPU RTC drivers | ||
| 1360 | # | ||
| 1361 | CONFIG_RTC_DRV_S3C=y | ||
| 1362 | # CONFIG_UIO is not set | ||
| 1363 | |||
| 1364 | # | ||
| 1182 | # File systems | 1365 | # File systems |
| 1183 | # | 1366 | # |
| 1184 | CONFIG_EXT2_FS=y | 1367 | CONFIG_EXT2_FS=y |
| 1185 | # CONFIG_EXT2_FS_XATTR is not set | 1368 | CONFIG_EXT2_FS_XATTR=y |
| 1369 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 1370 | CONFIG_EXT2_FS_SECURITY=y | ||
| 1186 | # CONFIG_EXT2_FS_XIP is not set | 1371 | # CONFIG_EXT2_FS_XIP is not set |
| 1187 | CONFIG_EXT3_FS=y | 1372 | CONFIG_EXT3_FS=y |
| 1188 | CONFIG_EXT3_FS_XATTR=y | 1373 | CONFIG_EXT3_FS_XATTR=y |
| 1189 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1374 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1190 | # CONFIG_EXT3_FS_SECURITY is not set | 1375 | # CONFIG_EXT3_FS_SECURITY is not set |
| 1191 | # CONFIG_EXT4DEV_FS is not set | 1376 | # CONFIG_EXT4DEV_FS is not set |
| 1192 | CONFIG_JBD=y | 1377 | CONFIG_JBD=y |
| 1193 | # CONFIG_JBD_DEBUG is not set | ||
| 1194 | CONFIG_FS_MBCACHE=y | 1378 | CONFIG_FS_MBCACHE=y |
| 1195 | # CONFIG_REISERFS_FS is not set | 1379 | # CONFIG_REISERFS_FS is not set |
| 1196 | # CONFIG_JFS_FS is not set | 1380 | # CONFIG_JFS_FS is not set |
| 1197 | # CONFIG_FS_POSIX_ACL is not set | 1381 | CONFIG_FS_POSIX_ACL=y |
| 1198 | # CONFIG_XFS_FS is not set | 1382 | # CONFIG_XFS_FS is not set |
| 1199 | # CONFIG_GFS2_FS is not set | ||
| 1200 | # CONFIG_OCFS2_FS is not set | 1383 | # CONFIG_OCFS2_FS is not set |
| 1201 | # CONFIG_MINIX_FS is not set | 1384 | CONFIG_DNOTIFY=y |
| 1202 | CONFIG_ROMFS_FS=y | ||
| 1203 | CONFIG_INOTIFY=y | 1385 | CONFIG_INOTIFY=y |
| 1204 | CONFIG_INOTIFY_USER=y | 1386 | CONFIG_INOTIFY_USER=y |
| 1205 | # CONFIG_QUOTA is not set | 1387 | # CONFIG_QUOTA is not set |
| 1206 | CONFIG_DNOTIFY=y | ||
| 1207 | # CONFIG_AUTOFS_FS is not set | 1388 | # CONFIG_AUTOFS_FS is not set |
| 1208 | # CONFIG_AUTOFS4_FS is not set | 1389 | # CONFIG_AUTOFS4_FS is not set |
| 1209 | # CONFIG_FUSE_FS is not set | 1390 | # CONFIG_FUSE_FS is not set |
| 1391 | CONFIG_GENERIC_ACL=y | ||
| 1210 | 1392 | ||
| 1211 | # | 1393 | # |
| 1212 | # CD-ROM/DVD Filesystems | 1394 | # CD-ROM/DVD Filesystems |
| 1213 | # | 1395 | # |
| 1214 | # CONFIG_ISO9660_FS is not set | 1396 | CONFIG_ISO9660_FS=y |
| 1215 | # CONFIG_UDF_FS is not set | 1397 | CONFIG_JOLIET=y |
| 1398 | # CONFIG_ZISOFS is not set | ||
| 1399 | CONFIG_UDF_FS=m | ||
| 1400 | CONFIG_UDF_NLS=y | ||
| 1216 | 1401 | ||
| 1217 | # | 1402 | # |
| 1218 | # DOS/FAT/NT Filesystems | 1403 | # DOS/FAT/NT Filesystems |
| @@ -1222,7 +1407,9 @@ CONFIG_MSDOS_FS=y | |||
| 1222 | CONFIG_VFAT_FS=y | 1407 | CONFIG_VFAT_FS=y |
| 1223 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | 1408 | CONFIG_FAT_DEFAULT_CODEPAGE=437 |
| 1224 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | 1409 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" |
| 1225 | # CONFIG_NTFS_FS is not set | 1410 | CONFIG_NTFS_FS=m |
| 1411 | # CONFIG_NTFS_DEBUG is not set | ||
| 1412 | # CONFIG_NTFS_RW is not set | ||
| 1226 | 1413 | ||
| 1227 | # | 1414 | # |
| 1228 | # Pseudo filesystems | 1415 | # Pseudo filesystems |
| @@ -1230,10 +1417,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1230 | CONFIG_PROC_FS=y | 1417 | CONFIG_PROC_FS=y |
| 1231 | CONFIG_PROC_SYSCTL=y | 1418 | CONFIG_PROC_SYSCTL=y |
| 1232 | CONFIG_SYSFS=y | 1419 | CONFIG_SYSFS=y |
| 1233 | # CONFIG_TMPFS is not set | 1420 | CONFIG_TMPFS=y |
| 1421 | CONFIG_TMPFS_POSIX_ACL=y | ||
| 1234 | # CONFIG_HUGETLB_PAGE is not set | 1422 | # CONFIG_HUGETLB_PAGE is not set |
| 1235 | CONFIG_RAMFS=y | 1423 | CONFIG_CONFIGFS_FS=m |
| 1236 | # CONFIG_CONFIGFS_FS is not set | ||
| 1237 | 1424 | ||
| 1238 | # | 1425 | # |
| 1239 | # Miscellaneous filesystems | 1426 | # Miscellaneous filesystems |
| @@ -1248,31 +1435,32 @@ CONFIG_RAMFS=y | |||
| 1248 | CONFIG_JFFS2_FS=y | 1435 | CONFIG_JFFS2_FS=y |
| 1249 | CONFIG_JFFS2_FS_DEBUG=0 | 1436 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1250 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1437 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1251 | # CONFIG_JFFS2_SUMMARY is not set | 1438 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set |
| 1439 | CONFIG_JFFS2_SUMMARY=y | ||
| 1252 | # CONFIG_JFFS2_FS_XATTR is not set | 1440 | # CONFIG_JFFS2_FS_XATTR is not set |
| 1253 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1441 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
| 1254 | CONFIG_JFFS2_ZLIB=y | 1442 | CONFIG_JFFS2_ZLIB=y |
| 1443 | # CONFIG_JFFS2_LZO is not set | ||
| 1255 | CONFIG_JFFS2_RTIME=y | 1444 | CONFIG_JFFS2_RTIME=y |
| 1256 | # CONFIG_JFFS2_RUBIN is not set | 1445 | # CONFIG_JFFS2_RUBIN is not set |
| 1257 | CONFIG_CRAMFS=y | 1446 | CONFIG_CRAMFS=y |
| 1258 | # CONFIG_VXFS_FS is not set | 1447 | # CONFIG_VXFS_FS is not set |
| 1448 | # CONFIG_MINIX_FS is not set | ||
| 1259 | # CONFIG_HPFS_FS is not set | 1449 | # CONFIG_HPFS_FS is not set |
| 1260 | # CONFIG_QNX4FS_FS is not set | 1450 | # CONFIG_QNX4FS_FS is not set |
| 1451 | CONFIG_ROMFS_FS=y | ||
| 1261 | # CONFIG_SYSV_FS is not set | 1452 | # CONFIG_SYSV_FS is not set |
| 1262 | # CONFIG_UFS_FS is not set | 1453 | # CONFIG_UFS_FS is not set |
| 1263 | 1454 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1264 | # | ||
| 1265 | # Network File Systems | ||
| 1266 | # | ||
| 1267 | CONFIG_NFS_FS=y | 1455 | CONFIG_NFS_FS=y |
| 1268 | # CONFIG_NFS_V3 is not set | 1456 | # CONFIG_NFS_V3 is not set |
| 1269 | # CONFIG_NFS_V4 is not set | 1457 | # CONFIG_NFS_V4 is not set |
| 1270 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1271 | # CONFIG_NFSD is not set | 1458 | # CONFIG_NFSD is not set |
| 1272 | CONFIG_ROOT_NFS=y | 1459 | CONFIG_ROOT_NFS=y |
| 1273 | CONFIG_LOCKD=y | 1460 | CONFIG_LOCKD=y |
| 1274 | CONFIG_NFS_COMMON=y | 1461 | CONFIG_NFS_COMMON=y |
| 1275 | CONFIG_SUNRPC=y | 1462 | CONFIG_SUNRPC=y |
| 1463 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1276 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1464 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 1277 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1465 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 1278 | # CONFIG_SMB_FS is not set | 1466 | # CONFIG_SMB_FS is not set |
| @@ -1280,7 +1468,6 @@ CONFIG_SUNRPC=y | |||
| 1280 | # CONFIG_NCP_FS is not set | 1468 | # CONFIG_NCP_FS is not set |
| 1281 | # CONFIG_CODA_FS is not set | 1469 | # CONFIG_CODA_FS is not set |
| 1282 | # CONFIG_AFS_FS is not set | 1470 | # CONFIG_AFS_FS is not set |
| 1283 | # CONFIG_9P_FS is not set | ||
| 1284 | 1471 | ||
| 1285 | # | 1472 | # |
| 1286 | # Partition Types | 1473 | # Partition Types |
| @@ -1302,94 +1489,93 @@ CONFIG_SOLARIS_X86_PARTITION=y | |||
| 1302 | # CONFIG_SUN_PARTITION is not set | 1489 | # CONFIG_SUN_PARTITION is not set |
| 1303 | # CONFIG_KARMA_PARTITION is not set | 1490 | # CONFIG_KARMA_PARTITION is not set |
| 1304 | # CONFIG_EFI_PARTITION is not set | 1491 | # CONFIG_EFI_PARTITION is not set |
| 1305 | 1492 | # CONFIG_SYSV68_PARTITION is not set | |
| 1306 | # | ||
| 1307 | # Native Language Support | ||
| 1308 | # | ||
| 1309 | CONFIG_NLS=y | 1493 | CONFIG_NLS=y |
| 1310 | CONFIG_NLS_DEFAULT="iso8859-1" | 1494 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1311 | # CONFIG_NLS_CODEPAGE_437 is not set | 1495 | CONFIG_NLS_CODEPAGE_437=y |
| 1312 | # CONFIG_NLS_CODEPAGE_737 is not set | 1496 | CONFIG_NLS_CODEPAGE_737=m |
| 1313 | # CONFIG_NLS_CODEPAGE_775 is not set | 1497 | CONFIG_NLS_CODEPAGE_775=m |
| 1314 | # CONFIG_NLS_CODEPAGE_850 is not set | 1498 | CONFIG_NLS_CODEPAGE_850=y |
| 1315 | # CONFIG_NLS_CODEPAGE_852 is not set | 1499 | CONFIG_NLS_CODEPAGE_852=m |
| 1316 | # CONFIG_NLS_CODEPAGE_855 is not set | 1500 | CONFIG_NLS_CODEPAGE_855=m |
| 1317 | # CONFIG_NLS_CODEPAGE_857 is not set | 1501 | CONFIG_NLS_CODEPAGE_857=m |
| 1318 | # CONFIG_NLS_CODEPAGE_860 is not set | 1502 | CONFIG_NLS_CODEPAGE_860=m |
| 1319 | # CONFIG_NLS_CODEPAGE_861 is not set | 1503 | CONFIG_NLS_CODEPAGE_861=m |
| 1320 | # CONFIG_NLS_CODEPAGE_862 is not set | 1504 | CONFIG_NLS_CODEPAGE_862=m |
| 1321 | # CONFIG_NLS_CODEPAGE_863 is not set | 1505 | CONFIG_NLS_CODEPAGE_863=m |
| 1322 | # CONFIG_NLS_CODEPAGE_864 is not set | 1506 | CONFIG_NLS_CODEPAGE_864=m |
| 1323 | # CONFIG_NLS_CODEPAGE_865 is not set | 1507 | CONFIG_NLS_CODEPAGE_865=m |
| 1324 | # CONFIG_NLS_CODEPAGE_866 is not set | 1508 | CONFIG_NLS_CODEPAGE_866=m |
| 1325 | # CONFIG_NLS_CODEPAGE_869 is not set | 1509 | CONFIG_NLS_CODEPAGE_869=m |
| 1326 | # CONFIG_NLS_CODEPAGE_936 is not set | 1510 | CONFIG_NLS_CODEPAGE_936=m |
| 1327 | # CONFIG_NLS_CODEPAGE_950 is not set | 1511 | CONFIG_NLS_CODEPAGE_950=m |
| 1328 | # CONFIG_NLS_CODEPAGE_932 is not set | 1512 | CONFIG_NLS_CODEPAGE_932=m |
| 1329 | # CONFIG_NLS_CODEPAGE_949 is not set | 1513 | CONFIG_NLS_CODEPAGE_949=m |
| 1330 | # CONFIG_NLS_CODEPAGE_874 is not set | 1514 | CONFIG_NLS_CODEPAGE_874=m |
| 1331 | # CONFIG_NLS_ISO8859_8 is not set | 1515 | CONFIG_NLS_ISO8859_8=m |
| 1332 | # CONFIG_NLS_CODEPAGE_1250 is not set | 1516 | CONFIG_NLS_CODEPAGE_1250=m |
| 1333 | # CONFIG_NLS_CODEPAGE_1251 is not set | 1517 | CONFIG_NLS_CODEPAGE_1251=m |
| 1334 | # CONFIG_NLS_ASCII is not set | 1518 | CONFIG_NLS_ASCII=y |
| 1335 | # CONFIG_NLS_ISO8859_1 is not set | 1519 | CONFIG_NLS_ISO8859_1=y |
| 1336 | # CONFIG_NLS_ISO8859_2 is not set | 1520 | CONFIG_NLS_ISO8859_2=m |
| 1337 | # CONFIG_NLS_ISO8859_3 is not set | 1521 | CONFIG_NLS_ISO8859_3=m |
| 1338 | # CONFIG_NLS_ISO8859_4 is not set | 1522 | CONFIG_NLS_ISO8859_4=m |
| 1339 | # CONFIG_NLS_ISO8859_5 is not set | 1523 | CONFIG_NLS_ISO8859_5=m |
| 1340 | # CONFIG_NLS_ISO8859_6 is not set | 1524 | CONFIG_NLS_ISO8859_6=m |
| 1341 | # CONFIG_NLS_ISO8859_7 is not set | 1525 | CONFIG_NLS_ISO8859_7=m |
| 1342 | # CONFIG_NLS_ISO8859_9 is not set | 1526 | CONFIG_NLS_ISO8859_9=m |
| 1343 | # CONFIG_NLS_ISO8859_13 is not set | 1527 | CONFIG_NLS_ISO8859_13=m |
| 1344 | # CONFIG_NLS_ISO8859_14 is not set | 1528 | CONFIG_NLS_ISO8859_14=m |
| 1345 | # CONFIG_NLS_ISO8859_15 is not set | 1529 | CONFIG_NLS_ISO8859_15=m |
| 1346 | # CONFIG_NLS_KOI8_R is not set | 1530 | CONFIG_NLS_KOI8_R=m |
| 1347 | # CONFIG_NLS_KOI8_U is not set | 1531 | CONFIG_NLS_KOI8_U=m |
| 1348 | # CONFIG_NLS_UTF8 is not set | 1532 | CONFIG_NLS_UTF8=m |
| 1349 | |||
| 1350 | # | ||
| 1351 | # Distributed Lock Manager | ||
| 1352 | # | ||
| 1353 | # CONFIG_DLM is not set | 1533 | # CONFIG_DLM is not set |
| 1354 | 1534 | ||
| 1355 | # | 1535 | # |
| 1356 | # Profiling support | ||
| 1357 | # | ||
| 1358 | # CONFIG_PROFILING is not set | ||
| 1359 | |||
| 1360 | # | ||
| 1361 | # Kernel hacking | 1536 | # Kernel hacking |
| 1362 | # | 1537 | # |
| 1363 | # CONFIG_PRINTK_TIME is not set | 1538 | # CONFIG_PRINTK_TIME is not set |
| 1539 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1364 | CONFIG_ENABLE_MUST_CHECK=y | 1540 | CONFIG_ENABLE_MUST_CHECK=y |
| 1541 | CONFIG_FRAME_WARN=1024 | ||
| 1365 | CONFIG_MAGIC_SYSRQ=y | 1542 | CONFIG_MAGIC_SYSRQ=y |
| 1366 | # CONFIG_UNUSED_SYMBOLS is not set | 1543 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1367 | # CONFIG_DEBUG_FS is not set | 1544 | # CONFIG_DEBUG_FS is not set |
| 1368 | # CONFIG_HEADERS_CHECK is not set | 1545 | # CONFIG_HEADERS_CHECK is not set |
| 1369 | CONFIG_DEBUG_KERNEL=y | 1546 | CONFIG_DEBUG_KERNEL=y |
| 1370 | # CONFIG_DEBUG_SHIRQ is not set | 1547 | # CONFIG_DEBUG_SHIRQ is not set |
| 1371 | CONFIG_LOG_BUF_SHIFT=16 | ||
| 1372 | CONFIG_DETECT_SOFTLOCKUP=y | 1548 | CONFIG_DETECT_SOFTLOCKUP=y |
| 1549 | CONFIG_SCHED_DEBUG=y | ||
| 1373 | # CONFIG_SCHEDSTATS is not set | 1550 | # CONFIG_SCHEDSTATS is not set |
| 1374 | # CONFIG_TIMER_STATS is not set | 1551 | # CONFIG_TIMER_STATS is not set |
| 1552 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1375 | # CONFIG_DEBUG_SLAB is not set | 1553 | # CONFIG_DEBUG_SLAB is not set |
| 1376 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1554 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1377 | # CONFIG_RT_MUTEX_TESTER is not set | 1555 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1378 | # CONFIG_DEBUG_SPINLOCK is not set | 1556 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1379 | CONFIG_DEBUG_MUTEXES=y | 1557 | CONFIG_DEBUG_MUTEXES=y |
| 1558 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1559 | # CONFIG_PROVE_LOCKING is not set | ||
| 1560 | # CONFIG_LOCK_STAT is not set | ||
| 1380 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1561 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1381 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1562 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1382 | # CONFIG_DEBUG_KOBJECT is not set | 1563 | # CONFIG_DEBUG_KOBJECT is not set |
| 1383 | CONFIG_DEBUG_BUGVERBOSE=y | 1564 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1384 | CONFIG_DEBUG_INFO=y | 1565 | CONFIG_DEBUG_INFO=y |
| 1385 | # CONFIG_DEBUG_VM is not set | 1566 | # CONFIG_DEBUG_VM is not set |
| 1567 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1386 | # CONFIG_DEBUG_LIST is not set | 1568 | # CONFIG_DEBUG_LIST is not set |
| 1569 | # CONFIG_DEBUG_SG is not set | ||
| 1387 | CONFIG_FRAME_POINTER=y | 1570 | CONFIG_FRAME_POINTER=y |
| 1388 | CONFIG_FORCED_INLINING=y | 1571 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1389 | # CONFIG_RCU_TORTURE_TEST is not set | 1572 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1573 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1390 | # CONFIG_FAULT_INJECTION is not set | 1574 | # CONFIG_FAULT_INJECTION is not set |
| 1575 | # CONFIG_SAMPLES is not set | ||
| 1391 | CONFIG_DEBUG_USER=y | 1576 | CONFIG_DEBUG_USER=y |
| 1392 | # CONFIG_DEBUG_ERRORS is not set | 1577 | CONFIG_DEBUG_ERRORS=y |
| 1578 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
| 1393 | CONFIG_DEBUG_LL=y | 1579 | CONFIG_DEBUG_LL=y |
| 1394 | # CONFIG_DEBUG_ICEDCC is not set | 1580 | # CONFIG_DEBUG_ICEDCC is not set |
| 1395 | CONFIG_DEBUG_S3C_PORT=y | 1581 | CONFIG_DEBUG_S3C_PORT=y |
| @@ -1400,21 +1586,100 @@ CONFIG_DEBUG_S3C_UART=0 | |||
| 1400 | # | 1586 | # |
| 1401 | # CONFIG_KEYS is not set | 1587 | # CONFIG_KEYS is not set |
| 1402 | # CONFIG_SECURITY is not set | 1588 | # CONFIG_SECURITY is not set |
| 1589 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1590 | CONFIG_CRYPTO=y | ||
| 1591 | |||
| 1592 | # | ||
| 1593 | # Crypto core or helper | ||
| 1594 | # | ||
| 1595 | CONFIG_CRYPTO_ALGAPI=m | ||
| 1596 | CONFIG_CRYPTO_AEAD=m | ||
| 1597 | CONFIG_CRYPTO_BLKCIPHER=m | ||
| 1598 | CONFIG_CRYPTO_HASH=m | ||
| 1599 | CONFIG_CRYPTO_MANAGER=m | ||
| 1600 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1601 | # CONFIG_CRYPTO_NULL is not set | ||
| 1602 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1603 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1604 | # CONFIG_CRYPTO_TEST is not set | ||
| 1605 | |||
| 1606 | # | ||
| 1607 | # Authenticated Encryption with Associated Data | ||
| 1608 | # | ||
| 1609 | # CONFIG_CRYPTO_CCM is not set | ||
| 1610 | # CONFIG_CRYPTO_GCM is not set | ||
| 1611 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1612 | |||
| 1613 | # | ||
| 1614 | # Block modes | ||
| 1615 | # | ||
| 1616 | CONFIG_CRYPTO_CBC=m | ||
| 1617 | # CONFIG_CRYPTO_CTR is not set | ||
| 1618 | # CONFIG_CRYPTO_CTS is not set | ||
| 1619 | CONFIG_CRYPTO_ECB=m | ||
| 1620 | # CONFIG_CRYPTO_LRW is not set | ||
| 1621 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1622 | # CONFIG_CRYPTO_XTS is not set | ||
| 1623 | |||
| 1624 | # | ||
| 1625 | # Hash modes | ||
| 1626 | # | ||
| 1627 | CONFIG_CRYPTO_HMAC=m | ||
| 1628 | # CONFIG_CRYPTO_XCBC is not set | ||
| 1629 | |||
| 1630 | # | ||
| 1631 | # Digest | ||
| 1632 | # | ||
| 1633 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1634 | # CONFIG_CRYPTO_MD4 is not set | ||
| 1635 | CONFIG_CRYPTO_MD5=m | ||
| 1636 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1637 | CONFIG_CRYPTO_SHA1=m | ||
| 1638 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 1639 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 1640 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 1641 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1642 | |||
| 1643 | # | ||
| 1644 | # Ciphers | ||
| 1645 | # | ||
| 1646 | CONFIG_CRYPTO_AES=m | ||
| 1647 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1648 | CONFIG_CRYPTO_ARC4=m | ||
| 1649 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1650 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1651 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 1652 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 1653 | CONFIG_CRYPTO_DES=m | ||
| 1654 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1655 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 1656 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 1657 | # CONFIG_CRYPTO_SEED is not set | ||
| 1658 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1659 | # CONFIG_CRYPTO_TEA is not set | ||
| 1660 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1403 | 1661 | ||
| 1404 | # | 1662 | # |
| 1405 | # Cryptographic options | 1663 | # Compression |
| 1406 | # | 1664 | # |
| 1407 | # CONFIG_CRYPTO is not set | 1665 | CONFIG_CRYPTO_DEFLATE=m |
| 1666 | # CONFIG_CRYPTO_LZO is not set | ||
| 1667 | CONFIG_CRYPTO_HW=y | ||
| 1408 | 1668 | ||
| 1409 | # | 1669 | # |
| 1410 | # Library routines | 1670 | # Library routines |
| 1411 | # | 1671 | # |
| 1412 | CONFIG_BITREVERSE=y | 1672 | CONFIG_BITREVERSE=y |
| 1673 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1674 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1413 | # CONFIG_CRC_CCITT is not set | 1675 | # CONFIG_CRC_CCITT is not set |
| 1414 | # CONFIG_CRC16 is not set | 1676 | # CONFIG_CRC16 is not set |
| 1677 | CONFIG_CRC_ITU_T=m | ||
| 1415 | CONFIG_CRC32=y | 1678 | CONFIG_CRC32=y |
| 1679 | # CONFIG_CRC7 is not set | ||
| 1416 | # CONFIG_LIBCRC32C is not set | 1680 | # CONFIG_LIBCRC32C is not set |
| 1417 | CONFIG_ZLIB_INFLATE=y | 1681 | CONFIG_ZLIB_INFLATE=y |
| 1418 | CONFIG_ZLIB_DEFLATE=y | 1682 | CONFIG_ZLIB_DEFLATE=y |
| 1419 | CONFIG_PLIST=y | 1683 | CONFIG_PLIST=y |
| 1420 | CONFIG_HAS_IOMEM=y | 1684 | CONFIG_HAS_IOMEM=y |
| 1685 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig index 484dc9739dfc..8688362bcf7b 100644 --- a/arch/arm/configs/sam9_l9260_defconfig +++ b/arch/arm/configs/sam9_l9260_defconfig | |||
| @@ -211,7 +211,6 @@ CONFIG_ARM_THUMB=y | |||
| 211 | # | 211 | # |
| 212 | # CONFIG_TICK_ONESHOT is not set | 212 | # CONFIG_TICK_ONESHOT is not set |
| 213 | CONFIG_PREEMPT=y | 213 | CONFIG_PREEMPT=y |
| 214 | # CONFIG_NO_IDLE_HZ is not set | ||
| 215 | CONFIG_HZ=100 | 214 | CONFIG_HZ=100 |
| 216 | # CONFIG_AEABI is not set | 215 | # CONFIG_AEABI is not set |
| 217 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 216 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index aa7a01179500..7d59fb1f1cea 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig | |||
| @@ -164,7 +164,6 @@ CONFIG_PCMCIA_PXA2XX=y | |||
| 164 | # Kernel Features | 164 | # Kernel Features |
| 165 | # | 165 | # |
| 166 | CONFIG_PREEMPT=y | 166 | CONFIG_PREEMPT=y |
| 167 | # CONFIG_NO_IDLE_HZ is not set | ||
| 168 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 167 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
| 169 | CONFIG_SELECT_MEMORY_MODEL=y | 168 | CONFIG_SELECT_MEMORY_MODEL=y |
| 170 | CONFIG_FLATMEM_MANUAL=y | 169 | CONFIG_FLATMEM_MANUAL=y |
diff --git a/arch/arm/configs/tct_hammer_defconfig b/arch/arm/configs/tct_hammer_defconfig index 576b8339f0d6..07dfb98df4f0 100644 --- a/arch/arm/configs/tct_hammer_defconfig +++ b/arch/arm/configs/tct_hammer_defconfig | |||
| @@ -247,7 +247,6 @@ CONFIG_ARM_THUMB=y | |||
| 247 | # | 247 | # |
| 248 | # CONFIG_TICK_ONESHOT is not set | 248 | # CONFIG_TICK_ONESHOT is not set |
| 249 | # CONFIG_PREEMPT is not set | 249 | # CONFIG_PREEMPT is not set |
| 250 | # CONFIG_NO_IDLE_HZ is not set | ||
| 251 | CONFIG_HZ=200 | 250 | CONFIG_HZ=200 |
| 252 | # CONFIG_AEABI is not set | 251 | # CONFIG_AEABI is not set |
| 253 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 252 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig index 6db6392806f9..8b7a431a8bfc 100644 --- a/arch/arm/configs/trizeps4_defconfig +++ b/arch/arm/configs/trizeps4_defconfig | |||
| @@ -195,7 +195,6 @@ CONFIG_PCMCIA_PXA2XX=y | |||
| 195 | # Kernel Features | 195 | # Kernel Features |
| 196 | # | 196 | # |
| 197 | CONFIG_PREEMPT=y | 197 | CONFIG_PREEMPT=y |
| 198 | # CONFIG_NO_IDLE_HZ is not set | ||
| 199 | CONFIG_HZ=100 | 198 | CONFIG_HZ=100 |
| 200 | CONFIG_AEABI=y | 199 | CONFIG_AEABI=y |
| 201 | CONFIG_OABI_COMPAT=y | 200 | CONFIG_OABI_COMPAT=y |
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig index 48dca69addae..8355f88f7292 100644 --- a/arch/arm/configs/versatile_defconfig +++ b/arch/arm/configs/versatile_defconfig | |||
| @@ -151,7 +151,6 @@ CONFIG_ARM_AMBA=y | |||
| 151 | # Kernel Features | 151 | # Kernel Features |
| 152 | # | 152 | # |
| 153 | # CONFIG_PREEMPT is not set | 153 | # CONFIG_PREEMPT is not set |
| 154 | # CONFIG_NO_IDLE_HZ is not set | ||
| 155 | CONFIG_HZ=100 | 154 | CONFIG_HZ=100 |
| 156 | # CONFIG_AEABI is not set | 155 | # CONFIG_AEABI is not set |
| 157 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 156 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
diff --git a/arch/arm/kernel/atags.c b/arch/arm/kernel/atags.c index 64c420805e6f..42a1a1415fa6 100644 --- a/arch/arm/kernel/atags.c +++ b/arch/arm/kernel/atags.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include <linux/slab.h> | 1 | #include <linux/slab.h> |
| 2 | #include <linux/kexec.h> | ||
| 3 | #include <linux/proc_fs.h> | 2 | #include <linux/proc_fs.h> |
| 4 | #include <asm/setup.h> | 3 | #include <asm/setup.h> |
| 5 | #include <asm/types.h> | 4 | #include <asm/types.h> |
| @@ -7,9 +6,8 @@ | |||
| 7 | 6 | ||
| 8 | struct buffer { | 7 | struct buffer { |
| 9 | size_t size; | 8 | size_t size; |
| 10 | char *data; | 9 | char data[]; |
| 11 | }; | 10 | }; |
| 12 | static struct buffer tags_buffer; | ||
| 13 | 11 | ||
| 14 | static int | 12 | static int |
| 15 | read_buffer(char* page, char** start, off_t off, int count, | 13 | read_buffer(char* page, char** start, off_t off, int count, |
| @@ -29,58 +27,57 @@ read_buffer(char* page, char** start, off_t off, int count, | |||
| 29 | return count; | 27 | return count; |
| 30 | } | 28 | } |
| 31 | 29 | ||
| 32 | 30 | #define BOOT_PARAMS_SIZE 1536 | |
| 33 | static int | 31 | static char __initdata atags_copy[BOOT_PARAMS_SIZE]; |
| 34 | create_proc_entries(void) | ||
| 35 | { | ||
| 36 | struct proc_dir_entry* tags_entry; | ||
| 37 | |||
| 38 | tags_entry = create_proc_read_entry("atags", 0400, NULL, read_buffer, &tags_buffer); | ||
| 39 | if (!tags_entry) | ||
| 40 | return -ENOMEM; | ||
| 41 | |||
| 42 | return 0; | ||
| 43 | } | ||
| 44 | |||
| 45 | |||
| 46 | static char __initdata atags_copy_buf[KEXEC_BOOT_PARAMS_SIZE]; | ||
| 47 | static char __initdata *atags_copy; | ||
| 48 | 32 | ||
| 49 | void __init save_atags(const struct tag *tags) | 33 | void __init save_atags(const struct tag *tags) |
| 50 | { | 34 | { |
| 51 | atags_copy = atags_copy_buf; | 35 | memcpy(atags_copy, tags, sizeof(atags_copy)); |
| 52 | memcpy(atags_copy, tags, KEXEC_BOOT_PARAMS_SIZE); | ||
| 53 | } | 36 | } |
| 54 | 37 | ||
| 55 | |||
| 56 | static int __init init_atags_procfs(void) | 38 | static int __init init_atags_procfs(void) |
| 57 | { | 39 | { |
| 58 | struct tag *tag; | 40 | /* |
| 59 | int error; | 41 | * This cannot go into save_atags() because kmalloc and proc don't work |
| 42 | * yet when it is called. | ||
| 43 | */ | ||
| 44 | struct proc_dir_entry *tags_entry; | ||
| 45 | struct tag *tag = (struct tag *)atags_copy; | ||
| 46 | struct buffer *b; | ||
| 47 | size_t size; | ||
| 60 | 48 | ||
| 61 | if (!atags_copy) { | 49 | if (tag->hdr.tag != ATAG_CORE) { |
| 62 | printk(KERN_WARNING "Exporting ATAGs: No saved tags found\n"); | 50 | printk(KERN_INFO "No ATAGs?"); |
| 63 | return -EIO; | 51 | return -EINVAL; |
| 64 | } | 52 | } |
| 65 | 53 | ||
| 66 | for (tag = (struct tag *) atags_copy; tag->hdr.size; tag = tag_next(tag)) | 54 | for (; tag->hdr.size; tag = tag_next(tag)) |
| 67 | ; | 55 | ; |
| 68 | 56 | ||
| 69 | tags_buffer.size = ((char *) tag - atags_copy) + sizeof(tag->hdr); | 57 | /* include the terminating ATAG_NONE */ |
| 70 | tags_buffer.data = kmalloc(tags_buffer.size, GFP_KERNEL); | 58 | size = (char *)tag - atags_copy + sizeof(struct tag_header); |
| 71 | if (tags_buffer.data == NULL) | ||
| 72 | return -ENOMEM; | ||
| 73 | memcpy(tags_buffer.data, atags_copy, tags_buffer.size); | ||
| 74 | |||
| 75 | error = create_proc_entries(); | ||
| 76 | if (error) { | ||
| 77 | printk(KERN_ERR "Exporting ATAGs: not enough memory\n"); | ||
| 78 | kfree(tags_buffer.data); | ||
| 79 | tags_buffer.size = 0; | ||
| 80 | tags_buffer.data = NULL; | ||
| 81 | } | ||
| 82 | 59 | ||
| 83 | return error; | 60 | WARN_ON(tag->hdr.tag != ATAG_NONE); |
| 84 | } | 61 | |
| 62 | b = kmalloc(sizeof(*b) + size, GFP_KERNEL); | ||
| 63 | if (!b) | ||
| 64 | goto nomem; | ||
| 85 | 65 | ||
| 66 | b->size = size; | ||
| 67 | memcpy(b->data, atags_copy, size); | ||
| 68 | |||
| 69 | tags_entry = create_proc_read_entry("atags", 0400, | ||
| 70 | NULL, read_buffer, b); | ||
| 71 | |||
| 72 | if (!tags_entry) | ||
| 73 | goto nomem; | ||
| 74 | |||
| 75 | return 0; | ||
| 76 | |||
| 77 | nomem: | ||
| 78 | kfree(b); | ||
| 79 | printk(KERN_ERR "Exporting ATAGs: not enough memory\n"); | ||
| 80 | |||
| 81 | return -ENOMEM; | ||
| 82 | } | ||
| 86 | arch_initcall(init_atags_procfs); | 83 | arch_initcall(init_atags_procfs); |
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index a53c0aba5c14..8bfd299bfe77 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c | |||
| @@ -680,7 +680,7 @@ static int __init ecard_probeirqhw(void) | |||
| 680 | #define IO_EC_MEMC8_BASE 0 | 680 | #define IO_EC_MEMC8_BASE 0 |
| 681 | #endif | 681 | #endif |
| 682 | 682 | ||
| 683 | unsigned int __ecard_address(ecard_t *ec, card_type_t type, card_speed_t speed) | 683 | static unsigned int __ecard_address(ecard_t *ec, card_type_t type, card_speed_t speed) |
| 684 | { | 684 | { |
| 685 | unsigned long address = 0; | 685 | unsigned long address = 0; |
| 686 | int slot = ec->slot_no; | 686 | int slot = ec->slot_no; |
| @@ -1002,7 +1002,7 @@ ecard_probe(int slot, card_type_t type) | |||
| 1002 | } | 1002 | } |
| 1003 | 1003 | ||
| 1004 | rc = -ENODEV; | 1004 | rc = -ENODEV; |
| 1005 | if ((ec->podaddr = ecard_address(ec, type, ECARD_SYNC)) == 0) | 1005 | if ((ec->podaddr = __ecard_address(ec, type, ECARD_SYNC)) == 0) |
| 1006 | goto nodev; | 1006 | goto nodev; |
| 1007 | 1007 | ||
| 1008 | cid.r_zero = 1; | 1008 | cid.r_zero = 1; |
| @@ -1141,10 +1141,10 @@ static int ecard_drv_probe(struct device *dev) | |||
| 1141 | 1141 | ||
| 1142 | id = ecard_match_device(drv->id_table, ec); | 1142 | id = ecard_match_device(drv->id_table, ec); |
| 1143 | 1143 | ||
| 1144 | ecard_claim(ec); | 1144 | ec->claimed = 1; |
| 1145 | ret = drv->probe(ec, id); | 1145 | ret = drv->probe(ec, id); |
| 1146 | if (ret) | 1146 | if (ret) |
| 1147 | ecard_release(ec); | 1147 | ec->claimed = 0; |
| 1148 | return ret; | 1148 | return ret; |
| 1149 | } | 1149 | } |
| 1150 | 1150 | ||
| @@ -1154,7 +1154,7 @@ static int ecard_drv_remove(struct device *dev) | |||
| 1154 | struct ecard_driver *drv = ECARD_DRV(dev->driver); | 1154 | struct ecard_driver *drv = ECARD_DRV(dev->driver); |
| 1155 | 1155 | ||
| 1156 | drv->remove(ec); | 1156 | drv->remove(ec); |
| 1157 | ecard_release(ec); | 1157 | ec->claimed = 0; |
| 1158 | 1158 | ||
| 1159 | /* | 1159 | /* |
| 1160 | * Restore the default operations. We ensure that the | 1160 | * Restore the default operations. We ensure that the |
| @@ -1182,7 +1182,7 @@ static void ecard_drv_shutdown(struct device *dev) | |||
| 1182 | if (dev->driver) { | 1182 | if (dev->driver) { |
| 1183 | if (drv->shutdown) | 1183 | if (drv->shutdown) |
| 1184 | drv->shutdown(ec); | 1184 | drv->shutdown(ec); |
| 1185 | ecard_release(ec); | 1185 | ec->claimed = 0; |
| 1186 | } | 1186 | } |
| 1187 | 1187 | ||
| 1188 | /* | 1188 | /* |
| @@ -1239,7 +1239,6 @@ static int ecard_bus_init(void) | |||
| 1239 | postcore_initcall(ecard_bus_init); | 1239 | postcore_initcall(ecard_bus_init); |
| 1240 | 1240 | ||
| 1241 | EXPORT_SYMBOL(ecard_readchunk); | 1241 | EXPORT_SYMBOL(ecard_readchunk); |
| 1242 | EXPORT_SYMBOL(__ecard_address); | ||
| 1243 | EXPORT_SYMBOL(ecard_register_driver); | 1242 | EXPORT_SYMBOL(ecard_register_driver); |
| 1244 | EXPORT_SYMBOL(ecard_remove_driver); | 1243 | EXPORT_SYMBOL(ecard_remove_driver); |
| 1245 | EXPORT_SYMBOL(ecard_bus_type); | 1244 | EXPORT_SYMBOL(ecard_bus_type); |
diff --git a/arch/arm/kernel/ecard.h b/arch/arm/kernel/ecard.h index d7c2dacf935d..4642d436be2a 100644 --- a/arch/arm/kernel/ecard.h +++ b/arch/arm/kernel/ecard.h | |||
| @@ -54,3 +54,16 @@ struct ex_chunk_dir { | |||
| 54 | #define c_len(x) ((x)->r_len[0]|((x)->r_len[1]<<8)|((x)->r_len[2]<<16)) | 54 | #define c_len(x) ((x)->r_len[0]|((x)->r_len[1]<<8)|((x)->r_len[2]<<16)) |
| 55 | #define c_start(x) ((x)->r_start) | 55 | #define c_start(x) ((x)->r_start) |
| 56 | }; | 56 | }; |
| 57 | |||
| 58 | typedef enum ecard_type { /* Cards address space */ | ||
| 59 | ECARD_IOC, | ||
| 60 | ECARD_MEMC, | ||
| 61 | ECARD_EASI | ||
| 62 | } card_type_t; | ||
| 63 | |||
| 64 | typedef enum { /* Speed for ECARD_IOC space */ | ||
| 65 | ECARD_SLOW = 0, | ||
| 66 | ECARD_MEDIUM = 1, | ||
| 67 | ECARD_FAST = 2, | ||
| 68 | ECARD_SYNC = 3 | ||
| 69 | } card_speed_t; | ||
diff --git a/arch/arm/kernel/init_task.c b/arch/arm/kernel/init_task.c index bd4ef53bc6b9..8b8c9d38a761 100644 --- a/arch/arm/kernel/init_task.c +++ b/arch/arm/kernel/init_task.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
| 14 | 14 | ||
| 15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
| 16 | static struct files_struct init_files = INIT_FILES; | ||
| 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 46bf2ede6128..199b3680118b 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
| @@ -133,10 +133,8 @@ static void default_idle(void) | |||
| 133 | cpu_relax(); | 133 | cpu_relax(); |
| 134 | else { | 134 | else { |
| 135 | local_irq_disable(); | 135 | local_irq_disable(); |
| 136 | if (!need_resched()) { | 136 | if (!need_resched()) |
| 137 | timer_dyn_reprogram(); | ||
| 138 | arch_idle(); | 137 | arch_idle(); |
| 139 | } | ||
| 140 | local_irq_enable(); | 138 | local_irq_enable(); |
| 141 | } | 139 | } |
| 142 | } | 140 | } |
diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c index ae31deb2d065..90e0c35ae60d 100644 --- a/arch/arm/kernel/stacktrace.c +++ b/arch/arm/kernel/stacktrace.c | |||
| @@ -36,6 +36,7 @@ EXPORT_SYMBOL(walk_stackframe); | |||
| 36 | #ifdef CONFIG_STACKTRACE | 36 | #ifdef CONFIG_STACKTRACE |
| 37 | struct stack_trace_data { | 37 | struct stack_trace_data { |
| 38 | struct stack_trace *trace; | 38 | struct stack_trace *trace; |
| 39 | unsigned int no_sched_functions; | ||
| 39 | unsigned int skip; | 40 | unsigned int skip; |
| 40 | }; | 41 | }; |
| 41 | 42 | ||
| @@ -43,27 +44,52 @@ static int save_trace(struct stackframe *frame, void *d) | |||
| 43 | { | 44 | { |
| 44 | struct stack_trace_data *data = d; | 45 | struct stack_trace_data *data = d; |
| 45 | struct stack_trace *trace = data->trace; | 46 | struct stack_trace *trace = data->trace; |
| 47 | unsigned long addr = frame->lr; | ||
| 46 | 48 | ||
| 49 | if (data->no_sched_functions && in_sched_functions(addr)) | ||
| 50 | return 0; | ||
| 47 | if (data->skip) { | 51 | if (data->skip) { |
| 48 | data->skip--; | 52 | data->skip--; |
| 49 | return 0; | 53 | return 0; |
| 50 | } | 54 | } |
| 51 | 55 | ||
| 52 | trace->entries[trace->nr_entries++] = frame->lr; | 56 | trace->entries[trace->nr_entries++] = addr; |
| 53 | 57 | ||
| 54 | return trace->nr_entries >= trace->max_entries; | 58 | return trace->nr_entries >= trace->max_entries; |
| 55 | } | 59 | } |
| 56 | 60 | ||
| 57 | void save_stack_trace(struct stack_trace *trace) | 61 | void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) |
| 58 | { | 62 | { |
| 59 | struct stack_trace_data data; | 63 | struct stack_trace_data data; |
| 60 | unsigned long fp, base; | 64 | unsigned long fp, base; |
| 61 | 65 | ||
| 62 | data.trace = trace; | 66 | data.trace = trace; |
| 63 | data.skip = trace->skip; | 67 | data.skip = trace->skip; |
| 64 | base = (unsigned long)task_stack_page(current); | 68 | base = (unsigned long)task_stack_page(tsk); |
| 65 | asm("mov %0, fp" : "=r" (fp)); | 69 | |
| 70 | if (tsk != current) { | ||
| 71 | #ifdef CONFIG_SMP | ||
| 72 | /* | ||
| 73 | * What guarantees do we have here that 'tsk' | ||
| 74 | * is not running on another CPU? | ||
| 75 | */ | ||
| 76 | BUG(); | ||
| 77 | #else | ||
| 78 | data.no_sched_functions = 1; | ||
| 79 | fp = thread_saved_fp(tsk); | ||
| 80 | #endif | ||
| 81 | } else { | ||
| 82 | data.no_sched_functions = 0; | ||
| 83 | asm("mov %0, fp" : "=r" (fp)); | ||
| 84 | } | ||
| 66 | 85 | ||
| 67 | walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data); | 86 | walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data); |
| 87 | if (trace->nr_entries < trace->max_entries) | ||
| 88 | trace->entries[trace->nr_entries++] = ULONG_MAX; | ||
| 89 | } | ||
| 90 | |||
| 91 | void save_stack_trace(struct stack_trace *trace) | ||
| 92 | { | ||
| 93 | save_stack_trace_tsk(current, trace); | ||
| 68 | } | 94 | } |
| 69 | #endif | 95 | #endif |
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index b5867eca1d0b..cc5145b28e7f 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
| @@ -365,108 +365,6 @@ static struct sysdev_class timer_sysclass = { | |||
| 365 | .resume = timer_resume, | 365 | .resume = timer_resume, |
| 366 | }; | 366 | }; |
| 367 | 367 | ||
| 368 | #ifdef CONFIG_NO_IDLE_HZ | ||
| 369 | static int timer_dyn_tick_enable(void) | ||
| 370 | { | ||
| 371 | struct dyn_tick_timer *dyn_tick = system_timer->dyn_tick; | ||
| 372 | unsigned long flags; | ||
| 373 | int ret = -ENODEV; | ||
| 374 | |||
| 375 | if (dyn_tick) { | ||
| 376 | spin_lock_irqsave(&dyn_tick->lock, flags); | ||
| 377 | ret = 0; | ||
| 378 | if (!(dyn_tick->state & DYN_TICK_ENABLED)) { | ||
| 379 | ret = dyn_tick->enable(); | ||
| 380 | |||
| 381 | if (ret == 0) | ||
| 382 | dyn_tick->state |= DYN_TICK_ENABLED; | ||
| 383 | } | ||
| 384 | spin_unlock_irqrestore(&dyn_tick->lock, flags); | ||
| 385 | } | ||
| 386 | |||
| 387 | return ret; | ||
| 388 | } | ||
| 389 | |||
| 390 | static int timer_dyn_tick_disable(void) | ||
| 391 | { | ||
| 392 | struct dyn_tick_timer *dyn_tick = system_timer->dyn_tick; | ||
| 393 | unsigned long flags; | ||
| 394 | int ret = -ENODEV; | ||
| 395 | |||
| 396 | if (dyn_tick) { | ||
| 397 | spin_lock_irqsave(&dyn_tick->lock, flags); | ||
| 398 | ret = 0; | ||
| 399 | if (dyn_tick->state & DYN_TICK_ENABLED) { | ||
| 400 | ret = dyn_tick->disable(); | ||
| 401 | |||
| 402 | if (ret == 0) | ||
| 403 | dyn_tick->state &= ~DYN_TICK_ENABLED; | ||
| 404 | } | ||
| 405 | spin_unlock_irqrestore(&dyn_tick->lock, flags); | ||
| 406 | } | ||
| 407 | |||
| 408 | return ret; | ||
| 409 | } | ||
| 410 | |||
| 411 | /* | ||
| 412 | * Reprogram the system timer for at least the calculated time interval. | ||
| 413 | * This function should be called from the idle thread with IRQs disabled, | ||
| 414 | * immediately before sleeping. | ||
| 415 | */ | ||
| 416 | void timer_dyn_reprogram(void) | ||
| 417 | { | ||
| 418 | struct dyn_tick_timer *dyn_tick = system_timer->dyn_tick; | ||
| 419 | unsigned long next, seq, flags; | ||
| 420 | |||
| 421 | if (!dyn_tick) | ||
| 422 | return; | ||
| 423 | |||
| 424 | spin_lock_irqsave(&dyn_tick->lock, flags); | ||
| 425 | if (dyn_tick->state & DYN_TICK_ENABLED) { | ||
| 426 | next = next_timer_interrupt(); | ||
| 427 | do { | ||
| 428 | seq = read_seqbegin(&xtime_lock); | ||
| 429 | dyn_tick->reprogram(next - jiffies); | ||
| 430 | } while (read_seqretry(&xtime_lock, seq)); | ||
| 431 | } | ||
| 432 | spin_unlock_irqrestore(&dyn_tick->lock, flags); | ||
| 433 | } | ||
| 434 | |||
| 435 | static ssize_t timer_show_dyn_tick(struct sys_device *dev, char *buf) | ||
| 436 | { | ||
| 437 | return sprintf(buf, "%i\n", | ||
| 438 | (system_timer->dyn_tick->state & DYN_TICK_ENABLED) >> 1); | ||
| 439 | } | ||
| 440 | |||
| 441 | static ssize_t timer_set_dyn_tick(struct sys_device *dev, const char *buf, | ||
| 442 | size_t count) | ||
| 443 | { | ||
| 444 | unsigned int enable = simple_strtoul(buf, NULL, 2); | ||
| 445 | |||
| 446 | if (enable) | ||
| 447 | timer_dyn_tick_enable(); | ||
| 448 | else | ||
| 449 | timer_dyn_tick_disable(); | ||
| 450 | |||
| 451 | return count; | ||
| 452 | } | ||
| 453 | static SYSDEV_ATTR(dyn_tick, 0644, timer_show_dyn_tick, timer_set_dyn_tick); | ||
| 454 | |||
| 455 | /* | ||
| 456 | * dyntick=enable|disable | ||
| 457 | */ | ||
| 458 | static char dyntick_str[4] __initdata = ""; | ||
| 459 | |||
| 460 | static int __init dyntick_setup(char *str) | ||
| 461 | { | ||
| 462 | if (str) | ||
| 463 | strlcpy(dyntick_str, str, sizeof(dyntick_str)); | ||
| 464 | return 1; | ||
| 465 | } | ||
| 466 | |||
| 467 | __setup("dyntick=", dyntick_setup); | ||
| 468 | #endif | ||
| 469 | |||
| 470 | static int __init timer_init_sysfs(void) | 368 | static int __init timer_init_sysfs(void) |
| 471 | { | 369 | { |
| 472 | int ret = sysdev_class_register(&timer_sysclass); | 370 | int ret = sysdev_class_register(&timer_sysclass); |
| @@ -475,19 +373,6 @@ static int __init timer_init_sysfs(void) | |||
| 475 | ret = sysdev_register(&system_timer->dev); | 373 | ret = sysdev_register(&system_timer->dev); |
| 476 | } | 374 | } |
| 477 | 375 | ||
| 478 | #ifdef CONFIG_NO_IDLE_HZ | ||
| 479 | if (ret == 0 && system_timer->dyn_tick) { | ||
| 480 | ret = sysdev_create_file(&system_timer->dev, &attr_dyn_tick); | ||
| 481 | |||
| 482 | /* | ||
| 483 | * Turn on dynamic tick after calibrate delay | ||
| 484 | * for correct bogomips | ||
| 485 | */ | ||
| 486 | if (ret == 0 && dyntick_str[0] == 'e') | ||
| 487 | ret = timer_dyn_tick_enable(); | ||
| 488 | } | ||
| 489 | #endif | ||
| 490 | |||
| 491 | return ret; | 376 | return ret; |
| 492 | } | 377 | } |
| 493 | 378 | ||
| @@ -500,10 +385,5 @@ void __init time_init(void) | |||
| 500 | system_timer->offset = dummy_gettimeoffset; | 385 | system_timer->offset = dummy_gettimeoffset; |
| 501 | #endif | 386 | #endif |
| 502 | system_timer->init(); | 387 | system_timer->init(); |
| 503 | |||
| 504 | #ifdef CONFIG_NO_IDLE_HZ | ||
| 505 | if (system_timer->dyn_tick) | ||
| 506 | spin_lock_init(&system_timer->dyn_tick->lock); | ||
| 507 | #endif | ||
| 508 | } | 388 | } |
| 509 | 389 | ||
diff --git a/arch/arm/lib/copy_template.S b/arch/arm/lib/copy_template.S index cab355c0c1f7..139cce646055 100644 --- a/arch/arm/lib/copy_template.S +++ b/arch/arm/lib/copy_template.S | |||
| @@ -13,14 +13,6 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | /* | 15 | /* |
| 16 | * This can be used to enable code to cacheline align the source pointer. | ||
| 17 | * Experiments on tested architectures (StrongARM and XScale) didn't show | ||
| 18 | * this a worthwhile thing to do. That might be different in the future. | ||
| 19 | */ | ||
| 20 | //#define CALGN(code...) code | ||
| 21 | #define CALGN(code...) | ||
| 22 | |||
| 23 | /* | ||
| 24 | * Theory of operation | 16 | * Theory of operation |
| 25 | * ------------------- | 17 | * ------------------- |
| 26 | * | 18 | * |
| @@ -82,7 +74,7 @@ | |||
| 82 | stmfd sp!, {r5 - r8} | 74 | stmfd sp!, {r5 - r8} |
| 83 | blt 5f | 75 | blt 5f |
| 84 | 76 | ||
| 85 | CALGN( ands ip, r1, #31 ) | 77 | CALGN( ands ip, r0, #31 ) |
| 86 | CALGN( rsb r3, ip, #32 ) | 78 | CALGN( rsb r3, ip, #32 ) |
| 87 | CALGN( sbcnes r4, r3, r2 ) @ C is always set here | 79 | CALGN( sbcnes r4, r3, r2 ) @ C is always set here |
| 88 | CALGN( bcs 2f ) | 80 | CALGN( bcs 2f ) |
| @@ -168,7 +160,7 @@ | |||
| 168 | subs r2, r2, #28 | 160 | subs r2, r2, #28 |
| 169 | blt 14f | 161 | blt 14f |
| 170 | 162 | ||
| 171 | CALGN( ands ip, r1, #31 ) | 163 | CALGN( ands ip, r0, #31 ) |
| 172 | CALGN( rsb ip, ip, #32 ) | 164 | CALGN( rsb ip, ip, #32 ) |
| 173 | CALGN( sbcnes r4, ip, r2 ) @ C is always set here | 165 | CALGN( sbcnes r4, ip, r2 ) @ C is always set here |
| 174 | CALGN( subcc r2, r2, ip ) | 166 | CALGN( subcc r2, r2, ip ) |
diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S index ef7fddc14ac9..2e301b7bd8f1 100644 --- a/arch/arm/lib/memmove.S +++ b/arch/arm/lib/memmove.S | |||
| @@ -13,14 +13,6 @@ | |||
| 13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 14 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
| 15 | 15 | ||
| 16 | /* | ||
| 17 | * This can be used to enable code to cacheline align the source pointer. | ||
| 18 | * Experiments on tested architectures (StrongARM and XScale) didn't show | ||
| 19 | * this a worthwhile thing to do. That might be different in the future. | ||
| 20 | */ | ||
| 21 | //#define CALGN(code...) code | ||
| 22 | #define CALGN(code...) | ||
| 23 | |||
| 24 | .text | 16 | .text |
| 25 | 17 | ||
| 26 | /* | 18 | /* |
| @@ -55,11 +47,12 @@ ENTRY(memmove) | |||
| 55 | stmfd sp!, {r5 - r8} | 47 | stmfd sp!, {r5 - r8} |
| 56 | blt 5f | 48 | blt 5f |
| 57 | 49 | ||
| 58 | CALGN( ands ip, r1, #31 ) | 50 | CALGN( ands ip, r0, #31 ) |
| 59 | CALGN( sbcnes r4, ip, r2 ) @ C is always set here | 51 | CALGN( sbcnes r4, ip, r2 ) @ C is always set here |
| 60 | CALGN( bcs 2f ) | 52 | CALGN( bcs 2f ) |
| 61 | CALGN( adr r4, 6f ) | 53 | CALGN( adr r4, 6f ) |
| 62 | CALGN( subs r2, r2, ip ) @ C is set here | 54 | CALGN( subs r2, r2, ip ) @ C is set here |
| 55 | CALGN( rsb ip, ip, #32 ) | ||
| 63 | CALGN( add pc, r4, ip ) | 56 | CALGN( add pc, r4, ip ) |
| 64 | 57 | ||
| 65 | PLD( pld [r1, #-4] ) | 58 | PLD( pld [r1, #-4] ) |
| @@ -138,8 +131,7 @@ ENTRY(memmove) | |||
| 138 | subs r2, r2, #28 | 131 | subs r2, r2, #28 |
| 139 | blt 14f | 132 | blt 14f |
| 140 | 133 | ||
| 141 | CALGN( ands ip, r1, #31 ) | 134 | CALGN( ands ip, r0, #31 ) |
| 142 | CALGN( rsb ip, ip, #32 ) | ||
| 143 | CALGN( sbcnes r4, ip, r2 ) @ C is always set here | 135 | CALGN( sbcnes r4, ip, r2 ) @ C is always set here |
| 144 | CALGN( subcc r2, r2, ip ) | 136 | CALGN( subcc r2, r2, ip ) |
| 145 | CALGN( bcc 15f ) | 137 | CALGN( bcc 15f ) |
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 95b110b07a89..b477d4ac88ef 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S | |||
| @@ -39,6 +39,9 @@ ENTRY(memset) | |||
| 39 | mov r3, r1 | 39 | mov r3, r1 |
| 40 | cmp r2, #16 | 40 | cmp r2, #16 |
| 41 | blt 4f | 41 | blt 4f |
| 42 | |||
| 43 | #if ! CALGN(1)+0 | ||
| 44 | |||
| 42 | /* | 45 | /* |
| 43 | * We need an extra register for this loop - save the return address and | 46 | * We need an extra register for this loop - save the return address and |
| 44 | * use the LR | 47 | * use the LR |
| @@ -64,6 +67,49 @@ ENTRY(memset) | |||
| 64 | stmneia r0!, {r1, r3, ip, lr} | 67 | stmneia r0!, {r1, r3, ip, lr} |
| 65 | ldr lr, [sp], #4 | 68 | ldr lr, [sp], #4 |
| 66 | 69 | ||
| 70 | #else | ||
| 71 | |||
| 72 | /* | ||
| 73 | * This version aligns the destination pointer in order to write | ||
| 74 | * whole cache lines at once. | ||
| 75 | */ | ||
| 76 | |||
| 77 | stmfd sp!, {r4-r7, lr} | ||
| 78 | mov r4, r1 | ||
| 79 | mov r5, r1 | ||
| 80 | mov r6, r1 | ||
| 81 | mov r7, r1 | ||
| 82 | mov ip, r1 | ||
| 83 | mov lr, r1 | ||
| 84 | |||
| 85 | cmp r2, #96 | ||
| 86 | tstgt r0, #31 | ||
| 87 | ble 3f | ||
| 88 | |||
| 89 | and ip, r0, #31 | ||
| 90 | rsb ip, ip, #32 | ||
| 91 | sub r2, r2, ip | ||
| 92 | movs ip, ip, lsl #(32 - 4) | ||
| 93 | stmcsia r0!, {r4, r5, r6, r7} | ||
| 94 | stmmiia r0!, {r4, r5} | ||
| 95 | tst ip, #(1 << 30) | ||
| 96 | mov ip, r1 | ||
| 97 | strne r1, [r0], #4 | ||
| 98 | |||
| 99 | 3: subs r2, r2, #64 | ||
| 100 | stmgeia r0!, {r1, r3-r7, ip, lr} | ||
| 101 | stmgeia r0!, {r1, r3-r7, ip, lr} | ||
| 102 | bgt 3b | ||
| 103 | ldmeqfd sp!, {r4-r7, pc} | ||
| 104 | |||
| 105 | tst r2, #32 | ||
| 106 | stmneia r0!, {r1, r3-r7, ip, lr} | ||
| 107 | tst r2, #16 | ||
| 108 | stmneia r0!, {r4-r7} | ||
| 109 | ldmfd sp!, {r4-r7, lr} | ||
| 110 | |||
| 111 | #endif | ||
| 112 | |||
| 67 | 4: tst r2, #8 | 113 | 4: tst r2, #8 |
| 68 | stmneia r0!, {r1, r3} | 114 | stmneia r0!, {r1, r3} |
| 69 | tst r2, #4 | 115 | tst r2, #4 |
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S index abf2508e8221..b8f79d80ee9b 100644 --- a/arch/arm/lib/memzero.S +++ b/arch/arm/lib/memzero.S | |||
| @@ -39,6 +39,9 @@ ENTRY(__memzero) | |||
| 39 | */ | 39 | */ |
| 40 | cmp r1, #16 @ 1 we can skip this chunk if we | 40 | cmp r1, #16 @ 1 we can skip this chunk if we |
| 41 | blt 4f @ 1 have < 16 bytes | 41 | blt 4f @ 1 have < 16 bytes |
| 42 | |||
| 43 | #if ! CALGN(1)+0 | ||
| 44 | |||
| 42 | /* | 45 | /* |
| 43 | * We need an extra register for this loop - save the return address and | 46 | * We need an extra register for this loop - save the return address and |
| 44 | * use the LR | 47 | * use the LR |
| @@ -64,6 +67,47 @@ ENTRY(__memzero) | |||
| 64 | stmneia r0!, {r2, r3, ip, lr} @ 4 | 67 | stmneia r0!, {r2, r3, ip, lr} @ 4 |
| 65 | ldr lr, [sp], #4 @ 1 | 68 | ldr lr, [sp], #4 @ 1 |
| 66 | 69 | ||
| 70 | #else | ||
| 71 | |||
| 72 | /* | ||
| 73 | * This version aligns the destination pointer in order to write | ||
| 74 | * whole cache lines at once. | ||
| 75 | */ | ||
| 76 | |||
| 77 | stmfd sp!, {r4-r7, lr} | ||
| 78 | mov r4, r2 | ||
| 79 | mov r5, r2 | ||
| 80 | mov r6, r2 | ||
| 81 | mov r7, r2 | ||
| 82 | mov ip, r2 | ||
| 83 | mov lr, r2 | ||
| 84 | |||
| 85 | cmp r1, #96 | ||
| 86 | andgts ip, r0, #31 | ||
| 87 | ble 3f | ||
| 88 | |||
| 89 | rsb ip, ip, #32 | ||
| 90 | sub r1, r1, ip | ||
| 91 | movs ip, ip, lsl #(32 - 4) | ||
| 92 | stmcsia r0!, {r4, r5, r6, r7} | ||
| 93 | stmmiia r0!, {r4, r5} | ||
| 94 | movs ip, ip, lsl #2 | ||
| 95 | strcs r2, [r0], #4 | ||
| 96 | |||
| 97 | 3: subs r1, r1, #64 | ||
| 98 | stmgeia r0!, {r2-r7, ip, lr} | ||
| 99 | stmgeia r0!, {r2-r7, ip, lr} | ||
| 100 | bgt 3b | ||
| 101 | ldmeqfd sp!, {r4-r7, pc} | ||
| 102 | |||
| 103 | tst r1, #32 | ||
| 104 | stmneia r0!, {r2-r7, ip, lr} | ||
| 105 | tst r1, #16 | ||
| 106 | stmneia r0!, {r4-r7} | ||
| 107 | ldmfd sp!, {r4-r7, lr} | ||
| 108 | |||
| 109 | #endif | ||
| 110 | |||
| 67 | 4: tst r1, #8 @ 1 8 bytes or more? | 111 | 4: tst r1, #8 @ 1 8 bytes or more? |
| 68 | stmneia r0!, {r2, r3} @ 2 | 112 | stmneia r0!, {r2, r3} @ 2 |
| 69 | tst r1, #4 @ 1 4 bytes or more? | 113 | tst r1, #4 @ 1 4 bytes or more? |
diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c index 1de121fc55f4..f44647738ee4 100644 --- a/arch/arm/mach-at91/at91x40.c +++ b/arch/arm/mach-at91/at91x40.c | |||
| @@ -16,16 +16,32 @@ | |||
| 16 | #include <asm/mach/arch.h> | 16 | #include <asm/mach/arch.h> |
| 17 | #include <asm/arch/at91x40.h> | 17 | #include <asm/arch/at91x40.h> |
| 18 | #include <asm/arch/at91_st.h> | 18 | #include <asm/arch/at91_st.h> |
| 19 | #include <asm/arch/timex.h> | ||
| 19 | #include "generic.h" | 20 | #include "generic.h" |
| 20 | 21 | ||
| 21 | /* | 22 | /* |
| 22 | * This is used in the gpio code, stub locally. | 23 | * Export the clock functions for the AT91X40. Some external code common |
| 24 | * to all AT91 family parts relys on this, like the gpio and serial support. | ||
| 23 | */ | 25 | */ |
| 24 | int clk_enable(struct clk *clk) | 26 | int clk_enable(struct clk *clk) |
| 25 | { | 27 | { |
| 26 | return 0; | 28 | return 0; |
| 27 | } | 29 | } |
| 28 | 30 | ||
| 31 | void clk_disable(struct clk *clk) | ||
| 32 | { | ||
| 33 | } | ||
| 34 | |||
| 35 | unsigned long clk_get_rate(struct clk *clk) | ||
| 36 | { | ||
| 37 | return AT91X40_MASTER_CLOCK; | ||
| 38 | } | ||
| 39 | |||
| 40 | struct clk *clk_get(struct device *dev, const char *id) | ||
| 41 | { | ||
| 42 | return NULL; | ||
| 43 | } | ||
| 44 | |||
| 29 | void __init at91x40_initialize(unsigned long main_clock) | 45 | void __init at91x40_initialize(unsigned long main_clock) |
| 30 | { | 46 | { |
| 31 | at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1) | 47 | at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1) |
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 9d7515c36bff..f62c35500bb7 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c | |||
| @@ -74,6 +74,7 @@ struct clk *clk_get(struct device *dev, const char *id) | |||
| 74 | 74 | ||
| 75 | return ERR_PTR(-ENOENT); | 75 | return ERR_PTR(-ENOENT); |
| 76 | } | 76 | } |
| 77 | EXPORT_SYMBOL(clk_get); | ||
| 77 | 78 | ||
| 78 | int clk_enable(struct clk *clk) | 79 | int clk_enable(struct clk *clk) |
| 79 | { | 80 | { |
| @@ -86,6 +87,7 @@ int clk_enable(struct clk *clk) | |||
| 86 | 87 | ||
| 87 | return 0; | 88 | return 0; |
| 88 | } | 89 | } |
| 90 | EXPORT_SYMBOL(clk_enable); | ||
| 89 | 91 | ||
| 90 | void clk_disable(struct clk *clk) | 92 | void clk_disable(struct clk *clk) |
| 91 | { | 93 | { |
| @@ -96,15 +98,18 @@ void clk_disable(struct clk *clk) | |||
| 96 | __raw_writel(value & ~clk->enable_mask, clk->enable_reg); | 98 | __raw_writel(value & ~clk->enable_mask, clk->enable_reg); |
| 97 | } | 99 | } |
| 98 | } | 100 | } |
| 101 | EXPORT_SYMBOL(clk_disable); | ||
| 99 | 102 | ||
| 100 | unsigned long clk_get_rate(struct clk *clk) | 103 | unsigned long clk_get_rate(struct clk *clk) |
| 101 | { | 104 | { |
| 102 | return clk->rate; | 105 | return clk->rate; |
| 103 | } | 106 | } |
| 107 | EXPORT_SYMBOL(clk_get_rate); | ||
| 104 | 108 | ||
| 105 | void clk_put(struct clk *clk) | 109 | void clk_put(struct clk *clk) |
| 106 | { | 110 | { |
| 107 | } | 111 | } |
| 112 | EXPORT_SYMBOL(clk_put); | ||
| 108 | 113 | ||
| 109 | 114 | ||
| 110 | 115 | ||
diff --git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile index 0694ad6b6476..32f8609e4f85 100644 --- a/arch/arm/mach-footbridge/Makefile +++ b/arch/arm/mach-footbridge/Makefile | |||
| @@ -14,12 +14,10 @@ pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o | |||
| 14 | pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o | 14 | pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o |
| 15 | pci-$(CONFIG_ARCH_PERSONAL_SERVER) += personal-pci.o | 15 | pci-$(CONFIG_ARCH_PERSONAL_SERVER) += personal-pci.o |
| 16 | 16 | ||
| 17 | leds-$(CONFIG_ARCH_CO285) += ebsa285-leds.o | ||
| 18 | leds-$(CONFIG_ARCH_EBSA285) += ebsa285-leds.o | 17 | leds-$(CONFIG_ARCH_EBSA285) += ebsa285-leds.o |
| 19 | leds-$(CONFIG_ARCH_NETWINDER) += netwinder-leds.o | 18 | leds-$(CONFIG_ARCH_NETWINDER) += netwinder-leds.o |
| 20 | 19 | ||
| 21 | obj-$(CONFIG_ARCH_CATS) += cats-hw.o isa-timer.o | 20 | obj-$(CONFIG_ARCH_CATS) += cats-hw.o isa-timer.o |
| 22 | obj-$(CONFIG_ARCH_CO285) += co285.o dc21285-timer.o | ||
| 23 | obj-$(CONFIG_ARCH_EBSA285) += ebsa285.o dc21285-timer.o | 21 | obj-$(CONFIG_ARCH_EBSA285) += ebsa285.o dc21285-timer.o |
| 24 | obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o | 22 | obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o |
| 25 | obj-$(CONFIG_ARCH_PERSONAL_SERVER) += personal.o dc21285-timer.o | 23 | obj-$(CONFIG_ARCH_PERSONAL_SERVER) += personal.o dc21285-timer.o |
diff --git a/arch/arm/mach-footbridge/co285.c b/arch/arm/mach-footbridge/co285.c deleted file mode 100644 index 4545576ad8d9..000000000000 --- a/arch/arm/mach-footbridge/co285.c +++ /dev/null | |||
| @@ -1,39 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-footbridge/co285.c | ||
| 3 | * | ||
| 4 | * CO285 machine fixup | ||
| 5 | */ | ||
| 6 | #include <linux/init.h> | ||
| 7 | |||
| 8 | #include <asm/hardware/dec21285.h> | ||
| 9 | #include <asm/mach-types.h> | ||
| 10 | |||
| 11 | #include <asm/mach/arch.h> | ||
| 12 | |||
| 13 | #include "common.h" | ||
| 14 | |||
| 15 | static void __init | ||
| 16 | fixup_coebsa285(struct machine_desc *desc, struct tag *tags, | ||
| 17 | char **cmdline, struct meminfo *mi) | ||
| 18 | { | ||
| 19 | extern unsigned long boot_memory_end; | ||
| 20 | extern char boot_command_line[]; | ||
| 21 | |||
| 22 | mi->nr_banks = 1; | ||
| 23 | mi->bank[0].start = PHYS_OFFSET; | ||
| 24 | mi->bank[0].size = boot_memory_end; | ||
| 25 | mi->bank[0].node = 0; | ||
| 26 | |||
| 27 | *cmdline = boot_command_line; | ||
| 28 | } | ||
| 29 | |||
| 30 | MACHINE_START(CO285, "co-EBSA285") | ||
| 31 | /* Maintainer: Mark van Doesburg */ | ||
| 32 | .phys_io = DC21285_ARMCSR_BASE, | ||
| 33 | .io_pg_offst = ((0x7cf00000) >> 18) & 0xfffc, | ||
| 34 | .fixup = fixup_coebsa285, | ||
| 35 | .map_io = footbridge_map_io, | ||
| 36 | .init_irq = footbridge_init_irq, | ||
| 37 | .timer = &footbridge_timer, | ||
| 38 | MACHINE_END | ||
| 39 | |||
diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c index ef29fc34ce65..b08ab507c052 100644 --- a/arch/arm/mach-footbridge/common.c +++ b/arch/arm/mach-footbridge/common.c | |||
| @@ -177,25 +177,6 @@ static struct map_desc ebsa285_host_io_desc[] __initdata = { | |||
| 177 | #endif | 177 | #endif |
| 178 | }; | 178 | }; |
| 179 | 179 | ||
| 180 | /* | ||
| 181 | * The CO-ebsa285 mapping. | ||
| 182 | */ | ||
| 183 | static struct map_desc co285_io_desc[] __initdata = { | ||
| 184 | #ifdef CONFIG_ARCH_CO285 | ||
| 185 | { | ||
| 186 | .virtual = PCIO_BASE, | ||
| 187 | .pfn = __phys_to_pfn(DC21285_PCI_IO), | ||
| 188 | .length = PCIO_SIZE, | ||
| 189 | .type = MT_DEVICE, | ||
| 190 | }, { | ||
| 191 | .virtual = PCIMEM_BASE, | ||
| 192 | .pfn = __phys_to_pfn(DC21285_PCI_MEM), | ||
| 193 | .length = PCIMEM_SIZE, | ||
| 194 | .type = MT_DEVICE, | ||
| 195 | }, | ||
| 196 | #endif | ||
| 197 | }; | ||
| 198 | |||
| 199 | void __init footbridge_map_io(void) | 180 | void __init footbridge_map_io(void) |
| 200 | { | 181 | { |
| 201 | /* | 182 | /* |
| @@ -208,8 +189,6 @@ void __init footbridge_map_io(void) | |||
| 208 | * Now, work out what we've got to map in addition on this | 189 | * Now, work out what we've got to map in addition on this |
| 209 | * platform. | 190 | * platform. |
| 210 | */ | 191 | */ |
| 211 | if (machine_is_co285()) | ||
| 212 | iotable_init(co285_io_desc, ARRAY_SIZE(co285_io_desc)); | ||
| 213 | if (footbridge_cfn_mode()) | 192 | if (footbridge_cfn_mode()) |
| 214 | iotable_init(ebsa285_host_io_desc, ARRAY_SIZE(ebsa285_host_io_desc)); | 193 | iotable_init(ebsa285_host_io_desc, ARRAY_SIZE(ebsa285_host_io_desc)); |
| 215 | } | 194 | } |
diff --git a/arch/arm/mach-footbridge/ebsa285-leds.c b/arch/arm/mach-footbridge/ebsa285-leds.c index a64e22226515..09c1fbc51876 100644 --- a/arch/arm/mach-footbridge/ebsa285-leds.c +++ b/arch/arm/mach-footbridge/ebsa285-leds.c | |||
| @@ -128,7 +128,7 @@ static void ebsa285_leds_event(led_event_t evt) | |||
| 128 | 128 | ||
| 129 | static int __init leds_init(void) | 129 | static int __init leds_init(void) |
| 130 | { | 130 | { |
| 131 | if (machine_is_ebsa285() || machine_is_co285()) | 131 | if (machine_is_ebsa285()) |
| 132 | leds_event = ebsa285_leds_event; | 132 | leds_event = ebsa285_leds_event; |
| 133 | 133 | ||
| 134 | leds_event(led_start); | 134 | leds_event(led_start); |
diff --git a/arch/arm/mach-footbridge/time.c b/arch/arm/mach-footbridge/time.c index 5d02e95dede3..d5cfcda385d6 100644 --- a/arch/arm/mach-footbridge/time.c +++ b/arch/arm/mach-footbridge/time.c | |||
| @@ -115,8 +115,7 @@ static int set_isa_cmos_time(void) | |||
| 115 | 115 | ||
| 116 | void __init isa_rtc_init(void) | 116 | void __init isa_rtc_init(void) |
| 117 | { | 117 | { |
| 118 | if (machine_is_co285() || | 118 | if (machine_is_personal_server()) |
| 119 | machine_is_personal_server()) | ||
| 120 | /* | 119 | /* |
| 121 | * Add-in 21285s shouldn't access the RTC | 120 | * Add-in 21285s shouldn't access the RTC |
| 122 | */ | 121 | */ |
diff --git a/arch/arm/mach-imx/dma.c b/arch/arm/mach-imx/dma.c index a59ff2987cb7..ee1c6f06ff64 100644 --- a/arch/arm/mach-imx/dma.c +++ b/arch/arm/mach-imx/dma.c | |||
| @@ -410,7 +410,6 @@ void imx_dma_free(imx_dmach_t dma_ch) | |||
| 410 | 410 | ||
| 411 | /** | 411 | /** |
| 412 | * imx_dma_request_by_prio - find and request some of free channels best suiting requested priority | 412 | * imx_dma_request_by_prio - find and request some of free channels best suiting requested priority |
| 413 | * @dma_ch: i.MX DMA channel number | ||
| 414 | * @name: the driver/caller own non-%NULL identification | 413 | * @name: the driver/caller own non-%NULL identification |
| 415 | * @prio: one of the hardware distinguished priority level: | 414 | * @prio: one of the hardware distinguished priority level: |
| 416 | * %DMA_PRIO_HIGH, %DMA_PRIO_MEDIUM, %DMA_PRIO_LOW | 415 | * %DMA_PRIO_HIGH, %DMA_PRIO_MEDIUM, %DMA_PRIO_LOW |
| @@ -420,11 +419,9 @@ void imx_dma_free(imx_dmach_t dma_ch) | |||
| 420 | * in the higher and then even lower priority groups. | 419 | * in the higher and then even lower priority groups. |
| 421 | * | 420 | * |
| 422 | * Return value: If there is no free channel to allocate, -%ENODEV is returned. | 421 | * Return value: If there is no free channel to allocate, -%ENODEV is returned. |
| 423 | * Zero value indicates successful channel allocation. | 422 | * On successful allocation channel is returned. |
| 424 | */ | 423 | */ |
| 425 | int | 424 | imx_dmach_t imx_dma_request_by_prio(const char *name, imx_dma_prio prio) |
| 426 | imx_dma_request_by_prio(imx_dmach_t * pdma_ch, const char *name, | ||
| 427 | imx_dma_prio prio) | ||
| 428 | { | 425 | { |
| 429 | int i; | 426 | int i; |
| 430 | int best; | 427 | int best; |
| @@ -444,15 +441,13 @@ imx_dma_request_by_prio(imx_dmach_t * pdma_ch, const char *name, | |||
| 444 | 441 | ||
| 445 | for (i = best; i < IMX_DMA_CHANNELS; i++) { | 442 | for (i = best; i < IMX_DMA_CHANNELS; i++) { |
| 446 | if (!imx_dma_request(i, name)) { | 443 | if (!imx_dma_request(i, name)) { |
| 447 | *pdma_ch = i; | 444 | return i; |
| 448 | return 0; | ||
| 449 | } | 445 | } |
| 450 | } | 446 | } |
| 451 | 447 | ||
| 452 | for (i = best - 1; i >= 0; i--) { | 448 | for (i = best - 1; i >= 0; i--) { |
| 453 | if (!imx_dma_request(i, name)) { | 449 | if (!imx_dma_request(i, name)) { |
| 454 | *pdma_ch = i; | 450 | return i; |
| 455 | return 0; | ||
| 456 | } | 451 | } |
| 457 | } | 452 | } |
| 458 | 453 | ||
diff --git a/arch/arm/mach-integrator/Makefile b/arch/arm/mach-integrator/Makefile index 158daaf9e3b0..6a5ef8d30b10 100644 --- a/arch/arm/mach-integrator/Makefile +++ b/arch/arm/mach-integrator/Makefile | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | # Object file lists. | 5 | # Object file lists. |
| 6 | 6 | ||
| 7 | obj-y := clock.o core.o lm.o time.o | 7 | obj-y := clock.o core.o lm.o |
| 8 | obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o | 8 | obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o |
| 9 | obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o | 9 | obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o |
| 10 | 10 | ||
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index 92d79fb39311..62e653a3ea1a 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
| @@ -369,7 +369,8 @@ static int impd1_probe(struct lm_device *dev) | |||
| 369 | 369 | ||
| 370 | lm_set_drvdata(dev, impd1); | 370 | lm_set_drvdata(dev, impd1); |
| 371 | 371 | ||
| 372 | printk("IM-PD1 found at 0x%08lx\n", dev->resource.start); | 372 | printk("IM-PD1 found at 0x%08lx\n", |
| 373 | (unsigned long)dev->resource.start); | ||
| 373 | 374 | ||
| 374 | for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) { | 375 | for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++) { |
| 375 | impd1->vcos[i].owner = THIS_MODULE, | 376 | impd1->vcos[i].owner = THIS_MODULE, |
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index d55fa4e9bb43..c07f497000ca 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c | |||
| @@ -405,7 +405,6 @@ v3_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
| 405 | addr, fsr, pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255, | 405 | addr, fsr, pc, instr, __raw_readl(SC_LBFADDR), __raw_readl(SC_LBFCODE) & 255, |
| 406 | v3_readb(V3_LB_ISTAT)); | 406 | v3_readb(V3_LB_ISTAT)); |
| 407 | printk(KERN_DEBUG "%s", buf); | 407 | printk(KERN_DEBUG "%s", buf); |
| 408 | printascii(buf); | ||
| 409 | #endif | 408 | #endif |
| 410 | 409 | ||
| 411 | v3_writeb(V3_LB_ISTAT, 0); | 410 | v3_writeb(V3_LB_ISTAT, 0); |
| @@ -447,6 +446,7 @@ static irqreturn_t v3_irq(int dummy, void *devid) | |||
| 447 | unsigned long pc = instruction_pointer(regs); | 446 | unsigned long pc = instruction_pointer(regs); |
| 448 | unsigned long instr = *(unsigned long *)pc; | 447 | unsigned long instr = *(unsigned long *)pc; |
| 449 | char buf[128]; | 448 | char buf[128]; |
| 449 | extern void printascii(const char *); | ||
| 450 | 450 | ||
| 451 | sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x " | 451 | sprintf(buf, "V3 int %d: pc=0x%08lx [%08lx] LBFADDR=%08x LBFCODE=%02x " |
| 452 | "ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr, | 452 | "ISTAT=%02x\n", IRQ_AP_V3INT, pc, instr, |
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c deleted file mode 100644 index 8508a0db3eaf..000000000000 --- a/arch/arm/mach-integrator/time.c +++ /dev/null | |||
| @@ -1,223 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-integrator/time.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2000-2001 Deep Blue Solutions Ltd. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | #include <linux/module.h> | ||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/time.h> | ||
| 13 | #include <linux/mc146818rtc.h> | ||
| 14 | #include <linux/interrupt.h> | ||
| 15 | #include <linux/init.h> | ||
| 16 | #include <linux/device.h> | ||
| 17 | #include <linux/amba/bus.h> | ||
| 18 | |||
| 19 | #include <asm/hardware.h> | ||
| 20 | #include <asm/io.h> | ||
| 21 | #include <asm/uaccess.h> | ||
| 22 | #include <asm/rtc.h> | ||
| 23 | |||
| 24 | #include <asm/mach/time.h> | ||
| 25 | |||
| 26 | #define RTC_DR (0) | ||
| 27 | #define RTC_MR (4) | ||
| 28 | #define RTC_STAT (8) | ||
| 29 | #define RTC_EOI (8) | ||
| 30 | #define RTC_LR (12) | ||
| 31 | #define RTC_CR (16) | ||
| 32 | #define RTC_CR_MIE (1 << 0) | ||
| 33 | |||
| 34 | extern int (*set_rtc)(void); | ||
| 35 | static void __iomem *rtc_base; | ||
| 36 | |||
| 37 | static int integrator_set_rtc(void) | ||
| 38 | { | ||
| 39 | __raw_writel(xtime.tv_sec, rtc_base + RTC_LR); | ||
| 40 | return 1; | ||
| 41 | } | ||
| 42 | |||
| 43 | static int integrator_rtc_read_alarm(struct rtc_wkalrm *alrm) | ||
| 44 | { | ||
| 45 | rtc_time_to_tm(readl(rtc_base + RTC_MR), &alrm->time); | ||
| 46 | return 0; | ||
| 47 | } | ||
| 48 | |||
| 49 | static inline int integrator_rtc_set_alarm(struct rtc_wkalrm *alrm) | ||
| 50 | { | ||
| 51 | unsigned long time; | ||
| 52 | int ret; | ||
| 53 | |||
| 54 | /* | ||
| 55 | * At the moment, we can only deal with non-wildcarded alarm times. | ||
| 56 | */ | ||
| 57 | ret = rtc_valid_tm(&alrm->time); | ||
| 58 | if (ret == 0) | ||
| 59 | ret = rtc_tm_to_time(&alrm->time, &time); | ||
| 60 | if (ret == 0) | ||
| 61 | writel(time, rtc_base + RTC_MR); | ||
| 62 | return ret; | ||
| 63 | } | ||
| 64 | |||
| 65 | static int integrator_rtc_read_time(struct rtc_time *tm) | ||
| 66 | { | ||
| 67 | rtc_time_to_tm(readl(rtc_base + RTC_DR), tm); | ||
| 68 | return 0; | ||
| 69 | } | ||
| 70 | |||
| 71 | /* | ||
| 72 | * Set the RTC time. Unfortunately, we can't accurately set | ||
| 73 | * the point at which the counter updates. | ||
| 74 | * | ||
| 75 | * Also, since RTC_LR is transferred to RTC_CR on next rising | ||
| 76 | * edge of the 1Hz clock, we must write the time one second | ||
| 77 | * in advance. | ||
| 78 | */ | ||
| 79 | static inline int integrator_rtc_set_time(struct rtc_time *tm) | ||
| 80 | { | ||
| 81 | unsigned long time; | ||
| 82 | int ret; | ||
| 83 | |||
| 84 | ret = rtc_tm_to_time(tm, &time); | ||
| 85 | if (ret == 0) | ||
| 86 | writel(time + 1, rtc_base + RTC_LR); | ||
| 87 | |||
| 88 | return ret; | ||
| 89 | } | ||
| 90 | |||
| 91 | static struct rtc_ops rtc_ops = { | ||
| 92 | .owner = THIS_MODULE, | ||
| 93 | .read_time = integrator_rtc_read_time, | ||
| 94 | .set_time = integrator_rtc_set_time, | ||
| 95 | .read_alarm = integrator_rtc_read_alarm, | ||
| 96 | .set_alarm = integrator_rtc_set_alarm, | ||
| 97 | }; | ||
| 98 | |||
| 99 | static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id) | ||
| 100 | { | ||
| 101 | writel(0, rtc_base + RTC_EOI); | ||
| 102 | return IRQ_HANDLED; | ||
| 103 | } | ||
| 104 | |||
| 105 | static int rtc_probe(struct amba_device *dev, void *id) | ||
| 106 | { | ||
| 107 | int ret; | ||
| 108 | |||
| 109 | if (rtc_base) | ||
| 110 | return -EBUSY; | ||
| 111 | |||
| 112 | ret = amba_request_regions(dev, NULL); | ||
| 113 | if (ret) | ||
| 114 | goto out; | ||
| 115 | |||
| 116 | rtc_base = ioremap(dev->res.start, SZ_4K); | ||
| 117 | if (!rtc_base) { | ||
| 118 | ret = -ENOMEM; | ||
| 119 | goto res_out; | ||
| 120 | } | ||
| 121 | |||
| 122 | __raw_writel(0, rtc_base + RTC_CR); | ||
| 123 | __raw_writel(0, rtc_base + RTC_EOI); | ||
| 124 | |||
| 125 | xtime.tv_sec = __raw_readl(rtc_base + RTC_DR); | ||
| 126 | |||
| 127 | /* note that 'dev' is merely used for irq disambiguation; | ||
| 128 | * it is not actually referenced in the irq handler | ||
| 129 | */ | ||
| 130 | ret = request_irq(dev->irq[0], arm_rtc_interrupt, IRQF_DISABLED, | ||
| 131 | "rtc-pl030", dev); | ||
| 132 | if (ret) | ||
| 133 | goto map_out; | ||
| 134 | |||
| 135 | ret = register_rtc(&rtc_ops); | ||
| 136 | if (ret) | ||
| 137 | goto irq_out; | ||
| 138 | |||
| 139 | set_rtc = integrator_set_rtc; | ||
| 140 | return 0; | ||
| 141 | |||
| 142 | irq_out: | ||
| 143 | free_irq(dev->irq[0], dev); | ||
| 144 | map_out: | ||
| 145 | iounmap(rtc_base); | ||
| 146 | rtc_base = NULL; | ||
| 147 | res_out: | ||
| 148 | amba_release_regions(dev); | ||
| 149 | out: | ||
| 150 | return ret; | ||
| 151 | } | ||
| 152 | |||
| 153 | static int rtc_remove(struct amba_device *dev) | ||
| 154 | { | ||
| 155 | set_rtc = NULL; | ||
| 156 | |||
| 157 | writel(0, rtc_base + RTC_CR); | ||
| 158 | |||
| 159 | free_irq(dev->irq[0], dev); | ||
| 160 | unregister_rtc(&rtc_ops); | ||
| 161 | |||
| 162 | iounmap(rtc_base); | ||
| 163 | rtc_base = NULL; | ||
| 164 | amba_release_regions(dev); | ||
| 165 | |||
| 166 | return 0; | ||
| 167 | } | ||
| 168 | |||
| 169 | static struct timespec rtc_delta; | ||
| 170 | |||
| 171 | static int rtc_suspend(struct amba_device *dev, pm_message_t state) | ||
| 172 | { | ||
| 173 | struct timespec rtc; | ||
| 174 | |||
| 175 | rtc.tv_sec = readl(rtc_base + RTC_DR); | ||
| 176 | rtc.tv_nsec = 0; | ||
| 177 | save_time_delta(&rtc_delta, &rtc); | ||
| 178 | |||
| 179 | return 0; | ||
| 180 | } | ||
| 181 | |||
| 182 | static int rtc_resume(struct amba_device *dev) | ||
| 183 | { | ||
| 184 | struct timespec rtc; | ||
| 185 | |||
| 186 | rtc.tv_sec = readl(rtc_base + RTC_DR); | ||
| 187 | rtc.tv_nsec = 0; | ||
| 188 | restore_time_delta(&rtc_delta, &rtc); | ||
| 189 | |||
| 190 | return 0; | ||
| 191 | } | ||
| 192 | |||
| 193 | static struct amba_id rtc_ids[] = { | ||
| 194 | { | ||
| 195 | .id = 0x00041030, | ||
| 196 | .mask = 0x000fffff, | ||
| 197 | }, | ||
| 198 | { 0, 0 }, | ||
| 199 | }; | ||
| 200 | |||
| 201 | static struct amba_driver rtc_driver = { | ||
| 202 | .drv = { | ||
| 203 | .name = "rtc-pl030", | ||
| 204 | }, | ||
| 205 | .probe = rtc_probe, | ||
| 206 | .remove = rtc_remove, | ||
| 207 | .suspend = rtc_suspend, | ||
| 208 | .resume = rtc_resume, | ||
| 209 | .id_table = rtc_ids, | ||
| 210 | }; | ||
| 211 | |||
| 212 | static int __init integrator_rtc_init(void) | ||
| 213 | { | ||
| 214 | return amba_driver_register(&rtc_driver); | ||
| 215 | } | ||
| 216 | |||
| 217 | static void __exit integrator_rtc_exit(void) | ||
| 218 | { | ||
| 219 | amba_driver_unregister(&rtc_driver); | ||
| 220 | } | ||
| 221 | |||
| 222 | module_init(integrator_rtc_init); | ||
| 223 | module_exit(integrator_rtc_exit); | ||
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index e774447c0592..db8b5fe06c0d 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig | |||
| @@ -125,6 +125,15 @@ config ARCH_IXDP4XX | |||
| 125 | depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 | 125 | depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 |
| 126 | default y | 126 | default y |
| 127 | 127 | ||
| 128 | config MACH_FSG | ||
| 129 | bool | ||
| 130 | prompt "Freecom FSG-3" | ||
| 131 | select PCI | ||
| 132 | help | ||
| 133 | Say 'Y' here if you want your kernel to support Freecom's | ||
| 134 | FSG-3 device. For more information on this platform, | ||
| 135 | see http://www.nslu2-linux.org/wiki/FSG3/HomePage | ||
| 136 | |||
| 128 | # | 137 | # |
| 129 | # Certain registers and IRQs are only enabled if supporting IXP465 CPUs | 138 | # Certain registers and IRQs are only enabled if supporting IXP465 CPUs |
| 130 | # | 139 | # |
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile index c1956882c48b..2e6bbf927a74 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile | |||
| @@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o | |||
| 15 | obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o | 15 | obj-pci-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o |
| 16 | obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o | 16 | obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o |
| 17 | obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o | 17 | obj-pci-$(CONFIG_MACH_WG302V2) += wg302v2-pci.o |
| 18 | obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o | ||
| 18 | 19 | ||
| 19 | obj-y += common.o | 20 | obj-y += common.o |
| 20 | 21 | ||
| @@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o | |||
| 28 | obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o | 29 | obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o |
| 29 | obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o | 30 | obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o |
| 30 | obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o | 31 | obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o |
| 32 | obj-$(CONFIG_MACH_FSG) += fsg-setup.o | ||
| 31 | 33 | ||
| 32 | obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o | 34 | obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o |
| 33 | obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o | 35 | obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o |
diff --git a/arch/arm/mach-ixp4xx/fsg-pci.c b/arch/arm/mach-ixp4xx/fsg-pci.c new file mode 100644 index 000000000000..f19f3f6feda1 --- /dev/null +++ b/arch/arm/mach-ixp4xx/fsg-pci.c | |||
| @@ -0,0 +1,71 @@ | |||
| 1 | /* | ||
| 2 | * arch/arch/mach-ixp4xx/fsg-pci.c | ||
| 3 | * | ||
| 4 | * FSG board-level PCI initialization | ||
| 5 | * | ||
| 6 | * Author: Rod Whitby <rod@whitby.id.au> | ||
| 7 | * Maintainer: http://www.nslu2-linux.org/ | ||
| 8 | * | ||
| 9 | * based on ixdp425-pci.c: | ||
| 10 | * Copyright (C) 2002 Intel Corporation. | ||
| 11 | * Copyright (C) 2003-2004 MontaVista Software, Inc. | ||
| 12 | * | ||
| 13 | * This program is free software; you can redistribute it and/or modify | ||
| 14 | * it under the terms of the GNU General Public License version 2 as | ||
| 15 | * published by the Free Software Foundation. | ||
| 16 | * | ||
| 17 | */ | ||
| 18 | |||
| 19 | #include <linux/pci.h> | ||
| 20 | #include <linux/init.h> | ||
| 21 | #include <linux/irq.h> | ||
| 22 | |||
| 23 | #include <asm/mach/pci.h> | ||
| 24 | #include <asm/mach-types.h> | ||
| 25 | |||
| 26 | void __init fsg_pci_preinit(void) | ||
| 27 | { | ||
| 28 | set_irq_type(IRQ_FSG_PCI_INTA, IRQT_LOW); | ||
| 29 | set_irq_type(IRQ_FSG_PCI_INTB, IRQT_LOW); | ||
| 30 | set_irq_type(IRQ_FSG_PCI_INTC, IRQT_LOW); | ||
| 31 | |||
| 32 | ixp4xx_pci_preinit(); | ||
| 33 | } | ||
| 34 | |||
| 35 | static int __init fsg_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 36 | { | ||
| 37 | static int pci_irq_table[FSG_PCI_IRQ_LINES] = { | ||
| 38 | IRQ_FSG_PCI_INTC, | ||
| 39 | IRQ_FSG_PCI_INTB, | ||
| 40 | IRQ_FSG_PCI_INTA, | ||
| 41 | }; | ||
| 42 | |||
| 43 | int irq = -1; | ||
| 44 | slot = slot - 11; | ||
| 45 | |||
| 46 | if (slot >= 1 && slot <= FSG_PCI_MAX_DEV && | ||
| 47 | pin >= 1 && pin <= FSG_PCI_IRQ_LINES) | ||
| 48 | irq = pci_irq_table[(slot - 1)]; | ||
| 49 | printk(KERN_INFO "%s: Mapped slot %d pin %d to IRQ %d\n", | ||
| 50 | __func__, slot, pin, irq); | ||
| 51 | |||
| 52 | return irq; | ||
| 53 | } | ||
| 54 | |||
| 55 | struct hw_pci fsg_pci __initdata = { | ||
| 56 | .nr_controllers = 1, | ||
| 57 | .preinit = fsg_pci_preinit, | ||
| 58 | .swizzle = pci_std_swizzle, | ||
| 59 | .setup = ixp4xx_setup, | ||
| 60 | .scan = ixp4xx_scan_bus, | ||
| 61 | .map_irq = fsg_map_irq, | ||
| 62 | }; | ||
| 63 | |||
| 64 | int __init fsg_pci_init(void) | ||
| 65 | { | ||
| 66 | if (machine_is_fsg()) | ||
| 67 | pci_common_init(&fsg_pci); | ||
| 68 | return 0; | ||
| 69 | } | ||
| 70 | |||
| 71 | subsys_initcall(fsg_pci_init); | ||
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c new file mode 100644 index 000000000000..0db3a909ae61 --- /dev/null +++ b/arch/arm/mach-ixp4xx/fsg-setup.c | |||
| @@ -0,0 +1,276 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ixp4xx/fsg-setup.c | ||
| 3 | * | ||
| 4 | * FSG board-setup | ||
| 5 | * | ||
| 6 | * Copyright (C) 2008 Rod Whitby <rod@whitby.id.au> | ||
| 7 | * | ||
| 8 | * based on ixdp425-setup.c: | ||
| 9 | * Copyright (C) 2003-2004 MontaVista Software, Inc. | ||
| 10 | * based on nslu2-power.c | ||
| 11 | * Copyright (C) 2005 Tower Technologies | ||
| 12 | * | ||
| 13 | * Author: Rod Whitby <rod@whitby.id.au> | ||
| 14 | * Maintainers: http://www.nslu2-linux.org/ | ||
| 15 | * | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/if_ether.h> | ||
| 19 | #include <linux/irq.h> | ||
| 20 | #include <linux/serial.h> | ||
| 21 | #include <linux/serial_8250.h> | ||
| 22 | #include <linux/leds.h> | ||
| 23 | #include <linux/reboot.h> | ||
| 24 | #include <linux/i2c.h> | ||
| 25 | #include <linux/i2c-gpio.h> | ||
| 26 | |||
| 27 | #include <asm/mach-types.h> | ||
| 28 | #include <asm/mach/arch.h> | ||
| 29 | #include <asm/mach/flash.h> | ||
| 30 | #include <asm/io.h> | ||
| 31 | #include <asm/gpio.h> | ||
| 32 | |||
| 33 | static struct flash_platform_data fsg_flash_data = { | ||
| 34 | .map_name = "cfi_probe", | ||
| 35 | .width = 2, | ||
| 36 | }; | ||
| 37 | |||
| 38 | static struct resource fsg_flash_resource = { | ||
| 39 | .flags = IORESOURCE_MEM, | ||
| 40 | }; | ||
| 41 | |||
| 42 | static struct platform_device fsg_flash = { | ||
| 43 | .name = "IXP4XX-Flash", | ||
| 44 | .id = 0, | ||
| 45 | .dev = { | ||
| 46 | .platform_data = &fsg_flash_data, | ||
| 47 | }, | ||
| 48 | .num_resources = 1, | ||
| 49 | .resource = &fsg_flash_resource, | ||
| 50 | }; | ||
| 51 | |||
| 52 | static struct i2c_gpio_platform_data fsg_i2c_gpio_data = { | ||
| 53 | .sda_pin = FSG_SDA_PIN, | ||
| 54 | .scl_pin = FSG_SCL_PIN, | ||
| 55 | }; | ||
| 56 | |||
| 57 | static struct platform_device fsg_i2c_gpio = { | ||
| 58 | .name = "i2c-gpio", | ||
| 59 | .id = 0, | ||
| 60 | .dev = { | ||
| 61 | .platform_data = &fsg_i2c_gpio_data, | ||
| 62 | }, | ||
| 63 | }; | ||
| 64 | |||
| 65 | static struct i2c_board_info __initdata fsg_i2c_board_info [] = { | ||
| 66 | { | ||
| 67 | I2C_BOARD_INFO("rtc-isl1208", 0x6f), | ||
| 68 | }, | ||
| 69 | }; | ||
| 70 | |||
| 71 | static struct resource fsg_uart_resources[] = { | ||
| 72 | { | ||
| 73 | .start = IXP4XX_UART1_BASE_PHYS, | ||
| 74 | .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, | ||
| 75 | .flags = IORESOURCE_MEM, | ||
| 76 | }, | ||
| 77 | { | ||
| 78 | .start = IXP4XX_UART2_BASE_PHYS, | ||
| 79 | .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, | ||
| 80 | .flags = IORESOURCE_MEM, | ||
| 81 | } | ||
| 82 | }; | ||
| 83 | |||
| 84 | static struct plat_serial8250_port fsg_uart_data[] = { | ||
| 85 | { | ||
| 86 | .mapbase = IXP4XX_UART1_BASE_PHYS, | ||
| 87 | .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, | ||
| 88 | .irq = IRQ_IXP4XX_UART1, | ||
| 89 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, | ||
| 90 | .iotype = UPIO_MEM, | ||
| 91 | .regshift = 2, | ||
| 92 | .uartclk = IXP4XX_UART_XTAL, | ||
| 93 | }, | ||
| 94 | { | ||
| 95 | .mapbase = IXP4XX_UART2_BASE_PHYS, | ||
| 96 | .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, | ||
| 97 | .irq = IRQ_IXP4XX_UART2, | ||
| 98 | .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, | ||
| 99 | .iotype = UPIO_MEM, | ||
| 100 | .regshift = 2, | ||
| 101 | .uartclk = IXP4XX_UART_XTAL, | ||
| 102 | }, | ||
| 103 | { } | ||
| 104 | }; | ||
| 105 | |||
| 106 | static struct platform_device fsg_uart = { | ||
| 107 | .name = "serial8250", | ||
| 108 | .id = PLAT8250_DEV_PLATFORM, | ||
| 109 | .dev = { | ||
| 110 | .platform_data = fsg_uart_data, | ||
| 111 | }, | ||
| 112 | .num_resources = ARRAY_SIZE(fsg_uart_resources), | ||
| 113 | .resource = fsg_uart_resources, | ||
| 114 | }; | ||
| 115 | |||
| 116 | static struct platform_device fsg_leds = { | ||
| 117 | .name = "fsg-led", | ||
| 118 | .id = -1, | ||
| 119 | }; | ||
| 120 | |||
| 121 | /* Built-in 10/100 Ethernet MAC interfaces */ | ||
| 122 | static struct eth_plat_info fsg_plat_eth[] = { | ||
| 123 | { | ||
| 124 | .phy = 5, | ||
| 125 | .rxq = 3, | ||
| 126 | .txreadyq = 20, | ||
| 127 | }, { | ||
| 128 | .phy = 4, | ||
| 129 | .rxq = 4, | ||
| 130 | .txreadyq = 21, | ||
| 131 | } | ||
| 132 | }; | ||
| 133 | |||
| 134 | static struct platform_device fsg_eth[] = { | ||
| 135 | { | ||
| 136 | .name = "ixp4xx_eth", | ||
| 137 | .id = IXP4XX_ETH_NPEB, | ||
| 138 | .dev = { | ||
| 139 | .platform_data = fsg_plat_eth, | ||
| 140 | }, | ||
| 141 | }, { | ||
| 142 | .name = "ixp4xx_eth", | ||
| 143 | .id = IXP4XX_ETH_NPEC, | ||
| 144 | .dev = { | ||
| 145 | .platform_data = fsg_plat_eth + 1, | ||
| 146 | }, | ||
| 147 | } | ||
| 148 | }; | ||
| 149 | |||
| 150 | static struct platform_device *fsg_devices[] __initdata = { | ||
| 151 | &fsg_i2c_gpio, | ||
| 152 | &fsg_flash, | ||
| 153 | &fsg_leds, | ||
| 154 | &fsg_eth[0], | ||
| 155 | &fsg_eth[1], | ||
| 156 | }; | ||
| 157 | |||
| 158 | static irqreturn_t fsg_power_handler(int irq, void *dev_id) | ||
| 159 | { | ||
| 160 | /* Signal init to do the ctrlaltdel action, this will bypass init if | ||
| 161 | * it hasn't started and do a kernel_restart. | ||
| 162 | */ | ||
| 163 | ctrl_alt_del(); | ||
| 164 | |||
| 165 | return IRQ_HANDLED; | ||
| 166 | } | ||
| 167 | |||
| 168 | static irqreturn_t fsg_reset_handler(int irq, void *dev_id) | ||
| 169 | { | ||
| 170 | /* This is the paper-clip reset which does an emergency reboot. */ | ||
| 171 | printk(KERN_INFO "Restarting system.\n"); | ||
| 172 | machine_restart(NULL); | ||
| 173 | |||
| 174 | /* This should never be reached. */ | ||
| 175 | return IRQ_HANDLED; | ||
| 176 | } | ||
| 177 | |||
| 178 | static void __init fsg_init(void) | ||
| 179 | { | ||
| 180 | DECLARE_MAC_BUF(mac_buf); | ||
| 181 | uint8_t __iomem *f; | ||
| 182 | int i; | ||
| 183 | |||
| 184 | ixp4xx_sys_init(); | ||
| 185 | |||
| 186 | fsg_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); | ||
| 187 | fsg_flash_resource.end = | ||
| 188 | IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; | ||
| 189 | |||
| 190 | *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; | ||
| 191 | *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; | ||
| 192 | |||
| 193 | /* Configure CS2 for operation, 8bit and writable */ | ||
| 194 | *IXP4XX_EXP_CS2 = 0xbfff0002; | ||
| 195 | |||
| 196 | i2c_register_board_info(0, fsg_i2c_board_info, | ||
| 197 | ARRAY_SIZE(fsg_i2c_board_info)); | ||
| 198 | |||
| 199 | /* This is only useful on a modified machine, but it is valuable | ||
| 200 | * to have it first in order to see debug messages, and so that | ||
| 201 | * it does *not* get removed if platform_add_devices fails! | ||
| 202 | */ | ||
| 203 | (void)platform_device_register(&fsg_uart); | ||
| 204 | |||
| 205 | platform_add_devices(fsg_devices, ARRAY_SIZE(fsg_devices)); | ||
| 206 | |||
| 207 | if (request_irq(gpio_to_irq(FSG_RB_GPIO), &fsg_reset_handler, | ||
| 208 | IRQF_DISABLED | IRQF_TRIGGER_LOW, | ||
| 209 | "FSG reset button", NULL) < 0) { | ||
| 210 | |||
| 211 | printk(KERN_DEBUG "Reset Button IRQ %d not available\n", | ||
| 212 | gpio_to_irq(FSG_RB_GPIO)); | ||
| 213 | } | ||
| 214 | |||
| 215 | if (request_irq(gpio_to_irq(FSG_SB_GPIO), &fsg_power_handler, | ||
| 216 | IRQF_DISABLED | IRQF_TRIGGER_LOW, | ||
| 217 | "FSG power button", NULL) < 0) { | ||
| 218 | |||
| 219 | printk(KERN_DEBUG "Power Button IRQ %d not available\n", | ||
| 220 | gpio_to_irq(FSG_SB_GPIO)); | ||
| 221 | } | ||
| 222 | |||
| 223 | /* | ||
| 224 | * Map in a portion of the flash and read the MAC addresses. | ||
| 225 | * Since it is stored in BE in the flash itself, we need to | ||
| 226 | * byteswap it if we're in LE mode. | ||
| 227 | */ | ||
| 228 | f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x400000); | ||
| 229 | if (f) { | ||
| 230 | #ifdef __ARMEB__ | ||
| 231 | for (i = 0; i < 6; i++) { | ||
| 232 | fsg_plat_eth[0].hwaddr[i] = readb(f + 0x3C0422 + i); | ||
| 233 | fsg_plat_eth[1].hwaddr[i] = readb(f + 0x3C043B + i); | ||
| 234 | } | ||
| 235 | #else | ||
| 236 | |||
| 237 | /* | ||
| 238 | Endian-swapped reads from unaligned addresses are | ||
| 239 | required to extract the two MACs from the big-endian | ||
| 240 | Redboot config area in flash. | ||
| 241 | */ | ||
| 242 | |||
| 243 | fsg_plat_eth[0].hwaddr[0] = readb(f + 0x3C0421); | ||
| 244 | fsg_plat_eth[0].hwaddr[1] = readb(f + 0x3C0420); | ||
| 245 | fsg_plat_eth[0].hwaddr[2] = readb(f + 0x3C0427); | ||
| 246 | fsg_plat_eth[0].hwaddr[3] = readb(f + 0x3C0426); | ||
| 247 | fsg_plat_eth[0].hwaddr[4] = readb(f + 0x3C0425); | ||
| 248 | fsg_plat_eth[0].hwaddr[5] = readb(f + 0x3C0424); | ||
| 249 | |||
| 250 | fsg_plat_eth[1].hwaddr[0] = readb(f + 0x3C0439); | ||
| 251 | fsg_plat_eth[1].hwaddr[1] = readb(f + 0x3C043F); | ||
| 252 | fsg_plat_eth[1].hwaddr[2] = readb(f + 0x3C043E); | ||
| 253 | fsg_plat_eth[1].hwaddr[3] = readb(f + 0x3C043D); | ||
| 254 | fsg_plat_eth[1].hwaddr[4] = readb(f + 0x3C043C); | ||
| 255 | fsg_plat_eth[1].hwaddr[5] = readb(f + 0x3C0443); | ||
| 256 | #endif | ||
| 257 | iounmap(f); | ||
| 258 | } | ||
| 259 | printk(KERN_INFO "FSG: Using MAC address %s for port 0\n", | ||
| 260 | print_mac(mac_buf, fsg_plat_eth[0].hwaddr)); | ||
| 261 | printk(KERN_INFO "FSG: Using MAC address %s for port 1\n", | ||
| 262 | print_mac(mac_buf, fsg_plat_eth[1].hwaddr)); | ||
| 263 | |||
| 264 | } | ||
| 265 | |||
| 266 | MACHINE_START(FSG, "Freecom FSG-3") | ||
| 267 | /* Maintainer: www.nslu2-linux.org */ | ||
| 268 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, | ||
| 269 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, | ||
| 270 | .map_io = ixp4xx_map_io, | ||
| 271 | .init_irq = ixp4xx_init_irq, | ||
| 272 | .timer = &ixp4xx_timer, | ||
| 273 | .boot_params = 0x0100, | ||
| 274 | .init_machine = fsg_init, | ||
| 275 | MACHINE_END | ||
| 276 | |||
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig new file mode 100644 index 000000000000..3600cd9f0519 --- /dev/null +++ b/arch/arm/mach-kirkwood/Kconfig | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | if ARCH_KIRKWOOD | ||
| 2 | |||
| 3 | menu "Marvell Kirkwood Implementations" | ||
| 4 | |||
| 5 | config MACH_DB88F6281_BP | ||
| 6 | bool "Marvell DB-88F6281-BP Development Board" | ||
| 7 | help | ||
| 8 | Say 'Y' here if you want your kernel to support the | ||
| 9 | Marvell DB-88F6281-BP Development Board. | ||
| 10 | |||
| 11 | config MACH_RD88F6192_NAS | ||
| 12 | bool "Marvell RD-88F6192-NAS Reference Board" | ||
| 13 | help | ||
| 14 | Say 'Y' here if you want your kernel to support the | ||
| 15 | Marvell RD-88F6192-NAS Reference Board. | ||
| 16 | |||
| 17 | config MACH_RD88F6281 | ||
| 18 | bool "Marvell RD-88F6281 Reference Board" | ||
| 19 | help | ||
| 20 | Say 'Y' here if you want your kernel to support the | ||
| 21 | Marvell RD-88F6281 Reference Board. | ||
| 22 | |||
| 23 | endmenu | ||
| 24 | |||
| 25 | endif | ||
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile new file mode 100644 index 000000000000..e14bf40bfb07 --- /dev/null +++ b/arch/arm/mach-kirkwood/Makefile | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | obj-y += common.o addr-map.o irq.o pcie.o | ||
| 2 | |||
| 3 | obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o | ||
| 4 | obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o | ||
| 5 | obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6281-setup.o | ||
diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot new file mode 100644 index 000000000000..67039c3e0c48 --- /dev/null +++ b/arch/arm/mach-kirkwood/Makefile.boot | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | zreladdr-y := 0x00008000 | ||
| 2 | params_phys-y := 0x00000100 | ||
| 3 | initrd_phys-y := 0x00800000 | ||
diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c new file mode 100644 index 000000000000..a39f0f3c4730 --- /dev/null +++ b/arch/arm/mach-kirkwood/addr-map.c | |||
| @@ -0,0 +1,139 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/addr-map.c | ||
| 3 | * | ||
| 4 | * Address map functions for Marvell Kirkwood SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/mbus.h> | ||
| 14 | #include <linux/io.h> | ||
| 15 | #include <asm/hardware.h> | ||
| 16 | #include "common.h" | ||
| 17 | |||
| 18 | /* | ||
| 19 | * Generic Address Decode Windows bit settings | ||
| 20 | */ | ||
| 21 | #define TARGET_DDR 0 | ||
| 22 | #define TARGET_DEV_BUS 1 | ||
| 23 | #define TARGET_PCIE 4 | ||
| 24 | #define ATTR_DEV_SPI_ROM 0x1e | ||
| 25 | #define ATTR_DEV_BOOT 0x1d | ||
| 26 | #define ATTR_DEV_NAND 0x2f | ||
| 27 | #define ATTR_DEV_CS3 0x37 | ||
| 28 | #define ATTR_DEV_CS2 0x3b | ||
| 29 | #define ATTR_DEV_CS1 0x3d | ||
| 30 | #define ATTR_DEV_CS0 0x3e | ||
| 31 | #define ATTR_PCIE_IO 0xe0 | ||
| 32 | #define ATTR_PCIE_MEM 0xe8 | ||
| 33 | |||
| 34 | /* | ||
| 35 | * Helpers to get DDR bank info | ||
| 36 | */ | ||
| 37 | #define DDR_BASE_CS_OFF(n) (0x0000 + ((n) << 3)) | ||
| 38 | #define DDR_SIZE_CS_OFF(n) (0x0004 + ((n) << 3)) | ||
| 39 | |||
| 40 | /* | ||
| 41 | * CPU Address Decode Windows registers | ||
| 42 | */ | ||
| 43 | #define WIN_OFF(n) (BRIDGE_VIRT_BASE + 0x0000 + ((n) << 4)) | ||
| 44 | #define WIN_CTRL_OFF 0x0000 | ||
| 45 | #define WIN_BASE_OFF 0x0004 | ||
| 46 | #define WIN_REMAP_LO_OFF 0x0008 | ||
| 47 | #define WIN_REMAP_HI_OFF 0x000c | ||
| 48 | |||
| 49 | |||
| 50 | struct mbus_dram_target_info kirkwood_mbus_dram_info; | ||
| 51 | |||
| 52 | static int __init cpu_win_can_remap(int win) | ||
| 53 | { | ||
| 54 | if (win < 4) | ||
| 55 | return 1; | ||
| 56 | |||
| 57 | return 0; | ||
| 58 | } | ||
| 59 | |||
| 60 | static void __init setup_cpu_win(int win, u32 base, u32 size, | ||
| 61 | u8 target, u8 attr, int remap) | ||
| 62 | { | ||
| 63 | void __iomem *addr = (void __iomem *)WIN_OFF(win); | ||
| 64 | u32 ctrl; | ||
| 65 | |||
| 66 | base &= 0xffff0000; | ||
| 67 | ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1; | ||
| 68 | |||
| 69 | writel(base, addr + WIN_BASE_OFF); | ||
| 70 | writel(ctrl, addr + WIN_CTRL_OFF); | ||
| 71 | if (cpu_win_can_remap(win)) { | ||
| 72 | if (remap < 0) | ||
| 73 | remap = base; | ||
| 74 | |||
| 75 | writel(remap & 0xffff0000, addr + WIN_REMAP_LO_OFF); | ||
| 76 | writel(0, addr + WIN_REMAP_HI_OFF); | ||
| 77 | } | ||
| 78 | } | ||
| 79 | |||
| 80 | void __init kirkwood_setup_cpu_mbus(void) | ||
| 81 | { | ||
| 82 | void __iomem *addr; | ||
| 83 | int i; | ||
| 84 | int cs; | ||
| 85 | |||
| 86 | /* | ||
| 87 | * First, disable and clear windows. | ||
| 88 | */ | ||
| 89 | for (i = 0; i < 8; i++) { | ||
| 90 | addr = (void __iomem *)WIN_OFF(i); | ||
| 91 | |||
| 92 | writel(0, addr + WIN_BASE_OFF); | ||
| 93 | writel(0, addr + WIN_CTRL_OFF); | ||
| 94 | if (cpu_win_can_remap(i)) { | ||
| 95 | writel(0, addr + WIN_REMAP_LO_OFF); | ||
| 96 | writel(0, addr + WIN_REMAP_HI_OFF); | ||
| 97 | } | ||
| 98 | } | ||
| 99 | |||
| 100 | /* | ||
| 101 | * Setup windows for PCIe IO+MEM space. | ||
| 102 | */ | ||
| 103 | setup_cpu_win(0, KIRKWOOD_PCIE_IO_PHYS_BASE, KIRKWOOD_PCIE_IO_SIZE, | ||
| 104 | TARGET_PCIE, ATTR_PCIE_IO, KIRKWOOD_PCIE_IO_BUS_BASE); | ||
| 105 | setup_cpu_win(1, KIRKWOOD_PCIE_MEM_PHYS_BASE, KIRKWOOD_PCIE_MEM_SIZE, | ||
| 106 | TARGET_PCIE, ATTR_PCIE_MEM, -1); | ||
| 107 | |||
| 108 | /* | ||
| 109 | * Setup window for NAND controller. | ||
| 110 | */ | ||
| 111 | setup_cpu_win(2, KIRKWOOD_NAND_MEM_PHYS_BASE, KIRKWOOD_NAND_MEM_SIZE, | ||
| 112 | TARGET_DEV_BUS, ATTR_DEV_NAND, -1); | ||
| 113 | |||
| 114 | /* | ||
| 115 | * Setup MBUS dram target info. | ||
| 116 | */ | ||
| 117 | kirkwood_mbus_dram_info.mbus_dram_target_id = TARGET_DDR; | ||
| 118 | |||
| 119 | addr = (void __iomem *)DDR_WINDOW_CPU_BASE; | ||
| 120 | |||
| 121 | for (i = 0, cs = 0; i < 4; i++) { | ||
| 122 | u32 base = readl(addr + DDR_BASE_CS_OFF(i)); | ||
| 123 | u32 size = readl(addr + DDR_SIZE_CS_OFF(i)); | ||
| 124 | |||
| 125 | /* | ||
| 126 | * Chip select enabled? | ||
| 127 | */ | ||
| 128 | if (size & 1) { | ||
| 129 | struct mbus_dram_window *w; | ||
| 130 | |||
| 131 | w = &kirkwood_mbus_dram_info.cs[cs++]; | ||
| 132 | w->cs_index = i; | ||
| 133 | w->mbus_attr = 0xf & ~(1 << i); | ||
| 134 | w->base = base & 0xffff0000; | ||
| 135 | w->size = (size | 0x0000ffff) + 1; | ||
| 136 | } | ||
| 137 | } | ||
| 138 | kirkwood_mbus_dram_info.num_cs = cs; | ||
| 139 | } | ||
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c new file mode 100644 index 000000000000..5938a3b33cdc --- /dev/null +++ b/arch/arm/mach-kirkwood/common.c | |||
| @@ -0,0 +1,331 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/common.c | ||
| 3 | * | ||
| 4 | * Core functions for Marvell Kirkwood SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/serial_8250.h> | ||
| 15 | #include <linux/mbus.h> | ||
| 16 | #include <linux/mv643xx_eth.h> | ||
| 17 | #include <linux/ata_platform.h> | ||
| 18 | #include <asm/page.h> | ||
| 19 | #include <asm/timex.h> | ||
| 20 | #include <asm/mach/map.h> | ||
| 21 | #include <asm/mach/time.h> | ||
| 22 | #include <asm/arch/kirkwood.h> | ||
| 23 | #include <asm/plat-orion/cache-feroceon-l2.h> | ||
| 24 | #include <asm/plat-orion/ehci-orion.h> | ||
| 25 | #include <asm/plat-orion/orion_nand.h> | ||
| 26 | #include <asm/plat-orion/time.h> | ||
| 27 | #include "common.h" | ||
| 28 | |||
| 29 | /***************************************************************************** | ||
| 30 | * I/O Address Mapping | ||
| 31 | ****************************************************************************/ | ||
| 32 | static struct map_desc kirkwood_io_desc[] __initdata = { | ||
| 33 | { | ||
| 34 | .virtual = KIRKWOOD_PCIE_IO_VIRT_BASE, | ||
| 35 | .pfn = __phys_to_pfn(KIRKWOOD_PCIE_IO_PHYS_BASE), | ||
| 36 | .length = KIRKWOOD_PCIE_IO_SIZE, | ||
| 37 | .type = MT_DEVICE, | ||
| 38 | }, { | ||
| 39 | .virtual = KIRKWOOD_REGS_VIRT_BASE, | ||
| 40 | .pfn = __phys_to_pfn(KIRKWOOD_REGS_PHYS_BASE), | ||
| 41 | .length = KIRKWOOD_REGS_SIZE, | ||
| 42 | .type = MT_DEVICE, | ||
| 43 | }, | ||
| 44 | }; | ||
| 45 | |||
| 46 | void __init kirkwood_map_io(void) | ||
| 47 | { | ||
| 48 | iotable_init(kirkwood_io_desc, ARRAY_SIZE(kirkwood_io_desc)); | ||
| 49 | } | ||
| 50 | |||
| 51 | |||
| 52 | /***************************************************************************** | ||
| 53 | * EHCI | ||
| 54 | ****************************************************************************/ | ||
| 55 | static struct orion_ehci_data kirkwood_ehci_data = { | ||
| 56 | .dram = &kirkwood_mbus_dram_info, | ||
| 57 | }; | ||
| 58 | |||
| 59 | static u64 ehci_dmamask = 0xffffffffUL; | ||
| 60 | |||
| 61 | |||
| 62 | /***************************************************************************** | ||
| 63 | * EHCI0 | ||
| 64 | ****************************************************************************/ | ||
| 65 | static struct resource kirkwood_ehci_resources[] = { | ||
| 66 | { | ||
| 67 | .start = USB_PHYS_BASE, | ||
| 68 | .end = USB_PHYS_BASE + 0x0fff, | ||
| 69 | .flags = IORESOURCE_MEM, | ||
| 70 | }, { | ||
| 71 | .start = IRQ_KIRKWOOD_USB, | ||
| 72 | .end = IRQ_KIRKWOOD_USB, | ||
| 73 | .flags = IORESOURCE_IRQ, | ||
| 74 | }, | ||
| 75 | }; | ||
| 76 | |||
| 77 | static struct platform_device kirkwood_ehci = { | ||
| 78 | .name = "orion-ehci", | ||
| 79 | .id = 0, | ||
| 80 | .dev = { | ||
| 81 | .dma_mask = &ehci_dmamask, | ||
| 82 | .coherent_dma_mask = 0xffffffff, | ||
| 83 | .platform_data = &kirkwood_ehci_data, | ||
| 84 | }, | ||
| 85 | .resource = kirkwood_ehci_resources, | ||
| 86 | .num_resources = ARRAY_SIZE(kirkwood_ehci_resources), | ||
| 87 | }; | ||
| 88 | |||
| 89 | void __init kirkwood_ehci_init(void) | ||
| 90 | { | ||
| 91 | platform_device_register(&kirkwood_ehci); | ||
| 92 | } | ||
| 93 | |||
| 94 | |||
| 95 | /***************************************************************************** | ||
| 96 | * GE00 | ||
| 97 | ****************************************************************************/ | ||
| 98 | struct mv643xx_eth_shared_platform_data kirkwood_ge00_shared_data = { | ||
| 99 | .t_clk = KIRKWOOD_TCLK, | ||
| 100 | .dram = &kirkwood_mbus_dram_info, | ||
| 101 | }; | ||
| 102 | |||
| 103 | static struct resource kirkwood_ge00_shared_resources[] = { | ||
| 104 | { | ||
| 105 | .name = "ge00 base", | ||
| 106 | .start = GE00_PHYS_BASE + 0x2000, | ||
| 107 | .end = GE00_PHYS_BASE + 0x3fff, | ||
| 108 | .flags = IORESOURCE_MEM, | ||
| 109 | }, | ||
| 110 | }; | ||
| 111 | |||
| 112 | static struct platform_device kirkwood_ge00_shared = { | ||
| 113 | .name = MV643XX_ETH_SHARED_NAME, | ||
| 114 | .id = 0, | ||
| 115 | .dev = { | ||
| 116 | .platform_data = &kirkwood_ge00_shared_data, | ||
| 117 | }, | ||
| 118 | .num_resources = 1, | ||
| 119 | .resource = kirkwood_ge00_shared_resources, | ||
| 120 | }; | ||
| 121 | |||
| 122 | static struct resource kirkwood_ge00_resources[] = { | ||
| 123 | { | ||
| 124 | .name = "ge00 irq", | ||
| 125 | .start = IRQ_KIRKWOOD_GE00_SUM, | ||
| 126 | .end = IRQ_KIRKWOOD_GE00_SUM, | ||
| 127 | .flags = IORESOURCE_IRQ, | ||
| 128 | }, | ||
| 129 | }; | ||
| 130 | |||
| 131 | static struct platform_device kirkwood_ge00 = { | ||
| 132 | .name = MV643XX_ETH_NAME, | ||
| 133 | .id = 0, | ||
| 134 | .num_resources = 1, | ||
| 135 | .resource = kirkwood_ge00_resources, | ||
| 136 | }; | ||
| 137 | |||
| 138 | void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) | ||
| 139 | { | ||
| 140 | eth_data->shared = &kirkwood_ge00_shared; | ||
| 141 | kirkwood_ge00.dev.platform_data = eth_data; | ||
| 142 | |||
| 143 | platform_device_register(&kirkwood_ge00_shared); | ||
| 144 | platform_device_register(&kirkwood_ge00); | ||
| 145 | } | ||
| 146 | |||
| 147 | |||
| 148 | /***************************************************************************** | ||
| 149 | * SoC RTC | ||
| 150 | ****************************************************************************/ | ||
| 151 | static struct resource kirkwood_rtc_resource = { | ||
| 152 | .start = RTC_PHYS_BASE, | ||
| 153 | .end = RTC_PHYS_BASE + SZ_16 - 1, | ||
| 154 | .flags = IORESOURCE_MEM, | ||
| 155 | }; | ||
| 156 | |||
| 157 | void __init kirkwood_rtc_init(void) | ||
| 158 | { | ||
| 159 | platform_device_register_simple("rtc-mv", -1, &kirkwood_rtc_resource, 1); | ||
| 160 | } | ||
| 161 | |||
| 162 | |||
| 163 | /***************************************************************************** | ||
| 164 | * SATA | ||
| 165 | ****************************************************************************/ | ||
| 166 | static struct resource kirkwood_sata_resources[] = { | ||
| 167 | { | ||
| 168 | .name = "sata base", | ||
| 169 | .start = SATA_PHYS_BASE, | ||
| 170 | .end = SATA_PHYS_BASE + 0x5000 - 1, | ||
| 171 | .flags = IORESOURCE_MEM, | ||
| 172 | }, { | ||
| 173 | .name = "sata irq", | ||
| 174 | .start = IRQ_KIRKWOOD_SATA, | ||
| 175 | .end = IRQ_KIRKWOOD_SATA, | ||
| 176 | .flags = IORESOURCE_IRQ, | ||
| 177 | }, | ||
| 178 | }; | ||
| 179 | |||
| 180 | static struct platform_device kirkwood_sata = { | ||
| 181 | .name = "sata_mv", | ||
| 182 | .id = 0, | ||
| 183 | .dev = { | ||
| 184 | .coherent_dma_mask = 0xffffffff, | ||
| 185 | }, | ||
| 186 | .num_resources = ARRAY_SIZE(kirkwood_sata_resources), | ||
| 187 | .resource = kirkwood_sata_resources, | ||
| 188 | }; | ||
| 189 | |||
| 190 | void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data) | ||
| 191 | { | ||
| 192 | sata_data->dram = &kirkwood_mbus_dram_info; | ||
| 193 | kirkwood_sata.dev.platform_data = sata_data; | ||
| 194 | platform_device_register(&kirkwood_sata); | ||
| 195 | } | ||
| 196 | |||
| 197 | |||
| 198 | /***************************************************************************** | ||
| 199 | * UART0 | ||
| 200 | ****************************************************************************/ | ||
| 201 | static struct plat_serial8250_port kirkwood_uart0_data[] = { | ||
| 202 | { | ||
| 203 | .mapbase = UART0_PHYS_BASE, | ||
| 204 | .membase = (char *)UART0_VIRT_BASE, | ||
| 205 | .irq = IRQ_KIRKWOOD_UART_0, | ||
| 206 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 207 | .iotype = UPIO_MEM, | ||
| 208 | .regshift = 2, | ||
| 209 | .uartclk = KIRKWOOD_TCLK, | ||
| 210 | }, { | ||
| 211 | }, | ||
| 212 | }; | ||
| 213 | |||
| 214 | static struct resource kirkwood_uart0_resources[] = { | ||
| 215 | { | ||
| 216 | .start = UART0_PHYS_BASE, | ||
| 217 | .end = UART0_PHYS_BASE + 0xff, | ||
| 218 | .flags = IORESOURCE_MEM, | ||
| 219 | }, { | ||
| 220 | .start = IRQ_KIRKWOOD_UART_0, | ||
| 221 | .end = IRQ_KIRKWOOD_UART_0, | ||
| 222 | .flags = IORESOURCE_IRQ, | ||
| 223 | }, | ||
| 224 | }; | ||
| 225 | |||
| 226 | static struct platform_device kirkwood_uart0 = { | ||
| 227 | .name = "serial8250", | ||
| 228 | .id = 0, | ||
| 229 | .dev = { | ||
| 230 | .platform_data = kirkwood_uart0_data, | ||
| 231 | }, | ||
| 232 | .resource = kirkwood_uart0_resources, | ||
| 233 | .num_resources = ARRAY_SIZE(kirkwood_uart0_resources), | ||
| 234 | }; | ||
| 235 | |||
| 236 | void __init kirkwood_uart0_init(void) | ||
| 237 | { | ||
| 238 | platform_device_register(&kirkwood_uart0); | ||
| 239 | } | ||
| 240 | |||
| 241 | |||
| 242 | /***************************************************************************** | ||
| 243 | * UART1 | ||
| 244 | ****************************************************************************/ | ||
| 245 | static struct plat_serial8250_port kirkwood_uart1_data[] = { | ||
| 246 | { | ||
| 247 | .mapbase = UART1_PHYS_BASE, | ||
| 248 | .membase = (char *)UART1_VIRT_BASE, | ||
| 249 | .irq = IRQ_KIRKWOOD_UART_1, | ||
| 250 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 251 | .iotype = UPIO_MEM, | ||
| 252 | .regshift = 2, | ||
| 253 | .uartclk = KIRKWOOD_TCLK, | ||
| 254 | }, { | ||
| 255 | }, | ||
| 256 | }; | ||
| 257 | |||
| 258 | static struct resource kirkwood_uart1_resources[] = { | ||
| 259 | { | ||
| 260 | .start = UART1_PHYS_BASE, | ||
| 261 | .end = UART1_PHYS_BASE + 0xff, | ||
| 262 | .flags = IORESOURCE_MEM, | ||
| 263 | }, { | ||
| 264 | .start = IRQ_KIRKWOOD_UART_1, | ||
| 265 | .end = IRQ_KIRKWOOD_UART_1, | ||
| 266 | .flags = IORESOURCE_IRQ, | ||
| 267 | }, | ||
| 268 | }; | ||
| 269 | |||
| 270 | static struct platform_device kirkwood_uart1 = { | ||
| 271 | .name = "serial8250", | ||
| 272 | .id = 1, | ||
| 273 | .dev = { | ||
| 274 | .platform_data = kirkwood_uart1_data, | ||
| 275 | }, | ||
| 276 | .resource = kirkwood_uart1_resources, | ||
| 277 | .num_resources = ARRAY_SIZE(kirkwood_uart1_resources), | ||
| 278 | }; | ||
| 279 | |||
| 280 | void __init kirkwood_uart1_init(void) | ||
| 281 | { | ||
| 282 | platform_device_register(&kirkwood_uart1); | ||
| 283 | } | ||
| 284 | |||
| 285 | |||
| 286 | /***************************************************************************** | ||
| 287 | * Time handling | ||
| 288 | ****************************************************************************/ | ||
| 289 | static void kirkwood_timer_init(void) | ||
| 290 | { | ||
| 291 | orion_time_init(IRQ_KIRKWOOD_BRIDGE, KIRKWOOD_TCLK); | ||
| 292 | } | ||
| 293 | |||
| 294 | struct sys_timer kirkwood_timer = { | ||
| 295 | .init = kirkwood_timer_init, | ||
| 296 | }; | ||
| 297 | |||
| 298 | |||
| 299 | /***************************************************************************** | ||
| 300 | * General | ||
| 301 | ****************************************************************************/ | ||
| 302 | static char * __init kirkwood_id(void) | ||
| 303 | { | ||
| 304 | switch (readl(DEVICE_ID) & 0x3) { | ||
| 305 | case 0: | ||
| 306 | return "88F6180"; | ||
| 307 | case 1: | ||
| 308 | return "88F6192"; | ||
| 309 | case 2: | ||
| 310 | return "88F6281"; | ||
| 311 | } | ||
| 312 | |||
| 313 | return "unknown 88F6000 variant"; | ||
| 314 | } | ||
| 315 | |||
| 316 | static int __init is_l2_writethrough(void) | ||
| 317 | { | ||
| 318 | return !!(readl(L2_CONFIG_REG) & L2_WRITETHROUGH); | ||
| 319 | } | ||
| 320 | |||
| 321 | void __init kirkwood_init(void) | ||
| 322 | { | ||
| 323 | printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n", | ||
| 324 | kirkwood_id(), KIRKWOOD_TCLK); | ||
| 325 | |||
| 326 | kirkwood_setup_cpu_mbus(); | ||
| 327 | |||
| 328 | #ifdef CONFIG_CACHE_FEROCEON_L2 | ||
| 329 | feroceon_l2_init(is_l2_writethrough()); | ||
| 330 | #endif | ||
| 331 | } | ||
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h new file mode 100644 index 000000000000..5dee2f6b40a5 --- /dev/null +++ b/arch/arm/mach-kirkwood/common.h | |||
| @@ -0,0 +1,42 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/common.h | ||
| 3 | * | ||
| 4 | * Core functions for Marvell Kirkwood SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ARCH_KIRKWOOD_COMMON_H | ||
| 12 | #define __ARCH_KIRKWOOD_COMMON_H | ||
| 13 | |||
| 14 | struct mv643xx_eth_platform_data; | ||
| 15 | struct mv_sata_platform_data; | ||
| 16 | |||
| 17 | /* | ||
| 18 | * Basic Kirkwood init functions used early by machine-setup. | ||
| 19 | */ | ||
| 20 | void kirkwood_map_io(void); | ||
| 21 | void kirkwood_init(void); | ||
| 22 | void kirkwood_init_irq(void); | ||
| 23 | |||
| 24 | extern struct mbus_dram_target_info kirkwood_mbus_dram_info; | ||
| 25 | void kirkwood_setup_cpu_mbus(void); | ||
| 26 | void kirkwood_setup_pcie_io_win(int window, u32 base, u32 size, | ||
| 27 | int maj, int min); | ||
| 28 | void kirkwood_setup_pcie_mem_win(int window, u32 base, u32 size, | ||
| 29 | int maj, int min); | ||
| 30 | |||
| 31 | void kirkwood_ehci_init(void); | ||
| 32 | void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 33 | void kirkwood_pcie_init(void); | ||
| 34 | void kirkwood_rtc_init(void); | ||
| 35 | void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); | ||
| 36 | void kirkwood_uart0_init(void); | ||
| 37 | void kirkwood_uart1_init(void); | ||
| 38 | |||
| 39 | extern struct sys_timer kirkwood_timer; | ||
| 40 | |||
| 41 | |||
| 42 | #endif | ||
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c new file mode 100644 index 000000000000..d5c482c628e3 --- /dev/null +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c | |||
| @@ -0,0 +1,68 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/db88f6281-bp-setup.c | ||
| 3 | * | ||
| 4 | * Marvell DB-88F6281-BP Development Board Setup | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/pci.h> | ||
| 15 | #include <linux/irq.h> | ||
| 16 | #include <linux/mtd/physmap.h> | ||
| 17 | #include <linux/mtd/nand.h> | ||
| 18 | #include <linux/timer.h> | ||
| 19 | #include <linux/ata_platform.h> | ||
| 20 | #include <linux/mv643xx_eth.h> | ||
| 21 | #include <asm/mach-types.h> | ||
| 22 | #include <asm/mach/arch.h> | ||
| 23 | #include <asm/mach/pci.h> | ||
| 24 | #include <asm/arch/kirkwood.h> | ||
| 25 | #include "common.h" | ||
| 26 | |||
| 27 | static struct mv643xx_eth_platform_data db88f6281_ge00_data = { | ||
| 28 | .phy_addr = 8, | ||
| 29 | }; | ||
| 30 | |||
| 31 | static struct mv_sata_platform_data db88f6281_sata_data = { | ||
| 32 | .n_ports = 2, | ||
| 33 | }; | ||
| 34 | |||
| 35 | static void __init db88f6281_init(void) | ||
| 36 | { | ||
| 37 | /* | ||
| 38 | * Basic setup. Needs to be called early. | ||
| 39 | */ | ||
| 40 | kirkwood_init(); | ||
| 41 | |||
| 42 | kirkwood_ehci_init(); | ||
| 43 | kirkwood_ge00_init(&db88f6281_ge00_data); | ||
| 44 | kirkwood_rtc_init(); | ||
| 45 | kirkwood_sata_init(&db88f6281_sata_data); | ||
| 46 | kirkwood_uart0_init(); | ||
| 47 | kirkwood_uart1_init(); | ||
| 48 | } | ||
| 49 | |||
| 50 | static int __init db88f6281_pci_init(void) | ||
| 51 | { | ||
| 52 | if (machine_is_db88f6281_bp()) | ||
| 53 | kirkwood_pcie_init(); | ||
| 54 | |||
| 55 | return 0; | ||
| 56 | } | ||
| 57 | subsys_initcall(db88f6281_pci_init); | ||
| 58 | |||
| 59 | MACHINE_START(DB88F6281_BP, "Marvell DB-88F6281-BP Development Board") | ||
| 60 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ | ||
| 61 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, | ||
| 62 | .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, | ||
| 63 | .boot_params = 0x00000100, | ||
| 64 | .init_machine = db88f6281_init, | ||
| 65 | .map_io = kirkwood_map_io, | ||
| 66 | .init_irq = kirkwood_init_irq, | ||
| 67 | .timer = &kirkwood_timer, | ||
| 68 | MACHINE_END | ||
diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c new file mode 100644 index 000000000000..302bb2cf6669 --- /dev/null +++ b/arch/arm/mach-kirkwood/irq.c | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/irq.c | ||
| 3 | * | ||
| 4 | * Kirkwood IRQ handling. | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/irq.h> | ||
| 14 | #include <linux/io.h> | ||
| 15 | #include <asm/plat-orion/irq.h> | ||
| 16 | #include "common.h" | ||
| 17 | |||
| 18 | void __init kirkwood_init_irq(void) | ||
| 19 | { | ||
| 20 | orion_irq_init(0, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF)); | ||
| 21 | orion_irq_init(32, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF)); | ||
| 22 | } | ||
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c new file mode 100644 index 000000000000..8282d0ff84bf --- /dev/null +++ b/arch/arm/mach-kirkwood/pcie.c | |||
| @@ -0,0 +1,180 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/pcie.c | ||
| 3 | * | ||
| 4 | * PCIe functions for Marvell Kirkwood SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/pci.h> | ||
| 13 | #include <linux/mbus.h> | ||
| 14 | #include <asm/mach/pci.h> | ||
| 15 | #include <asm/plat-orion/pcie.h> | ||
| 16 | #include "common.h" | ||
| 17 | |||
| 18 | |||
| 19 | #define PCIE_BASE ((void __iomem *)PCIE_VIRT_BASE) | ||
| 20 | |||
| 21 | static int pcie_valid_config(int bus, int dev) | ||
| 22 | { | ||
| 23 | /* | ||
| 24 | * Don't go out when trying to access -- | ||
| 25 | * 1. nonexisting device on local bus | ||
| 26 | * 2. where there's no device connected (no link) | ||
| 27 | */ | ||
| 28 | if (bus == 0 && dev == 0) | ||
| 29 | return 1; | ||
| 30 | |||
| 31 | if (!orion_pcie_link_up(PCIE_BASE)) | ||
| 32 | return 0; | ||
| 33 | |||
| 34 | if (bus == 0 && dev != 1) | ||
| 35 | return 0; | ||
| 36 | |||
| 37 | return 1; | ||
| 38 | } | ||
| 39 | |||
| 40 | |||
| 41 | /* | ||
| 42 | * PCIe config cycles are done by programming the PCIE_CONF_ADDR register | ||
| 43 | * and then reading the PCIE_CONF_DATA register. Need to make sure these | ||
| 44 | * transactions are atomic. | ||
| 45 | */ | ||
| 46 | static DEFINE_SPINLOCK(kirkwood_pcie_lock); | ||
| 47 | |||
| 48 | static int pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, | ||
| 49 | int size, u32 *val) | ||
| 50 | { | ||
| 51 | unsigned long flags; | ||
| 52 | int ret; | ||
| 53 | |||
| 54 | if (pcie_valid_config(bus->number, PCI_SLOT(devfn)) == 0) { | ||
| 55 | *val = 0xffffffff; | ||
| 56 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
| 57 | } | ||
| 58 | |||
| 59 | spin_lock_irqsave(&kirkwood_pcie_lock, flags); | ||
| 60 | ret = orion_pcie_rd_conf(PCIE_BASE, bus, devfn, where, size, val); | ||
| 61 | spin_unlock_irqrestore(&kirkwood_pcie_lock, flags); | ||
| 62 | |||
| 63 | return ret; | ||
| 64 | } | ||
| 65 | |||
| 66 | static int pcie_wr_conf(struct pci_bus *bus, u32 devfn, | ||
| 67 | int where, int size, u32 val) | ||
| 68 | { | ||
| 69 | unsigned long flags; | ||
| 70 | int ret; | ||
| 71 | |||
| 72 | if (pcie_valid_config(bus->number, PCI_SLOT(devfn)) == 0) | ||
| 73 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
| 74 | |||
| 75 | spin_lock_irqsave(&kirkwood_pcie_lock, flags); | ||
| 76 | ret = orion_pcie_wr_conf(PCIE_BASE, bus, devfn, where, size, val); | ||
| 77 | spin_unlock_irqrestore(&kirkwood_pcie_lock, flags); | ||
| 78 | |||
| 79 | return ret; | ||
| 80 | } | ||
| 81 | |||
| 82 | static struct pci_ops pcie_ops = { | ||
| 83 | .read = pcie_rd_conf, | ||
| 84 | .write = pcie_wr_conf, | ||
| 85 | }; | ||
| 86 | |||
| 87 | |||
| 88 | static int kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) | ||
| 89 | { | ||
| 90 | struct resource *res; | ||
| 91 | |||
| 92 | /* | ||
| 93 | * Generic PCIe unit setup. | ||
| 94 | */ | ||
| 95 | orion_pcie_setup(PCIE_BASE, &kirkwood_mbus_dram_info); | ||
| 96 | |||
| 97 | /* | ||
| 98 | * Request resources. | ||
| 99 | */ | ||
| 100 | res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL); | ||
| 101 | if (!res) | ||
| 102 | panic("pcie_setup unable to alloc resources"); | ||
| 103 | |||
| 104 | /* | ||
| 105 | * IORESOURCE_IO | ||
| 106 | */ | ||
| 107 | res[0].name = "PCIe I/O Space"; | ||
| 108 | res[0].flags = IORESOURCE_IO; | ||
| 109 | res[0].start = KIRKWOOD_PCIE_IO_PHYS_BASE; | ||
| 110 | res[0].end = res[0].start + KIRKWOOD_PCIE_IO_SIZE - 1; | ||
| 111 | if (request_resource(&ioport_resource, &res[0])) | ||
| 112 | panic("Request PCIe IO resource failed\n"); | ||
| 113 | sys->resource[0] = &res[0]; | ||
| 114 | |||
| 115 | /* | ||
| 116 | * IORESOURCE_MEM | ||
| 117 | */ | ||
| 118 | res[1].name = "PCIe Memory Space"; | ||
| 119 | res[1].flags = IORESOURCE_MEM; | ||
| 120 | res[1].start = KIRKWOOD_PCIE_MEM_PHYS_BASE; | ||
| 121 | res[1].end = res[1].start + KIRKWOOD_PCIE_MEM_SIZE - 1; | ||
| 122 | if (request_resource(&iomem_resource, &res[1])) | ||
| 123 | panic("Request PCIe Memory resource failed\n"); | ||
| 124 | sys->resource[1] = &res[1]; | ||
| 125 | |||
| 126 | sys->resource[2] = NULL; | ||
| 127 | sys->io_offset = 0; | ||
| 128 | |||
| 129 | return 1; | ||
| 130 | } | ||
| 131 | |||
| 132 | static void __devinit rc_pci_fixup(struct pci_dev *dev) | ||
| 133 | { | ||
| 134 | /* | ||
| 135 | * Prevent enumeration of root complex. | ||
| 136 | */ | ||
| 137 | if (dev->bus->parent == NULL && dev->devfn == 0) { | ||
| 138 | int i; | ||
| 139 | |||
| 140 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { | ||
| 141 | dev->resource[i].start = 0; | ||
| 142 | dev->resource[i].end = 0; | ||
| 143 | dev->resource[i].flags = 0; | ||
| 144 | } | ||
| 145 | } | ||
| 146 | } | ||
| 147 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); | ||
| 148 | |||
| 149 | static struct pci_bus __init * | ||
| 150 | kirkwood_pcie_scan_bus(int nr, struct pci_sys_data *sys) | ||
| 151 | { | ||
| 152 | struct pci_bus *bus; | ||
| 153 | |||
| 154 | if (nr == 0) { | ||
| 155 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); | ||
| 156 | } else { | ||
| 157 | bus = NULL; | ||
| 158 | BUG(); | ||
| 159 | } | ||
| 160 | |||
| 161 | return bus; | ||
| 162 | } | ||
| 163 | |||
| 164 | static int __init kirkwood_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 165 | { | ||
| 166 | return IRQ_KIRKWOOD_PCIE; | ||
| 167 | } | ||
| 168 | |||
| 169 | static struct hw_pci kirkwood_pci __initdata = { | ||
| 170 | .nr_controllers = 1, | ||
| 171 | .swizzle = pci_std_swizzle, | ||
| 172 | .setup = kirkwood_pcie_setup, | ||
| 173 | .scan = kirkwood_pcie_scan_bus, | ||
| 174 | .map_irq = kirkwood_pcie_map_irq, | ||
| 175 | }; | ||
| 176 | |||
| 177 | void __init kirkwood_pcie_init(void) | ||
| 178 | { | ||
| 179 | pci_common_init(&kirkwood_pci); | ||
| 180 | } | ||
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c new file mode 100644 index 000000000000..6cf642c504d3 --- /dev/null +++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | |||
| @@ -0,0 +1,69 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | ||
| 3 | * | ||
| 4 | * Marvell RD-88F6192-NAS Reference Board Setup | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/pci.h> | ||
| 15 | #include <linux/irq.h> | ||
| 16 | #include <linux/mtd/physmap.h> | ||
| 17 | #include <linux/mtd/nand.h> | ||
| 18 | #include <linux/timer.h> | ||
| 19 | #include <linux/ata_platform.h> | ||
| 20 | #include <linux/mv643xx_eth.h> | ||
| 21 | #include <asm/mach-types.h> | ||
| 22 | #include <asm/mach/arch.h> | ||
| 23 | #include <asm/mach/pci.h> | ||
| 24 | #include <asm/arch/kirkwood.h> | ||
| 25 | #include "common.h" | ||
| 26 | |||
| 27 | #define RD88F6192_GPIO_USB_VBUS 10 | ||
| 28 | |||
| 29 | static struct mv643xx_eth_platform_data rd88f6192_ge00_data = { | ||
| 30 | .phy_addr = 8, | ||
| 31 | }; | ||
| 32 | |||
| 33 | static struct mv_sata_platform_data rd88f6192_sata_data = { | ||
| 34 | .n_ports = 2, | ||
| 35 | }; | ||
| 36 | |||
| 37 | static void __init rd88f6192_init(void) | ||
| 38 | { | ||
| 39 | /* | ||
| 40 | * Basic setup. Needs to be called early. | ||
| 41 | */ | ||
| 42 | kirkwood_init(); | ||
| 43 | |||
| 44 | kirkwood_ehci_init(); | ||
| 45 | kirkwood_ge00_init(&rd88f6192_ge00_data); | ||
| 46 | kirkwood_rtc_init(); | ||
| 47 | kirkwood_sata_init(&rd88f6192_sata_data); | ||
| 48 | kirkwood_uart0_init(); | ||
| 49 | } | ||
| 50 | |||
| 51 | static int __init rd88f6192_pci_init(void) | ||
| 52 | { | ||
| 53 | if (machine_is_rd88f6192_nas()) | ||
| 54 | kirkwood_pcie_init(); | ||
| 55 | |||
| 56 | return 0; | ||
| 57 | } | ||
| 58 | subsys_initcall(rd88f6192_pci_init); | ||
| 59 | |||
| 60 | MACHINE_START(RD88F6192_NAS, "Marvell RD-88F6192-NAS Development Board") | ||
| 61 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ | ||
| 62 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, | ||
| 63 | .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, | ||
| 64 | .boot_params = 0x00000100, | ||
| 65 | .init_machine = rd88f6192_init, | ||
| 66 | .map_io = kirkwood_map_io, | ||
| 67 | .init_irq = kirkwood_init_irq, | ||
| 68 | .timer = &kirkwood_timer, | ||
| 69 | MACHINE_END | ||
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c new file mode 100644 index 000000000000..e1f8de2c74a2 --- /dev/null +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c | |||
| @@ -0,0 +1,113 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/rd88f6281-setup.c | ||
| 3 | * | ||
| 4 | * Marvell RD-88F6281 Reference Board Setup | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/pci.h> | ||
| 15 | #include <linux/irq.h> | ||
| 16 | #include <linux/mtd/physmap.h> | ||
| 17 | #include <linux/mtd/nand.h> | ||
| 18 | #include <linux/timer.h> | ||
| 19 | #include <linux/ata_platform.h> | ||
| 20 | #include <linux/mv643xx_eth.h> | ||
| 21 | #include <asm/mach-types.h> | ||
| 22 | #include <asm/mach/arch.h> | ||
| 23 | #include <asm/mach/pci.h> | ||
| 24 | #include <asm/arch/kirkwood.h> | ||
| 25 | #include <asm/plat-orion/orion_nand.h> | ||
| 26 | #include "common.h" | ||
| 27 | |||
| 28 | static struct mtd_partition rd88f6281_nand_parts[] = { | ||
| 29 | { | ||
| 30 | .name = "u-boot", | ||
| 31 | .offset = 0, | ||
| 32 | .size = SZ_1M | ||
| 33 | }, { | ||
| 34 | .name = "uImage", | ||
| 35 | .offset = MTDPART_OFS_NXTBLK, | ||
| 36 | .size = SZ_2M | ||
| 37 | }, { | ||
| 38 | .name = "root", | ||
| 39 | .offset = MTDPART_OFS_NXTBLK, | ||
| 40 | .size = MTDPART_SIZ_FULL | ||
| 41 | }, | ||
| 42 | }; | ||
| 43 | |||
| 44 | static struct resource rd88f6281_nand_resource = { | ||
| 45 | .flags = IORESOURCE_MEM, | ||
| 46 | .start = KIRKWOOD_NAND_MEM_PHYS_BASE, | ||
| 47 | .end = KIRKWOOD_NAND_MEM_PHYS_BASE + | ||
| 48 | KIRKWOOD_NAND_MEM_SIZE - 1, | ||
| 49 | }; | ||
| 50 | |||
| 51 | static struct orion_nand_data rd88f6281_nand_data = { | ||
| 52 | .parts = rd88f6281_nand_parts, | ||
| 53 | .nr_parts = ARRAY_SIZE(rd88f6281_nand_parts), | ||
| 54 | .cle = 0, | ||
| 55 | .ale = 1, | ||
| 56 | .width = 8, | ||
| 57 | .chip_delay = 25, | ||
| 58 | }; | ||
| 59 | |||
| 60 | static struct platform_device rd88f6281_nand_flash = { | ||
| 61 | .name = "orion_nand", | ||
| 62 | .id = -1, | ||
| 63 | .dev = { | ||
| 64 | .platform_data = &rd88f6281_nand_data, | ||
| 65 | }, | ||
| 66 | .resource = &rd88f6281_nand_resource, | ||
| 67 | .num_resources = 1, | ||
| 68 | }; | ||
| 69 | |||
| 70 | static struct mv643xx_eth_platform_data rd88f6281_ge00_data = { | ||
| 71 | .phy_addr = -1, | ||
| 72 | }; | ||
| 73 | |||
| 74 | static struct mv_sata_platform_data rd88f6281_sata_data = { | ||
| 75 | .n_ports = 2, | ||
| 76 | }; | ||
| 77 | |||
| 78 | static void __init rd88f6281_init(void) | ||
| 79 | { | ||
| 80 | /* | ||
| 81 | * Basic setup. Needs to be called early. | ||
| 82 | */ | ||
| 83 | kirkwood_init(); | ||
| 84 | |||
| 85 | kirkwood_ehci_init(); | ||
| 86 | kirkwood_ge00_init(&rd88f6281_ge00_data); | ||
| 87 | kirkwood_rtc_init(); | ||
| 88 | kirkwood_sata_init(&rd88f6281_sata_data); | ||
| 89 | kirkwood_uart0_init(); | ||
| 90 | kirkwood_uart1_init(); | ||
| 91 | |||
| 92 | platform_device_register(&rd88f6281_nand_flash); | ||
| 93 | } | ||
| 94 | |||
| 95 | static int __init rd88f6281_pci_init(void) | ||
| 96 | { | ||
| 97 | if (machine_is_rd88f6281()) | ||
| 98 | kirkwood_pcie_init(); | ||
| 99 | |||
| 100 | return 0; | ||
| 101 | } | ||
| 102 | subsys_initcall(rd88f6281_pci_init); | ||
| 103 | |||
| 104 | MACHINE_START(RD88F6281, "Marvell RD-88F6281 Reference Board") | ||
| 105 | /* Maintainer: Saeed Bishara <saeed@marvell.com> */ | ||
| 106 | .phys_io = KIRKWOOD_REGS_PHYS_BASE, | ||
| 107 | .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, | ||
| 108 | .boot_params = 0x00000100, | ||
| 109 | .init_machine = rd88f6281_init, | ||
| 110 | .map_io = kirkwood_map_io, | ||
| 111 | .init_irq = kirkwood_init_irq, | ||
| 112 | .timer = &kirkwood_timer, | ||
| 113 | MACHINE_END | ||
diff --git a/arch/arm/mach-loki/Kconfig b/arch/arm/mach-loki/Kconfig new file mode 100644 index 000000000000..0045bdd761ca --- /dev/null +++ b/arch/arm/mach-loki/Kconfig | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | if ARCH_LOKI | ||
| 2 | |||
| 3 | menu "Marvell Loki (88RC8480) Implementations" | ||
| 4 | |||
| 5 | config MACH_LB88RC8480 | ||
| 6 | bool "Marvell LB88RC8480 Development Board" | ||
| 7 | help | ||
| 8 | Say 'Y' here if you want your kernel to support the | ||
| 9 | Marvell LB88RC8480 Development Board. | ||
| 10 | |||
| 11 | endmenu | ||
| 12 | |||
| 13 | endif | ||
diff --git a/arch/arm/mach-loki/Makefile b/arch/arm/mach-loki/Makefile new file mode 100644 index 000000000000..d43233ee590f --- /dev/null +++ b/arch/arm/mach-loki/Makefile | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | obj-y += common.o addr-map.o irq.o | ||
| 2 | |||
| 3 | obj-$(CONFIG_MACH_LB88RC8480) += lb88rc8480-setup.o | ||
diff --git a/arch/arm/mach-loki/Makefile.boot b/arch/arm/mach-loki/Makefile.boot new file mode 100644 index 000000000000..67039c3e0c48 --- /dev/null +++ b/arch/arm/mach-loki/Makefile.boot | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | zreladdr-y := 0x00008000 | ||
| 2 | params_phys-y := 0x00000100 | ||
| 3 | initrd_phys-y := 0x00800000 | ||
diff --git a/arch/arm/mach-loki/addr-map.c b/arch/arm/mach-loki/addr-map.c new file mode 100644 index 000000000000..ba25e56ade58 --- /dev/null +++ b/arch/arm/mach-loki/addr-map.c | |||
| @@ -0,0 +1,121 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-loki/addr-map.c | ||
| 3 | * | ||
| 4 | * Address map functions for Marvell Loki (88RC8480) SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/mbus.h> | ||
| 14 | #include <asm/hardware.h> | ||
| 15 | #include <asm/io.h> | ||
| 16 | #include "common.h" | ||
| 17 | |||
| 18 | /* | ||
| 19 | * Generic Address Decode Windows bit settings | ||
| 20 | */ | ||
| 21 | #define TARGET_DDR 0 | ||
| 22 | #define TARGET_DEV_BUS 1 | ||
| 23 | #define TARGET_PCIE0 3 | ||
| 24 | #define TARGET_PCIE1 4 | ||
| 25 | #define ATTR_DEV_BOOT 0x0f | ||
| 26 | #define ATTR_DEV_CS2 0x1b | ||
| 27 | #define ATTR_DEV_CS1 0x1d | ||
| 28 | #define ATTR_DEV_CS0 0x1e | ||
| 29 | #define ATTR_PCIE_IO 0x51 | ||
| 30 | #define ATTR_PCIE_MEM 0x59 | ||
| 31 | |||
| 32 | /* | ||
| 33 | * Helpers to get DDR bank info | ||
| 34 | */ | ||
| 35 | #define DDR_SIZE_CS(n) DDR_REG(0x1500 + ((n) << 3)) | ||
| 36 | #define DDR_BASE_CS(n) DDR_REG(0x1504 + ((n) << 3)) | ||
| 37 | |||
| 38 | /* | ||
| 39 | * CPU Address Decode Windows registers | ||
| 40 | */ | ||
| 41 | #define CPU_WIN_CTRL(n) BRIDGE_REG(0x000 | ((n) << 4)) | ||
| 42 | #define CPU_WIN_BASE(n) BRIDGE_REG(0x004 | ((n) << 4)) | ||
| 43 | #define CPU_WIN_REMAP_LO(n) BRIDGE_REG(0x008 | ((n) << 4)) | ||
| 44 | #define CPU_WIN_REMAP_HI(n) BRIDGE_REG(0x00c | ((n) << 4)) | ||
| 45 | |||
| 46 | |||
| 47 | struct mbus_dram_target_info loki_mbus_dram_info; | ||
| 48 | |||
| 49 | static void __init setup_cpu_win(int win, u32 base, u32 size, | ||
| 50 | u8 target, u8 attr, int remap) | ||
| 51 | { | ||
| 52 | u32 ctrl; | ||
| 53 | |||
| 54 | base &= 0xffff0000; | ||
| 55 | ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (1 << 5) | target; | ||
| 56 | |||
| 57 | writel(base, CPU_WIN_BASE(win)); | ||
| 58 | writel(ctrl, CPU_WIN_CTRL(win)); | ||
| 59 | if (win < 2) { | ||
| 60 | if (remap < 0) | ||
| 61 | remap = base; | ||
| 62 | |||
| 63 | writel(remap & 0xffff0000, CPU_WIN_REMAP_LO(win)); | ||
| 64 | writel(0, CPU_WIN_REMAP_HI(win)); | ||
| 65 | } | ||
| 66 | } | ||
| 67 | |||
| 68 | void __init loki_setup_cpu_mbus(void) | ||
| 69 | { | ||
| 70 | int i; | ||
| 71 | int cs; | ||
| 72 | |||
| 73 | /* | ||
| 74 | * First, disable and clear windows. | ||
| 75 | */ | ||
| 76 | for (i = 0; i < 8; i++) { | ||
| 77 | writel(0, CPU_WIN_BASE(i)); | ||
| 78 | writel(0, CPU_WIN_CTRL(i)); | ||
| 79 | if (i < 2) { | ||
| 80 | writel(0, CPU_WIN_REMAP_LO(i)); | ||
| 81 | writel(0, CPU_WIN_REMAP_HI(i)); | ||
| 82 | } | ||
| 83 | } | ||
| 84 | |||
| 85 | /* | ||
| 86 | * Setup windows for PCIe IO+MEM space. | ||
| 87 | */ | ||
| 88 | setup_cpu_win(2, LOKI_PCIE0_MEM_PHYS_BASE, LOKI_PCIE0_MEM_SIZE, | ||
| 89 | TARGET_PCIE0, ATTR_PCIE_MEM, -1); | ||
| 90 | setup_cpu_win(3, LOKI_PCIE1_MEM_PHYS_BASE, LOKI_PCIE1_MEM_SIZE, | ||
| 91 | TARGET_PCIE1, ATTR_PCIE_MEM, -1); | ||
| 92 | |||
| 93 | /* | ||
| 94 | * Setup MBUS dram target info. | ||
| 95 | */ | ||
| 96 | loki_mbus_dram_info.mbus_dram_target_id = TARGET_DDR; | ||
| 97 | |||
| 98 | for (i = 0, cs = 0; i < 4; i++) { | ||
| 99 | u32 base = readl(DDR_BASE_CS(i)); | ||
| 100 | u32 size = readl(DDR_SIZE_CS(i)); | ||
| 101 | |||
| 102 | /* | ||
| 103 | * Chip select enabled? | ||
| 104 | */ | ||
| 105 | if (size & 1) { | ||
| 106 | struct mbus_dram_window *w; | ||
| 107 | |||
| 108 | w = &loki_mbus_dram_info.cs[cs++]; | ||
| 109 | w->cs_index = i; | ||
| 110 | w->mbus_attr = 0xf & ~(1 << i); | ||
| 111 | w->base = base & 0xffff0000; | ||
| 112 | w->size = (size | 0x0000ffff) + 1; | ||
| 113 | } | ||
| 114 | } | ||
| 115 | loki_mbus_dram_info.num_cs = cs; | ||
| 116 | } | ||
| 117 | |||
| 118 | void __init loki_setup_dev_boot_win(u32 base, u32 size) | ||
| 119 | { | ||
| 120 | setup_cpu_win(4, base, size, TARGET_DEV_BUS, ATTR_DEV_BOOT, -1); | ||
| 121 | } | ||
diff --git a/arch/arm/mach-loki/common.c b/arch/arm/mach-loki/common.c new file mode 100644 index 000000000000..410f50399dd3 --- /dev/null +++ b/arch/arm/mach-loki/common.c | |||
| @@ -0,0 +1,305 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-loki/common.c | ||
| 3 | * | ||
| 4 | * Core functions for Marvell Loki (88RC8480) SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/serial_8250.h> | ||
| 15 | #include <linux/mbus.h> | ||
| 16 | #include <linux/mv643xx_eth.h> | ||
| 17 | #include <asm/page.h> | ||
| 18 | #include <asm/timex.h> | ||
| 19 | #include <asm/mach/map.h> | ||
| 20 | #include <asm/mach/time.h> | ||
| 21 | #include <asm/arch/loki.h> | ||
| 22 | #include <asm/plat-orion/orion_nand.h> | ||
| 23 | #include <asm/plat-orion/time.h> | ||
| 24 | #include "common.h" | ||
| 25 | |||
| 26 | /***************************************************************************** | ||
| 27 | * I/O Address Mapping | ||
| 28 | ****************************************************************************/ | ||
| 29 | static struct map_desc loki_io_desc[] __initdata = { | ||
| 30 | { | ||
| 31 | .virtual = LOKI_REGS_VIRT_BASE, | ||
| 32 | .pfn = __phys_to_pfn(LOKI_REGS_PHYS_BASE), | ||
| 33 | .length = LOKI_REGS_SIZE, | ||
| 34 | .type = MT_DEVICE, | ||
| 35 | }, | ||
| 36 | }; | ||
| 37 | |||
| 38 | void __init loki_map_io(void) | ||
| 39 | { | ||
| 40 | iotable_init(loki_io_desc, ARRAY_SIZE(loki_io_desc)); | ||
| 41 | } | ||
| 42 | |||
| 43 | |||
| 44 | /***************************************************************************** | ||
| 45 | * GE0 | ||
| 46 | ****************************************************************************/ | ||
| 47 | struct mv643xx_eth_shared_platform_data loki_ge0_shared_data = { | ||
| 48 | .t_clk = LOKI_TCLK, | ||
| 49 | .dram = &loki_mbus_dram_info, | ||
| 50 | }; | ||
| 51 | |||
| 52 | static struct resource loki_ge0_shared_resources[] = { | ||
| 53 | { | ||
| 54 | .name = "ge0 base", | ||
| 55 | .start = GE0_PHYS_BASE + 0x2000, | ||
| 56 | .end = GE0_PHYS_BASE + 0x3fff, | ||
| 57 | .flags = IORESOURCE_MEM, | ||
| 58 | }, | ||
| 59 | }; | ||
| 60 | |||
| 61 | static struct platform_device loki_ge0_shared = { | ||
| 62 | .name = MV643XX_ETH_SHARED_NAME, | ||
| 63 | .id = 0, | ||
| 64 | .dev = { | ||
| 65 | .platform_data = &loki_ge0_shared_data, | ||
| 66 | }, | ||
| 67 | .num_resources = 1, | ||
| 68 | .resource = loki_ge0_shared_resources, | ||
| 69 | }; | ||
| 70 | |||
| 71 | static struct resource loki_ge0_resources[] = { | ||
| 72 | { | ||
| 73 | .name = "ge0 irq", | ||
| 74 | .start = IRQ_LOKI_GBE_A_INT, | ||
| 75 | .end = IRQ_LOKI_GBE_A_INT, | ||
| 76 | .flags = IORESOURCE_IRQ, | ||
| 77 | }, | ||
| 78 | }; | ||
| 79 | |||
| 80 | static struct platform_device loki_ge0 = { | ||
| 81 | .name = MV643XX_ETH_NAME, | ||
| 82 | .id = 0, | ||
| 83 | .num_resources = 1, | ||
| 84 | .resource = loki_ge0_resources, | ||
| 85 | }; | ||
| 86 | |||
| 87 | void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data) | ||
| 88 | { | ||
| 89 | eth_data->shared = &loki_ge0_shared; | ||
| 90 | loki_ge0.dev.platform_data = eth_data; | ||
| 91 | |||
| 92 | writel(0x00079220, GE0_VIRT_BASE + 0x20b0); | ||
| 93 | platform_device_register(&loki_ge0_shared); | ||
| 94 | platform_device_register(&loki_ge0); | ||
| 95 | } | ||
| 96 | |||
| 97 | |||
| 98 | /***************************************************************************** | ||
| 99 | * GE1 | ||
| 100 | ****************************************************************************/ | ||
| 101 | struct mv643xx_eth_shared_platform_data loki_ge1_shared_data = { | ||
| 102 | .t_clk = LOKI_TCLK, | ||
| 103 | .dram = &loki_mbus_dram_info, | ||
| 104 | }; | ||
| 105 | |||
| 106 | static struct resource loki_ge1_shared_resources[] = { | ||
| 107 | { | ||
| 108 | .name = "ge1 base", | ||
| 109 | .start = GE1_PHYS_BASE + 0x2000, | ||
| 110 | .end = GE1_PHYS_BASE + 0x3fff, | ||
| 111 | .flags = IORESOURCE_MEM, | ||
| 112 | }, | ||
| 113 | }; | ||
| 114 | |||
| 115 | static struct platform_device loki_ge1_shared = { | ||
| 116 | .name = MV643XX_ETH_SHARED_NAME, | ||
| 117 | .id = 1, | ||
| 118 | .dev = { | ||
| 119 | .platform_data = &loki_ge1_shared_data, | ||
| 120 | }, | ||
| 121 | .num_resources = 1, | ||
| 122 | .resource = loki_ge1_shared_resources, | ||
| 123 | }; | ||
| 124 | |||
| 125 | static struct resource loki_ge1_resources[] = { | ||
| 126 | { | ||
| 127 | .name = "ge1 irq", | ||
| 128 | .start = IRQ_LOKI_GBE_B_INT, | ||
| 129 | .end = IRQ_LOKI_GBE_B_INT, | ||
| 130 | .flags = IORESOURCE_IRQ, | ||
| 131 | }, | ||
| 132 | }; | ||
| 133 | |||
| 134 | static struct platform_device loki_ge1 = { | ||
| 135 | .name = MV643XX_ETH_NAME, | ||
| 136 | .id = 1, | ||
| 137 | .num_resources = 1, | ||
| 138 | .resource = loki_ge1_resources, | ||
| 139 | }; | ||
| 140 | |||
| 141 | void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data) | ||
| 142 | { | ||
| 143 | eth_data->shared = &loki_ge1_shared; | ||
| 144 | loki_ge1.dev.platform_data = eth_data; | ||
| 145 | |||
| 146 | writel(0x00079220, GE1_VIRT_BASE + 0x20b0); | ||
| 147 | platform_device_register(&loki_ge1_shared); | ||
| 148 | platform_device_register(&loki_ge1); | ||
| 149 | } | ||
| 150 | |||
| 151 | |||
| 152 | /***************************************************************************** | ||
| 153 | * SAS/SATA | ||
| 154 | ****************************************************************************/ | ||
| 155 | static struct resource loki_sas_resources[] = { | ||
| 156 | { | ||
| 157 | .name = "mvsas0 mem", | ||
| 158 | .start = SAS0_PHYS_BASE, | ||
| 159 | .end = SAS0_PHYS_BASE + 0x01ff, | ||
| 160 | .flags = IORESOURCE_MEM, | ||
| 161 | }, { | ||
| 162 | .name = "mvsas0 irq", | ||
| 163 | .start = IRQ_LOKI_SAS_A, | ||
| 164 | .end = IRQ_LOKI_SAS_A, | ||
| 165 | .flags = IORESOURCE_IRQ, | ||
| 166 | }, { | ||
| 167 | .name = "mvsas1 mem", | ||
| 168 | .start = SAS1_PHYS_BASE, | ||
| 169 | .end = SAS1_PHYS_BASE + 0x01ff, | ||
| 170 | .flags = IORESOURCE_MEM, | ||
| 171 | }, { | ||
| 172 | .name = "mvsas1 irq", | ||
| 173 | .start = IRQ_LOKI_SAS_B, | ||
| 174 | .end = IRQ_LOKI_SAS_B, | ||
| 175 | .flags = IORESOURCE_IRQ, | ||
| 176 | }, | ||
| 177 | }; | ||
| 178 | |||
| 179 | static struct platform_device loki_sas = { | ||
| 180 | .name = "mvsas", | ||
| 181 | .id = 0, | ||
| 182 | .dev = { | ||
| 183 | .coherent_dma_mask = 0xffffffff, | ||
| 184 | }, | ||
| 185 | .num_resources = ARRAY_SIZE(loki_sas_resources), | ||
| 186 | .resource = loki_sas_resources, | ||
| 187 | }; | ||
| 188 | |||
| 189 | void __init loki_sas_init(void) | ||
| 190 | { | ||
| 191 | writel(0x8300f707, DDR_REG(0x1424)); | ||
| 192 | platform_device_register(&loki_sas); | ||
| 193 | } | ||
| 194 | |||
| 195 | |||
| 196 | /***************************************************************************** | ||
| 197 | * UART0 | ||
| 198 | ****************************************************************************/ | ||
| 199 | static struct plat_serial8250_port loki_uart0_data[] = { | ||
| 200 | { | ||
| 201 | .mapbase = UART0_PHYS_BASE, | ||
| 202 | .membase = (char *)UART0_VIRT_BASE, | ||
| 203 | .irq = IRQ_LOKI_UART0, | ||
| 204 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 205 | .iotype = UPIO_MEM, | ||
| 206 | .regshift = 2, | ||
| 207 | .uartclk = LOKI_TCLK, | ||
| 208 | }, { | ||
| 209 | }, | ||
| 210 | }; | ||
| 211 | |||
| 212 | static struct resource loki_uart0_resources[] = { | ||
| 213 | { | ||
| 214 | .start = UART0_PHYS_BASE, | ||
| 215 | .end = UART0_PHYS_BASE + 0xff, | ||
| 216 | .flags = IORESOURCE_MEM, | ||
| 217 | }, { | ||
| 218 | .start = IRQ_LOKI_UART0, | ||
| 219 | .end = IRQ_LOKI_UART0, | ||
| 220 | .flags = IORESOURCE_IRQ, | ||
| 221 | }, | ||
| 222 | }; | ||
| 223 | |||
| 224 | static struct platform_device loki_uart0 = { | ||
| 225 | .name = "serial8250", | ||
| 226 | .id = 0, | ||
| 227 | .dev = { | ||
| 228 | .platform_data = loki_uart0_data, | ||
| 229 | }, | ||
| 230 | .resource = loki_uart0_resources, | ||
| 231 | .num_resources = ARRAY_SIZE(loki_uart0_resources), | ||
| 232 | }; | ||
| 233 | |||
| 234 | void __init loki_uart0_init(void) | ||
| 235 | { | ||
| 236 | platform_device_register(&loki_uart0); | ||
| 237 | } | ||
| 238 | |||
| 239 | |||
| 240 | /***************************************************************************** | ||
| 241 | * UART1 | ||
| 242 | ****************************************************************************/ | ||
| 243 | static struct plat_serial8250_port loki_uart1_data[] = { | ||
| 244 | { | ||
| 245 | .mapbase = UART1_PHYS_BASE, | ||
| 246 | .membase = (char *)UART1_VIRT_BASE, | ||
| 247 | .irq = IRQ_LOKI_UART1, | ||
| 248 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 249 | .iotype = UPIO_MEM, | ||
| 250 | .regshift = 2, | ||
| 251 | .uartclk = LOKI_TCLK, | ||
| 252 | }, { | ||
| 253 | }, | ||
| 254 | }; | ||
| 255 | |||
| 256 | static struct resource loki_uart1_resources[] = { | ||
| 257 | { | ||
| 258 | .start = UART1_PHYS_BASE, | ||
| 259 | .end = UART1_PHYS_BASE + 0xff, | ||
| 260 | .flags = IORESOURCE_MEM, | ||
| 261 | }, { | ||
| 262 | .start = IRQ_LOKI_UART1, | ||
| 263 | .end = IRQ_LOKI_UART1, | ||
| 264 | .flags = IORESOURCE_IRQ, | ||
| 265 | }, | ||
| 266 | }; | ||
| 267 | |||
| 268 | static struct platform_device loki_uart1 = { | ||
| 269 | .name = "serial8250", | ||
| 270 | .id = 1, | ||
| 271 | .dev = { | ||
| 272 | .platform_data = loki_uart1_data, | ||
| 273 | }, | ||
| 274 | .resource = loki_uart1_resources, | ||
| 275 | .num_resources = ARRAY_SIZE(loki_uart1_resources), | ||
| 276 | }; | ||
| 277 | |||
| 278 | void __init loki_uart1_init(void) | ||
| 279 | { | ||
| 280 | platform_device_register(&loki_uart1); | ||
| 281 | } | ||
| 282 | |||
| 283 | |||
| 284 | /***************************************************************************** | ||
| 285 | * Time handling | ||
| 286 | ****************************************************************************/ | ||
| 287 | static void loki_timer_init(void) | ||
| 288 | { | ||
| 289 | orion_time_init(IRQ_LOKI_BRIDGE, LOKI_TCLK); | ||
| 290 | } | ||
| 291 | |||
| 292 | struct sys_timer loki_timer = { | ||
| 293 | .init = loki_timer_init, | ||
| 294 | }; | ||
| 295 | |||
| 296 | |||
| 297 | /***************************************************************************** | ||
| 298 | * General | ||
| 299 | ****************************************************************************/ | ||
| 300 | void __init loki_init(void) | ||
| 301 | { | ||
| 302 | printk(KERN_INFO "Loki ID: 88RC8480. TCLK=%d.\n", LOKI_TCLK); | ||
| 303 | |||
| 304 | loki_setup_cpu_mbus(); | ||
| 305 | } | ||
diff --git a/arch/arm/mach-loki/common.h b/arch/arm/mach-loki/common.h new file mode 100644 index 000000000000..26054fd0f05e --- /dev/null +++ b/arch/arm/mach-loki/common.h | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-loki/common.h | ||
| 3 | * | ||
| 4 | * Core functions for Marvell Loki (88RC8480) SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ARCH_LOKI_COMMON_H | ||
| 12 | #define __ARCH_LOKI_COMMON_H | ||
| 13 | |||
| 14 | struct mv643xx_eth_platform_data; | ||
| 15 | |||
| 16 | /* | ||
| 17 | * Basic Loki init functions used early by machine-setup. | ||
| 18 | */ | ||
| 19 | void loki_map_io(void); | ||
| 20 | void loki_init(void); | ||
| 21 | void loki_init_irq(void); | ||
| 22 | |||
| 23 | extern struct mbus_dram_target_info loki_mbus_dram_info; | ||
| 24 | void loki_setup_cpu_mbus(void); | ||
| 25 | void loki_setup_dev_boot_win(u32 base, u32 size); | ||
| 26 | |||
| 27 | void loki_ge0_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 28 | void loki_ge1_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 29 | void loki_sas_init(void); | ||
| 30 | void loki_uart0_init(void); | ||
| 31 | void loki_uart1_init(void); | ||
| 32 | |||
| 33 | extern struct sys_timer loki_timer; | ||
| 34 | |||
| 35 | |||
| 36 | #endif | ||
diff --git a/arch/arm/mach-loki/irq.c b/arch/arm/mach-loki/irq.c new file mode 100644 index 000000000000..d839af91fe03 --- /dev/null +++ b/arch/arm/mach-loki/irq.c | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-loki/irq.c | ||
| 3 | * | ||
| 4 | * Marvell Loki (88RC8480) IRQ handling. | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/irq.h> | ||
| 14 | #include <asm/io.h> | ||
| 15 | #include <asm/plat-orion/irq.h> | ||
| 16 | #include "common.h" | ||
| 17 | |||
| 18 | void __init loki_init_irq(void) | ||
| 19 | { | ||
| 20 | orion_irq_init(0, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_OFF)); | ||
| 21 | } | ||
diff --git a/arch/arm/mach-loki/lb88rc8480-setup.c b/arch/arm/mach-loki/lb88rc8480-setup.c new file mode 100644 index 000000000000..d1b9e6e6253a --- /dev/null +++ b/arch/arm/mach-loki/lb88rc8480-setup.c | |||
| @@ -0,0 +1,100 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-loki/lb88rc8480-setup.c | ||
| 3 | * | ||
| 4 | * Marvell LB88RC8480 Development Board Setup | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/irq.h> | ||
| 15 | #include <linux/mtd/physmap.h> | ||
| 16 | #include <linux/mtd/nand.h> | ||
| 17 | #include <linux/timer.h> | ||
| 18 | #include <linux/ata_platform.h> | ||
| 19 | #include <linux/mv643xx_eth.h> | ||
| 20 | #include <asm/mach-types.h> | ||
| 21 | #include <asm/mach/arch.h> | ||
| 22 | #include <asm/arch/loki.h> | ||
| 23 | #include "common.h" | ||
| 24 | |||
| 25 | #define LB88RC8480_FLASH_BOOT_CS_BASE 0xf8000000 | ||
| 26 | #define LB88RC8480_FLASH_BOOT_CS_SIZE SZ_128M | ||
| 27 | |||
| 28 | #define LB88RC8480_NOR_BOOT_BASE 0xff000000 | ||
| 29 | #define LB88RC8480_NOR_BOOT_SIZE SZ_16M | ||
| 30 | |||
| 31 | static struct mtd_partition lb88rc8480_boot_flash_parts[] = { | ||
| 32 | { | ||
| 33 | .name = "kernel", | ||
| 34 | .offset = 0, | ||
| 35 | .size = SZ_2M, | ||
| 36 | }, { | ||
| 37 | .name = "root-fs", | ||
| 38 | .offset = SZ_2M, | ||
| 39 | .size = (SZ_8M + SZ_4M + SZ_1M), | ||
| 40 | }, { | ||
| 41 | .name = "u-boot", | ||
| 42 | .offset = (SZ_8M + SZ_4M + SZ_2M + SZ_1M), | ||
| 43 | .size = SZ_1M, | ||
| 44 | }, | ||
| 45 | }; | ||
| 46 | |||
| 47 | static struct physmap_flash_data lb88rc8480_boot_flash_data = { | ||
| 48 | .parts = lb88rc8480_boot_flash_parts, | ||
| 49 | .nr_parts = ARRAY_SIZE(lb88rc8480_boot_flash_parts), | ||
| 50 | .width = 1, /* 8 bit bus width */ | ||
| 51 | }; | ||
| 52 | |||
| 53 | static struct resource lb88rc8480_boot_flash_resource = { | ||
| 54 | .flags = IORESOURCE_MEM, | ||
| 55 | .start = LB88RC8480_NOR_BOOT_BASE, | ||
| 56 | .end = LB88RC8480_NOR_BOOT_BASE + LB88RC8480_NOR_BOOT_SIZE - 1, | ||
| 57 | }; | ||
| 58 | |||
| 59 | static struct platform_device lb88rc8480_boot_flash = { | ||
| 60 | .name = "physmap-flash", | ||
| 61 | .id = 0, | ||
| 62 | .dev = { | ||
| 63 | .platform_data = &lb88rc8480_boot_flash_data, | ||
| 64 | }, | ||
| 65 | .num_resources = 1, | ||
| 66 | .resource = &lb88rc8480_boot_flash_resource, | ||
| 67 | }; | ||
| 68 | |||
| 69 | static struct mv643xx_eth_platform_data lb88rc8480_ge0_data = { | ||
| 70 | .phy_addr = 1, | ||
| 71 | .mac_addr = { 0x00, 0x50, 0x43, 0x11, 0x22, 0x33 }, | ||
| 72 | }; | ||
| 73 | |||
| 74 | static void __init lb88rc8480_init(void) | ||
| 75 | { | ||
| 76 | /* | ||
| 77 | * Basic setup. Needs to be called early. | ||
| 78 | */ | ||
| 79 | loki_init(); | ||
| 80 | |||
| 81 | loki_ge0_init(&lb88rc8480_ge0_data); | ||
| 82 | loki_sas_init(); | ||
| 83 | loki_uart0_init(); | ||
| 84 | loki_uart1_init(); | ||
| 85 | |||
| 86 | loki_setup_dev_boot_win(LB88RC8480_FLASH_BOOT_CS_BASE, | ||
| 87 | LB88RC8480_FLASH_BOOT_CS_SIZE); | ||
| 88 | platform_device_register(&lb88rc8480_boot_flash); | ||
| 89 | } | ||
| 90 | |||
| 91 | MACHINE_START(LB88RC8480, "Marvell LB88RC8480 Development Board") | ||
| 92 | /* Maintainer: Ke Wei <kewei@marvell.com> */ | ||
| 93 | .phys_io = LOKI_REGS_PHYS_BASE, | ||
| 94 | .io_pg_offst = ((LOKI_REGS_VIRT_BASE) >> 18) & 0xfffc, | ||
| 95 | .boot_params = 0x00000100, | ||
| 96 | .init_machine = lb88rc8480_init, | ||
| 97 | .map_io = loki_map_io, | ||
| 98 | .init_irq = loki_init_irq, | ||
| 99 | .timer = &loki_timer, | ||
| 100 | MACHINE_END | ||
diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-mv78xx0/Kconfig new file mode 100644 index 000000000000..d83cb86837db --- /dev/null +++ b/arch/arm/mach-mv78xx0/Kconfig | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | if ARCH_MV78XX0 | ||
| 2 | |||
| 3 | menu "Marvell MV78xx0 Implementations" | ||
| 4 | |||
| 5 | config MACH_DB78X00_BP | ||
| 6 | bool "Marvell DB-78x00-BP Development Board" | ||
| 7 | help | ||
| 8 | Say 'Y' here if you want your kernel to support the | ||
| 9 | Marvell DB-78x00-BP Development Board. | ||
| 10 | |||
| 11 | endmenu | ||
| 12 | |||
| 13 | endif | ||
diff --git a/arch/arm/mach-mv78xx0/Makefile b/arch/arm/mach-mv78xx0/Makefile new file mode 100644 index 000000000000..ec16c05c3b1b --- /dev/null +++ b/arch/arm/mach-mv78xx0/Makefile | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | obj-y += common.o addr-map.o irq.o pcie.o | ||
| 2 | obj-$(CONFIG_MACH_DB78X00_BP) += db78x00-bp-setup.o | ||
diff --git a/arch/arm/mach-mv78xx0/Makefile.boot b/arch/arm/mach-mv78xx0/Makefile.boot new file mode 100644 index 000000000000..67039c3e0c48 --- /dev/null +++ b/arch/arm/mach-mv78xx0/Makefile.boot | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | zreladdr-y := 0x00008000 | ||
| 2 | params_phys-y := 0x00000100 | ||
| 3 | initrd_phys-y := 0x00800000 | ||
diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c new file mode 100644 index 000000000000..4004b672a2eb --- /dev/null +++ b/arch/arm/mach-mv78xx0/addr-map.c | |||
| @@ -0,0 +1,156 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-mv78xx0/addr-map.c | ||
| 3 | * | ||
| 4 | * Address map functions for Marvell MV78xx0 SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/mbus.h> | ||
| 14 | #include <asm/io.h> | ||
| 15 | #include "common.h" | ||
| 16 | |||
| 17 | /* | ||
| 18 | * Generic Address Decode Windows bit settings | ||
| 19 | */ | ||
| 20 | #define TARGET_DDR 0 | ||
| 21 | #define TARGET_DEV_BUS 1 | ||
| 22 | #define TARGET_PCIE0 4 | ||
| 23 | #define TARGET_PCIE1 8 | ||
| 24 | #define TARGET_PCIE(i) ((i) ? TARGET_PCIE1 : TARGET_PCIE0) | ||
| 25 | #define ATTR_DEV_SPI_ROM 0x1f | ||
| 26 | #define ATTR_DEV_BOOT 0x2f | ||
| 27 | #define ATTR_DEV_CS3 0x37 | ||
| 28 | #define ATTR_DEV_CS2 0x3b | ||
| 29 | #define ATTR_DEV_CS1 0x3d | ||
| 30 | #define ATTR_DEV_CS0 0x3e | ||
| 31 | #define ATTR_PCIE_IO(l) (0xf0 & ~(0x10 << (l))) | ||
| 32 | #define ATTR_PCIE_MEM(l) (0xf8 & ~(0x10 << (l))) | ||
| 33 | |||
| 34 | /* | ||
| 35 | * Helpers to get DDR bank info | ||
| 36 | */ | ||
| 37 | #define DDR_BASE_CS_OFF(n) (0x0000 + ((n) << 3)) | ||
| 38 | #define DDR_SIZE_CS_OFF(n) (0x0004 + ((n) << 3)) | ||
| 39 | |||
| 40 | /* | ||
| 41 | * CPU Address Decode Windows registers | ||
| 42 | */ | ||
| 43 | #define WIN0_OFF(n) (BRIDGE_VIRT_BASE + 0x0000 + ((n) << 4)) | ||
| 44 | #define WIN8_OFF(n) (BRIDGE_VIRT_BASE + 0x0900 + (((n) - 8) << 4)) | ||
| 45 | #define WIN_CTRL_OFF 0x0000 | ||
| 46 | #define WIN_BASE_OFF 0x0004 | ||
| 47 | #define WIN_REMAP_LO_OFF 0x0008 | ||
| 48 | #define WIN_REMAP_HI_OFF 0x000c | ||
| 49 | |||
| 50 | |||
| 51 | struct mbus_dram_target_info mv78xx0_mbus_dram_info; | ||
| 52 | |||
| 53 | static void __init __iomem *win_cfg_base(int win) | ||
| 54 | { | ||
| 55 | /* | ||
| 56 | * Find the control register base address for this window. | ||
| 57 | * | ||
| 58 | * BRIDGE_VIRT_BASE points to the right (CPU0's or CPU1's) | ||
| 59 | * MBUS bridge depending on which CPU core we're running on, | ||
| 60 | * so we don't need to take that into account here. | ||
| 61 | */ | ||
| 62 | |||
| 63 | return (void __iomem *)((win < 8) ? WIN0_OFF(win) : WIN8_OFF(win)); | ||
| 64 | } | ||
| 65 | |||
| 66 | static int __init cpu_win_can_remap(int win) | ||
| 67 | { | ||
| 68 | if (win < 8) | ||
| 69 | return 1; | ||
| 70 | |||
| 71 | return 0; | ||
| 72 | } | ||
| 73 | |||
| 74 | static void __init setup_cpu_win(int win, u32 base, u32 size, | ||
| 75 | u8 target, u8 attr, int remap) | ||
| 76 | { | ||
| 77 | void __iomem *addr = win_cfg_base(win); | ||
| 78 | u32 ctrl; | ||
| 79 | |||
| 80 | base &= 0xffff0000; | ||
| 81 | ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1; | ||
| 82 | |||
| 83 | writel(base, addr + WIN_BASE_OFF); | ||
| 84 | writel(ctrl, addr + WIN_CTRL_OFF); | ||
| 85 | if (cpu_win_can_remap(win)) { | ||
| 86 | if (remap < 0) | ||
| 87 | remap = base; | ||
| 88 | |||
| 89 | writel(remap & 0xffff0000, addr + WIN_REMAP_LO_OFF); | ||
| 90 | writel(0, addr + WIN_REMAP_HI_OFF); | ||
| 91 | } | ||
| 92 | } | ||
| 93 | |||
| 94 | void __init mv78xx0_setup_cpu_mbus(void) | ||
| 95 | { | ||
| 96 | void __iomem *addr; | ||
| 97 | int i; | ||
| 98 | int cs; | ||
| 99 | |||
| 100 | /* | ||
| 101 | * First, disable and clear windows. | ||
| 102 | */ | ||
| 103 | for (i = 0; i < 14; i++) { | ||
| 104 | addr = win_cfg_base(i); | ||
| 105 | |||
| 106 | writel(0, addr + WIN_BASE_OFF); | ||
| 107 | writel(0, addr + WIN_CTRL_OFF); | ||
| 108 | if (cpu_win_can_remap(i)) { | ||
| 109 | writel(0, addr + WIN_REMAP_LO_OFF); | ||
| 110 | writel(0, addr + WIN_REMAP_HI_OFF); | ||
| 111 | } | ||
| 112 | } | ||
| 113 | |||
| 114 | /* | ||
| 115 | * Setup MBUS dram target info. | ||
| 116 | */ | ||
| 117 | mv78xx0_mbus_dram_info.mbus_dram_target_id = TARGET_DDR; | ||
| 118 | |||
| 119 | if (mv78xx0_core_index() == 0) | ||
| 120 | addr = (void __iomem *)DDR_WINDOW_CPU0_BASE; | ||
| 121 | else | ||
| 122 | addr = (void __iomem *)DDR_WINDOW_CPU1_BASE; | ||
| 123 | |||
| 124 | for (i = 0, cs = 0; i < 4; i++) { | ||
| 125 | u32 base = readl(addr + DDR_BASE_CS_OFF(i)); | ||
| 126 | u32 size = readl(addr + DDR_SIZE_CS_OFF(i)); | ||
| 127 | |||
| 128 | /* | ||
| 129 | * Chip select enabled? | ||
| 130 | */ | ||
| 131 | if (size & 1) { | ||
| 132 | struct mbus_dram_window *w; | ||
| 133 | |||
| 134 | w = &mv78xx0_mbus_dram_info.cs[cs++]; | ||
| 135 | w->cs_index = i; | ||
| 136 | w->mbus_attr = 0xf & ~(1 << i); | ||
| 137 | w->base = base & 0xffff0000; | ||
| 138 | w->size = (size | 0x0000ffff) + 1; | ||
| 139 | } | ||
| 140 | } | ||
| 141 | mv78xx0_mbus_dram_info.num_cs = cs; | ||
| 142 | } | ||
| 143 | |||
| 144 | void __init mv78xx0_setup_pcie_io_win(int window, u32 base, u32 size, | ||
| 145 | int maj, int min) | ||
| 146 | { | ||
| 147 | setup_cpu_win(window, base, size, TARGET_PCIE(maj), | ||
| 148 | ATTR_PCIE_IO(min), -1); | ||
| 149 | } | ||
| 150 | |||
| 151 | void __init mv78xx0_setup_pcie_mem_win(int window, u32 base, u32 size, | ||
| 152 | int maj, int min) | ||
| 153 | { | ||
| 154 | setup_cpu_win(window, base, size, TARGET_PCIE(maj), | ||
| 155 | ATTR_PCIE_MEM(min), -1); | ||
| 156 | } | ||
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c new file mode 100644 index 000000000000..d27b83b7bf62 --- /dev/null +++ b/arch/arm/mach-mv78xx0/common.c | |||
| @@ -0,0 +1,754 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-mv78xx0/common.c | ||
| 3 | * | ||
| 4 | * Core functions for Marvell MV78xx0 SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/serial_8250.h> | ||
| 15 | #include <linux/mbus.h> | ||
| 16 | #include <linux/mv643xx_eth.h> | ||
| 17 | #include <linux/ata_platform.h> | ||
| 18 | #include <asm/mach/map.h> | ||
| 19 | #include <asm/mach/time.h> | ||
| 20 | #include <asm/arch/mv78xx0.h> | ||
| 21 | #include <asm/plat-orion/cache-feroceon-l2.h> | ||
| 22 | #include <asm/plat-orion/ehci-orion.h> | ||
| 23 | #include <asm/plat-orion/orion_nand.h> | ||
| 24 | #include <asm/plat-orion/time.h> | ||
| 25 | #include "common.h" | ||
| 26 | |||
| 27 | |||
| 28 | /***************************************************************************** | ||
| 29 | * Common bits | ||
| 30 | ****************************************************************************/ | ||
| 31 | int mv78xx0_core_index(void) | ||
| 32 | { | ||
| 33 | u32 extra; | ||
| 34 | |||
| 35 | /* | ||
| 36 | * Read Extra Features register. | ||
| 37 | */ | ||
| 38 | __asm__("mrc p15, 1, %0, c15, c1, 0" : "=r" (extra)); | ||
| 39 | |||
| 40 | return !!(extra & 0x00004000); | ||
| 41 | } | ||
| 42 | |||
| 43 | static int get_hclk(void) | ||
| 44 | { | ||
| 45 | int hclk; | ||
| 46 | |||
| 47 | /* | ||
| 48 | * HCLK tick rate is configured by DEV_D[7:5] pins. | ||
| 49 | */ | ||
| 50 | switch ((readl(SAMPLE_AT_RESET_LOW) >> 5) & 7) { | ||
| 51 | case 0: | ||
| 52 | hclk = 166666667; | ||
| 53 | break; | ||
| 54 | case 1: | ||
| 55 | hclk = 200000000; | ||
| 56 | break; | ||
| 57 | case 2: | ||
| 58 | hclk = 266666667; | ||
| 59 | break; | ||
| 60 | case 3: | ||
| 61 | hclk = 333333333; | ||
| 62 | break; | ||
| 63 | case 4: | ||
| 64 | hclk = 400000000; | ||
| 65 | break; | ||
| 66 | default: | ||
| 67 | panic("unknown HCLK PLL setting: %.8x\n", | ||
| 68 | readl(SAMPLE_AT_RESET_LOW)); | ||
| 69 | } | ||
| 70 | |||
| 71 | return hclk; | ||
| 72 | } | ||
| 73 | |||
| 74 | static void get_pclk_l2clk(int hclk, int core_index, int *pclk, int *l2clk) | ||
| 75 | { | ||
| 76 | u32 cfg; | ||
| 77 | |||
| 78 | /* | ||
| 79 | * Core #0 PCLK/L2CLK is configured by bits [13:8], core #1 | ||
| 80 | * PCLK/L2CLK by bits [19:14]. | ||
| 81 | */ | ||
| 82 | if (core_index == 0) { | ||
| 83 | cfg = (readl(SAMPLE_AT_RESET_LOW) >> 8) & 0x3f; | ||
| 84 | } else { | ||
| 85 | cfg = (readl(SAMPLE_AT_RESET_LOW) >> 14) & 0x3f; | ||
| 86 | } | ||
| 87 | |||
| 88 | /* | ||
| 89 | * Bits [11:8] ([17:14] for core #1) configure the PCLK:HCLK | ||
| 90 | * ratio (1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6). | ||
| 91 | */ | ||
| 92 | *pclk = ((u64)hclk * (2 + (cfg & 0xf))) >> 1; | ||
| 93 | |||
| 94 | /* | ||
| 95 | * Bits [13:12] ([19:18] for core #1) configure the PCLK:L2CLK | ||
| 96 | * ratio (1, 2, 3). | ||
| 97 | */ | ||
| 98 | *l2clk = *pclk / (((cfg >> 4) & 3) + 1); | ||
| 99 | } | ||
| 100 | |||
| 101 | static int get_tclk(void) | ||
| 102 | { | ||
| 103 | int tclk; | ||
| 104 | |||
| 105 | /* | ||
| 106 | * TCLK tick rate is configured by DEV_A[2:0] strap pins. | ||
| 107 | */ | ||
| 108 | switch ((readl(SAMPLE_AT_RESET_HIGH) >> 6) & 7) { | ||
| 109 | case 1: | ||
| 110 | tclk = 166666667; | ||
| 111 | break; | ||
| 112 | case 3: | ||
| 113 | tclk = 200000000; | ||
| 114 | break; | ||
| 115 | default: | ||
| 116 | panic("unknown TCLK PLL setting: %.8x\n", | ||
| 117 | readl(SAMPLE_AT_RESET_HIGH)); | ||
| 118 | } | ||
| 119 | |||
| 120 | return tclk; | ||
| 121 | } | ||
| 122 | |||
| 123 | |||
| 124 | /***************************************************************************** | ||
| 125 | * I/O Address Mapping | ||
| 126 | ****************************************************************************/ | ||
| 127 | static struct map_desc mv78xx0_io_desc[] __initdata = { | ||
| 128 | { | ||
| 129 | .virtual = MV78XX0_CORE_REGS_VIRT_BASE, | ||
| 130 | .pfn = 0, | ||
| 131 | .length = MV78XX0_CORE_REGS_SIZE, | ||
| 132 | .type = MT_DEVICE, | ||
| 133 | }, { | ||
| 134 | .virtual = MV78XX0_PCIE_IO_VIRT_BASE(0), | ||
| 135 | .pfn = __phys_to_pfn(MV78XX0_PCIE_IO_PHYS_BASE(0)), | ||
| 136 | .length = MV78XX0_PCIE_IO_SIZE * 8, | ||
| 137 | .type = MT_DEVICE, | ||
| 138 | }, { | ||
| 139 | .virtual = MV78XX0_REGS_VIRT_BASE, | ||
| 140 | .pfn = __phys_to_pfn(MV78XX0_REGS_PHYS_BASE), | ||
| 141 | .length = MV78XX0_REGS_SIZE, | ||
| 142 | .type = MT_DEVICE, | ||
| 143 | }, | ||
| 144 | }; | ||
| 145 | |||
| 146 | void __init mv78xx0_map_io(void) | ||
| 147 | { | ||
| 148 | unsigned long phys; | ||
| 149 | |||
| 150 | /* | ||
| 151 | * Map the right set of per-core registers depending on | ||
| 152 | * which core we are running on. | ||
| 153 | */ | ||
| 154 | if (mv78xx0_core_index() == 0) { | ||
| 155 | phys = MV78XX0_CORE0_REGS_PHYS_BASE; | ||
| 156 | } else { | ||
| 157 | phys = MV78XX0_CORE1_REGS_PHYS_BASE; | ||
| 158 | } | ||
| 159 | mv78xx0_io_desc[0].pfn = __phys_to_pfn(phys); | ||
| 160 | |||
| 161 | iotable_init(mv78xx0_io_desc, ARRAY_SIZE(mv78xx0_io_desc)); | ||
| 162 | } | ||
| 163 | |||
| 164 | |||
| 165 | /***************************************************************************** | ||
| 166 | * EHCI | ||
| 167 | ****************************************************************************/ | ||
| 168 | static struct orion_ehci_data mv78xx0_ehci_data = { | ||
| 169 | .dram = &mv78xx0_mbus_dram_info, | ||
| 170 | }; | ||
| 171 | |||
| 172 | static u64 ehci_dmamask = 0xffffffffUL; | ||
| 173 | |||
| 174 | |||
| 175 | /***************************************************************************** | ||
| 176 | * EHCI0 | ||
| 177 | ****************************************************************************/ | ||
| 178 | static struct resource mv78xx0_ehci0_resources[] = { | ||
| 179 | { | ||
| 180 | .start = USB0_PHYS_BASE, | ||
| 181 | .end = USB0_PHYS_BASE + 0x0fff, | ||
| 182 | .flags = IORESOURCE_MEM, | ||
| 183 | }, { | ||
| 184 | .start = IRQ_MV78XX0_USB_0, | ||
| 185 | .end = IRQ_MV78XX0_USB_0, | ||
| 186 | .flags = IORESOURCE_IRQ, | ||
| 187 | }, | ||
| 188 | }; | ||
| 189 | |||
| 190 | static struct platform_device mv78xx0_ehci0 = { | ||
| 191 | .name = "orion-ehci", | ||
| 192 | .id = 0, | ||
| 193 | .dev = { | ||
| 194 | .dma_mask = &ehci_dmamask, | ||
| 195 | .coherent_dma_mask = 0xffffffff, | ||
| 196 | .platform_data = &mv78xx0_ehci_data, | ||
| 197 | }, | ||
| 198 | .resource = mv78xx0_ehci0_resources, | ||
| 199 | .num_resources = ARRAY_SIZE(mv78xx0_ehci0_resources), | ||
| 200 | }; | ||
| 201 | |||
| 202 | void __init mv78xx0_ehci0_init(void) | ||
| 203 | { | ||
| 204 | platform_device_register(&mv78xx0_ehci0); | ||
| 205 | } | ||
| 206 | |||
| 207 | |||
| 208 | /***************************************************************************** | ||
| 209 | * EHCI1 | ||
| 210 | ****************************************************************************/ | ||
| 211 | static struct resource mv78xx0_ehci1_resources[] = { | ||
| 212 | { | ||
| 213 | .start = USB1_PHYS_BASE, | ||
| 214 | .end = USB1_PHYS_BASE + 0x0fff, | ||
| 215 | .flags = IORESOURCE_MEM, | ||
| 216 | }, { | ||
| 217 | .start = IRQ_MV78XX0_USB_1, | ||
| 218 | .end = IRQ_MV78XX0_USB_1, | ||
| 219 | .flags = IORESOURCE_IRQ, | ||
| 220 | }, | ||
| 221 | }; | ||
| 222 | |||
| 223 | static struct platform_device mv78xx0_ehci1 = { | ||
| 224 | .name = "orion-ehci", | ||
| 225 | .id = 1, | ||
| 226 | .dev = { | ||
| 227 | .dma_mask = &ehci_dmamask, | ||
| 228 | .coherent_dma_mask = 0xffffffff, | ||
| 229 | .platform_data = &mv78xx0_ehci_data, | ||
| 230 | }, | ||
| 231 | .resource = mv78xx0_ehci1_resources, | ||
| 232 | .num_resources = ARRAY_SIZE(mv78xx0_ehci1_resources), | ||
| 233 | }; | ||
| 234 | |||
| 235 | void __init mv78xx0_ehci1_init(void) | ||
| 236 | { | ||
| 237 | platform_device_register(&mv78xx0_ehci1); | ||
| 238 | } | ||
| 239 | |||
| 240 | |||
| 241 | /***************************************************************************** | ||
| 242 | * EHCI2 | ||
| 243 | ****************************************************************************/ | ||
| 244 | static struct resource mv78xx0_ehci2_resources[] = { | ||
| 245 | { | ||
| 246 | .start = USB2_PHYS_BASE, | ||
| 247 | .end = USB2_PHYS_BASE + 0x0fff, | ||
| 248 | .flags = IORESOURCE_MEM, | ||
| 249 | }, { | ||
| 250 | .start = IRQ_MV78XX0_USB_2, | ||
| 251 | .end = IRQ_MV78XX0_USB_2, | ||
| 252 | .flags = IORESOURCE_IRQ, | ||
| 253 | }, | ||
| 254 | }; | ||
| 255 | |||
| 256 | static struct platform_device mv78xx0_ehci2 = { | ||
| 257 | .name = "orion-ehci", | ||
| 258 | .id = 2, | ||
| 259 | .dev = { | ||
| 260 | .dma_mask = &ehci_dmamask, | ||
| 261 | .coherent_dma_mask = 0xffffffff, | ||
| 262 | .platform_data = &mv78xx0_ehci_data, | ||
| 263 | }, | ||
| 264 | .resource = mv78xx0_ehci2_resources, | ||
| 265 | .num_resources = ARRAY_SIZE(mv78xx0_ehci2_resources), | ||
| 266 | }; | ||
| 267 | |||
| 268 | void __init mv78xx0_ehci2_init(void) | ||
| 269 | { | ||
| 270 | platform_device_register(&mv78xx0_ehci2); | ||
| 271 | } | ||
| 272 | |||
| 273 | |||
| 274 | /***************************************************************************** | ||
| 275 | * GE00 | ||
| 276 | ****************************************************************************/ | ||
| 277 | struct mv643xx_eth_shared_platform_data mv78xx0_ge00_shared_data = { | ||
| 278 | .t_clk = 0, | ||
| 279 | .dram = &mv78xx0_mbus_dram_info, | ||
| 280 | }; | ||
| 281 | |||
| 282 | static struct resource mv78xx0_ge00_shared_resources[] = { | ||
| 283 | { | ||
| 284 | .name = "ge00 base", | ||
| 285 | .start = GE00_PHYS_BASE + 0x2000, | ||
| 286 | .end = GE00_PHYS_BASE + 0x3fff, | ||
| 287 | .flags = IORESOURCE_MEM, | ||
| 288 | }, | ||
| 289 | }; | ||
| 290 | |||
| 291 | static struct platform_device mv78xx0_ge00_shared = { | ||
| 292 | .name = MV643XX_ETH_SHARED_NAME, | ||
| 293 | .id = 0, | ||
| 294 | .dev = { | ||
| 295 | .platform_data = &mv78xx0_ge00_shared_data, | ||
| 296 | }, | ||
| 297 | .num_resources = 1, | ||
| 298 | .resource = mv78xx0_ge00_shared_resources, | ||
| 299 | }; | ||
| 300 | |||
| 301 | static struct resource mv78xx0_ge00_resources[] = { | ||
| 302 | { | ||
| 303 | .name = "ge00 irq", | ||
| 304 | .start = IRQ_MV78XX0_GE00_SUM, | ||
| 305 | .end = IRQ_MV78XX0_GE00_SUM, | ||
| 306 | .flags = IORESOURCE_IRQ, | ||
| 307 | }, | ||
| 308 | }; | ||
| 309 | |||
| 310 | static struct platform_device mv78xx0_ge00 = { | ||
| 311 | .name = MV643XX_ETH_NAME, | ||
| 312 | .id = 0, | ||
| 313 | .num_resources = 1, | ||
| 314 | .resource = mv78xx0_ge00_resources, | ||
| 315 | }; | ||
| 316 | |||
| 317 | void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data) | ||
| 318 | { | ||
| 319 | eth_data->shared = &mv78xx0_ge00_shared; | ||
| 320 | mv78xx0_ge00.dev.platform_data = eth_data; | ||
| 321 | |||
| 322 | platform_device_register(&mv78xx0_ge00_shared); | ||
| 323 | platform_device_register(&mv78xx0_ge00); | ||
| 324 | } | ||
| 325 | |||
| 326 | |||
| 327 | /***************************************************************************** | ||
| 328 | * GE01 | ||
| 329 | ****************************************************************************/ | ||
| 330 | struct mv643xx_eth_shared_platform_data mv78xx0_ge01_shared_data = { | ||
| 331 | .t_clk = 0, | ||
| 332 | .dram = &mv78xx0_mbus_dram_info, | ||
| 333 | }; | ||
| 334 | |||
| 335 | static struct resource mv78xx0_ge01_shared_resources[] = { | ||
| 336 | { | ||
| 337 | .name = "ge01 base", | ||
| 338 | .start = GE01_PHYS_BASE + 0x2000, | ||
| 339 | .end = GE01_PHYS_BASE + 0x3fff, | ||
| 340 | .flags = IORESOURCE_MEM, | ||
| 341 | }, | ||
| 342 | }; | ||
| 343 | |||
| 344 | static struct platform_device mv78xx0_ge01_shared = { | ||
| 345 | .name = MV643XX_ETH_SHARED_NAME, | ||
| 346 | .id = 1, | ||
| 347 | .dev = { | ||
| 348 | .platform_data = &mv78xx0_ge01_shared_data, | ||
| 349 | }, | ||
| 350 | .num_resources = 1, | ||
| 351 | .resource = mv78xx0_ge01_shared_resources, | ||
| 352 | }; | ||
| 353 | |||
| 354 | static struct resource mv78xx0_ge01_resources[] = { | ||
| 355 | { | ||
| 356 | .name = "ge01 irq", | ||
| 357 | .start = IRQ_MV78XX0_GE01_SUM, | ||
| 358 | .end = IRQ_MV78XX0_GE01_SUM, | ||
| 359 | .flags = IORESOURCE_IRQ, | ||
| 360 | }, | ||
| 361 | }; | ||
| 362 | |||
| 363 | static struct platform_device mv78xx0_ge01 = { | ||
| 364 | .name = MV643XX_ETH_NAME, | ||
| 365 | .id = 1, | ||
| 366 | .num_resources = 1, | ||
| 367 | .resource = mv78xx0_ge01_resources, | ||
| 368 | }; | ||
| 369 | |||
| 370 | void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) | ||
| 371 | { | ||
| 372 | eth_data->shared = &mv78xx0_ge01_shared; | ||
| 373 | eth_data->shared_smi = &mv78xx0_ge00_shared; | ||
| 374 | mv78xx0_ge01.dev.platform_data = eth_data; | ||
| 375 | |||
| 376 | platform_device_register(&mv78xx0_ge01_shared); | ||
| 377 | platform_device_register(&mv78xx0_ge01); | ||
| 378 | } | ||
| 379 | |||
| 380 | |||
| 381 | /***************************************************************************** | ||
| 382 | * GE10 | ||
| 383 | ****************************************************************************/ | ||
| 384 | struct mv643xx_eth_shared_platform_data mv78xx0_ge10_shared_data = { | ||
| 385 | .t_clk = 0, | ||
| 386 | .dram = &mv78xx0_mbus_dram_info, | ||
| 387 | }; | ||
| 388 | |||
| 389 | static struct resource mv78xx0_ge10_shared_resources[] = { | ||
| 390 | { | ||
| 391 | .name = "ge10 base", | ||
| 392 | .start = GE10_PHYS_BASE + 0x2000, | ||
| 393 | .end = GE10_PHYS_BASE + 0x3fff, | ||
| 394 | .flags = IORESOURCE_MEM, | ||
| 395 | }, | ||
| 396 | }; | ||
| 397 | |||
| 398 | static struct platform_device mv78xx0_ge10_shared = { | ||
| 399 | .name = MV643XX_ETH_SHARED_NAME, | ||
| 400 | .id = 2, | ||
| 401 | .dev = { | ||
| 402 | .platform_data = &mv78xx0_ge10_shared_data, | ||
| 403 | }, | ||
| 404 | .num_resources = 1, | ||
| 405 | .resource = mv78xx0_ge10_shared_resources, | ||
| 406 | }; | ||
| 407 | |||
| 408 | static struct resource mv78xx0_ge10_resources[] = { | ||
| 409 | { | ||
| 410 | .name = "ge10 irq", | ||
| 411 | .start = IRQ_MV78XX0_GE10_SUM, | ||
| 412 | .end = IRQ_MV78XX0_GE10_SUM, | ||
| 413 | .flags = IORESOURCE_IRQ, | ||
| 414 | }, | ||
| 415 | }; | ||
| 416 | |||
| 417 | static struct platform_device mv78xx0_ge10 = { | ||
| 418 | .name = MV643XX_ETH_NAME, | ||
| 419 | .id = 2, | ||
| 420 | .num_resources = 1, | ||
| 421 | .resource = mv78xx0_ge10_resources, | ||
| 422 | }; | ||
| 423 | |||
| 424 | void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data) | ||
| 425 | { | ||
| 426 | eth_data->shared = &mv78xx0_ge10_shared; | ||
| 427 | eth_data->shared_smi = &mv78xx0_ge00_shared; | ||
| 428 | mv78xx0_ge10.dev.platform_data = eth_data; | ||
| 429 | |||
| 430 | platform_device_register(&mv78xx0_ge10_shared); | ||
| 431 | platform_device_register(&mv78xx0_ge10); | ||
| 432 | } | ||
| 433 | |||
| 434 | |||
| 435 | /***************************************************************************** | ||
| 436 | * GE11 | ||
| 437 | ****************************************************************************/ | ||
| 438 | struct mv643xx_eth_shared_platform_data mv78xx0_ge11_shared_data = { | ||
| 439 | .t_clk = 0, | ||
| 440 | .dram = &mv78xx0_mbus_dram_info, | ||
| 441 | }; | ||
| 442 | |||
| 443 | static struct resource mv78xx0_ge11_shared_resources[] = { | ||
| 444 | { | ||
| 445 | .name = "ge11 base", | ||
| 446 | .start = GE11_PHYS_BASE + 0x2000, | ||
| 447 | .end = GE11_PHYS_BASE + 0x3fff, | ||
| 448 | .flags = IORESOURCE_MEM, | ||
| 449 | }, | ||
| 450 | }; | ||
| 451 | |||
| 452 | static struct platform_device mv78xx0_ge11_shared = { | ||
| 453 | .name = MV643XX_ETH_SHARED_NAME, | ||
| 454 | .id = 3, | ||
| 455 | .dev = { | ||
| 456 | .platform_data = &mv78xx0_ge11_shared_data, | ||
| 457 | }, | ||
| 458 | .num_resources = 1, | ||
| 459 | .resource = mv78xx0_ge11_shared_resources, | ||
| 460 | }; | ||
| 461 | |||
| 462 | static struct resource mv78xx0_ge11_resources[] = { | ||
| 463 | { | ||
| 464 | .name = "ge11 irq", | ||
| 465 | .start = IRQ_MV78XX0_GE11_SUM, | ||
| 466 | .end = IRQ_MV78XX0_GE11_SUM, | ||
| 467 | .flags = IORESOURCE_IRQ, | ||
| 468 | }, | ||
| 469 | }; | ||
| 470 | |||
| 471 | static struct platform_device mv78xx0_ge11 = { | ||
| 472 | .name = MV643XX_ETH_NAME, | ||
| 473 | .id = 3, | ||
| 474 | .num_resources = 1, | ||
| 475 | .resource = mv78xx0_ge11_resources, | ||
| 476 | }; | ||
| 477 | |||
| 478 | void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data) | ||
| 479 | { | ||
| 480 | eth_data->shared = &mv78xx0_ge11_shared; | ||
| 481 | eth_data->shared_smi = &mv78xx0_ge00_shared; | ||
| 482 | mv78xx0_ge11.dev.platform_data = eth_data; | ||
| 483 | |||
| 484 | platform_device_register(&mv78xx0_ge11_shared); | ||
| 485 | platform_device_register(&mv78xx0_ge11); | ||
| 486 | } | ||
| 487 | |||
| 488 | |||
| 489 | /***************************************************************************** | ||
| 490 | * SATA | ||
| 491 | ****************************************************************************/ | ||
| 492 | static struct resource mv78xx0_sata_resources[] = { | ||
| 493 | { | ||
| 494 | .name = "sata base", | ||
| 495 | .start = SATA_PHYS_BASE, | ||
| 496 | .end = SATA_PHYS_BASE + 0x5000 - 1, | ||
| 497 | .flags = IORESOURCE_MEM, | ||
| 498 | }, { | ||
| 499 | .name = "sata irq", | ||
| 500 | .start = IRQ_MV78XX0_SATA, | ||
| 501 | .end = IRQ_MV78XX0_SATA, | ||
| 502 | .flags = IORESOURCE_IRQ, | ||
| 503 | }, | ||
| 504 | }; | ||
| 505 | |||
| 506 | static struct platform_device mv78xx0_sata = { | ||
| 507 | .name = "sata_mv", | ||
| 508 | .id = 0, | ||
| 509 | .dev = { | ||
| 510 | .coherent_dma_mask = 0xffffffff, | ||
| 511 | }, | ||
| 512 | .num_resources = ARRAY_SIZE(mv78xx0_sata_resources), | ||
| 513 | .resource = mv78xx0_sata_resources, | ||
| 514 | }; | ||
| 515 | |||
| 516 | void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data) | ||
| 517 | { | ||
| 518 | sata_data->dram = &mv78xx0_mbus_dram_info; | ||
| 519 | mv78xx0_sata.dev.platform_data = sata_data; | ||
| 520 | platform_device_register(&mv78xx0_sata); | ||
| 521 | } | ||
| 522 | |||
| 523 | |||
| 524 | /***************************************************************************** | ||
| 525 | * UART0 | ||
| 526 | ****************************************************************************/ | ||
| 527 | static struct plat_serial8250_port mv78xx0_uart0_data[] = { | ||
| 528 | { | ||
| 529 | .mapbase = UART0_PHYS_BASE, | ||
| 530 | .membase = (char *)UART0_VIRT_BASE, | ||
| 531 | .irq = IRQ_MV78XX0_UART_0, | ||
| 532 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 533 | .iotype = UPIO_MEM, | ||
| 534 | .regshift = 2, | ||
| 535 | .uartclk = 0, | ||
| 536 | }, { | ||
| 537 | }, | ||
| 538 | }; | ||
| 539 | |||
| 540 | static struct resource mv78xx0_uart0_resources[] = { | ||
| 541 | { | ||
| 542 | .start = UART0_PHYS_BASE, | ||
| 543 | .end = UART0_PHYS_BASE + 0xff, | ||
| 544 | .flags = IORESOURCE_MEM, | ||
| 545 | }, { | ||
| 546 | .start = IRQ_MV78XX0_UART_0, | ||
| 547 | .end = IRQ_MV78XX0_UART_0, | ||
| 548 | .flags = IORESOURCE_IRQ, | ||
| 549 | }, | ||
| 550 | }; | ||
| 551 | |||
| 552 | static struct platform_device mv78xx0_uart0 = { | ||
| 553 | .name = "serial8250", | ||
| 554 | .id = 0, | ||
| 555 | .dev = { | ||
| 556 | .platform_data = mv78xx0_uart0_data, | ||
| 557 | }, | ||
| 558 | .resource = mv78xx0_uart0_resources, | ||
| 559 | .num_resources = ARRAY_SIZE(mv78xx0_uart0_resources), | ||
| 560 | }; | ||
| 561 | |||
| 562 | void __init mv78xx0_uart0_init(void) | ||
| 563 | { | ||
| 564 | platform_device_register(&mv78xx0_uart0); | ||
| 565 | } | ||
| 566 | |||
| 567 | |||
| 568 | /***************************************************************************** | ||
| 569 | * UART1 | ||
| 570 | ****************************************************************************/ | ||
| 571 | static struct plat_serial8250_port mv78xx0_uart1_data[] = { | ||
| 572 | { | ||
| 573 | .mapbase = UART1_PHYS_BASE, | ||
| 574 | .membase = (char *)UART1_VIRT_BASE, | ||
| 575 | .irq = IRQ_MV78XX0_UART_1, | ||
| 576 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 577 | .iotype = UPIO_MEM, | ||
| 578 | .regshift = 2, | ||
| 579 | .uartclk = 0, | ||
| 580 | }, { | ||
| 581 | }, | ||
| 582 | }; | ||
| 583 | |||
| 584 | static struct resource mv78xx0_uart1_resources[] = { | ||
| 585 | { | ||
| 586 | .start = UART1_PHYS_BASE, | ||
| 587 | .end = UART1_PHYS_BASE + 0xff, | ||
| 588 | .flags = IORESOURCE_MEM, | ||
| 589 | }, { | ||
| 590 | .start = IRQ_MV78XX0_UART_1, | ||
| 591 | .end = IRQ_MV78XX0_UART_1, | ||
| 592 | .flags = IORESOURCE_IRQ, | ||
| 593 | }, | ||
| 594 | }; | ||
| 595 | |||
| 596 | static struct platform_device mv78xx0_uart1 = { | ||
| 597 | .name = "serial8250", | ||
| 598 | .id = 1, | ||
| 599 | .dev = { | ||
| 600 | .platform_data = mv78xx0_uart1_data, | ||
| 601 | }, | ||
| 602 | .resource = mv78xx0_uart1_resources, | ||
| 603 | .num_resources = ARRAY_SIZE(mv78xx0_uart1_resources), | ||
| 604 | }; | ||
| 605 | |||
| 606 | void __init mv78xx0_uart1_init(void) | ||
| 607 | { | ||
| 608 | platform_device_register(&mv78xx0_uart1); | ||
| 609 | } | ||
| 610 | |||
| 611 | |||
| 612 | /***************************************************************************** | ||
| 613 | * UART2 | ||
| 614 | ****************************************************************************/ | ||
| 615 | static struct plat_serial8250_port mv78xx0_uart2_data[] = { | ||
| 616 | { | ||
| 617 | .mapbase = UART2_PHYS_BASE, | ||
| 618 | .membase = (char *)UART2_VIRT_BASE, | ||
| 619 | .irq = IRQ_MV78XX0_UART_2, | ||
| 620 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 621 | .iotype = UPIO_MEM, | ||
| 622 | .regshift = 2, | ||
| 623 | .uartclk = 0, | ||
| 624 | }, { | ||
| 625 | }, | ||
| 626 | }; | ||
| 627 | |||
| 628 | static struct resource mv78xx0_uart2_resources[] = { | ||
| 629 | { | ||
| 630 | .start = UART2_PHYS_BASE, | ||
| 631 | .end = UART2_PHYS_BASE + 0xff, | ||
| 632 | .flags = IORESOURCE_MEM, | ||
| 633 | }, { | ||
| 634 | .start = IRQ_MV78XX0_UART_2, | ||
| 635 | .end = IRQ_MV78XX0_UART_2, | ||
| 636 | .flags = IORESOURCE_IRQ, | ||
| 637 | }, | ||
| 638 | }; | ||
| 639 | |||
| 640 | static struct platform_device mv78xx0_uart2 = { | ||
| 641 | .name = "serial8250", | ||
| 642 | .id = 2, | ||
| 643 | .dev = { | ||
| 644 | .platform_data = mv78xx0_uart2_data, | ||
| 645 | }, | ||
| 646 | .resource = mv78xx0_uart2_resources, | ||
| 647 | .num_resources = ARRAY_SIZE(mv78xx0_uart2_resources), | ||
| 648 | }; | ||
| 649 | |||
| 650 | void __init mv78xx0_uart2_init(void) | ||
| 651 | { | ||
| 652 | platform_device_register(&mv78xx0_uart2); | ||
| 653 | } | ||
| 654 | |||
| 655 | |||
| 656 | /***************************************************************************** | ||
| 657 | * UART3 | ||
| 658 | ****************************************************************************/ | ||
| 659 | static struct plat_serial8250_port mv78xx0_uart3_data[] = { | ||
| 660 | { | ||
| 661 | .mapbase = UART3_PHYS_BASE, | ||
| 662 | .membase = (char *)UART3_VIRT_BASE, | ||
| 663 | .irq = IRQ_MV78XX0_UART_3, | ||
| 664 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 665 | .iotype = UPIO_MEM, | ||
| 666 | .regshift = 2, | ||
| 667 | .uartclk = 0, | ||
| 668 | }, { | ||
| 669 | }, | ||
| 670 | }; | ||
| 671 | |||
| 672 | static struct resource mv78xx0_uart3_resources[] = { | ||
| 673 | { | ||
| 674 | .start = UART3_PHYS_BASE, | ||
| 675 | .end = UART3_PHYS_BASE + 0xff, | ||
| 676 | .flags = IORESOURCE_MEM, | ||
| 677 | }, { | ||
| 678 | .start = IRQ_MV78XX0_UART_3, | ||
| 679 | .end = IRQ_MV78XX0_UART_3, | ||
| 680 | .flags = IORESOURCE_IRQ, | ||
| 681 | }, | ||
| 682 | }; | ||
| 683 | |||
| 684 | static struct platform_device mv78xx0_uart3 = { | ||
| 685 | .name = "serial8250", | ||
| 686 | .id = 3, | ||
| 687 | .dev = { | ||
| 688 | .platform_data = mv78xx0_uart3_data, | ||
| 689 | }, | ||
| 690 | .resource = mv78xx0_uart3_resources, | ||
| 691 | .num_resources = ARRAY_SIZE(mv78xx0_uart3_resources), | ||
| 692 | }; | ||
| 693 | |||
| 694 | void __init mv78xx0_uart3_init(void) | ||
| 695 | { | ||
| 696 | platform_device_register(&mv78xx0_uart3); | ||
| 697 | } | ||
| 698 | |||
| 699 | |||
| 700 | /***************************************************************************** | ||
| 701 | * Time handling | ||
| 702 | ****************************************************************************/ | ||
| 703 | static void mv78xx0_timer_init(void) | ||
| 704 | { | ||
| 705 | orion_time_init(IRQ_MV78XX0_TIMER_1, get_tclk()); | ||
| 706 | } | ||
| 707 | |||
| 708 | struct sys_timer mv78xx0_timer = { | ||
| 709 | .init = mv78xx0_timer_init, | ||
| 710 | }; | ||
| 711 | |||
| 712 | |||
| 713 | /***************************************************************************** | ||
| 714 | * General | ||
| 715 | ****************************************************************************/ | ||
| 716 | static int __init is_l2_writethrough(void) | ||
| 717 | { | ||
| 718 | return !!(readl(CPU_CONTROL) & L2_WRITETHROUGH); | ||
| 719 | } | ||
| 720 | |||
| 721 | void __init mv78xx0_init(void) | ||
| 722 | { | ||
| 723 | int core_index; | ||
| 724 | int hclk; | ||
| 725 | int pclk; | ||
| 726 | int l2clk; | ||
| 727 | int tclk; | ||
| 728 | |||
| 729 | core_index = mv78xx0_core_index(); | ||
| 730 | hclk = get_hclk(); | ||
| 731 | get_pclk_l2clk(hclk, core_index, &pclk, &l2clk); | ||
| 732 | tclk = get_tclk(); | ||
| 733 | |||
| 734 | printk(KERN_INFO "MV78xx0 core #%d, ", core_index); | ||
| 735 | printk("PCLK = %dMHz, ", (pclk + 499999) / 1000000); | ||
| 736 | printk("L2 = %dMHz, ", (l2clk + 499999) / 1000000); | ||
| 737 | printk("HCLK = %dMHz, ", (hclk + 499999) / 1000000); | ||
| 738 | printk("TCLK = %dMHz\n", (tclk + 499999) / 1000000); | ||
| 739 | |||
| 740 | mv78xx0_setup_cpu_mbus(); | ||
| 741 | |||
| 742 | #ifdef CONFIG_CACHE_FEROCEON_L2 | ||
| 743 | feroceon_l2_init(is_l2_writethrough()); | ||
| 744 | #endif | ||
| 745 | |||
| 746 | mv78xx0_ge00_shared_data.t_clk = tclk; | ||
| 747 | mv78xx0_ge01_shared_data.t_clk = tclk; | ||
| 748 | mv78xx0_ge10_shared_data.t_clk = tclk; | ||
| 749 | mv78xx0_ge11_shared_data.t_clk = tclk; | ||
| 750 | mv78xx0_uart0_data[0].uartclk = tclk; | ||
| 751 | mv78xx0_uart1_data[0].uartclk = tclk; | ||
| 752 | mv78xx0_uart2_data[0].uartclk = tclk; | ||
| 753 | mv78xx0_uart3_data[0].uartclk = tclk; | ||
| 754 | } | ||
diff --git a/arch/arm/mach-mv78xx0/common.h b/arch/arm/mach-mv78xx0/common.h new file mode 100644 index 000000000000..78af5de319dd --- /dev/null +++ b/arch/arm/mach-mv78xx0/common.h | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-mv78xx0/common.h | ||
| 3 | * | ||
| 4 | * Core functions for Marvell MV78xx0 SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ARCH_MV78XX0_COMMON_H | ||
| 12 | #define __ARCH_MV78XX0_COMMON_H | ||
| 13 | |||
| 14 | struct mv643xx_eth_platform_data; | ||
| 15 | struct mv_sata_platform_data; | ||
| 16 | |||
| 17 | /* | ||
| 18 | * Basic MV78xx0 init functions used early by machine-setup. | ||
| 19 | */ | ||
| 20 | int mv78xx0_core_index(void); | ||
| 21 | void mv78xx0_map_io(void); | ||
| 22 | void mv78xx0_init(void); | ||
| 23 | void mv78xx0_init_irq(void); | ||
| 24 | |||
| 25 | extern struct mbus_dram_target_info mv78xx0_mbus_dram_info; | ||
| 26 | void mv78xx0_setup_cpu_mbus(void); | ||
| 27 | void mv78xx0_setup_pcie_io_win(int window, u32 base, u32 size, | ||
| 28 | int maj, int min); | ||
| 29 | void mv78xx0_setup_pcie_mem_win(int window, u32 base, u32 size, | ||
| 30 | int maj, int min); | ||
| 31 | |||
| 32 | void mv78xx0_ehci0_init(void); | ||
| 33 | void mv78xx0_ehci1_init(void); | ||
| 34 | void mv78xx0_ehci2_init(void); | ||
| 35 | void mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 36 | void mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 37 | void mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 38 | void mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 39 | void mv78xx0_pcie_init(int init_port0, int init_port1); | ||
| 40 | void mv78xx0_sata_init(struct mv_sata_platform_data *sata_data); | ||
| 41 | void mv78xx0_uart0_init(void); | ||
| 42 | void mv78xx0_uart1_init(void); | ||
| 43 | void mv78xx0_uart2_init(void); | ||
| 44 | void mv78xx0_uart3_init(void); | ||
| 45 | |||
| 46 | extern struct sys_timer mv78xx0_timer; | ||
| 47 | |||
| 48 | |||
| 49 | #endif | ||
diff --git a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c new file mode 100644 index 000000000000..0c93d19193df --- /dev/null +++ b/arch/arm/mach-mv78xx0/db78x00-bp-setup.c | |||
| @@ -0,0 +1,94 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-mv78xx0/db78x00-bp-setup.c | ||
| 3 | * | ||
| 4 | * Marvell DB-78x00-BP Development Board Setup | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/ata_platform.h> | ||
| 15 | #include <linux/mv643xx_eth.h> | ||
| 16 | #include <asm/arch/mv78xx0.h> | ||
| 17 | #include <asm/mach-types.h> | ||
| 18 | #include <asm/mach/arch.h> | ||
| 19 | #include "common.h" | ||
| 20 | |||
| 21 | static struct mv643xx_eth_platform_data db78x00_ge00_data = { | ||
| 22 | .phy_addr = 8, | ||
| 23 | }; | ||
| 24 | |||
| 25 | static struct mv643xx_eth_platform_data db78x00_ge01_data = { | ||
| 26 | .phy_addr = 9, | ||
| 27 | }; | ||
| 28 | |||
| 29 | static struct mv643xx_eth_platform_data db78x00_ge10_data = { | ||
| 30 | .phy_addr = -1, | ||
| 31 | }; | ||
| 32 | |||
| 33 | static struct mv643xx_eth_platform_data db78x00_ge11_data = { | ||
| 34 | .phy_addr = -1, | ||
| 35 | }; | ||
| 36 | |||
| 37 | static struct mv_sata_platform_data db78x00_sata_data = { | ||
| 38 | .n_ports = 2, | ||
| 39 | }; | ||
| 40 | |||
| 41 | static void __init db78x00_init(void) | ||
| 42 | { | ||
| 43 | /* | ||
| 44 | * Basic MV78xx0 setup. Needs to be called early. | ||
| 45 | */ | ||
| 46 | mv78xx0_init(); | ||
| 47 | |||
| 48 | /* | ||
| 49 | * Partition on-chip peripherals between the two CPU cores. | ||
| 50 | */ | ||
| 51 | if (mv78xx0_core_index() == 0) { | ||
| 52 | mv78xx0_ehci0_init(); | ||
| 53 | mv78xx0_ehci1_init(); | ||
| 54 | mv78xx0_ehci2_init(); | ||
| 55 | mv78xx0_ge00_init(&db78x00_ge00_data); | ||
| 56 | mv78xx0_ge01_init(&db78x00_ge01_data); | ||
| 57 | mv78xx0_ge10_init(&db78x00_ge10_data); | ||
| 58 | mv78xx0_ge11_init(&db78x00_ge11_data); | ||
| 59 | mv78xx0_sata_init(&db78x00_sata_data); | ||
| 60 | mv78xx0_uart0_init(); | ||
| 61 | mv78xx0_uart2_init(); | ||
| 62 | } else { | ||
| 63 | mv78xx0_uart1_init(); | ||
| 64 | mv78xx0_uart3_init(); | ||
| 65 | } | ||
| 66 | } | ||
| 67 | |||
| 68 | static int __init db78x00_pci_init(void) | ||
| 69 | { | ||
| 70 | if (machine_is_db78x00_bp()) { | ||
| 71 | /* | ||
| 72 | * Assign the x16 PCIe slot on the board to CPU core | ||
| 73 | * #0, and let CPU core #1 have the four x1 slots. | ||
| 74 | */ | ||
| 75 | if (mv78xx0_core_index() == 0) | ||
| 76 | mv78xx0_pcie_init(0, 1); | ||
| 77 | else | ||
| 78 | mv78xx0_pcie_init(1, 0); | ||
| 79 | } | ||
| 80 | |||
| 81 | return 0; | ||
| 82 | } | ||
| 83 | subsys_initcall(db78x00_pci_init); | ||
| 84 | |||
| 85 | MACHINE_START(DB78X00_BP, "Marvell DB-78x00-BP Development Board") | ||
| 86 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ | ||
| 87 | .phys_io = MV78XX0_REGS_PHYS_BASE, | ||
| 88 | .io_pg_offst = ((MV78XX0_REGS_VIRT_BASE) >> 18) & 0xfffc, | ||
| 89 | .boot_params = 0x00000100, | ||
| 90 | .init_machine = db78x00_init, | ||
| 91 | .map_io = mv78xx0_map_io, | ||
| 92 | .init_irq = mv78xx0_init_irq, | ||
| 93 | .timer = &mv78xx0_timer, | ||
| 94 | MACHINE_END | ||
diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c new file mode 100644 index 000000000000..60f4ee4d4532 --- /dev/null +++ b/arch/arm/mach-mv78xx0/irq.c | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-mv78xx0/irq.c | ||
| 3 | * | ||
| 4 | * MV78xx0 IRQ handling. | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/pci.h> | ||
| 14 | #include <asm/arch/mv78xx0.h> | ||
| 15 | #include <asm/plat-orion/irq.h> | ||
| 16 | #include "common.h" | ||
| 17 | |||
| 18 | void __init mv78xx0_init_irq(void) | ||
| 19 | { | ||
| 20 | orion_irq_init(0, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF)); | ||
| 21 | orion_irq_init(32, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF)); | ||
| 22 | } | ||
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c new file mode 100644 index 000000000000..b78e1443159f --- /dev/null +++ b/arch/arm/mach-mv78xx0/pcie.c | |||
| @@ -0,0 +1,312 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-mv78xx0/pcie.c | ||
| 3 | * | ||
| 4 | * PCIe functions for Marvell MV78xx0 SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/pci.h> | ||
| 13 | #include <linux/mbus.h> | ||
| 14 | #include <asm/mach/pci.h> | ||
| 15 | #include <asm/plat-orion/pcie.h> | ||
| 16 | #include "common.h" | ||
| 17 | |||
| 18 | struct pcie_port { | ||
| 19 | u8 maj; | ||
| 20 | u8 min; | ||
| 21 | u8 root_bus_nr; | ||
| 22 | void __iomem *base; | ||
| 23 | spinlock_t conf_lock; | ||
| 24 | char io_space_name[16]; | ||
| 25 | char mem_space_name[16]; | ||
| 26 | struct resource res[2]; | ||
| 27 | }; | ||
| 28 | |||
| 29 | static struct pcie_port pcie_port[8]; | ||
| 30 | static int num_pcie_ports; | ||
| 31 | static struct resource pcie_io_space; | ||
| 32 | static struct resource pcie_mem_space; | ||
| 33 | |||
| 34 | |||
| 35 | static void __init mv78xx0_pcie_preinit(void) | ||
| 36 | { | ||
| 37 | int i; | ||
| 38 | u32 size_each; | ||
| 39 | u32 start; | ||
| 40 | int win; | ||
| 41 | |||
| 42 | pcie_io_space.name = "PCIe I/O Space"; | ||
| 43 | pcie_io_space.start = MV78XX0_PCIE_IO_PHYS_BASE(0); | ||
| 44 | pcie_io_space.end = | ||
| 45 | MV78XX0_PCIE_IO_PHYS_BASE(0) + MV78XX0_PCIE_IO_SIZE * 8 - 1; | ||
| 46 | pcie_io_space.flags = IORESOURCE_IO; | ||
| 47 | if (request_resource(&iomem_resource, &pcie_io_space)) | ||
| 48 | panic("can't allocate PCIe I/O space"); | ||
| 49 | |||
| 50 | pcie_mem_space.name = "PCIe MEM Space"; | ||
| 51 | pcie_mem_space.start = MV78XX0_PCIE_MEM_PHYS_BASE; | ||
| 52 | pcie_mem_space.end = | ||
| 53 | MV78XX0_PCIE_MEM_PHYS_BASE + MV78XX0_PCIE_MEM_SIZE - 1; | ||
| 54 | pcie_mem_space.flags = IORESOURCE_MEM; | ||
| 55 | if (request_resource(&iomem_resource, &pcie_mem_space)) | ||
| 56 | panic("can't allocate PCIe MEM space"); | ||
| 57 | |||
| 58 | for (i = 0; i < num_pcie_ports; i++) { | ||
| 59 | struct pcie_port *pp = pcie_port + i; | ||
| 60 | |||
| 61 | snprintf(pp->io_space_name, sizeof(pp->io_space_name), | ||
| 62 | "PCIe %d.%d I/O", pp->maj, pp->min); | ||
| 63 | pp->io_space_name[sizeof(pp->io_space_name) - 1] = 0; | ||
| 64 | pp->res[0].name = pp->io_space_name; | ||
| 65 | pp->res[0].start = MV78XX0_PCIE_IO_PHYS_BASE(i); | ||
| 66 | pp->res[0].end = pp->res[0].start + MV78XX0_PCIE_IO_SIZE - 1; | ||
| 67 | pp->res[0].flags = IORESOURCE_IO; | ||
| 68 | |||
| 69 | snprintf(pp->mem_space_name, sizeof(pp->mem_space_name), | ||
| 70 | "PCIe %d.%d MEM", pp->maj, pp->min); | ||
| 71 | pp->mem_space_name[sizeof(pp->mem_space_name) - 1] = 0; | ||
| 72 | pp->res[1].name = pp->mem_space_name; | ||
| 73 | pp->res[1].flags = IORESOURCE_MEM; | ||
| 74 | } | ||
| 75 | |||
| 76 | switch (num_pcie_ports) { | ||
| 77 | case 0: | ||
| 78 | size_each = 0; | ||
| 79 | break; | ||
| 80 | |||
| 81 | case 1: | ||
| 82 | size_each = 0x30000000; | ||
| 83 | break; | ||
| 84 | |||
| 85 | case 2 ... 3: | ||
| 86 | size_each = 0x10000000; | ||
| 87 | break; | ||
| 88 | |||
| 89 | case 4 ... 6: | ||
| 90 | size_each = 0x08000000; | ||
| 91 | break; | ||
| 92 | |||
| 93 | case 7: | ||
| 94 | size_each = 0x04000000; | ||
| 95 | break; | ||
| 96 | |||
| 97 | default: | ||
| 98 | panic("invalid number of PCIe ports"); | ||
| 99 | } | ||
| 100 | |||
| 101 | start = MV78XX0_PCIE_MEM_PHYS_BASE; | ||
| 102 | for (i = 0; i < num_pcie_ports; i++) { | ||
| 103 | struct pcie_port *pp = pcie_port + i; | ||
| 104 | |||
| 105 | pp->res[1].start = start; | ||
| 106 | pp->res[1].end = start + size_each - 1; | ||
| 107 | start += size_each; | ||
| 108 | } | ||
| 109 | |||
| 110 | for (i = 0; i < num_pcie_ports; i++) { | ||
| 111 | struct pcie_port *pp = pcie_port + i; | ||
| 112 | |||
| 113 | if (request_resource(&pcie_io_space, &pp->res[0])) | ||
| 114 | panic("can't allocate PCIe I/O sub-space"); | ||
| 115 | |||
| 116 | if (request_resource(&pcie_mem_space, &pp->res[1])) | ||
| 117 | panic("can't allocate PCIe MEM sub-space"); | ||
| 118 | } | ||
| 119 | |||
| 120 | win = 0; | ||
| 121 | for (i = 0; i < num_pcie_ports; i++) { | ||
| 122 | struct pcie_port *pp = pcie_port + i; | ||
| 123 | |||
| 124 | mv78xx0_setup_pcie_io_win(win++, pp->res[0].start, | ||
| 125 | pp->res[0].end - pp->res[0].start + 1, | ||
| 126 | pp->maj, pp->min); | ||
| 127 | |||
| 128 | mv78xx0_setup_pcie_mem_win(win++, pp->res[1].start, | ||
| 129 | pp->res[1].end - pp->res[1].start + 1, | ||
| 130 | pp->maj, pp->min); | ||
| 131 | } | ||
| 132 | } | ||
| 133 | |||
| 134 | static int __init mv78xx0_pcie_setup(int nr, struct pci_sys_data *sys) | ||
| 135 | { | ||
| 136 | struct pcie_port *pp; | ||
| 137 | |||
| 138 | if (nr >= num_pcie_ports) | ||
| 139 | return 0; | ||
| 140 | |||
| 141 | pp = &pcie_port[nr]; | ||
| 142 | pp->root_bus_nr = sys->busnr; | ||
| 143 | |||
| 144 | /* | ||
| 145 | * Generic PCIe unit setup. | ||
| 146 | */ | ||
| 147 | orion_pcie_set_local_bus_nr(pp->base, sys->busnr); | ||
| 148 | orion_pcie_setup(pp->base, &mv78xx0_mbus_dram_info); | ||
| 149 | |||
| 150 | sys->resource[0] = &pp->res[0]; | ||
| 151 | sys->resource[1] = &pp->res[1]; | ||
| 152 | sys->resource[2] = NULL; | ||
| 153 | |||
| 154 | return 1; | ||
| 155 | } | ||
| 156 | |||
| 157 | static struct pcie_port *bus_to_port(int bus) | ||
| 158 | { | ||
| 159 | int i; | ||
| 160 | |||
| 161 | for (i = num_pcie_ports - 1; i >= 0; i--) { | ||
| 162 | int rbus = pcie_port[i].root_bus_nr; | ||
| 163 | if (rbus != -1 && rbus <= bus) | ||
| 164 | break; | ||
| 165 | } | ||
| 166 | |||
| 167 | return i >= 0 ? pcie_port + i : NULL; | ||
| 168 | } | ||
| 169 | |||
| 170 | static int pcie_valid_config(struct pcie_port *pp, int bus, int dev) | ||
| 171 | { | ||
| 172 | /* | ||
| 173 | * Don't go out when trying to access nonexisting devices | ||
| 174 | * on the local bus. | ||
| 175 | */ | ||
| 176 | if (bus == pp->root_bus_nr && dev > 1) | ||
| 177 | return 0; | ||
| 178 | |||
| 179 | return 1; | ||
| 180 | } | ||
| 181 | |||
| 182 | static int pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, | ||
| 183 | int size, u32 *val) | ||
| 184 | { | ||
| 185 | struct pcie_port *pp = bus_to_port(bus->number); | ||
| 186 | unsigned long flags; | ||
| 187 | int ret; | ||
| 188 | |||
| 189 | if (pcie_valid_config(pp, bus->number, PCI_SLOT(devfn)) == 0) { | ||
| 190 | *val = 0xffffffff; | ||
| 191 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
| 192 | } | ||
| 193 | |||
| 194 | spin_lock_irqsave(&pp->conf_lock, flags); | ||
| 195 | ret = orion_pcie_rd_conf(pp->base, bus, devfn, where, size, val); | ||
| 196 | spin_unlock_irqrestore(&pp->conf_lock, flags); | ||
| 197 | |||
| 198 | return ret; | ||
| 199 | } | ||
| 200 | |||
| 201 | static int pcie_wr_conf(struct pci_bus *bus, u32 devfn, | ||
| 202 | int where, int size, u32 val) | ||
| 203 | { | ||
| 204 | struct pcie_port *pp = bus_to_port(bus->number); | ||
| 205 | unsigned long flags; | ||
| 206 | int ret; | ||
| 207 | |||
| 208 | if (pcie_valid_config(pp, bus->number, PCI_SLOT(devfn)) == 0) | ||
| 209 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
| 210 | |||
| 211 | spin_lock_irqsave(&pp->conf_lock, flags); | ||
| 212 | ret = orion_pcie_wr_conf(pp->base, bus, devfn, where, size, val); | ||
| 213 | spin_unlock_irqrestore(&pp->conf_lock, flags); | ||
| 214 | |||
| 215 | return ret; | ||
| 216 | } | ||
| 217 | |||
| 218 | static struct pci_ops pcie_ops = { | ||
| 219 | .read = pcie_rd_conf, | ||
| 220 | .write = pcie_wr_conf, | ||
| 221 | }; | ||
| 222 | |||
| 223 | static void __devinit rc_pci_fixup(struct pci_dev *dev) | ||
| 224 | { | ||
| 225 | /* | ||
| 226 | * Prevent enumeration of root complex. | ||
| 227 | */ | ||
| 228 | if (dev->bus->parent == NULL && dev->devfn == 0) { | ||
| 229 | int i; | ||
| 230 | |||
| 231 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { | ||
| 232 | dev->resource[i].start = 0; | ||
| 233 | dev->resource[i].end = 0; | ||
| 234 | dev->resource[i].flags = 0; | ||
| 235 | } | ||
| 236 | } | ||
| 237 | } | ||
| 238 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); | ||
| 239 | |||
| 240 | static struct pci_bus __init * | ||
| 241 | mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys) | ||
| 242 | { | ||
| 243 | struct pci_bus *bus; | ||
| 244 | |||
| 245 | if (nr < num_pcie_ports) { | ||
| 246 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); | ||
| 247 | } else { | ||
| 248 | bus = NULL; | ||
| 249 | BUG(); | ||
| 250 | } | ||
| 251 | |||
| 252 | return bus; | ||
| 253 | } | ||
| 254 | |||
| 255 | static int __init mv78xx0_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 256 | { | ||
| 257 | struct pcie_port *pp = bus_to_port(dev->bus->number); | ||
| 258 | |||
| 259 | return IRQ_MV78XX0_PCIE_00 + (pp->maj << 2) + pp->min; | ||
| 260 | } | ||
| 261 | |||
| 262 | static struct hw_pci mv78xx0_pci __initdata = { | ||
| 263 | .nr_controllers = 8, | ||
| 264 | .preinit = mv78xx0_pcie_preinit, | ||
| 265 | .swizzle = pci_std_swizzle, | ||
| 266 | .setup = mv78xx0_pcie_setup, | ||
| 267 | .scan = mv78xx0_pcie_scan_bus, | ||
| 268 | .map_irq = mv78xx0_pcie_map_irq, | ||
| 269 | }; | ||
| 270 | |||
| 271 | static void __init add_pcie_port(int maj, int min, unsigned long base) | ||
| 272 | { | ||
| 273 | printk(KERN_INFO "MV78xx0 PCIe port %d.%d: ", maj, min); | ||
| 274 | |||
| 275 | if (orion_pcie_link_up((void __iomem *)base)) { | ||
| 276 | struct pcie_port *pp = &pcie_port[num_pcie_ports++]; | ||
| 277 | |||
| 278 | printk("link up\n"); | ||
| 279 | |||
| 280 | pp->maj = maj; | ||
| 281 | pp->min = min; | ||
| 282 | pp->root_bus_nr = -1; | ||
| 283 | pp->base = (void __iomem *)base; | ||
| 284 | spin_lock_init(&pp->conf_lock); | ||
| 285 | memset(pp->res, 0, sizeof(pp->res)); | ||
| 286 | } else { | ||
| 287 | printk("link down, ignoring\n"); | ||
| 288 | } | ||
| 289 | } | ||
| 290 | |||
| 291 | void __init mv78xx0_pcie_init(int init_port0, int init_port1) | ||
| 292 | { | ||
| 293 | if (init_port0) { | ||
| 294 | add_pcie_port(0, 0, PCIE00_VIRT_BASE); | ||
| 295 | if (!orion_pcie_x4_mode((void __iomem *)PCIE00_VIRT_BASE)) { | ||
| 296 | add_pcie_port(0, 1, PCIE01_VIRT_BASE); | ||
| 297 | add_pcie_port(0, 2, PCIE02_VIRT_BASE); | ||
| 298 | add_pcie_port(0, 3, PCIE03_VIRT_BASE); | ||
| 299 | } | ||
| 300 | } | ||
| 301 | |||
| 302 | if (init_port1) { | ||
| 303 | add_pcie_port(1, 0, PCIE10_VIRT_BASE); | ||
| 304 | if (!orion_pcie_x4_mode((void __iomem *)PCIE10_VIRT_BASE)) { | ||
| 305 | add_pcie_port(1, 1, PCIE11_VIRT_BASE); | ||
| 306 | add_pcie_port(1, 2, PCIE12_VIRT_BASE); | ||
| 307 | add_pcie_port(1, 3, PCIE13_VIRT_BASE); | ||
| 308 | } | ||
| 309 | } | ||
| 310 | |||
| 311 | pci_common_init(&mv78xx0_pci); | ||
| 312 | } | ||
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index c06f5254c0f3..1bda8f5d7546 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile | |||
| @@ -3,7 +3,9 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Common support | 5 | # Common support |
| 6 | obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o | 6 | obj-y := io.o id.o sram.o clock.o irq.o mux.o serial.o devices.o |
| 7 | |||
| 8 | obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o | ||
| 7 | 9 | ||
| 8 | obj-$(CONFIG_OMAP_MPU_TIMER) += time.o | 10 | obj-$(CONFIG_OMAP_MPU_TIMER) += time.o |
| 9 | obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o | 11 | obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o |
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index bcb984f2300f..3f39e0e79c9f 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/mutex.h> | ||
| 13 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 14 | #include <linux/input.h> | 15 | #include <linux/input.h> |
| 15 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
| @@ -202,7 +203,7 @@ static struct omap_board_config_kernel nokia770_config[] __initdata = { | |||
| 202 | #define AMPLIFIER_CTRL_GPIO 58 | 203 | #define AMPLIFIER_CTRL_GPIO 58 |
| 203 | 204 | ||
| 204 | static struct clk *dspxor_ck; | 205 | static struct clk *dspxor_ck; |
| 205 | static DECLARE_MUTEX(audio_pwr_sem); | 206 | static DEFINE_MUTEX(audio_pwr_lock); |
| 206 | /* | 207 | /* |
| 207 | * audio_pwr_state | 208 | * audio_pwr_state |
| 208 | * +--+-------------------------+---------------------------------------+ | 209 | * +--+-------------------------+---------------------------------------+ |
| @@ -218,7 +219,7 @@ static DECLARE_MUTEX(audio_pwr_sem); | |||
| 218 | static int audio_pwr_state = -1; | 219 | static int audio_pwr_state = -1; |
| 219 | 220 | ||
| 220 | /* | 221 | /* |
| 221 | * audio_pwr_up / down should be called under audio_pwr_sem | 222 | * audio_pwr_up / down should be called under audio_pwr_lock |
| 222 | */ | 223 | */ |
| 223 | static void nokia770_audio_pwr_up(void) | 224 | static void nokia770_audio_pwr_up(void) |
| 224 | { | 225 | { |
| @@ -237,11 +238,11 @@ static void nokia770_audio_pwr_up(void) | |||
| 237 | 238 | ||
| 238 | static void codec_delayed_power_down(struct work_struct *work) | 239 | static void codec_delayed_power_down(struct work_struct *work) |
| 239 | { | 240 | { |
| 240 | down(&audio_pwr_sem); | 241 | mutex_lock(&audio_pwr_lock); |
| 241 | if (audio_pwr_state == -1) | 242 | if (audio_pwr_state == -1) |
| 242 | aic23_power_down(); | 243 | aic23_power_down(); |
| 243 | clk_disable(dspxor_ck); | 244 | clk_disable(dspxor_ck); |
| 244 | up(&audio_pwr_sem); | 245 | mutex_unlock(&audio_pwr_lock); |
| 245 | } | 246 | } |
| 246 | 247 | ||
| 247 | static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down); | 248 | static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down); |
| @@ -258,19 +259,19 @@ static void nokia770_audio_pwr_down(void) | |||
| 258 | static int | 259 | static int |
| 259 | nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage) | 260 | nokia770_audio_pwr_up_request(struct dsp_kfunc_device *kdev, int stage) |
| 260 | { | 261 | { |
| 261 | down(&audio_pwr_sem); | 262 | mutex_lock(&audio_pwr_lock); |
| 262 | if (audio_pwr_state == -1) | 263 | if (audio_pwr_state == -1) |
| 263 | nokia770_audio_pwr_up(); | 264 | nokia770_audio_pwr_up(); |
| 264 | /* force audio_pwr_state = 0, even if it was 1. */ | 265 | /* force audio_pwr_state = 0, even if it was 1. */ |
| 265 | audio_pwr_state = 0; | 266 | audio_pwr_state = 0; |
| 266 | up(&audio_pwr_sem); | 267 | mutex_unlock(&audio_pwr_lock); |
| 267 | return 0; | 268 | return 0; |
| 268 | } | 269 | } |
| 269 | 270 | ||
| 270 | static int | 271 | static int |
| 271 | nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage) | 272 | nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage) |
| 272 | { | 273 | { |
| 273 | down(&audio_pwr_sem); | 274 | mutex_lock(&audio_pwr_lock); |
| 274 | switch (stage) { | 275 | switch (stage) { |
| 275 | case 1: | 276 | case 1: |
| 276 | if (audio_pwr_state == 0) | 277 | if (audio_pwr_state == 0) |
| @@ -283,7 +284,7 @@ nokia770_audio_pwr_down_request(struct dsp_kfunc_device *kdev, int stage) | |||
| 283 | } | 284 | } |
| 284 | break; | 285 | break; |
| 285 | } | 286 | } |
| 286 | up(&audio_pwr_sem); | 287 | mutex_unlock(&audio_pwr_lock); |
| 287 | return 0; | 288 | return 0; |
| 288 | } | 289 | } |
| 289 | 290 | ||
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index a66505f58b15..845c66371ca3 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
| @@ -267,13 +267,17 @@ static struct i2c_board_info __initdata osk_i2c_board_info[] = { | |||
| 267 | 267 | ||
| 268 | static void __init osk_init_smc91x(void) | 268 | static void __init osk_init_smc91x(void) |
| 269 | { | 269 | { |
| 270 | u32 l; | ||
| 271 | |||
| 270 | if ((gpio_request(0, "smc_irq")) < 0) { | 272 | if ((gpio_request(0, "smc_irq")) < 0) { |
| 271 | printk("Error requesting gpio 0 for smc91x irq\n"); | 273 | printk("Error requesting gpio 0 for smc91x irq\n"); |
| 272 | return; | 274 | return; |
| 273 | } | 275 | } |
| 274 | 276 | ||
| 275 | /* Check EMIFS wait states to fix errors with SMC_GET_PKT_HDR */ | 277 | /* Check EMIFS wait states to fix errors with SMC_GET_PKT_HDR */ |
| 276 | EMIFS_CCS(1) |= 0x3; | 278 | l = omap_readl(EMIFS_CCS(1)); |
| 279 | l |= 0x3; | ||
| 280 | omap_writel(l, EMIFS_CCS(1)); | ||
| 277 | } | 281 | } |
| 278 | 282 | ||
| 279 | static void __init osk_init_cf(void) | 283 | static void __init osk_init_cf(void) |
| @@ -526,20 +530,26 @@ static void __init osk_mistral_init(void) { } | |||
| 526 | 530 | ||
| 527 | static void __init osk_init(void) | 531 | static void __init osk_init(void) |
| 528 | { | 532 | { |
| 533 | u32 l; | ||
| 534 | |||
| 529 | /* Workaround for wrong CS3 (NOR flash) timing | 535 | /* Workaround for wrong CS3 (NOR flash) timing |
| 530 | * There are some U-Boot versions out there which configure | 536 | * There are some U-Boot versions out there which configure |
| 531 | * wrong CS3 memory timings. This mainly leads to CRC | 537 | * wrong CS3 memory timings. This mainly leads to CRC |
| 532 | * or similar errors if you use NOR flash (e.g. with JFFS2) | 538 | * or similar errors if you use NOR flash (e.g. with JFFS2) |
| 533 | */ | 539 | */ |
| 534 | if (EMIFS_CCS(3) != EMIFS_CS3_VAL) | 540 | l = omap_readl(EMIFS_CCS(3)); |
| 535 | EMIFS_CCS(3) = EMIFS_CS3_VAL; | 541 | if (l != EMIFS_CS3_VAL) |
| 542 | omap_writel(EMIFS_CS3_VAL, EMIFS_CCS(3)); | ||
| 536 | 543 | ||
| 537 | osk_flash_resource.end = osk_flash_resource.start = omap_cs3_phys(); | 544 | osk_flash_resource.end = osk_flash_resource.start = omap_cs3_phys(); |
| 538 | osk_flash_resource.end += SZ_32M - 1; | 545 | osk_flash_resource.end += SZ_32M - 1; |
| 539 | platform_add_devices(osk5912_devices, ARRAY_SIZE(osk5912_devices)); | 546 | platform_add_devices(osk5912_devices, ARRAY_SIZE(osk5912_devices)); |
| 540 | omap_board_config = osk_config; | 547 | omap_board_config = osk_config; |
| 541 | omap_board_config_size = ARRAY_SIZE(osk_config); | 548 | omap_board_config_size = ARRAY_SIZE(osk_config); |
| 542 | USB_TRANSCEIVER_CTRL_REG |= (3 << 1); | 549 | |
| 550 | l = omap_readl(USB_TRANSCEIVER_CTRL); | ||
| 551 | l |= (3 << 1); | ||
| 552 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 543 | 553 | ||
| 544 | /* irq for tps65010 chip */ | 554 | /* irq for tps65010 chip */ |
| 545 | /* bootloader effectively does: omap_cfg_reg(U19_1610_MPUIO1); */ | 555 | /* bootloader effectively does: omap_cfg_reg(U19_1610_MPUIO1); */ |
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index a0b16a7e8a04..a4d20127a60e 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/mtd/mtd.h> | 24 | #include <linux/mtd/mtd.h> |
| 25 | #include <linux/mtd/partitions.h> | 25 | #include <linux/mtd/partitions.h> |
| 26 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
| 27 | #include <linux/spi/tsc2102.h> | ||
| 28 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 29 | #include <linux/apm-emulation.h> | 28 | #include <linux/apm-emulation.h> |
| 30 | 29 | ||
| @@ -315,14 +314,6 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery) | |||
| 315 | #define palmte_get_power_status NULL | 314 | #define palmte_get_power_status NULL |
| 316 | #endif | 315 | #endif |
| 317 | 316 | ||
| 318 | static struct tsc2102_config palmte_tsc2102_config = { | ||
| 319 | .use_internal = 0, | ||
| 320 | .monitor = TSC_BAT1 | TSC_AUX | TSC_TEMP, | ||
| 321 | .temp_at25c = { 2200, 2615 }, | ||
| 322 | .apm_report = palmte_get_power_status, | ||
| 323 | .alsa_config = &palmte_alsa_config, | ||
| 324 | }; | ||
| 325 | |||
| 326 | static struct omap_board_config_kernel palmte_config[] __initdata = { | 317 | static struct omap_board_config_kernel palmte_config[] __initdata = { |
| 327 | { OMAP_TAG_USB, &palmte_usb_config }, | 318 | { OMAP_TAG_USB, &palmte_usb_config }, |
| 328 | { OMAP_TAG_MMC, &palmte_mmc_config }, | 319 | { OMAP_TAG_MMC, &palmte_mmc_config }, |
| @@ -336,7 +327,6 @@ static struct spi_board_info palmte_spi_info[] __initdata = { | |||
| 336 | .bus_num = 2, /* uWire (officially) */ | 327 | .bus_num = 2, /* uWire (officially) */ |
| 337 | .chip_select = 0, /* As opposed to 3 */ | 328 | .chip_select = 0, /* As opposed to 3 */ |
| 338 | .irq = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO), | 329 | .irq = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO), |
| 339 | .platform_data = &palmte_tsc2102_config, | ||
| 340 | .max_speed_hz = 8000000, | 330 | .max_speed_hz = 8000000, |
| 341 | }, | 331 | }, |
| 342 | }; | 332 | }; |
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 30e188109046..0cf62ef5ecb7 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | static void fpga_mask_irq(unsigned int irq) | 33 | static void fpga_mask_irq(unsigned int irq) |
| 34 | { | 34 | { |
| 35 | irq -= OMAP1510_IH_FPGA_BASE; | 35 | irq -= OMAP_FPGA_IRQ_BASE; |
| 36 | 36 | ||
| 37 | if (irq < 8) | 37 | if (irq < 8) |
| 38 | __raw_writeb((__raw_readb(OMAP1510_FPGA_IMR_LO) | 38 | __raw_writeb((__raw_readb(OMAP1510_FPGA_IMR_LO) |
| @@ -65,7 +65,7 @@ static void fpga_ack_irq(unsigned int irq) | |||
| 65 | 65 | ||
| 66 | static void fpga_unmask_irq(unsigned int irq) | 66 | static void fpga_unmask_irq(unsigned int irq) |
| 67 | { | 67 | { |
| 68 | irq -= OMAP1510_IH_FPGA_BASE; | 68 | irq -= OMAP_FPGA_IRQ_BASE; |
| 69 | 69 | ||
| 70 | if (irq < 8) | 70 | if (irq < 8) |
| 71 | __raw_writeb((__raw_readb(OMAP1510_FPGA_IMR_LO) | (1 << irq)), | 71 | __raw_writeb((__raw_readb(OMAP1510_FPGA_IMR_LO) | (1 << irq)), |
| @@ -95,8 +95,8 @@ void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc) | |||
| 95 | if (!stat) | 95 | if (!stat) |
| 96 | return; | 96 | return; |
| 97 | 97 | ||
| 98 | for (fpga_irq = OMAP1510_IH_FPGA_BASE; | 98 | for (fpga_irq = OMAP_FPGA_IRQ_BASE; |
| 99 | (fpga_irq < (OMAP1510_IH_FPGA_BASE + NR_FPGA_IRQS)) && stat; | 99 | (fpga_irq < OMAP_FPGA_IRQ_END) && stat; |
| 100 | fpga_irq++, stat >>= 1) { | 100 | fpga_irq++, stat >>= 1) { |
| 101 | if (stat & 1) { | 101 | if (stat & 1) { |
| 102 | d = irq_desc + fpga_irq; | 102 | d = irq_desc + fpga_irq; |
| @@ -151,7 +151,7 @@ void omap1510_fpga_init_irq(void) | |||
| 151 | __raw_writeb(0, OMAP1510_FPGA_IMR_HI); | 151 | __raw_writeb(0, OMAP1510_FPGA_IMR_HI); |
| 152 | __raw_writeb(0, INNOVATOR_FPGA_IMR2); | 152 | __raw_writeb(0, INNOVATOR_FPGA_IMR2); |
| 153 | 153 | ||
| 154 | for (i = OMAP1510_IH_FPGA_BASE; i < (OMAP1510_IH_FPGA_BASE + NR_FPGA_IRQS); i++) { | 154 | for (i = OMAP_FPGA_IRQ_BASE; i < OMAP_FPGA_IRQ_END; i++) { |
| 155 | 155 | ||
| 156 | if (i == OMAP1510_INT_FPGA_TS) { | 156 | if (i == OMAP1510_INT_FPGA_TS) { |
| 157 | /* | 157 | /* |
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c new file mode 100644 index 000000000000..2d2c2522b048 --- /dev/null +++ b/arch/arm/mach-omap1/mcbsp.c | |||
| @@ -0,0 +1,280 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap1/mcbsp.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Instituto Nokia de Tecnologia | ||
| 5 | * Contact: Eduardo Valentin <eduardo.valentin@indt.org.br> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | * | ||
| 11 | * Multichannel mode not supported. | ||
| 12 | */ | ||
| 13 | #include <linux/module.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | #include <linux/clk.h> | ||
| 16 | #include <linux/err.h> | ||
| 17 | #include <linux/io.h> | ||
| 18 | #include <linux/platform_device.h> | ||
| 19 | |||
| 20 | #include <asm/arch/dma.h> | ||
| 21 | #include <asm/arch/mux.h> | ||
| 22 | #include <asm/arch/cpu.h> | ||
| 23 | #include <asm/arch/mcbsp.h> | ||
| 24 | #include <asm/arch/dsp_common.h> | ||
| 25 | |||
| 26 | #define DPS_RSTCT2_PER_EN (1 << 0) | ||
| 27 | #define DSP_RSTCT2_WD_PER_EN (1 << 1) | ||
| 28 | |||
| 29 | struct mcbsp_internal_clk { | ||
| 30 | struct clk clk; | ||
| 31 | struct clk **childs; | ||
| 32 | int n_childs; | ||
| 33 | }; | ||
| 34 | |||
| 35 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) | ||
| 36 | static void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk) | ||
| 37 | { | ||
| 38 | const char *clk_names[] = { "dsp_ck", "api_ck", "dspxor_ck" }; | ||
| 39 | int i; | ||
| 40 | |||
| 41 | mclk->n_childs = ARRAY_SIZE(clk_names); | ||
| 42 | mclk->childs = kzalloc(mclk->n_childs * sizeof(struct clk *), | ||
| 43 | GFP_KERNEL); | ||
| 44 | |||
| 45 | for (i = 0; i < mclk->n_childs; i++) { | ||
| 46 | /* We fake a platform device to get correct device id */ | ||
| 47 | struct platform_device pdev; | ||
| 48 | |||
| 49 | pdev.dev.bus = &platform_bus_type; | ||
| 50 | pdev.id = mclk->clk.id; | ||
| 51 | mclk->childs[i] = clk_get(&pdev.dev, clk_names[i]); | ||
| 52 | if (IS_ERR(mclk->childs[i])) | ||
| 53 | printk(KERN_ERR "Could not get clock %s (%d).\n", | ||
| 54 | clk_names[i], mclk->clk.id); | ||
| 55 | } | ||
| 56 | } | ||
| 57 | |||
| 58 | static int omap_mcbsp_clk_enable(struct clk *clk) | ||
| 59 | { | ||
| 60 | struct mcbsp_internal_clk *mclk = container_of(clk, | ||
| 61 | struct mcbsp_internal_clk, clk); | ||
| 62 | int i; | ||
| 63 | |||
| 64 | for (i = 0; i < mclk->n_childs; i++) | ||
| 65 | clk_enable(mclk->childs[i]); | ||
| 66 | return 0; | ||
| 67 | } | ||
| 68 | |||
| 69 | static void omap_mcbsp_clk_disable(struct clk *clk) | ||
| 70 | { | ||
| 71 | struct mcbsp_internal_clk *mclk = container_of(clk, | ||
| 72 | struct mcbsp_internal_clk, clk); | ||
| 73 | int i; | ||
| 74 | |||
| 75 | for (i = 0; i < mclk->n_childs; i++) | ||
| 76 | clk_disable(mclk->childs[i]); | ||
| 77 | } | ||
| 78 | |||
| 79 | static struct mcbsp_internal_clk omap_mcbsp_clks[] = { | ||
| 80 | { | ||
| 81 | .clk = { | ||
| 82 | .name = "mcbsp_clk", | ||
| 83 | .id = 1, | ||
| 84 | .enable = omap_mcbsp_clk_enable, | ||
| 85 | .disable = omap_mcbsp_clk_disable, | ||
| 86 | }, | ||
| 87 | }, | ||
| 88 | { | ||
| 89 | .clk = { | ||
| 90 | .name = "mcbsp_clk", | ||
| 91 | .id = 3, | ||
| 92 | .enable = omap_mcbsp_clk_enable, | ||
| 93 | .disable = omap_mcbsp_clk_disable, | ||
| 94 | }, | ||
| 95 | }, | ||
| 96 | }; | ||
| 97 | |||
| 98 | #define omap_mcbsp_clks_size ARRAY_SIZE(omap_mcbsp_clks) | ||
| 99 | #else | ||
| 100 | #define omap_mcbsp_clks_size 0 | ||
| 101 | static struct mcbsp_internal_clk __initdata *omap_mcbsp_clks; | ||
| 102 | static inline void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk) | ||
| 103 | { } | ||
| 104 | #endif | ||
| 105 | |||
| 106 | static int omap1_mcbsp_check(unsigned int id) | ||
| 107 | { | ||
| 108 | /* REVISIT: Check correctly for number of registered McBSPs */ | ||
| 109 | if (cpu_is_omap730()) { | ||
| 110 | if (id > OMAP_MAX_MCBSP_COUNT - 2) { | ||
| 111 | printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", | ||
| 112 | id + 1); | ||
| 113 | return -ENODEV; | ||
| 114 | } | ||
| 115 | return 0; | ||
| 116 | } | ||
| 117 | |||
| 118 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { | ||
| 119 | if (id > OMAP_MAX_MCBSP_COUNT - 1) { | ||
| 120 | printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", | ||
| 121 | id + 1); | ||
| 122 | return -ENODEV; | ||
| 123 | } | ||
| 124 | return 0; | ||
| 125 | } | ||
| 126 | |||
| 127 | return -ENODEV; | ||
| 128 | } | ||
| 129 | |||
| 130 | static void omap1_mcbsp_request(unsigned int id) | ||
| 131 | { | ||
| 132 | /* | ||
| 133 | * On 1510, 1610 and 1710, McBSP1 and McBSP3 | ||
| 134 | * are DSP public peripherals. | ||
| 135 | */ | ||
| 136 | if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) { | ||
| 137 | omap_dsp_request_mem(); | ||
| 138 | /* | ||
| 139 | * DSP external peripheral reset | ||
| 140 | * FIXME: This should be moved to dsp code | ||
| 141 | */ | ||
| 142 | __raw_writew(__raw_readw(DSP_RSTCT2) | DPS_RSTCT2_PER_EN | | ||
| 143 | DSP_RSTCT2_WD_PER_EN, DSP_RSTCT2); | ||
| 144 | } | ||
| 145 | } | ||
| 146 | |||
| 147 | static void omap1_mcbsp_free(unsigned int id) | ||
| 148 | { | ||
| 149 | if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) | ||
| 150 | omap_dsp_release_mem(); | ||
| 151 | } | ||
| 152 | |||
| 153 | static struct omap_mcbsp_ops omap1_mcbsp_ops = { | ||
| 154 | .check = omap1_mcbsp_check, | ||
| 155 | .request = omap1_mcbsp_request, | ||
| 156 | .free = omap1_mcbsp_free, | ||
| 157 | }; | ||
| 158 | |||
| 159 | #ifdef CONFIG_ARCH_OMAP730 | ||
| 160 | static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { | ||
| 161 | { | ||
| 162 | .virt_base = io_p2v(OMAP730_MCBSP1_BASE), | ||
| 163 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | ||
| 164 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | ||
| 165 | .rx_irq = INT_730_McBSP1RX, | ||
| 166 | .tx_irq = INT_730_McBSP1TX, | ||
| 167 | .ops = &omap1_mcbsp_ops, | ||
| 168 | }, | ||
| 169 | { | ||
| 170 | .virt_base = io_p2v(OMAP730_MCBSP2_BASE), | ||
| 171 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | ||
| 172 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | ||
| 173 | .rx_irq = INT_730_McBSP2RX, | ||
| 174 | .tx_irq = INT_730_McBSP2TX, | ||
| 175 | .ops = &omap1_mcbsp_ops, | ||
| 176 | }, | ||
| 177 | }; | ||
| 178 | #define OMAP730_MCBSP_PDATA_SZ ARRAY_SIZE(omap730_mcbsp_pdata) | ||
| 179 | #else | ||
| 180 | #define omap730_mcbsp_pdata NULL | ||
| 181 | #define OMAP730_MCBSP_PDATA_SZ 0 | ||
| 182 | #endif | ||
| 183 | |||
| 184 | #ifdef CONFIG_ARCH_OMAP15XX | ||
| 185 | static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { | ||
| 186 | { | ||
| 187 | .virt_base = OMAP1510_MCBSP1_BASE, | ||
| 188 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | ||
| 189 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | ||
| 190 | .rx_irq = INT_McBSP1RX, | ||
| 191 | .tx_irq = INT_McBSP1TX, | ||
| 192 | .ops = &omap1_mcbsp_ops, | ||
| 193 | .clk_name = "mcbsp_clk", | ||
| 194 | }, | ||
| 195 | { | ||
| 196 | .virt_base = io_p2v(OMAP1510_MCBSP2_BASE), | ||
| 197 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, | ||
| 198 | .dma_tx_sync = OMAP_DMA_MCBSP2_TX, | ||
| 199 | .rx_irq = INT_1510_SPI_RX, | ||
| 200 | .tx_irq = INT_1510_SPI_TX, | ||
| 201 | .ops = &omap1_mcbsp_ops, | ||
| 202 | }, | ||
| 203 | { | ||
| 204 | .virt_base = OMAP1510_MCBSP3_BASE, | ||
| 205 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | ||
| 206 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | ||
| 207 | .rx_irq = INT_McBSP3RX, | ||
| 208 | .tx_irq = INT_McBSP3TX, | ||
| 209 | .ops = &omap1_mcbsp_ops, | ||
| 210 | .clk_name = "mcbsp_clk", | ||
| 211 | }, | ||
| 212 | }; | ||
| 213 | #define OMAP15XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap15xx_mcbsp_pdata) | ||
| 214 | #else | ||
| 215 | #define omap15xx_mcbsp_pdata NULL | ||
| 216 | #define OMAP15XX_MCBSP_PDATA_SZ 0 | ||
| 217 | #endif | ||
| 218 | |||
| 219 | #ifdef CONFIG_ARCH_OMAP16XX | ||
| 220 | static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { | ||
| 221 | { | ||
| 222 | .virt_base = OMAP1610_MCBSP1_BASE, | ||
| 223 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | ||
| 224 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | ||
| 225 | .rx_irq = INT_McBSP1RX, | ||
| 226 | .tx_irq = INT_McBSP1TX, | ||
| 227 | .ops = &omap1_mcbsp_ops, | ||
| 228 | .clk_name = "mcbsp_clk", | ||
| 229 | }, | ||
| 230 | { | ||
| 231 | .virt_base = io_p2v(OMAP1610_MCBSP2_BASE), | ||
| 232 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, | ||
| 233 | .dma_tx_sync = OMAP_DMA_MCBSP2_TX, | ||
| 234 | .rx_irq = INT_1610_McBSP2_RX, | ||
| 235 | .tx_irq = INT_1610_McBSP2_TX, | ||
| 236 | .ops = &omap1_mcbsp_ops, | ||
| 237 | }, | ||
| 238 | { | ||
| 239 | .virt_base = OMAP1610_MCBSP3_BASE, | ||
| 240 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | ||
| 241 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | ||
| 242 | .rx_irq = INT_McBSP3RX, | ||
| 243 | .tx_irq = INT_McBSP3TX, | ||
| 244 | .ops = &omap1_mcbsp_ops, | ||
| 245 | .clk_name = "mcbsp_clk", | ||
| 246 | }, | ||
| 247 | }; | ||
| 248 | #define OMAP16XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap16xx_mcbsp_pdata) | ||
| 249 | #else | ||
| 250 | #define omap16xx_mcbsp_pdata NULL | ||
| 251 | #define OMAP16XX_MCBSP_PDATA_SZ 0 | ||
| 252 | #endif | ||
| 253 | |||
| 254 | int __init omap1_mcbsp_init(void) | ||
| 255 | { | ||
| 256 | int i; | ||
| 257 | |||
| 258 | for (i = 0; i < omap_mcbsp_clks_size; i++) { | ||
| 259 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { | ||
| 260 | omap_mcbsp_clk_init(&omap_mcbsp_clks[i]); | ||
| 261 | clk_register(&omap_mcbsp_clks[i].clk); | ||
| 262 | } | ||
| 263 | } | ||
| 264 | |||
| 265 | if (cpu_is_omap730()) | ||
| 266 | omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata, | ||
| 267 | OMAP730_MCBSP_PDATA_SZ); | ||
| 268 | |||
| 269 | if (cpu_is_omap15xx()) | ||
| 270 | omap_mcbsp_register_board_cfg(omap15xx_mcbsp_pdata, | ||
| 271 | OMAP15XX_MCBSP_PDATA_SZ); | ||
| 272 | |||
| 273 | if (cpu_is_omap16xx()) | ||
| 274 | omap_mcbsp_register_board_cfg(omap16xx_mcbsp_pdata, | ||
| 275 | OMAP16XX_MCBSP_PDATA_SZ); | ||
| 276 | |||
| 277 | return omap_mcbsp_init(); | ||
| 278 | } | ||
| 279 | |||
| 280 | arch_initcall(omap1_mcbsp_init); | ||
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index e6c64e10b7ec..742f79e73bd7 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
| @@ -116,13 +116,6 @@ void omap_pm_idle(void) | |||
| 116 | return; | 116 | return; |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | /* | ||
| 120 | * Since an interrupt may set up a timer, we don't want to | ||
| 121 | * reprogram the hardware timer with interrupts enabled. | ||
| 122 | * Re-enable interrupts only after returning from idle. | ||
| 123 | */ | ||
| 124 | timer_dyn_reprogram(); | ||
| 125 | |||
| 126 | #ifdef CONFIG_OMAP_MPU_TIMER | 119 | #ifdef CONFIG_OMAP_MPU_TIMER |
| 127 | #warning Enable 32kHz OS timer in order to allow sleep states in idle | 120 | #warning Enable 32kHz OS timer in order to allow sleep states in idle |
| 128 | use_idlect1 = use_idlect1 & ~(1 << 9); | 121 | use_idlect1 = use_idlect1 & ~(1 << 9); |
diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/mach-omap1/sram.S index 9e1813c77e05..126d252062d7 100644 --- a/arch/arm/plat-omap/sram-fn.S +++ b/arch/arm/mach-omap1/sram.S | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | /* | 18 | /* |
| 19 | * Reprograms ULPD and CKCTL. | 19 | * Reprograms ULPD and CKCTL. |
| 20 | */ | 20 | */ |
| 21 | ENTRY(sram_reprogram_clock) | 21 | ENTRY(omap1_sram_reprogram_clock) |
| 22 | stmfd sp!, {r0 - r12, lr} @ save registers on stack | 22 | stmfd sp!, {r0 - r12, lr} @ save registers on stack |
| 23 | 23 | ||
| 24 | mov r2, #IO_ADDRESS(DPLL_CTL) & 0xff000000 | 24 | mov r2, #IO_ADDRESS(DPLL_CTL) & 0xff000000 |
| @@ -53,5 +53,5 @@ lock: ldrh r4, [r2], #0 @ read back dpll value | |||
| 53 | 53 | ||
| 54 | out: | 54 | out: |
| 55 | ldmfd sp!, {r0 - r12, pc} @ restore regs and return | 55 | ldmfd sp!, {r0 - r12, pc} @ restore regs and return |
| 56 | ENTRY(sram_reprogram_clock_sz) | 56 | ENTRY(omap1_sram_reprogram_clock_sz) |
| 57 | .word . - sram_reprogram_clock | 57 | .word . - omap1_sram_reprogram_clock |
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 2feb6870b735..93ee990618ef 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -3,9 +3,15 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Common support | 5 | # Common support |
| 6 | obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o clock.o mux.o \ | 6 | obj-y := irq.o id.o io.o memory.o control.o prcm.o clock.o mux.o \ |
| 7 | devices.o serial.o gpmc.o timer-gp.o | 7 | devices.o serial.o gpmc.o timer-gp.o |
| 8 | 8 | ||
| 9 | obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o | ||
| 10 | |||
| 11 | # Functions loaded to SRAM | ||
| 12 | obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o | ||
| 13 | obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o | ||
| 14 | |||
| 9 | # Power Management | 15 | # Power Management |
| 10 | obj-$(CONFIG_PM) += pm.o sleep.o | 16 | obj-$(CONFIG_PM) += pm.o sleep.o |
| 11 | 17 | ||
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index ab9fc57d25f1..15675bce8012 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -41,6 +41,24 @@ | |||
| 41 | 41 | ||
| 42 | #define MAX_CLOCK_ENABLE_WAIT 100000 | 42 | #define MAX_CLOCK_ENABLE_WAIT 100000 |
| 43 | 43 | ||
| 44 | /* DPLL rate rounding: minimum DPLL multiplier, divider values */ | ||
| 45 | #define DPLL_MIN_MULTIPLIER 1 | ||
| 46 | #define DPLL_MIN_DIVIDER 1 | ||
| 47 | |||
| 48 | /* Possible error results from _dpll_test_mult */ | ||
| 49 | #define DPLL_MULT_UNDERFLOW (1 << 0) | ||
| 50 | |||
| 51 | /* | ||
| 52 | * Scale factor to mitigate roundoff errors in DPLL rate rounding. | ||
| 53 | * The higher the scale factor, the greater the risk of arithmetic overflow, | ||
| 54 | * but the closer the rounded rate to the target rate. DPLL_SCALE_FACTOR | ||
| 55 | * must be a power of DPLL_SCALE_BASE. | ||
| 56 | */ | ||
| 57 | #define DPLL_SCALE_FACTOR 64 | ||
| 58 | #define DPLL_SCALE_BASE 2 | ||
| 59 | #define DPLL_ROUNDING_VAL ((DPLL_SCALE_BASE / 2) * \ | ||
| 60 | (DPLL_SCALE_FACTOR / DPLL_SCALE_BASE)) | ||
| 61 | |||
| 44 | u8 cpu_mask; | 62 | u8 cpu_mask; |
| 45 | 63 | ||
| 46 | /*------------------------------------------------------------------------- | 64 | /*------------------------------------------------------------------------- |
| @@ -95,7 +113,7 @@ u32 omap2_get_dpll_rate(struct clk *clk) | |||
| 95 | { | 113 | { |
| 96 | long long dpll_clk; | 114 | long long dpll_clk; |
| 97 | u32 dpll_mult, dpll_div, dpll; | 115 | u32 dpll_mult, dpll_div, dpll; |
| 98 | const struct dpll_data *dd; | 116 | struct dpll_data *dd; |
| 99 | 117 | ||
| 100 | dd = clk->dpll_data; | 118 | dd = clk->dpll_data; |
| 101 | /* REVISIT: What do we return on error? */ | 119 | /* REVISIT: What do we return on error? */ |
| @@ -603,7 +621,8 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long rate) | |||
| 603 | clk->rate = clk->parent->rate / new_div; | 621 | clk->rate = clk->parent->rate / new_div; |
| 604 | 622 | ||
| 605 | if (clk->flags & DELAYED_APP && cpu_is_omap24xx()) { | 623 | if (clk->flags & DELAYED_APP && cpu_is_omap24xx()) { |
| 606 | __raw_writel(OMAP24XX_VALID_CONFIG, OMAP24XX_PRCM_CLKCFG_CTRL); | 624 | prm_write_mod_reg(OMAP24XX_VALID_CONFIG, |
| 625 | OMAP24XX_GR_MOD, OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET); | ||
| 607 | wmb(); | 626 | wmb(); |
| 608 | } | 627 | } |
| 609 | 628 | ||
| @@ -723,6 +742,184 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) | |||
| 723 | return 0; | 742 | return 0; |
| 724 | } | 743 | } |
| 725 | 744 | ||
| 745 | /* DPLL rate rounding code */ | ||
| 746 | |||
| 747 | /** | ||
| 748 | * omap2_dpll_set_rate_tolerance: set the error tolerance during rate rounding | ||
| 749 | * @clk: struct clk * of the DPLL | ||
| 750 | * @tolerance: maximum rate error tolerance | ||
| 751 | * | ||
| 752 | * Set the maximum DPLL rate error tolerance for the rate rounding | ||
| 753 | * algorithm. The rate tolerance is an attempt to balance DPLL power | ||
| 754 | * saving (the least divider value "n") vs. rate fidelity (the least | ||
| 755 | * difference between the desired DPLL target rate and the rounded | ||
| 756 | * rate out of the algorithm). So, increasing the tolerance is likely | ||
| 757 | * to decrease DPLL power consumption and increase DPLL rate error. | ||
| 758 | * Returns -EINVAL if provided a null clock ptr or a clk that is not a | ||
| 759 | * DPLL; or 0 upon success. | ||
| 760 | */ | ||
| 761 | int omap2_dpll_set_rate_tolerance(struct clk *clk, unsigned int tolerance) | ||
| 762 | { | ||
| 763 | if (!clk || !clk->dpll_data) | ||
| 764 | return -EINVAL; | ||
| 765 | |||
| 766 | clk->dpll_data->rate_tolerance = tolerance; | ||
| 767 | |||
| 768 | return 0; | ||
| 769 | } | ||
| 770 | |||
| 771 | static unsigned long _dpll_compute_new_rate(unsigned long parent_rate, unsigned int m, unsigned int n) | ||
| 772 | { | ||
| 773 | unsigned long long num; | ||
| 774 | |||
| 775 | num = (unsigned long long)parent_rate * m; | ||
| 776 | do_div(num, n); | ||
| 777 | return num; | ||
| 778 | } | ||
| 779 | |||
| 780 | /* | ||
| 781 | * _dpll_test_mult - test a DPLL multiplier value | ||
| 782 | * @m: pointer to the DPLL m (multiplier) value under test | ||
| 783 | * @n: current DPLL n (divider) value under test | ||
| 784 | * @new_rate: pointer to storage for the resulting rounded rate | ||
| 785 | * @target_rate: the desired DPLL rate | ||
| 786 | * @parent_rate: the DPLL's parent clock rate | ||
| 787 | * | ||
| 788 | * This code tests a DPLL multiplier value, ensuring that the | ||
| 789 | * resulting rate will not be higher than the target_rate, and that | ||
| 790 | * the multiplier value itself is valid for the DPLL. Initially, the | ||
| 791 | * integer pointed to by the m argument should be prescaled by | ||
| 792 | * multiplying by DPLL_SCALE_FACTOR. The code will replace this with | ||
| 793 | * a non-scaled m upon return. This non-scaled m will result in a | ||
| 794 | * new_rate as close as possible to target_rate (but not greater than | ||
| 795 | * target_rate) given the current (parent_rate, n, prescaled m) | ||
| 796 | * triple. Returns DPLL_MULT_UNDERFLOW in the event that the | ||
| 797 | * non-scaled m attempted to underflow, which can allow the calling | ||
| 798 | * function to bail out early; or 0 upon success. | ||
| 799 | */ | ||
| 800 | static int _dpll_test_mult(int *m, int n, unsigned long *new_rate, | ||
| 801 | unsigned long target_rate, | ||
| 802 | unsigned long parent_rate) | ||
| 803 | { | ||
| 804 | int flags = 0, carry = 0; | ||
| 805 | |||
| 806 | /* Unscale m and round if necessary */ | ||
| 807 | if (*m % DPLL_SCALE_FACTOR >= DPLL_ROUNDING_VAL) | ||
| 808 | carry = 1; | ||
| 809 | *m = (*m / DPLL_SCALE_FACTOR) + carry; | ||
| 810 | |||
| 811 | /* | ||
| 812 | * The new rate must be <= the target rate to avoid programming | ||
| 813 | * a rate that is impossible for the hardware to handle | ||
| 814 | */ | ||
| 815 | *new_rate = _dpll_compute_new_rate(parent_rate, *m, n); | ||
| 816 | if (*new_rate > target_rate) { | ||
| 817 | (*m)--; | ||
| 818 | *new_rate = 0; | ||
| 819 | } | ||
| 820 | |||
| 821 | /* Guard against m underflow */ | ||
| 822 | if (*m < DPLL_MIN_MULTIPLIER) { | ||
| 823 | *m = DPLL_MIN_MULTIPLIER; | ||
| 824 | *new_rate = 0; | ||
| 825 | flags = DPLL_MULT_UNDERFLOW; | ||
| 826 | } | ||
| 827 | |||
| 828 | if (*new_rate == 0) | ||
| 829 | *new_rate = _dpll_compute_new_rate(parent_rate, *m, n); | ||
| 830 | |||
| 831 | return flags; | ||
| 832 | } | ||
| 833 | |||
| 834 | /** | ||
| 835 | * omap2_dpll_round_rate - round a target rate for an OMAP DPLL | ||
| 836 | * @clk: struct clk * for a DPLL | ||
| 837 | * @target_rate: desired DPLL clock rate | ||
| 838 | * | ||
| 839 | * Given a DPLL, a desired target rate, and a rate tolerance, round | ||
| 840 | * the target rate to a possible, programmable rate for this DPLL. | ||
| 841 | * Rate tolerance is assumed to be set by the caller before this | ||
| 842 | * function is called. Attempts to select the minimum possible n | ||
| 843 | * within the tolerance to reduce power consumption. Stores the | ||
| 844 | * computed (m, n) in the DPLL's dpll_data structure so set_rate() | ||
| 845 | * will not need to call this (expensive) function again. Returns ~0 | ||
| 846 | * if the target rate cannot be rounded, either because the rate is | ||
| 847 | * too low or because the rate tolerance is set too tightly; or the | ||
| 848 | * rounded rate upon success. | ||
| 849 | */ | ||
| 850 | long omap2_dpll_round_rate(struct clk *clk, unsigned long target_rate) | ||
| 851 | { | ||
| 852 | int m, n, r, e, scaled_max_m; | ||
| 853 | unsigned long scaled_rt_rp, new_rate; | ||
| 854 | int min_e = -1, min_e_m = -1, min_e_n = -1; | ||
| 855 | |||
| 856 | if (!clk || !clk->dpll_data) | ||
| 857 | return ~0; | ||
| 858 | |||
| 859 | pr_debug("clock: starting DPLL round_rate for clock %s, target rate " | ||
| 860 | "%ld\n", clk->name, target_rate); | ||
| 861 | |||
| 862 | scaled_rt_rp = target_rate / (clk->parent->rate / DPLL_SCALE_FACTOR); | ||
| 863 | scaled_max_m = clk->dpll_data->max_multiplier * DPLL_SCALE_FACTOR; | ||
| 864 | |||
| 865 | clk->dpll_data->last_rounded_rate = 0; | ||
| 866 | |||
| 867 | for (n = clk->dpll_data->max_divider; n >= DPLL_MIN_DIVIDER; n--) { | ||
| 868 | |||
| 869 | /* Compute the scaled DPLL multiplier, based on the divider */ | ||
| 870 | m = scaled_rt_rp * n; | ||
| 871 | |||
| 872 | /* | ||
| 873 | * Since we're counting n down, a m overflow means we can | ||
| 874 | * can immediately skip to the next n | ||
| 875 | */ | ||
| 876 | if (m > scaled_max_m) | ||
| 877 | continue; | ||
| 878 | |||
| 879 | r = _dpll_test_mult(&m, n, &new_rate, target_rate, | ||
| 880 | clk->parent->rate); | ||
| 881 | |||
| 882 | e = target_rate - new_rate; | ||
| 883 | pr_debug("clock: n = %d: m = %d: rate error is %d " | ||
| 884 | "(new_rate = %ld)\n", n, m, e, new_rate); | ||
| 885 | |||
| 886 | if (min_e == -1 || | ||
| 887 | min_e >= (int)(abs(e) - clk->dpll_data->rate_tolerance)) { | ||
| 888 | min_e = e; | ||
| 889 | min_e_m = m; | ||
| 890 | min_e_n = n; | ||
| 891 | |||
| 892 | pr_debug("clock: found new least error %d\n", min_e); | ||
| 893 | } | ||
| 894 | |||
| 895 | /* | ||
| 896 | * Since we're counting n down, a m underflow means we | ||
| 897 | * can bail out completely (since as n decreases in | ||
| 898 | * the next iteration, there's no way that m can | ||
| 899 | * increase beyond the current m) | ||
| 900 | */ | ||
| 901 | if (r & DPLL_MULT_UNDERFLOW) | ||
| 902 | break; | ||
| 903 | } | ||
| 904 | |||
| 905 | if (min_e < 0) { | ||
| 906 | pr_debug("clock: error: target rate or tolerance too low\n"); | ||
| 907 | return ~0; | ||
| 908 | } | ||
| 909 | |||
| 910 | clk->dpll_data->last_rounded_m = min_e_m; | ||
| 911 | clk->dpll_data->last_rounded_n = min_e_n; | ||
| 912 | clk->dpll_data->last_rounded_rate = | ||
| 913 | _dpll_compute_new_rate(clk->parent->rate, min_e_m, min_e_n); | ||
| 914 | |||
| 915 | pr_debug("clock: final least error: e = %d, m = %d, n = %d\n", | ||
| 916 | min_e, min_e_m, min_e_n); | ||
| 917 | pr_debug("clock: final rate: %ld (target rate: %ld)\n", | ||
| 918 | clk->dpll_data->last_rounded_rate, target_rate); | ||
| 919 | |||
| 920 | return clk->dpll_data->last_rounded_rate; | ||
| 921 | } | ||
| 922 | |||
| 726 | /*------------------------------------------------------------------------- | 923 | /*------------------------------------------------------------------------- |
| 727 | * Omap2 clock reset and init functions | 924 | * Omap2 clock reset and init functions |
| 728 | *-------------------------------------------------------------------------*/ | 925 | *-------------------------------------------------------------------------*/ |
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index d5980a9e09a4..3cd37cb57c5a 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h | |||
| @@ -18,11 +18,16 @@ | |||
| 18 | 18 | ||
| 19 | #include <asm/arch/clock.h> | 19 | #include <asm/arch/clock.h> |
| 20 | 20 | ||
| 21 | /* The maximum error between a target DPLL rate and the rounded rate in Hz */ | ||
| 22 | #define DEFAULT_DPLL_RATE_TOLERANCE 50000 | ||
| 23 | |||
| 21 | int omap2_clk_enable(struct clk *clk); | 24 | int omap2_clk_enable(struct clk *clk); |
| 22 | void omap2_clk_disable(struct clk *clk); | 25 | void omap2_clk_disable(struct clk *clk); |
| 23 | long omap2_clk_round_rate(struct clk *clk, unsigned long rate); | 26 | long omap2_clk_round_rate(struct clk *clk, unsigned long rate); |
| 24 | int omap2_clk_set_rate(struct clk *clk, unsigned long rate); | 27 | int omap2_clk_set_rate(struct clk *clk, unsigned long rate); |
| 25 | int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent); | 28 | int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent); |
| 29 | int omap2_dpll_rate_tolerance_set(struct clk *clk, unsigned int tolerance); | ||
| 30 | long omap2_dpll_round_rate(struct clk *clk, unsigned long target_rate); | ||
| 26 | 31 | ||
| 27 | #ifdef CONFIG_OMAP_RESET_CLOCKS | 32 | #ifdef CONFIG_OMAP_RESET_CLOCKS |
| 28 | void omap2_clk_disable_unused(struct clk *clk); | 33 | void omap2_clk_disable_unused(struct clk *clk); |
| @@ -42,6 +47,7 @@ long omap2_clksel_round_rate(struct clk *clk, unsigned long target_rate); | |||
| 42 | int omap2_clksel_set_rate(struct clk *clk, unsigned long rate); | 47 | int omap2_clksel_set_rate(struct clk *clk, unsigned long rate); |
| 43 | u32 omap2_get_dpll_rate(struct clk *clk); | 48 | u32 omap2_get_dpll_rate(struct clk *clk); |
| 44 | int omap2_wait_clock_ready(void __iomem *reg, u32 cval, const char *name); | 49 | int omap2_wait_clock_ready(void __iomem *reg, u32 cval, const char *name); |
| 50 | void omap2_clk_prepare_for_reboot(void); | ||
| 45 | 51 | ||
| 46 | extern u8 cpu_mask; | 52 | extern u8 cpu_mask; |
| 47 | 53 | ||
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index ece32d8acba4..aa567876651d 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
| @@ -154,7 +154,7 @@ static void omap2_clk_fixed_disable(struct clk *clk) | |||
| 154 | * Uses the current prcm set to tell if a rate is valid. | 154 | * Uses the current prcm set to tell if a rate is valid. |
| 155 | * You can go slower, but not faster within a given rate set. | 155 | * You can go slower, but not faster within a given rate set. |
| 156 | */ | 156 | */ |
| 157 | static u32 omap2_dpll_round_rate(unsigned long target_rate) | 157 | long omap2_dpllcore_round_rate(unsigned long target_rate) |
| 158 | { | 158 | { |
| 159 | u32 high, low, core_clk_src; | 159 | u32 high, low, core_clk_src; |
| 160 | 160 | ||
| @@ -183,14 +183,14 @@ static u32 omap2_dpll_round_rate(unsigned long target_rate) | |||
| 183 | 183 | ||
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | static void omap2_dpll_recalc(struct clk *clk) | 186 | static void omap2_dpllcore_recalc(struct clk *clk) |
| 187 | { | 187 | { |
| 188 | clk->rate = omap2_get_dpll_rate_24xx(clk); | 188 | clk->rate = omap2_get_dpll_rate_24xx(clk); |
| 189 | 189 | ||
| 190 | propagate_rate(clk); | 190 | propagate_rate(clk); |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | static int omap2_reprogram_dpll(struct clk *clk, unsigned long rate) | 193 | static int omap2_reprogram_dpllcore(struct clk *clk, unsigned long rate) |
| 194 | { | 194 | { |
| 195 | u32 cur_rate, low, mult, div, valid_rate, done_rate; | 195 | u32 cur_rate, low, mult, div, valid_rate, done_rate; |
| 196 | u32 bypass = 0; | 196 | u32 bypass = 0; |
| @@ -209,7 +209,7 @@ static int omap2_reprogram_dpll(struct clk *clk, unsigned long rate) | |||
| 209 | } else if ((rate == (cur_rate * 2)) && (mult == 1)) { | 209 | } else if ((rate == (cur_rate * 2)) && (mult == 1)) { |
| 210 | omap2_reprogram_sdrc(CORE_CLK_SRC_DPLL_X2, 1); | 210 | omap2_reprogram_sdrc(CORE_CLK_SRC_DPLL_X2, 1); |
| 211 | } else if (rate != cur_rate) { | 211 | } else if (rate != cur_rate) { |
| 212 | valid_rate = omap2_dpll_round_rate(rate); | 212 | valid_rate = omap2_dpllcore_round_rate(rate); |
| 213 | if (valid_rate != rate) | 213 | if (valid_rate != rate) |
| 214 | goto dpll_exit; | 214 | goto dpll_exit; |
| 215 | 215 | ||
| @@ -256,7 +256,7 @@ static int omap2_reprogram_dpll(struct clk *clk, unsigned long rate) | |||
| 256 | omap2_init_memory_params(omap2_dll_force_needed()); | 256 | omap2_init_memory_params(omap2_dll_force_needed()); |
| 257 | omap2_reprogram_sdrc(done_rate, 0); | 257 | omap2_reprogram_sdrc(done_rate, 0); |
| 258 | } | 258 | } |
| 259 | omap2_dpll_recalc(&dpll_ck); | 259 | omap2_dpllcore_recalc(&dpll_ck); |
| 260 | ret = 0; | 260 | ret = 0; |
| 261 | 261 | ||
| 262 | dpll_exit: | 262 | dpll_exit: |
| @@ -383,7 +383,7 @@ static int omap2_select_table_rate(struct clk *clk, unsigned long rate) | |||
| 383 | 383 | ||
| 384 | local_irq_restore(flags); | 384 | local_irq_restore(flags); |
| 385 | } | 385 | } |
| 386 | omap2_dpll_recalc(&dpll_ck); | 386 | omap2_dpllcore_recalc(&dpll_ck); |
| 387 | 387 | ||
| 388 | return 0; | 388 | return 0; |
| 389 | } | 389 | } |
diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h index 88081ed13f96..be4e25554e05 100644 --- a/arch/arm/mach-omap2/clock24xx.h +++ b/arch/arm/mach-omap2/clock24xx.h | |||
| @@ -30,12 +30,12 @@ static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate); | |||
| 30 | static void omap2_sys_clk_recalc(struct clk *clk); | 30 | static void omap2_sys_clk_recalc(struct clk *clk); |
| 31 | static void omap2_osc_clk_recalc(struct clk *clk); | 31 | static void omap2_osc_clk_recalc(struct clk *clk); |
| 32 | static void omap2_sys_clk_recalc(struct clk *clk); | 32 | static void omap2_sys_clk_recalc(struct clk *clk); |
| 33 | static void omap2_dpll_recalc(struct clk *clk); | 33 | static void omap2_dpllcore_recalc(struct clk *clk); |
| 34 | static int omap2_clk_fixed_enable(struct clk *clk); | 34 | static int omap2_clk_fixed_enable(struct clk *clk); |
| 35 | static void omap2_clk_fixed_disable(struct clk *clk); | 35 | static void omap2_clk_fixed_disable(struct clk *clk); |
| 36 | static int omap2_enable_osc_ck(struct clk *clk); | 36 | static int omap2_enable_osc_ck(struct clk *clk); |
| 37 | static void omap2_disable_osc_ck(struct clk *clk); | 37 | static void omap2_disable_osc_ck(struct clk *clk); |
| 38 | static int omap2_reprogram_dpll(struct clk *clk, unsigned long rate); | 38 | static int omap2_reprogram_dpllcore(struct clk *clk, unsigned long rate); |
| 39 | 39 | ||
| 40 | /* Key dividers which make up a PRCM set. Ratio's for a PRCM are mandated. | 40 | /* Key dividers which make up a PRCM set. Ratio's for a PRCM are mandated. |
| 41 | * xtal_speed, dpll_speed, mpu_speed, CM_CLKSEL_MPU,CM_CLKSEL_DSP | 41 | * xtal_speed, dpll_speed, mpu_speed, CM_CLKSEL_MPU,CM_CLKSEL_DSP |
| @@ -665,20 +665,27 @@ static struct clk alt_ck = { /* Typical 54M or 48M, may not exist */ | |||
| 665 | * deal with this | 665 | * deal with this |
| 666 | */ | 666 | */ |
| 667 | 667 | ||
| 668 | static const struct dpll_data dpll_dd = { | 668 | static struct dpll_data dpll_dd = { |
| 669 | .mult_div1_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1), | 669 | .mult_div1_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1), |
| 670 | .mult_mask = OMAP24XX_DPLL_MULT_MASK, | 670 | .mult_mask = OMAP24XX_DPLL_MULT_MASK, |
| 671 | .div1_mask = OMAP24XX_DPLL_DIV_MASK, | 671 | .div1_mask = OMAP24XX_DPLL_DIV_MASK, |
| 672 | .max_multiplier = 1024, | ||
| 673 | .max_divider = 16, | ||
| 674 | .rate_tolerance = DEFAULT_DPLL_RATE_TOLERANCE | ||
| 672 | }; | 675 | }; |
| 673 | 676 | ||
| 677 | /* | ||
| 678 | * XXX Cannot add round_rate here yet, as this is still a composite clock, | ||
| 679 | * not just a DPLL | ||
| 680 | */ | ||
| 674 | static struct clk dpll_ck = { | 681 | static struct clk dpll_ck = { |
| 675 | .name = "dpll_ck", | 682 | .name = "dpll_ck", |
| 676 | .parent = &sys_ck, /* Can be func_32k also */ | 683 | .parent = &sys_ck, /* Can be func_32k also */ |
| 677 | .dpll_data = &dpll_dd, | 684 | .dpll_data = &dpll_dd, |
| 678 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | | 685 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X | |
| 679 | RATE_PROPAGATES | ALWAYS_ENABLED, | 686 | RATE_PROPAGATES | ALWAYS_ENABLED, |
| 680 | .recalc = &omap2_dpll_recalc, | 687 | .recalc = &omap2_dpllcore_recalc, |
| 681 | .set_rate = &omap2_reprogram_dpll, | 688 | .set_rate = &omap2_reprogram_dpllcore, |
| 682 | }; | 689 | }; |
| 683 | 690 | ||
| 684 | static struct clk apll96_ck = { | 691 | static struct clk apll96_ck = { |
| @@ -1747,7 +1754,8 @@ static struct clk gpt12_fck = { | |||
| 1747 | }; | 1754 | }; |
| 1748 | 1755 | ||
| 1749 | static struct clk mcbsp1_ick = { | 1756 | static struct clk mcbsp1_ick = { |
| 1750 | .name = "mcbsp1_ick", | 1757 | .name = "mcbsp_ick", |
| 1758 | .id = 1, | ||
| 1751 | .parent = &l4_ck, | 1759 | .parent = &l4_ck, |
| 1752 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, | 1760 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, |
| 1753 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | 1761 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), |
| @@ -1756,7 +1764,8 @@ static struct clk mcbsp1_ick = { | |||
| 1756 | }; | 1764 | }; |
| 1757 | 1765 | ||
| 1758 | static struct clk mcbsp1_fck = { | 1766 | static struct clk mcbsp1_fck = { |
| 1759 | .name = "mcbsp1_fck", | 1767 | .name = "mcbsp_fck", |
| 1768 | .id = 1, | ||
| 1760 | .parent = &func_96m_ck, | 1769 | .parent = &func_96m_ck, |
| 1761 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, | 1770 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, |
| 1762 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | 1771 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), |
| @@ -1765,7 +1774,8 @@ static struct clk mcbsp1_fck = { | |||
| 1765 | }; | 1774 | }; |
| 1766 | 1775 | ||
| 1767 | static struct clk mcbsp2_ick = { | 1776 | static struct clk mcbsp2_ick = { |
| 1768 | .name = "mcbsp2_ick", | 1777 | .name = "mcbsp_ick", |
| 1778 | .id = 2, | ||
| 1769 | .parent = &l4_ck, | 1779 | .parent = &l4_ck, |
| 1770 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, | 1780 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, |
| 1771 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | 1781 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), |
| @@ -1774,7 +1784,8 @@ static struct clk mcbsp2_ick = { | |||
| 1774 | }; | 1784 | }; |
| 1775 | 1785 | ||
| 1776 | static struct clk mcbsp2_fck = { | 1786 | static struct clk mcbsp2_fck = { |
| 1777 | .name = "mcbsp2_fck", | 1787 | .name = "mcbsp_fck", |
| 1788 | .id = 2, | ||
| 1778 | .parent = &func_96m_ck, | 1789 | .parent = &func_96m_ck, |
| 1779 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, | 1790 | .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, |
| 1780 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | 1791 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), |
| @@ -1783,7 +1794,8 @@ static struct clk mcbsp2_fck = { | |||
| 1783 | }; | 1794 | }; |
| 1784 | 1795 | ||
| 1785 | static struct clk mcbsp3_ick = { | 1796 | static struct clk mcbsp3_ick = { |
| 1786 | .name = "mcbsp3_ick", | 1797 | .name = "mcbsp_ick", |
| 1798 | .id = 3, | ||
| 1787 | .parent = &l4_ck, | 1799 | .parent = &l4_ck, |
| 1788 | .flags = CLOCK_IN_OMAP243X, | 1800 | .flags = CLOCK_IN_OMAP243X, |
| 1789 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), | 1801 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), |
| @@ -1792,7 +1804,8 @@ static struct clk mcbsp3_ick = { | |||
| 1792 | }; | 1804 | }; |
| 1793 | 1805 | ||
| 1794 | static struct clk mcbsp3_fck = { | 1806 | static struct clk mcbsp3_fck = { |
| 1795 | .name = "mcbsp3_fck", | 1807 | .name = "mcbsp_fck", |
| 1808 | .id = 3, | ||
| 1796 | .parent = &func_96m_ck, | 1809 | .parent = &func_96m_ck, |
| 1797 | .flags = CLOCK_IN_OMAP243X, | 1810 | .flags = CLOCK_IN_OMAP243X, |
| 1798 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), | 1811 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), |
| @@ -1801,7 +1814,8 @@ static struct clk mcbsp3_fck = { | |||
| 1801 | }; | 1814 | }; |
| 1802 | 1815 | ||
| 1803 | static struct clk mcbsp4_ick = { | 1816 | static struct clk mcbsp4_ick = { |
| 1804 | .name = "mcbsp4_ick", | 1817 | .name = "mcbsp_ick", |
| 1818 | .id = 4, | ||
| 1805 | .parent = &l4_ck, | 1819 | .parent = &l4_ck, |
| 1806 | .flags = CLOCK_IN_OMAP243X, | 1820 | .flags = CLOCK_IN_OMAP243X, |
| 1807 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), | 1821 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), |
| @@ -1810,7 +1824,8 @@ static struct clk mcbsp4_ick = { | |||
| 1810 | }; | 1824 | }; |
| 1811 | 1825 | ||
| 1812 | static struct clk mcbsp4_fck = { | 1826 | static struct clk mcbsp4_fck = { |
| 1813 | .name = "mcbsp4_fck", | 1827 | .name = "mcbsp_fck", |
| 1828 | .id = 4, | ||
| 1814 | .parent = &func_96m_ck, | 1829 | .parent = &func_96m_ck, |
| 1815 | .flags = CLOCK_IN_OMAP243X, | 1830 | .flags = CLOCK_IN_OMAP243X, |
| 1816 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), | 1831 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), |
| @@ -1819,7 +1834,8 @@ static struct clk mcbsp4_fck = { | |||
| 1819 | }; | 1834 | }; |
| 1820 | 1835 | ||
| 1821 | static struct clk mcbsp5_ick = { | 1836 | static struct clk mcbsp5_ick = { |
| 1822 | .name = "mcbsp5_ick", | 1837 | .name = "mcbsp_ick", |
| 1838 | .id = 5, | ||
| 1823 | .parent = &l4_ck, | 1839 | .parent = &l4_ck, |
| 1824 | .flags = CLOCK_IN_OMAP243X, | 1840 | .flags = CLOCK_IN_OMAP243X, |
| 1825 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), | 1841 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), |
| @@ -1828,7 +1844,8 @@ static struct clk mcbsp5_ick = { | |||
| 1828 | }; | 1844 | }; |
| 1829 | 1845 | ||
| 1830 | static struct clk mcbsp5_fck = { | 1846 | static struct clk mcbsp5_fck = { |
| 1831 | .name = "mcbsp5_fck", | 1847 | .name = "mcbsp_fck", |
| 1848 | .id = 5, | ||
| 1832 | .parent = &func_96m_ck, | 1849 | .parent = &func_96m_ck, |
| 1833 | .flags = CLOCK_IN_OMAP243X, | 1850 | .flags = CLOCK_IN_OMAP243X, |
| 1834 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), | 1851 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), |
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index b42bdd6079a5..4263099b1ad3 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * OMAP3-specific clock framework functions | 2 | * OMAP3-specific clock framework functions |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2007 Texas Instruments, Inc. | 4 | * Copyright (C) 2007-2008 Texas Instruments, Inc. |
| 5 | * Copyright (C) 2007 Nokia Corporation | 5 | * Copyright (C) 2007-2008 Nokia Corporation |
| 6 | * | 6 | * |
| 7 | * Written by Paul Walmsley | 7 | * Written by Paul Walmsley |
| 8 | * Testing and integration fixes by Jouni Högander | ||
| 8 | * | 9 | * |
| 9 | * Parts of this code are based on code written by | 10 | * Parts of this code are based on code written by |
| 10 | * Richard Woodruff, Tony Lindgren, Tuukka Tikkanen, Karthik Dasu | 11 | * Richard Woodruff, Tony Lindgren, Tuukka Tikkanen, Karthik Dasu |
| @@ -23,6 +24,7 @@ | |||
| 23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 24 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
| 25 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 27 | #include <linux/limits.h> | ||
| 26 | 28 | ||
| 27 | #include <asm/arch/clock.h> | 29 | #include <asm/arch/clock.h> |
| 28 | #include <asm/arch/sram.h> | 30 | #include <asm/arch/sram.h> |
| @@ -37,8 +39,11 @@ | |||
| 37 | #include "cm.h" | 39 | #include "cm.h" |
| 38 | #include "cm-regbits-34xx.h" | 40 | #include "cm-regbits-34xx.h" |
| 39 | 41 | ||
| 40 | /* CM_CLKEN_PLL*.EN* bit values */ | 42 | /* CM_AUTOIDLE_PLL*.AUTO_* bit values */ |
| 41 | #define DPLL_LOCKED 0x7 | 43 | #define DPLL_AUTOIDLE_DISABLE 0x0 |
| 44 | #define DPLL_AUTOIDLE_LOW_POWER_STOP 0x1 | ||
| 45 | |||
| 46 | #define MAX_DPLL_WAIT_TRIES 1000000 | ||
| 42 | 47 | ||
| 43 | /** | 48 | /** |
| 44 | * omap3_dpll_recalc - recalculate DPLL rate | 49 | * omap3_dpll_recalc - recalculate DPLL rate |
| @@ -53,6 +58,290 @@ static void omap3_dpll_recalc(struct clk *clk) | |||
| 53 | propagate_rate(clk); | 58 | propagate_rate(clk); |
| 54 | } | 59 | } |
| 55 | 60 | ||
| 61 | /* _omap3_dpll_write_clken - write clken_bits arg to a DPLL's enable bits */ | ||
| 62 | static void _omap3_dpll_write_clken(struct clk *clk, u8 clken_bits) | ||
| 63 | { | ||
| 64 | const struct dpll_data *dd; | ||
| 65 | |||
| 66 | dd = clk->dpll_data; | ||
| 67 | |||
| 68 | cm_rmw_reg_bits(dd->enable_mask, clken_bits << __ffs(dd->enable_mask), | ||
| 69 | dd->control_reg); | ||
| 70 | } | ||
| 71 | |||
| 72 | /* _omap3_wait_dpll_status: wait for a DPLL to enter a specific state */ | ||
| 73 | static int _omap3_wait_dpll_status(struct clk *clk, u8 state) | ||
| 74 | { | ||
| 75 | const struct dpll_data *dd; | ||
| 76 | int i = 0; | ||
| 77 | int ret = -EINVAL; | ||
| 78 | u32 idlest_mask; | ||
| 79 | |||
| 80 | dd = clk->dpll_data; | ||
| 81 | |||
| 82 | state <<= dd->idlest_bit; | ||
| 83 | idlest_mask = 1 << dd->idlest_bit; | ||
| 84 | |||
| 85 | while (((cm_read_reg(dd->idlest_reg) & idlest_mask) != state) && | ||
| 86 | i < MAX_DPLL_WAIT_TRIES) { | ||
| 87 | i++; | ||
| 88 | udelay(1); | ||
| 89 | } | ||
| 90 | |||
| 91 | if (i == MAX_DPLL_WAIT_TRIES) { | ||
| 92 | printk(KERN_ERR "clock: %s failed transition to '%s'\n", | ||
| 93 | clk->name, (state) ? "locked" : "bypassed"); | ||
| 94 | } else { | ||
| 95 | pr_debug("clock: %s transition to '%s' in %d loops\n", | ||
| 96 | clk->name, (state) ? "locked" : "bypassed", i); | ||
| 97 | |||
| 98 | ret = 0; | ||
| 99 | } | ||
| 100 | |||
| 101 | return ret; | ||
| 102 | } | ||
| 103 | |||
| 104 | /* Non-CORE DPLL (e.g., DPLLs that do not control SDRC) clock functions */ | ||
| 105 | |||
| 106 | /* | ||
| 107 | * _omap3_noncore_dpll_lock - instruct a DPLL to lock and wait for readiness | ||
| 108 | * @clk: pointer to a DPLL struct clk | ||
| 109 | * | ||
| 110 | * Instructs a non-CORE DPLL to lock. Waits for the DPLL to report | ||
| 111 | * readiness before returning. Will save and restore the DPLL's | ||
| 112 | * autoidle state across the enable, per the CDP code. If the DPLL | ||
| 113 | * locked successfully, return 0; if the DPLL did not lock in the time | ||
| 114 | * allotted, or DPLL3 was passed in, return -EINVAL. | ||
| 115 | */ | ||
| 116 | static int _omap3_noncore_dpll_lock(struct clk *clk) | ||
| 117 | { | ||
| 118 | u8 ai; | ||
| 119 | int r; | ||
| 120 | |||
| 121 | if (clk == &dpll3_ck) | ||
| 122 | return -EINVAL; | ||
| 123 | |||
| 124 | pr_debug("clock: locking DPLL %s\n", clk->name); | ||
| 125 | |||
| 126 | ai = omap3_dpll_autoidle_read(clk); | ||
| 127 | |||
| 128 | _omap3_dpll_write_clken(clk, DPLL_LOCKED); | ||
| 129 | |||
| 130 | if (ai) { | ||
| 131 | /* | ||
| 132 | * If no downstream clocks are enabled, CM_IDLEST bit | ||
| 133 | * may never become active, so don't wait for DPLL to lock. | ||
| 134 | */ | ||
| 135 | r = 0; | ||
| 136 | omap3_dpll_allow_idle(clk); | ||
| 137 | } else { | ||
| 138 | r = _omap3_wait_dpll_status(clk, 1); | ||
| 139 | omap3_dpll_deny_idle(clk); | ||
| 140 | }; | ||
| 141 | |||
| 142 | return r; | ||
| 143 | } | ||
| 144 | |||
| 145 | /* | ||
| 146 | * omap3_noncore_dpll_bypass - instruct a DPLL to bypass and wait for readiness | ||
| 147 | * @clk: pointer to a DPLL struct clk | ||
| 148 | * | ||
| 149 | * Instructs a non-CORE DPLL to enter low-power bypass mode. In | ||
| 150 | * bypass mode, the DPLL's rate is set equal to its parent clock's | ||
| 151 | * rate. Waits for the DPLL to report readiness before returning. | ||
| 152 | * Will save and restore the DPLL's autoidle state across the enable, | ||
| 153 | * per the CDP code. If the DPLL entered bypass mode successfully, | ||
| 154 | * return 0; if the DPLL did not enter bypass in the time allotted, or | ||
| 155 | * DPLL3 was passed in, or the DPLL does not support low-power bypass, | ||
| 156 | * return -EINVAL. | ||
| 157 | */ | ||
| 158 | static int _omap3_noncore_dpll_bypass(struct clk *clk) | ||
| 159 | { | ||
| 160 | int r; | ||
| 161 | u8 ai; | ||
| 162 | |||
| 163 | if (clk == &dpll3_ck) | ||
| 164 | return -EINVAL; | ||
| 165 | |||
| 166 | if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_BYPASS))) | ||
| 167 | return -EINVAL; | ||
| 168 | |||
| 169 | pr_debug("clock: configuring DPLL %s for low-power bypass\n", | ||
| 170 | clk->name); | ||
| 171 | |||
| 172 | ai = omap3_dpll_autoidle_read(clk); | ||
| 173 | |||
| 174 | _omap3_dpll_write_clken(clk, DPLL_LOW_POWER_BYPASS); | ||
| 175 | |||
| 176 | r = _omap3_wait_dpll_status(clk, 0); | ||
| 177 | |||
| 178 | if (ai) | ||
| 179 | omap3_dpll_allow_idle(clk); | ||
| 180 | else | ||
| 181 | omap3_dpll_deny_idle(clk); | ||
| 182 | |||
| 183 | return r; | ||
| 184 | } | ||
| 185 | |||
| 186 | /* | ||
| 187 | * _omap3_noncore_dpll_stop - instruct a DPLL to stop | ||
| 188 | * @clk: pointer to a DPLL struct clk | ||
| 189 | * | ||
| 190 | * Instructs a non-CORE DPLL to enter low-power stop. Will save and | ||
| 191 | * restore the DPLL's autoidle state across the stop, per the CDP | ||
| 192 | * code. If DPLL3 was passed in, or the DPLL does not support | ||
| 193 | * low-power stop, return -EINVAL; otherwise, return 0. | ||
| 194 | */ | ||
| 195 | static int _omap3_noncore_dpll_stop(struct clk *clk) | ||
| 196 | { | ||
| 197 | u8 ai; | ||
| 198 | |||
| 199 | if (clk == &dpll3_ck) | ||
| 200 | return -EINVAL; | ||
| 201 | |||
| 202 | if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_STOP))) | ||
| 203 | return -EINVAL; | ||
| 204 | |||
| 205 | pr_debug("clock: stopping DPLL %s\n", clk->name); | ||
| 206 | |||
| 207 | ai = omap3_dpll_autoidle_read(clk); | ||
| 208 | |||
| 209 | _omap3_dpll_write_clken(clk, DPLL_LOW_POWER_STOP); | ||
| 210 | |||
| 211 | if (ai) | ||
| 212 | omap3_dpll_allow_idle(clk); | ||
| 213 | else | ||
| 214 | omap3_dpll_deny_idle(clk); | ||
| 215 | |||
| 216 | return 0; | ||
| 217 | } | ||
| 218 | |||
| 219 | /** | ||
| 220 | * omap3_noncore_dpll_enable - instruct a DPLL to enter bypass or lock mode | ||
| 221 | * @clk: pointer to a DPLL struct clk | ||
| 222 | * | ||
| 223 | * Instructs a non-CORE DPLL to enable, e.g., to enter bypass or lock. | ||
| 224 | * The choice of modes depends on the DPLL's programmed rate: if it is | ||
| 225 | * the same as the DPLL's parent clock, it will enter bypass; | ||
| 226 | * otherwise, it will enter lock. This code will wait for the DPLL to | ||
| 227 | * indicate readiness before returning, unless the DPLL takes too long | ||
| 228 | * to enter the target state. Intended to be used as the struct clk's | ||
| 229 | * enable function. If DPLL3 was passed in, or the DPLL does not | ||
| 230 | * support low-power stop, or if the DPLL took too long to enter | ||
| 231 | * bypass or lock, return -EINVAL; otherwise, return 0. | ||
| 232 | */ | ||
| 233 | static int omap3_noncore_dpll_enable(struct clk *clk) | ||
| 234 | { | ||
| 235 | int r; | ||
| 236 | |||
| 237 | if (clk == &dpll3_ck) | ||
| 238 | return -EINVAL; | ||
| 239 | |||
| 240 | if (clk->parent->rate == clk_get_rate(clk)) | ||
| 241 | r = _omap3_noncore_dpll_bypass(clk); | ||
| 242 | else | ||
| 243 | r = _omap3_noncore_dpll_lock(clk); | ||
| 244 | |||
| 245 | return r; | ||
| 246 | } | ||
| 247 | |||
| 248 | /** | ||
| 249 | * omap3_noncore_dpll_enable - instruct a DPLL to enter bypass or lock mode | ||
| 250 | * @clk: pointer to a DPLL struct clk | ||
| 251 | * | ||
| 252 | * Instructs a non-CORE DPLL to enable, e.g., to enter bypass or lock. | ||
| 253 | * The choice of modes depends on the DPLL's programmed rate: if it is | ||
| 254 | * the same as the DPLL's parent clock, it will enter bypass; | ||
| 255 | * otherwise, it will enter lock. This code will wait for the DPLL to | ||
| 256 | * indicate readiness before returning, unless the DPLL takes too long | ||
| 257 | * to enter the target state. Intended to be used as the struct clk's | ||
| 258 | * enable function. If DPLL3 was passed in, or the DPLL does not | ||
| 259 | * support low-power stop, or if the DPLL took too long to enter | ||
| 260 | * bypass or lock, return -EINVAL; otherwise, return 0. | ||
| 261 | */ | ||
| 262 | static void omap3_noncore_dpll_disable(struct clk *clk) | ||
| 263 | { | ||
| 264 | if (clk == &dpll3_ck) | ||
| 265 | return; | ||
| 266 | |||
| 267 | _omap3_noncore_dpll_stop(clk); | ||
| 268 | } | ||
| 269 | |||
| 270 | /** | ||
| 271 | * omap3_dpll_autoidle_read - read a DPLL's autoidle bits | ||
| 272 | * @clk: struct clk * of the DPLL to read | ||
| 273 | * | ||
| 274 | * Return the DPLL's autoidle bits, shifted down to bit 0. Returns | ||
| 275 | * -EINVAL if passed a null pointer or if the struct clk does not | ||
| 276 | * appear to refer to a DPLL. | ||
| 277 | */ | ||
| 278 | static u32 omap3_dpll_autoidle_read(struct clk *clk) | ||
| 279 | { | ||
| 280 | const struct dpll_data *dd; | ||
| 281 | u32 v; | ||
| 282 | |||
| 283 | if (!clk || !clk->dpll_data) | ||
| 284 | return -EINVAL; | ||
| 285 | |||
| 286 | dd = clk->dpll_data; | ||
| 287 | |||
| 288 | v = cm_read_reg(dd->autoidle_reg); | ||
| 289 | v &= dd->autoidle_mask; | ||
| 290 | v >>= __ffs(dd->autoidle_mask); | ||
| 291 | |||
| 292 | return v; | ||
| 293 | } | ||
| 294 | |||
| 295 | /** | ||
| 296 | * omap3_dpll_allow_idle - enable DPLL autoidle bits | ||
| 297 | * @clk: struct clk * of the DPLL to operate on | ||
| 298 | * | ||
| 299 | * Enable DPLL automatic idle control. This automatic idle mode | ||
| 300 | * switching takes effect only when the DPLL is locked, at least on | ||
| 301 | * OMAP3430. The DPLL will enter low-power stop when its downstream | ||
| 302 | * clocks are gated. No return value. | ||
| 303 | */ | ||
| 304 | static void omap3_dpll_allow_idle(struct clk *clk) | ||
| 305 | { | ||
| 306 | const struct dpll_data *dd; | ||
| 307 | |||
| 308 | if (!clk || !clk->dpll_data) | ||
| 309 | return; | ||
| 310 | |||
| 311 | dd = clk->dpll_data; | ||
| 312 | |||
| 313 | /* | ||
| 314 | * REVISIT: CORE DPLL can optionally enter low-power bypass | ||
| 315 | * by writing 0x5 instead of 0x1. Add some mechanism to | ||
| 316 | * optionally enter this mode. | ||
| 317 | */ | ||
| 318 | cm_rmw_reg_bits(dd->autoidle_mask, | ||
| 319 | DPLL_AUTOIDLE_LOW_POWER_STOP << __ffs(dd->autoidle_mask), | ||
| 320 | dd->autoidle_reg); | ||
| 321 | } | ||
| 322 | |||
| 323 | /** | ||
| 324 | * omap3_dpll_deny_idle - prevent DPLL from automatically idling | ||
| 325 | * @clk: struct clk * of the DPLL to operate on | ||
| 326 | * | ||
| 327 | * Disable DPLL automatic idle control. No return value. | ||
| 328 | */ | ||
| 329 | static void omap3_dpll_deny_idle(struct clk *clk) | ||
| 330 | { | ||
| 331 | const struct dpll_data *dd; | ||
| 332 | |||
| 333 | if (!clk || !clk->dpll_data) | ||
| 334 | return; | ||
| 335 | |||
| 336 | dd = clk->dpll_data; | ||
| 337 | |||
| 338 | cm_rmw_reg_bits(dd->autoidle_mask, | ||
| 339 | DPLL_AUTOIDLE_DISABLE << __ffs(dd->autoidle_mask), | ||
| 340 | dd->autoidle_reg); | ||
| 341 | } | ||
| 342 | |||
| 343 | /* Clock control for DPLL outputs */ | ||
| 344 | |||
| 56 | /** | 345 | /** |
| 57 | * omap3_clkoutx2_recalc - recalculate DPLL X2 output virtual clock rate | 346 | * omap3_clkoutx2_recalc - recalculate DPLL X2 output virtual clock rate |
| 58 | * @clk: DPLL output struct clk | 347 | * @clk: DPLL output struct clk |
| @@ -89,6 +378,8 @@ static void omap3_clkoutx2_recalc(struct clk *clk) | |||
| 89 | propagate_rate(clk); | 378 | propagate_rate(clk); |
| 90 | } | 379 | } |
| 91 | 380 | ||
| 381 | /* Common clock code */ | ||
| 382 | |||
| 92 | /* | 383 | /* |
| 93 | * As it is structured now, this will prevent an OMAP2/3 multiboot | 384 | * As it is structured now, this will prevent an OMAP2/3 multiboot |
| 94 | * kernel from compiling. This will need further attention. | 385 | * kernel from compiling. This will need further attention. |
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index c9c5972a2e25..05757eb032bc 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h | |||
| @@ -1,14 +1,19 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * OMAP3 clock framework | 2 | * OMAP3 clock framework |
| 3 | * | 3 | * |
| 4 | * Virtual clocks are introduced as a convenient tools. | ||
| 5 | * They are sources for other clocks and not supposed | ||
| 6 | * to be requested from drivers directly. | ||
| 7 | * | ||
| 8 | * Copyright (C) 2007-2008 Texas Instruments, Inc. | 4 | * Copyright (C) 2007-2008 Texas Instruments, Inc. |
| 9 | * Copyright (C) 2007-2008 Nokia Corporation | 5 | * Copyright (C) 2007-2008 Nokia Corporation |
| 10 | * | 6 | * |
| 11 | * Written by Paul Walmsley | 7 | * Written by Paul Walmsley |
| 8 | * With many device clock fixes by Kevin Hilman and Jouni Högander | ||
| 9 | * DPLL bypass clock support added by Roman Tereshonkov | ||
| 10 | * | ||
| 11 | */ | ||
| 12 | |||
| 13 | /* | ||
| 14 | * Virtual clocks are introduced as convenient tools. | ||
| 15 | * They are sources for other clocks and not supposed | ||
| 16 | * to be requested from drivers directly. | ||
| 12 | */ | 17 | */ |
| 13 | 18 | ||
| 14 | #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H | 19 | #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H |
| @@ -24,6 +29,15 @@ | |||
| 24 | 29 | ||
| 25 | static void omap3_dpll_recalc(struct clk *clk); | 30 | static void omap3_dpll_recalc(struct clk *clk); |
| 26 | static void omap3_clkoutx2_recalc(struct clk *clk); | 31 | static void omap3_clkoutx2_recalc(struct clk *clk); |
| 32 | static void omap3_dpll_allow_idle(struct clk *clk); | ||
| 33 | static void omap3_dpll_deny_idle(struct clk *clk); | ||
| 34 | static u32 omap3_dpll_autoidle_read(struct clk *clk); | ||
| 35 | static int omap3_noncore_dpll_enable(struct clk *clk); | ||
| 36 | static void omap3_noncore_dpll_disable(struct clk *clk); | ||
| 37 | |||
| 38 | /* Maximum DPLL multiplier, divider values for OMAP3 */ | ||
| 39 | #define OMAP3_MAX_DPLL_MULT 2048 | ||
| 40 | #define OMAP3_MAX_DPLL_DIV 128 | ||
| 27 | 41 | ||
| 28 | /* | 42 | /* |
| 29 | * DPLL1 supplies clock to the MPU. | 43 | * DPLL1 supplies clock to the MPU. |
| @@ -33,6 +47,11 @@ static void omap3_clkoutx2_recalc(struct clk *clk); | |||
| 33 | * DPLL5 supplies other peripheral clocks (USBHOST, USIM). | 47 | * DPLL5 supplies other peripheral clocks (USBHOST, USIM). |
| 34 | */ | 48 | */ |
| 35 | 49 | ||
| 50 | /* CM_CLKEN_PLL*.EN* bit values - not all are available for every DPLL */ | ||
| 51 | #define DPLL_LOW_POWER_STOP 0x1 | ||
| 52 | #define DPLL_LOW_POWER_BYPASS 0x5 | ||
| 53 | #define DPLL_LOCKED 0x7 | ||
| 54 | |||
| 36 | /* PRM CLOCKS */ | 55 | /* PRM CLOCKS */ |
| 37 | 56 | ||
| 38 | /* According to timer32k.c, this is a 32768Hz clock, not a 32000Hz clock. */ | 57 | /* According to timer32k.c, this is a 32768Hz clock, not a 32000Hz clock. */ |
| @@ -240,15 +259,23 @@ static const struct clksel_rate div16_dpll_rates[] = { | |||
| 240 | /* DPLL1 */ | 259 | /* DPLL1 */ |
| 241 | /* MPU clock source */ | 260 | /* MPU clock source */ |
| 242 | /* Type: DPLL */ | 261 | /* Type: DPLL */ |
| 243 | static const struct dpll_data dpll1_dd = { | 262 | static struct dpll_data dpll1_dd = { |
| 244 | .mult_div1_reg = OMAP_CM_REGADDR(MPU_MOD, OMAP3430_CM_CLKSEL1_PLL), | 263 | .mult_div1_reg = OMAP_CM_REGADDR(MPU_MOD, OMAP3430_CM_CLKSEL1_PLL), |
| 245 | .mult_mask = OMAP3430_MPU_DPLL_MULT_MASK, | 264 | .mult_mask = OMAP3430_MPU_DPLL_MULT_MASK, |
| 246 | .div1_mask = OMAP3430_MPU_DPLL_DIV_MASK, | 265 | .div1_mask = OMAP3430_MPU_DPLL_DIV_MASK, |
| 247 | .control_reg = OMAP_CM_REGADDR(MPU_MOD, OMAP3430_CM_CLKEN_PLL), | 266 | .control_reg = OMAP_CM_REGADDR(MPU_MOD, OMAP3430_CM_CLKEN_PLL), |
| 248 | .enable_mask = OMAP3430_EN_MPU_DPLL_MASK, | 267 | .enable_mask = OMAP3430_EN_MPU_DPLL_MASK, |
| 268 | .modes = (1 << DPLL_LOW_POWER_BYPASS) | (1 << DPLL_LOCKED), | ||
| 249 | .auto_recal_bit = OMAP3430_EN_MPU_DPLL_DRIFTGUARD_SHIFT, | 269 | .auto_recal_bit = OMAP3430_EN_MPU_DPLL_DRIFTGUARD_SHIFT, |
| 250 | .recal_en_bit = OMAP3430_MPU_DPLL_RECAL_EN_SHIFT, | 270 | .recal_en_bit = OMAP3430_MPU_DPLL_RECAL_EN_SHIFT, |
| 251 | .recal_st_bit = OMAP3430_MPU_DPLL_ST_SHIFT, | 271 | .recal_st_bit = OMAP3430_MPU_DPLL_ST_SHIFT, |
| 272 | .autoidle_reg = OMAP_CM_REGADDR(MPU_MOD, OMAP3430_CM_AUTOIDLE_PLL), | ||
| 273 | .autoidle_mask = OMAP3430_AUTO_MPU_DPLL_MASK, | ||
| 274 | .idlest_reg = OMAP_CM_REGADDR(MPU_MOD, OMAP3430_CM_IDLEST_PLL), | ||
| 275 | .idlest_bit = OMAP3430_ST_MPU_CLK_SHIFT, | ||
| 276 | .max_multiplier = OMAP3_MAX_DPLL_MULT, | ||
| 277 | .max_divider = OMAP3_MAX_DPLL_DIV, | ||
| 278 | .rate_tolerance = DEFAULT_DPLL_RATE_TOLERANCE | ||
| 252 | }; | 279 | }; |
| 253 | 280 | ||
| 254 | static struct clk dpll1_ck = { | 281 | static struct clk dpll1_ck = { |
| @@ -256,6 +283,7 @@ static struct clk dpll1_ck = { | |||
| 256 | .parent = &sys_ck, | 283 | .parent = &sys_ck, |
| 257 | .dpll_data = &dpll1_dd, | 284 | .dpll_data = &dpll1_dd, |
| 258 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED, | 285 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED, |
| 286 | .round_rate = &omap2_dpll_round_rate, | ||
| 259 | .recalc = &omap3_dpll_recalc, | 287 | .recalc = &omap3_dpll_recalc, |
| 260 | }; | 288 | }; |
| 261 | 289 | ||
| @@ -297,22 +325,34 @@ static struct clk dpll1_x2m2_ck = { | |||
| 297 | /* IVA2 clock source */ | 325 | /* IVA2 clock source */ |
| 298 | /* Type: DPLL */ | 326 | /* Type: DPLL */ |
| 299 | 327 | ||
| 300 | static const struct dpll_data dpll2_dd = { | 328 | static struct dpll_data dpll2_dd = { |
| 301 | .mult_div1_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSEL1_PLL), | 329 | .mult_div1_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSEL1_PLL), |
| 302 | .mult_mask = OMAP3430_IVA2_DPLL_MULT_MASK, | 330 | .mult_mask = OMAP3430_IVA2_DPLL_MULT_MASK, |
| 303 | .div1_mask = OMAP3430_IVA2_DPLL_DIV_MASK, | 331 | .div1_mask = OMAP3430_IVA2_DPLL_DIV_MASK, |
| 304 | .control_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKEN_PLL), | 332 | .control_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKEN_PLL), |
| 305 | .enable_mask = OMAP3430_EN_IVA2_DPLL_MASK, | 333 | .enable_mask = OMAP3430_EN_IVA2_DPLL_MASK, |
| 334 | .modes = (1 << DPLL_LOW_POWER_STOP) | (1 << DPLL_LOCKED) | | ||
| 335 | (1 << DPLL_LOW_POWER_BYPASS), | ||
| 306 | .auto_recal_bit = OMAP3430_EN_IVA2_DPLL_DRIFTGUARD_SHIFT, | 336 | .auto_recal_bit = OMAP3430_EN_IVA2_DPLL_DRIFTGUARD_SHIFT, |
| 307 | .recal_en_bit = OMAP3430_PRM_IRQENABLE_MPU_IVA2_DPLL_RECAL_EN_SHIFT, | 337 | .recal_en_bit = OMAP3430_PRM_IRQENABLE_MPU_IVA2_DPLL_RECAL_EN_SHIFT, |
| 308 | .recal_st_bit = OMAP3430_PRM_IRQSTATUS_MPU_IVA2_DPLL_ST_SHIFT, | 338 | .recal_st_bit = OMAP3430_PRM_IRQSTATUS_MPU_IVA2_DPLL_ST_SHIFT, |
| 339 | .autoidle_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_AUTOIDLE_PLL), | ||
| 340 | .autoidle_mask = OMAP3430_AUTO_IVA2_DPLL_MASK, | ||
| 341 | .idlest_reg = OMAP_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_IDLEST_PLL), | ||
| 342 | .idlest_bit = OMAP3430_ST_IVA2_CLK_SHIFT, | ||
| 343 | .max_multiplier = OMAP3_MAX_DPLL_MULT, | ||
| 344 | .max_divider = OMAP3_MAX_DPLL_DIV, | ||
| 345 | .rate_tolerance = DEFAULT_DPLL_RATE_TOLERANCE | ||
| 309 | }; | 346 | }; |
| 310 | 347 | ||
| 311 | static struct clk dpll2_ck = { | 348 | static struct clk dpll2_ck = { |
| 312 | .name = "dpll2_ck", | 349 | .name = "dpll2_ck", |
| 313 | .parent = &sys_ck, | 350 | .parent = &sys_ck, |
| 314 | .dpll_data = &dpll2_dd, | 351 | .dpll_data = &dpll2_dd, |
| 315 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED, | 352 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES, |
| 353 | .enable = &omap3_noncore_dpll_enable, | ||
| 354 | .disable = &omap3_noncore_dpll_disable, | ||
| 355 | .round_rate = &omap2_dpll_round_rate, | ||
| 316 | .recalc = &omap3_dpll_recalc, | 356 | .recalc = &omap3_dpll_recalc, |
| 317 | }; | 357 | }; |
| 318 | 358 | ||
| @@ -338,10 +378,12 @@ static struct clk dpll2_m2_ck = { | |||
| 338 | .recalc = &omap2_clksel_recalc, | 378 | .recalc = &omap2_clksel_recalc, |
| 339 | }; | 379 | }; |
| 340 | 380 | ||
| 341 | /* DPLL3 */ | 381 | /* |
| 342 | /* Source clock for all interfaces and for some device fclks */ | 382 | * DPLL3 |
| 343 | /* Type: DPLL */ | 383 | * Source clock for all interfaces and for some device fclks |
| 344 | static const struct dpll_data dpll3_dd = { | 384 | * REVISIT: Also supports fast relock bypass - not included below |
| 385 | */ | ||
| 386 | static struct dpll_data dpll3_dd = { | ||
| 345 | .mult_div1_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1), | 387 | .mult_div1_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1), |
| 346 | .mult_mask = OMAP3430_CORE_DPLL_MULT_MASK, | 388 | .mult_mask = OMAP3430_CORE_DPLL_MULT_MASK, |
| 347 | .div1_mask = OMAP3430_CORE_DPLL_DIV_MASK, | 389 | .div1_mask = OMAP3430_CORE_DPLL_DIV_MASK, |
| @@ -350,6 +392,11 @@ static const struct dpll_data dpll3_dd = { | |||
| 350 | .auto_recal_bit = OMAP3430_EN_CORE_DPLL_DRIFTGUARD_SHIFT, | 392 | .auto_recal_bit = OMAP3430_EN_CORE_DPLL_DRIFTGUARD_SHIFT, |
| 351 | .recal_en_bit = OMAP3430_CORE_DPLL_RECAL_EN_SHIFT, | 393 | .recal_en_bit = OMAP3430_CORE_DPLL_RECAL_EN_SHIFT, |
| 352 | .recal_st_bit = OMAP3430_CORE_DPLL_ST_SHIFT, | 394 | .recal_st_bit = OMAP3430_CORE_DPLL_ST_SHIFT, |
| 395 | .autoidle_reg = OMAP_CM_REGADDR(PLL_MOD, CM_AUTOIDLE), | ||
| 396 | .autoidle_mask = OMAP3430_AUTO_CORE_DPLL_MASK, | ||
| 397 | .max_multiplier = OMAP3_MAX_DPLL_MULT, | ||
| 398 | .max_divider = OMAP3_MAX_DPLL_DIV, | ||
| 399 | .rate_tolerance = DEFAULT_DPLL_RATE_TOLERANCE | ||
| 353 | }; | 400 | }; |
| 354 | 401 | ||
| 355 | static struct clk dpll3_ck = { | 402 | static struct clk dpll3_ck = { |
| @@ -357,6 +404,7 @@ static struct clk dpll3_ck = { | |||
| 357 | .parent = &sys_ck, | 404 | .parent = &sys_ck, |
| 358 | .dpll_data = &dpll3_dd, | 405 | .dpll_data = &dpll3_dd, |
| 359 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED, | 406 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED, |
| 407 | .round_rate = &omap2_dpll_round_rate, | ||
| 360 | .recalc = &omap3_dpll_recalc, | 408 | .recalc = &omap3_dpll_recalc, |
| 361 | }; | 409 | }; |
| 362 | 410 | ||
| @@ -439,7 +487,7 @@ static struct clk core_ck = { | |||
| 439 | .name = "core_ck", | 487 | .name = "core_ck", |
| 440 | .init = &omap2_init_clksel_parent, | 488 | .init = &omap2_init_clksel_parent, |
| 441 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | 489 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), |
| 442 | .clksel_mask = OMAP3430_ST_CORE_CLK, | 490 | .clksel_mask = OMAP3430_ST_CORE_CLK_MASK, |
| 443 | .clksel = core_ck_clksel, | 491 | .clksel = core_ck_clksel, |
| 444 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | | 492 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | |
| 445 | PARENT_CONTROLS_CLOCK, | 493 | PARENT_CONTROLS_CLOCK, |
| @@ -456,7 +504,7 @@ static struct clk dpll3_m2x2_ck = { | |||
| 456 | .name = "dpll3_m2x2_ck", | 504 | .name = "dpll3_m2x2_ck", |
| 457 | .init = &omap2_init_clksel_parent, | 505 | .init = &omap2_init_clksel_parent, |
| 458 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | 506 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), |
| 459 | .clksel_mask = OMAP3430_ST_CORE_CLK, | 507 | .clksel_mask = OMAP3430_ST_CORE_CLK_MASK, |
| 460 | .clksel = dpll3_m2x2_ck_clksel, | 508 | .clksel = dpll3_m2x2_ck_clksel, |
| 461 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | | 509 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | |
| 462 | PARENT_CONTROLS_CLOCK, | 510 | PARENT_CONTROLS_CLOCK, |
| @@ -503,7 +551,7 @@ static struct clk emu_core_alwon_ck = { | |||
| 503 | .parent = &dpll3_m3x2_ck, | 551 | .parent = &dpll3_m3x2_ck, |
| 504 | .init = &omap2_init_clksel_parent, | 552 | .init = &omap2_init_clksel_parent, |
| 505 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | 553 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), |
| 506 | .clksel_mask = OMAP3430_ST_CORE_CLK, | 554 | .clksel_mask = OMAP3430_ST_CORE_CLK_MASK, |
| 507 | .clksel = emu_core_alwon_ck_clksel, | 555 | .clksel = emu_core_alwon_ck_clksel, |
| 508 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | | 556 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | |
| 509 | PARENT_CONTROLS_CLOCK, | 557 | PARENT_CONTROLS_CLOCK, |
| @@ -513,22 +561,33 @@ static struct clk emu_core_alwon_ck = { | |||
| 513 | /* DPLL4 */ | 561 | /* DPLL4 */ |
| 514 | /* Supplies 96MHz, 54Mhz TV DAC, DSS fclk, CAM sensor clock, emul trace clk */ | 562 | /* Supplies 96MHz, 54Mhz TV DAC, DSS fclk, CAM sensor clock, emul trace clk */ |
| 515 | /* Type: DPLL */ | 563 | /* Type: DPLL */ |
| 516 | static const struct dpll_data dpll4_dd = { | 564 | static struct dpll_data dpll4_dd = { |
| 517 | .mult_div1_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL2), | 565 | .mult_div1_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL2), |
| 518 | .mult_mask = OMAP3430_PERIPH_DPLL_MULT_MASK, | 566 | .mult_mask = OMAP3430_PERIPH_DPLL_MULT_MASK, |
| 519 | .div1_mask = OMAP3430_PERIPH_DPLL_DIV_MASK, | 567 | .div1_mask = OMAP3430_PERIPH_DPLL_DIV_MASK, |
| 520 | .control_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), | 568 | .control_reg = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN), |
| 521 | .enable_mask = OMAP3430_EN_PERIPH_DPLL_MASK, | 569 | .enable_mask = OMAP3430_EN_PERIPH_DPLL_MASK, |
| 570 | .modes = (1 << DPLL_LOW_POWER_STOP) | (1 << DPLL_LOCKED), | ||
| 522 | .auto_recal_bit = OMAP3430_EN_PERIPH_DPLL_DRIFTGUARD_SHIFT, | 571 | .auto_recal_bit = OMAP3430_EN_PERIPH_DPLL_DRIFTGUARD_SHIFT, |
| 523 | .recal_en_bit = OMAP3430_PERIPH_DPLL_RECAL_EN_SHIFT, | 572 | .recal_en_bit = OMAP3430_PERIPH_DPLL_RECAL_EN_SHIFT, |
| 524 | .recal_st_bit = OMAP3430_PERIPH_DPLL_ST_SHIFT, | 573 | .recal_st_bit = OMAP3430_PERIPH_DPLL_ST_SHIFT, |
| 574 | .autoidle_reg = OMAP_CM_REGADDR(PLL_MOD, CM_AUTOIDLE), | ||
| 575 | .autoidle_mask = OMAP3430_AUTO_PERIPH_DPLL_MASK, | ||
| 576 | .idlest_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | ||
| 577 | .idlest_bit = OMAP3430_ST_PERIPH_CLK_SHIFT, | ||
| 578 | .max_multiplier = OMAP3_MAX_DPLL_MULT, | ||
| 579 | .max_divider = OMAP3_MAX_DPLL_DIV, | ||
| 580 | .rate_tolerance = DEFAULT_DPLL_RATE_TOLERANCE | ||
| 525 | }; | 581 | }; |
| 526 | 582 | ||
| 527 | static struct clk dpll4_ck = { | 583 | static struct clk dpll4_ck = { |
| 528 | .name = "dpll4_ck", | 584 | .name = "dpll4_ck", |
| 529 | .parent = &sys_ck, | 585 | .parent = &sys_ck, |
| 530 | .dpll_data = &dpll4_dd, | 586 | .dpll_data = &dpll4_dd, |
| 531 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | ALWAYS_ENABLED, | 587 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES, |
| 588 | .enable = &omap3_noncore_dpll_enable, | ||
| 589 | .disable = &omap3_noncore_dpll_disable, | ||
| 590 | .round_rate = &omap2_dpll_round_rate, | ||
| 532 | .recalc = &omap3_dpll_recalc, | 591 | .recalc = &omap3_dpll_recalc, |
| 533 | }; | 592 | }; |
| 534 | 593 | ||
| @@ -584,7 +643,7 @@ static struct clk omap_96m_alwon_fck = { | |||
| 584 | .parent = &dpll4_m2x2_ck, | 643 | .parent = &dpll4_m2x2_ck, |
| 585 | .init = &omap2_init_clksel_parent, | 644 | .init = &omap2_init_clksel_parent, |
| 586 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | 645 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), |
| 587 | .clksel_mask = OMAP3430_ST_PERIPH_CLK, | 646 | .clksel_mask = OMAP3430_ST_PERIPH_CLK_MASK, |
| 588 | .clksel = omap_96m_alwon_fck_clksel, | 647 | .clksel = omap_96m_alwon_fck_clksel, |
| 589 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | | 648 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | |
| 590 | PARENT_CONTROLS_CLOCK, | 649 | PARENT_CONTROLS_CLOCK, |
| @@ -610,7 +669,7 @@ static struct clk cm_96m_fck = { | |||
| 610 | .parent = &dpll4_m2x2_ck, | 669 | .parent = &dpll4_m2x2_ck, |
| 611 | .init = &omap2_init_clksel_parent, | 670 | .init = &omap2_init_clksel_parent, |
| 612 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | 671 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), |
| 613 | .clksel_mask = OMAP3430_ST_PERIPH_CLK, | 672 | .clksel_mask = OMAP3430_ST_PERIPH_CLK_MASK, |
| 614 | .clksel = cm_96m_fck_clksel, | 673 | .clksel = cm_96m_fck_clksel, |
| 615 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | | 674 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | |
| 616 | PARENT_CONTROLS_CLOCK, | 675 | PARENT_CONTROLS_CLOCK, |
| @@ -652,7 +711,7 @@ static struct clk virt_omap_54m_fck = { | |||
| 652 | .parent = &dpll4_m3x2_ck, | 711 | .parent = &dpll4_m3x2_ck, |
| 653 | .init = &omap2_init_clksel_parent, | 712 | .init = &omap2_init_clksel_parent, |
| 654 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | 713 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), |
| 655 | .clksel_mask = OMAP3430_ST_PERIPH_CLK, | 714 | .clksel_mask = OMAP3430_ST_PERIPH_CLK_MASK, |
| 656 | .clksel = virt_omap_54m_fck_clksel, | 715 | .clksel = virt_omap_54m_fck_clksel, |
| 657 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | | 716 | .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | |
| 658 | PARENT_CONTROLS_CLOCK, | 717 | PARENT_CONTROLS_CLOCK, |
| @@ -804,23 +863,33 @@ static struct clk emu_per_alwon_ck = { | |||
| 804 | /* Supplies 120MHz clock, USIM source clock */ | 863 | /* Supplies 120MHz clock, USIM source clock */ |
| 805 | /* Type: DPLL */ | 864 | /* Type: DPLL */ |
| 806 | /* 3430ES2 only */ | 865 | /* 3430ES2 only */ |
| 807 | static const struct dpll_data dpll5_dd = { | 866 | static struct dpll_data dpll5_dd = { |
| 808 | .mult_div1_reg = OMAP_CM_REGADDR(PLL_MOD, OMAP3430ES2_CM_CLKSEL4), | 867 | .mult_div1_reg = OMAP_CM_REGADDR(PLL_MOD, OMAP3430ES2_CM_CLKSEL4), |
| 809 | .mult_mask = OMAP3430ES2_PERIPH2_DPLL_MULT_MASK, | 868 | .mult_mask = OMAP3430ES2_PERIPH2_DPLL_MULT_MASK, |
| 810 | .div1_mask = OMAP3430ES2_PERIPH2_DPLL_DIV_MASK, | 869 | .div1_mask = OMAP3430ES2_PERIPH2_DPLL_DIV_MASK, |
| 811 | .control_reg = OMAP_CM_REGADDR(PLL_MOD, OMAP3430ES2_CM_CLKEN2), | 870 | .control_reg = OMAP_CM_REGADDR(PLL_MOD, OMAP3430ES2_CM_CLKEN2), |
| 812 | .enable_mask = OMAP3430ES2_EN_PERIPH2_DPLL_MASK, | 871 | .enable_mask = OMAP3430ES2_EN_PERIPH2_DPLL_MASK, |
| 872 | .modes = (1 << DPLL_LOW_POWER_STOP) | (1 << DPLL_LOCKED), | ||
| 813 | .auto_recal_bit = OMAP3430ES2_EN_PERIPH2_DPLL_DRIFTGUARD_SHIFT, | 873 | .auto_recal_bit = OMAP3430ES2_EN_PERIPH2_DPLL_DRIFTGUARD_SHIFT, |
| 814 | .recal_en_bit = OMAP3430ES2_SND_PERIPH_DPLL_RECAL_EN_SHIFT, | 874 | .recal_en_bit = OMAP3430ES2_SND_PERIPH_DPLL_RECAL_EN_SHIFT, |
| 815 | .recal_st_bit = OMAP3430ES2_SND_PERIPH_DPLL_ST_SHIFT, | 875 | .recal_st_bit = OMAP3430ES2_SND_PERIPH_DPLL_ST_SHIFT, |
| 876 | .autoidle_reg = OMAP_CM_REGADDR(PLL_MOD, OMAP3430ES2_CM_AUTOIDLE2_PLL), | ||
| 877 | .autoidle_mask = OMAP3430ES2_AUTO_PERIPH2_DPLL_MASK, | ||
| 878 | .idlest_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST2), | ||
| 879 | .idlest_bit = OMAP3430ES2_ST_PERIPH2_CLK_SHIFT, | ||
| 880 | .max_multiplier = OMAP3_MAX_DPLL_MULT, | ||
| 881 | .max_divider = OMAP3_MAX_DPLL_DIV, | ||
| 882 | .rate_tolerance = DEFAULT_DPLL_RATE_TOLERANCE | ||
| 816 | }; | 883 | }; |
| 817 | 884 | ||
| 818 | static struct clk dpll5_ck = { | 885 | static struct clk dpll5_ck = { |
| 819 | .name = "dpll5_ck", | 886 | .name = "dpll5_ck", |
| 820 | .parent = &sys_ck, | 887 | .parent = &sys_ck, |
| 821 | .dpll_data = &dpll5_dd, | 888 | .dpll_data = &dpll5_dd, |
| 822 | .flags = CLOCK_IN_OMAP3430ES2 | RATE_PROPAGATES | | 889 | .flags = CLOCK_IN_OMAP3430ES2 | RATE_PROPAGATES, |
| 823 | ALWAYS_ENABLED, | 890 | .enable = &omap3_noncore_dpll_enable, |
| 891 | .disable = &omap3_noncore_dpll_disable, | ||
| 892 | .round_rate = &omap2_dpll_round_rate, | ||
| 824 | .recalc = &omap3_dpll_recalc, | 893 | .recalc = &omap3_dpll_recalc, |
| 825 | }; | 894 | }; |
| 826 | 895 | ||
| @@ -1365,7 +1434,8 @@ static const struct clksel mcbsp_15_clksel[] = { | |||
| 1365 | }; | 1434 | }; |
| 1366 | 1435 | ||
| 1367 | static struct clk mcbsp5_fck = { | 1436 | static struct clk mcbsp5_fck = { |
| 1368 | .name = "mcbsp5_fck", | 1437 | .name = "mcbsp_fck", |
| 1438 | .id = 5, | ||
| 1369 | .init = &omap2_init_clksel_parent, | 1439 | .init = &omap2_init_clksel_parent, |
| 1370 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | 1440 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), |
| 1371 | .enable_bit = OMAP3430_EN_MCBSP5_SHIFT, | 1441 | .enable_bit = OMAP3430_EN_MCBSP5_SHIFT, |
| @@ -1377,7 +1447,8 @@ static struct clk mcbsp5_fck = { | |||
| 1377 | }; | 1447 | }; |
| 1378 | 1448 | ||
| 1379 | static struct clk mcbsp1_fck = { | 1449 | static struct clk mcbsp1_fck = { |
| 1380 | .name = "mcbsp1_fck", | 1450 | .name = "mcbsp_fck", |
| 1451 | .id = 1, | ||
| 1381 | .init = &omap2_init_clksel_parent, | 1452 | .init = &omap2_init_clksel_parent, |
| 1382 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | 1453 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), |
| 1383 | .enable_bit = OMAP3430_EN_MCBSP1_SHIFT, | 1454 | .enable_bit = OMAP3430_EN_MCBSP1_SHIFT, |
| @@ -1789,7 +1860,8 @@ static struct clk gpt10_ick = { | |||
| 1789 | }; | 1860 | }; |
| 1790 | 1861 | ||
| 1791 | static struct clk mcbsp5_ick = { | 1862 | static struct clk mcbsp5_ick = { |
| 1792 | .name = "mcbsp5_ick", | 1863 | .name = "mcbsp_ick", |
| 1864 | .id = 5, | ||
| 1793 | .parent = &core_l4_ick, | 1865 | .parent = &core_l4_ick, |
| 1794 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | 1866 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), |
| 1795 | .enable_bit = OMAP3430_EN_MCBSP5_SHIFT, | 1867 | .enable_bit = OMAP3430_EN_MCBSP5_SHIFT, |
| @@ -1798,7 +1870,8 @@ static struct clk mcbsp5_ick = { | |||
| 1798 | }; | 1870 | }; |
| 1799 | 1871 | ||
| 1800 | static struct clk mcbsp1_ick = { | 1872 | static struct clk mcbsp1_ick = { |
| 1801 | .name = "mcbsp1_ick", | 1873 | .name = "mcbsp_ick", |
| 1874 | .id = 1, | ||
| 1802 | .parent = &core_l4_ick, | 1875 | .parent = &core_l4_ick, |
| 1803 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | 1876 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), |
| 1804 | .enable_bit = OMAP3430_EN_MCBSP1_SHIFT, | 1877 | .enable_bit = OMAP3430_EN_MCBSP1_SHIFT, |
| @@ -1935,7 +2008,7 @@ static struct clk dss1_alwon_fck = { | |||
| 1935 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_FCLKEN), | 2008 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_DSS_MOD, CM_FCLKEN), |
| 1936 | .enable_bit = OMAP3430_EN_DSS1_SHIFT, | 2009 | .enable_bit = OMAP3430_EN_DSS1_SHIFT, |
| 1937 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | 2010 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), |
| 1938 | .clksel_mask = OMAP3430_ST_PERIPH_CLK, | 2011 | .clksel_mask = OMAP3430_ST_PERIPH_CLK_MASK, |
| 1939 | .clksel = dss1_alwon_fck_clksel, | 2012 | .clksel = dss1_alwon_fck_clksel, |
| 1940 | .flags = CLOCK_IN_OMAP343X, | 2013 | .flags = CLOCK_IN_OMAP343X, |
| 1941 | .recalc = &omap2_clksel_recalc, | 2014 | .recalc = &omap2_clksel_recalc, |
| @@ -1991,7 +2064,7 @@ static struct clk cam_mclk = { | |||
| 1991 | .parent = &dpll4_m5x2_ck, | 2064 | .parent = &dpll4_m5x2_ck, |
| 1992 | .init = &omap2_init_clksel_parent, | 2065 | .init = &omap2_init_clksel_parent, |
| 1993 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), | 2066 | .clksel_reg = OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), |
| 1994 | .clksel_mask = OMAP3430_ST_PERIPH_CLK, | 2067 | .clksel_mask = OMAP3430_ST_PERIPH_CLK_MASK, |
| 1995 | .clksel = cam_mclk_clksel, | 2068 | .clksel = cam_mclk_clksel, |
| 1996 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN), | 2069 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_CAM_MOD, CM_FCLKEN), |
| 1997 | .enable_bit = OMAP3430_EN_CAM_SHIFT, | 2070 | .enable_bit = OMAP3430_EN_CAM_SHIFT, |
| @@ -2541,7 +2614,8 @@ static struct clk gpt2_ick = { | |||
| 2541 | }; | 2614 | }; |
| 2542 | 2615 | ||
| 2543 | static struct clk mcbsp2_ick = { | 2616 | static struct clk mcbsp2_ick = { |
| 2544 | .name = "mcbsp2_ick", | 2617 | .name = "mcbsp_ick", |
| 2618 | .id = 2, | ||
| 2545 | .parent = &per_l4_ick, | 2619 | .parent = &per_l4_ick, |
| 2546 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), | 2620 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), |
| 2547 | .enable_bit = OMAP3430_EN_MCBSP2_SHIFT, | 2621 | .enable_bit = OMAP3430_EN_MCBSP2_SHIFT, |
| @@ -2550,7 +2624,8 @@ static struct clk mcbsp2_ick = { | |||
| 2550 | }; | 2624 | }; |
| 2551 | 2625 | ||
| 2552 | static struct clk mcbsp3_ick = { | 2626 | static struct clk mcbsp3_ick = { |
| 2553 | .name = "mcbsp3_ick", | 2627 | .name = "mcbsp_ick", |
| 2628 | .id = 3, | ||
| 2554 | .parent = &per_l4_ick, | 2629 | .parent = &per_l4_ick, |
| 2555 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), | 2630 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), |
| 2556 | .enable_bit = OMAP3430_EN_MCBSP3_SHIFT, | 2631 | .enable_bit = OMAP3430_EN_MCBSP3_SHIFT, |
| @@ -2559,7 +2634,8 @@ static struct clk mcbsp3_ick = { | |||
| 2559 | }; | 2634 | }; |
| 2560 | 2635 | ||
| 2561 | static struct clk mcbsp4_ick = { | 2636 | static struct clk mcbsp4_ick = { |
| 2562 | .name = "mcbsp4_ick", | 2637 | .name = "mcbsp_ick", |
| 2638 | .id = 4, | ||
| 2563 | .parent = &per_l4_ick, | 2639 | .parent = &per_l4_ick, |
| 2564 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), | 2640 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), |
| 2565 | .enable_bit = OMAP3430_EN_MCBSP4_SHIFT, | 2641 | .enable_bit = OMAP3430_EN_MCBSP4_SHIFT, |
| @@ -2574,7 +2650,8 @@ static const struct clksel mcbsp_234_clksel[] = { | |||
| 2574 | }; | 2650 | }; |
| 2575 | 2651 | ||
| 2576 | static struct clk mcbsp2_fck = { | 2652 | static struct clk mcbsp2_fck = { |
| 2577 | .name = "mcbsp2_fck", | 2653 | .name = "mcbsp_fck", |
| 2654 | .id = 2, | ||
| 2578 | .init = &omap2_init_clksel_parent, | 2655 | .init = &omap2_init_clksel_parent, |
| 2579 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), | 2656 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), |
| 2580 | .enable_bit = OMAP3430_EN_MCBSP2_SHIFT, | 2657 | .enable_bit = OMAP3430_EN_MCBSP2_SHIFT, |
| @@ -2586,7 +2663,8 @@ static struct clk mcbsp2_fck = { | |||
| 2586 | }; | 2663 | }; |
| 2587 | 2664 | ||
| 2588 | static struct clk mcbsp3_fck = { | 2665 | static struct clk mcbsp3_fck = { |
| 2589 | .name = "mcbsp3_fck", | 2666 | .name = "mcbsp_fck", |
| 2667 | .id = 3, | ||
| 2590 | .init = &omap2_init_clksel_parent, | 2668 | .init = &omap2_init_clksel_parent, |
| 2591 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), | 2669 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), |
| 2592 | .enable_bit = OMAP3430_EN_MCBSP3_SHIFT, | 2670 | .enable_bit = OMAP3430_EN_MCBSP3_SHIFT, |
| @@ -2598,7 +2676,8 @@ static struct clk mcbsp3_fck = { | |||
| 2598 | }; | 2676 | }; |
| 2599 | 2677 | ||
| 2600 | static struct clk mcbsp4_fck = { | 2678 | static struct clk mcbsp4_fck = { |
| 2601 | .name = "mcbsp4_fck", | 2679 | .name = "mcbsp_fck", |
| 2680 | .id = 4, | ||
| 2602 | .init = &omap2_init_clksel_parent, | 2681 | .init = &omap2_init_clksel_parent, |
| 2603 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), | 2682 | .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), |
| 2604 | .enable_bit = OMAP3430_EN_MCBSP4_SHIFT, | 2683 | .enable_bit = OMAP3430_EN_MCBSP4_SHIFT, |
diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h index 3c38395f6442..ee4c0ca1a708 100644 --- a/arch/arm/mach-omap2/cm-regbits-34xx.h +++ b/arch/arm/mach-omap2/cm-regbits-34xx.h | |||
| @@ -72,7 +72,8 @@ | |||
| 72 | #define OMAP3430_ST_IVA2 (1 << 0) | 72 | #define OMAP3430_ST_IVA2 (1 << 0) |
| 73 | 73 | ||
| 74 | /* CM_IDLEST_PLL_IVA2 */ | 74 | /* CM_IDLEST_PLL_IVA2 */ |
| 75 | #define OMAP3430_ST_IVA2_CLK (1 << 0) | 75 | #define OMAP3430_ST_IVA2_CLK_SHIFT 0 |
| 76 | #define OMAP3430_ST_IVA2_CLK_MASK (1 << 0) | ||
| 76 | 77 | ||
| 77 | /* CM_AUTOIDLE_PLL_IVA2 */ | 78 | /* CM_AUTOIDLE_PLL_IVA2 */ |
| 78 | #define OMAP3430_AUTO_IVA2_DPLL_SHIFT 0 | 79 | #define OMAP3430_AUTO_IVA2_DPLL_SHIFT 0 |
| @@ -115,10 +116,7 @@ | |||
| 115 | #define OMAP3430_ST_MPU (1 << 0) | 116 | #define OMAP3430_ST_MPU (1 << 0) |
| 116 | 117 | ||
| 117 | /* CM_IDLEST_PLL_MPU */ | 118 | /* CM_IDLEST_PLL_MPU */ |
| 118 | #define OMAP3430_ST_MPU_CLK (1 << 0) | 119 | #define OMAP3430_ST_MPU_CLK_SHIFT 0 |
| 119 | #define OMAP3430_ST_IVA2_CLK_MASK (1 << 0) | ||
| 120 | |||
| 121 | /* CM_IDLEST_PLL_MPU */ | ||
| 122 | #define OMAP3430_ST_MPU_CLK_MASK (1 << 0) | 120 | #define OMAP3430_ST_MPU_CLK_MASK (1 << 0) |
| 123 | 121 | ||
| 124 | /* CM_AUTOIDLE_PLL_MPU */ | 122 | /* CM_AUTOIDLE_PLL_MPU */ |
| @@ -408,8 +406,10 @@ | |||
| 408 | #define OMAP3430_ST_12M_CLK (1 << 4) | 406 | #define OMAP3430_ST_12M_CLK (1 << 4) |
| 409 | #define OMAP3430_ST_48M_CLK (1 << 3) | 407 | #define OMAP3430_ST_48M_CLK (1 << 3) |
| 410 | #define OMAP3430_ST_96M_CLK (1 << 2) | 408 | #define OMAP3430_ST_96M_CLK (1 << 2) |
| 411 | #define OMAP3430_ST_PERIPH_CLK (1 << 1) | 409 | #define OMAP3430_ST_PERIPH_CLK_SHIFT 1 |
| 412 | #define OMAP3430_ST_CORE_CLK (1 << 0) | 410 | #define OMAP3430_ST_PERIPH_CLK_MASK (1 << 1) |
| 411 | #define OMAP3430_ST_CORE_CLK_SHIFT 0 | ||
| 412 | #define OMAP3430_ST_CORE_CLK_MASK (1 << 0) | ||
| 413 | 413 | ||
| 414 | /* CM_IDLEST2_CKGEN */ | 414 | /* CM_IDLEST2_CKGEN */ |
| 415 | #define OMAP3430ES2_ST_120M_CLK_SHIFT 1 | 415 | #define OMAP3430ES2_ST_120M_CLK_SHIFT 1 |
| @@ -423,6 +423,10 @@ | |||
| 423 | #define OMAP3430_AUTO_CORE_DPLL_SHIFT 0 | 423 | #define OMAP3430_AUTO_CORE_DPLL_SHIFT 0 |
| 424 | #define OMAP3430_AUTO_CORE_DPLL_MASK (0x7 << 0) | 424 | #define OMAP3430_AUTO_CORE_DPLL_MASK (0x7 << 0) |
| 425 | 425 | ||
| 426 | /* CM_AUTOIDLE2_PLL */ | ||
| 427 | #define OMAP3430ES2_AUTO_PERIPH2_DPLL_SHIFT 0 | ||
| 428 | #define OMAP3430ES2_AUTO_PERIPH2_DPLL_MASK (0x7 << 0) | ||
| 429 | |||
| 426 | /* CM_CLKSEL1_PLL */ | 430 | /* CM_CLKSEL1_PLL */ |
| 427 | /* Note that OMAP3430_CORE_DPLL_CLKOUT_DIV_MASK was (0x3 << 27) on 3430ES1 */ | 431 | /* Note that OMAP3430_CORE_DPLL_CLKOUT_DIV_MASK was (0x3 << 27) on 3430ES1 */ |
| 428 | #define OMAP3430_CORE_DPLL_CLKOUT_DIV_SHIFT 27 | 432 | #define OMAP3430_CORE_DPLL_CLKOUT_DIV_SHIFT 27 |
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h index 8489f3029fed..87a44c715aa4 100644 --- a/arch/arm/mach-omap2/cm.h +++ b/arch/arm/mach-omap2/cm.h | |||
| @@ -81,6 +81,7 @@ | |||
| 81 | #define OMAP3430ES2_CM_FCLKEN3 0x0008 | 81 | #define OMAP3430ES2_CM_FCLKEN3 0x0008 |
| 82 | #define OMAP3430_CM_IDLEST_PLL CM_IDLEST2 | 82 | #define OMAP3430_CM_IDLEST_PLL CM_IDLEST2 |
| 83 | #define OMAP3430_CM_AUTOIDLE_PLL CM_AUTOIDLE2 | 83 | #define OMAP3430_CM_AUTOIDLE_PLL CM_AUTOIDLE2 |
| 84 | #define OMAP3430ES2_CM_AUTOIDLE2_PLL CM_AUTOIDLE2 | ||
| 84 | #define OMAP3430_CM_CLKSEL1 CM_CLKSEL | 85 | #define OMAP3430_CM_CLKSEL1 CM_CLKSEL |
| 85 | #define OMAP3430_CM_CLKSEL1_PLL CM_CLKSEL | 86 | #define OMAP3430_CM_CLKSEL1_PLL CM_CLKSEL |
| 86 | #define OMAP3430_CM_CLKSEL2_PLL CM_CLKSEL2 | 87 | #define OMAP3430_CM_CLKSEL2_PLL CM_CLKSEL2 |
| @@ -96,15 +97,21 @@ | |||
| 96 | /* Clock management domain register get/set */ | 97 | /* Clock management domain register get/set */ |
| 97 | 98 | ||
| 98 | #ifndef __ASSEMBLER__ | 99 | #ifndef __ASSEMBLER__ |
| 99 | static inline void cm_write_mod_reg(u32 val, s16 module, s16 idx) | 100 | |
| 101 | extern u32 cm_read_mod_reg(s16 module, u16 idx); | ||
| 102 | extern void cm_write_mod_reg(u32 val, s16 module, u16 idx); | ||
| 103 | extern u32 cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx); | ||
| 104 | |||
| 105 | static inline u32 cm_set_mod_reg_bits(u32 bits, s16 module, s16 idx) | ||
| 100 | { | 106 | { |
| 101 | __raw_writel(val, OMAP_CM_REGADDR(module, idx)); | 107 | return cm_rmw_mod_reg_bits(bits, bits, module, idx); |
| 102 | } | 108 | } |
| 103 | 109 | ||
| 104 | static inline u32 cm_read_mod_reg(s16 module, s16 idx) | 110 | static inline u32 cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) |
| 105 | { | 111 | { |
| 106 | return __raw_readl(OMAP_CM_REGADDR(module, idx)); | 112 | return cm_rmw_mod_reg_bits(bits, 0x0, module, idx); |
| 107 | } | 113 | } |
| 114 | |||
| 108 | #endif | 115 | #endif |
| 109 | 116 | ||
| 110 | /* CM register bits shared between 24XX and 3430 */ | 117 | /* CM register bits shared between 24XX and 3430 */ |
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index a5d86a49c213..51f70300996f 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c | |||
| @@ -13,22 +13,21 @@ | |||
| 13 | #undef DEBUG | 13 | #undef DEBUG |
| 14 | 14 | ||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/io.h> | ||
| 16 | 17 | ||
| 17 | #include <asm/io.h> | 18 | #include <asm/arch/common.h> |
| 18 | |||
| 19 | #include <asm/arch/control.h> | 19 | #include <asm/arch/control.h> |
| 20 | 20 | ||
| 21 | static u32 omap2_ctrl_base; | 21 | static void __iomem *omap2_ctrl_base; |
| 22 | 22 | ||
| 23 | #define OMAP_CTRL_REGADDR(reg) (void __iomem *)IO_ADDRESS(omap2_ctrl_base \ | 23 | #define OMAP_CTRL_REGADDR(reg) (omap2_ctrl_base + (reg)) |
| 24 | + (reg)) | ||
| 25 | 24 | ||
| 26 | void omap_ctrl_base_set(u32 base) | 25 | void __init omap2_set_globals_control(struct omap_globals *omap2_globals) |
| 27 | { | 26 | { |
| 28 | omap2_ctrl_base = base; | 27 | omap2_ctrl_base = omap2_globals->ctrl; |
| 29 | } | 28 | } |
| 30 | 29 | ||
| 31 | u32 omap_ctrl_base_get(void) | 30 | void __iomem *omap_ctrl_base_get(void) |
| 32 | { | 31 | { |
| 33 | return omap2_ctrl_base; | 32 | return omap2_ctrl_base; |
| 34 | } | 33 | } |
| @@ -50,25 +49,16 @@ u32 omap_ctrl_readl(u16 offset) | |||
| 50 | 49 | ||
| 51 | void omap_ctrl_writeb(u8 val, u16 offset) | 50 | void omap_ctrl_writeb(u8 val, u16 offset) |
| 52 | { | 51 | { |
| 53 | pr_debug("omap_ctrl_writeb: writing 0x%0x to 0x%0x\n", val, | ||
| 54 | (u32)OMAP_CTRL_REGADDR(offset)); | ||
| 55 | |||
| 56 | __raw_writeb(val, OMAP_CTRL_REGADDR(offset)); | 52 | __raw_writeb(val, OMAP_CTRL_REGADDR(offset)); |
| 57 | } | 53 | } |
| 58 | 54 | ||
| 59 | void omap_ctrl_writew(u16 val, u16 offset) | 55 | void omap_ctrl_writew(u16 val, u16 offset) |
| 60 | { | 56 | { |
| 61 | pr_debug("omap_ctrl_writew: writing 0x%0x to 0x%0x\n", val, | ||
| 62 | (u32)OMAP_CTRL_REGADDR(offset)); | ||
| 63 | |||
| 64 | __raw_writew(val, OMAP_CTRL_REGADDR(offset)); | 57 | __raw_writew(val, OMAP_CTRL_REGADDR(offset)); |
| 65 | } | 58 | } |
| 66 | 59 | ||
| 67 | void omap_ctrl_writel(u32 val, u16 offset) | 60 | void omap_ctrl_writel(u32 val, u16 offset) |
| 68 | { | 61 | { |
| 69 | pr_debug("omap_ctrl_writel: writing 0x%0x to 0x%0x\n", val, | ||
| 70 | (u32)OMAP_CTRL_REGADDR(offset)); | ||
| 71 | |||
| 72 | __raw_writel(val, OMAP_CTRL_REGADDR(offset)); | 62 | __raw_writel(val, OMAP_CTRL_REGADDR(offset)); |
| 73 | } | 63 | } |
| 74 | 64 | ||
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 02cede295e89..dbf68dc50ae2 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #define GPMC_STATUS 0x54 | 42 | #define GPMC_STATUS 0x54 |
| 43 | #define GPMC_PREFETCH_CONFIG1 0x1e0 | 43 | #define GPMC_PREFETCH_CONFIG1 0x1e0 |
| 44 | #define GPMC_PREFETCH_CONFIG2 0x1e4 | 44 | #define GPMC_PREFETCH_CONFIG2 0x1e4 |
| 45 | #define GPMC_PREFETCH_CONTROL 0x1e8 | 45 | #define GPMC_PREFETCH_CONTROL 0x1ec |
| 46 | #define GPMC_PREFETCH_STATUS 0x1f0 | 46 | #define GPMC_PREFETCH_STATUS 0x1f0 |
| 47 | #define GPMC_ECC_CONFIG 0x1f4 | 47 | #define GPMC_ECC_CONFIG 0x1f4 |
| 48 | #define GPMC_ECC_CONTROL 0x1f8 | 48 | #define GPMC_ECC_CONTROL 0x1f8 |
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 4dfd878d7968..dff4b16cead6 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
| @@ -17,16 +17,23 @@ | |||
| 17 | 17 | ||
| 18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 19 | 19 | ||
| 20 | #if defined(CONFIG_ARCH_OMAP2420) | 20 | #include <asm/arch/control.h> |
| 21 | #define OMAP24XX_TAP_BASE io_p2v(0x48014000) | 21 | #include <asm/arch/cpu.h> |
| 22 | #endif | ||
| 23 | 22 | ||
| 24 | #if defined(CONFIG_ARCH_OMAP2430) | 23 | #if defined(CONFIG_ARCH_OMAP2420) |
| 25 | #define OMAP24XX_TAP_BASE io_p2v(0x4900A000) | 24 | #define TAP_BASE io_p2v(0x48014000) |
| 25 | #elif defined(CONFIG_ARCH_OMAP2430) | ||
| 26 | #define TAP_BASE io_p2v(0x4900A000) | ||
| 27 | #elif defined(CONFIG_ARCH_OMAP34XX) | ||
| 28 | #define TAP_BASE io_p2v(0x4830A000) | ||
| 26 | #endif | 29 | #endif |
| 27 | 30 | ||
| 28 | #define OMAP_TAP_IDCODE 0x0204 | 31 | #define OMAP_TAP_IDCODE 0x0204 |
| 32 | #if defined(CONFIG_ARCH_OMAP34XX) | ||
| 33 | #define OMAP_TAP_PROD_ID 0x0210 | ||
| 34 | #else | ||
| 29 | #define OMAP_TAP_PROD_ID 0x0208 | 35 | #define OMAP_TAP_PROD_ID 0x0208 |
| 36 | #endif | ||
| 30 | 37 | ||
| 31 | #define OMAP_TAP_DIE_ID_0 0x0218 | 38 | #define OMAP_TAP_DIE_ID_0 0x0218 |
| 32 | #define OMAP_TAP_DIE_ID_1 0x021C | 39 | #define OMAP_TAP_DIE_ID_1 0x021C |
| @@ -56,9 +63,134 @@ static struct omap_id omap_ids[] __initdata = { | |||
| 56 | { .hawkeye = 0xb68a, .dev = 0x0, .type = 0x24300000 }, | 63 | { .hawkeye = 0xb68a, .dev = 0x0, .type = 0x24300000 }, |
| 57 | }; | 64 | }; |
| 58 | 65 | ||
| 66 | static struct omap_chip_id omap_chip; | ||
| 67 | |||
| 68 | /** | ||
| 69 | * omap_chip_is - test whether currently running OMAP matches a chip type | ||
| 70 | * @oc: omap_chip_t to test against | ||
| 71 | * | ||
| 72 | * Test whether the currently-running OMAP chip matches the supplied | ||
| 73 | * chip type 'oc'. Returns 1 upon a match; 0 upon failure. | ||
| 74 | */ | ||
| 75 | int omap_chip_is(struct omap_chip_id oci) | ||
| 76 | { | ||
| 77 | return (oci.oc & omap_chip.oc) ? 1 : 0; | ||
| 78 | } | ||
| 79 | EXPORT_SYMBOL(omap_chip_is); | ||
| 80 | |||
| 59 | static u32 __init read_tap_reg(int reg) | 81 | static u32 __init read_tap_reg(int reg) |
| 60 | { | 82 | { |
| 61 | return __raw_readl(OMAP24XX_TAP_BASE + reg); | 83 | unsigned int regval = 0; |
| 84 | u32 cpuid; | ||
| 85 | |||
| 86 | /* Reading the IDCODE register on 3430 ES1 results in a | ||
| 87 | * data abort as the register is not exposed on the OCP | ||
| 88 | * Hence reading the Cortex Rev | ||
| 89 | */ | ||
| 90 | cpuid = read_cpuid(CPUID_ID); | ||
| 91 | |||
| 92 | /* If the processor type is Cortex-A8 and the revision is 0x0 | ||
| 93 | * it means its Cortex r0p0 which is 3430 ES1 | ||
| 94 | */ | ||
| 95 | if ((((cpuid >> 4) & 0xFFF) == 0xC08) && ((cpuid & 0xF) == 0x0)) { | ||
| 96 | switch (reg) { | ||
| 97 | case OMAP_TAP_IDCODE : regval = 0x0B7AE02F; break; | ||
| 98 | /* Making DevType as 0xF in ES1 to differ from ES2 */ | ||
| 99 | case OMAP_TAP_PROD_ID : regval = 0x000F00F0; break; | ||
| 100 | case OMAP_TAP_DIE_ID_0: regval = 0x01000000; break; | ||
| 101 | case OMAP_TAP_DIE_ID_1: regval = 0x1012d687; break; | ||
| 102 | case OMAP_TAP_DIE_ID_2: regval = 0x00000000; break; | ||
| 103 | case OMAP_TAP_DIE_ID_3: regval = 0x2d2c0000; break; | ||
| 104 | } | ||
| 105 | } else | ||
| 106 | regval = __raw_readl(TAP_BASE + reg); | ||
| 107 | |||
| 108 | return regval; | ||
| 109 | |||
| 110 | } | ||
| 111 | |||
| 112 | /* | ||
| 113 | * _set_system_rev - set the system_rev global based on current OMAP chip type | ||
| 114 | * | ||
| 115 | * Set the system_rev global. This is primarily used by the cpu_is_omapxxxx() | ||
| 116 | * macros. | ||
| 117 | */ | ||
| 118 | static void __init _set_system_rev(u32 type, u8 rev) | ||
| 119 | { | ||
| 120 | u32 i, ctrl_status; | ||
| 121 | |||
| 122 | /* | ||
| 123 | * system_rev encoding is as follows | ||
| 124 | * system_rev & 0xff000000 -> Omap Class (24xx/34xx) | ||
| 125 | * system_rev & 0xfff00000 -> Omap Sub Class (242x/343x) | ||
| 126 | * system_rev & 0xffff0000 -> Omap type (2420/2422/2423/2430/3430) | ||
| 127 | * system_rev & 0x0000f000 -> Silicon revision (ES1, ES2 ) | ||
| 128 | * system_rev & 0x00000700 -> Device Type ( EMU/HS/GP/BAD ) | ||
| 129 | * system_rev & 0x000000c0 -> IDCODE revision[6:7] | ||
| 130 | * system_rev & 0x0000003f -> sys_boot[0:5] | ||
| 131 | */ | ||
| 132 | /* Embedding the ES revision info in type field */ | ||
| 133 | system_rev = type; | ||
| 134 | /* Also add IDCODE revision info only two lower bits */ | ||
| 135 | system_rev |= ((rev & 0x3) << 6); | ||
| 136 | |||
| 137 | /* Add in the device type and sys_boot fields (see above) */ | ||
| 138 | if (cpu_is_omap24xx()) { | ||
| 139 | i = OMAP24XX_CONTROL_STATUS; | ||
| 140 | } else if (cpu_is_omap343x()) { | ||
| 141 | i = OMAP343X_CONTROL_STATUS; | ||
| 142 | } else { | ||
| 143 | printk(KERN_ERR "id: unknown CPU type\n"); | ||
| 144 | BUG(); | ||
| 145 | } | ||
| 146 | ctrl_status = omap_ctrl_readl(i); | ||
| 147 | system_rev |= (ctrl_status & (OMAP2_SYSBOOT_5_MASK | | ||
| 148 | OMAP2_SYSBOOT_4_MASK | | ||
| 149 | OMAP2_SYSBOOT_3_MASK | | ||
| 150 | OMAP2_SYSBOOT_2_MASK | | ||
| 151 | OMAP2_SYSBOOT_1_MASK | | ||
| 152 | OMAP2_SYSBOOT_0_MASK)); | ||
| 153 | system_rev |= (ctrl_status & OMAP2_DEVICETYPE_MASK); | ||
| 154 | } | ||
| 155 | |||
| 156 | |||
| 157 | /* | ||
| 158 | * _set_omap_chip - set the omap_chip global based on OMAP chip type | ||
| 159 | * | ||
| 160 | * Build the omap_chip bits. This variable is used by powerdomain and | ||
| 161 | * clockdomain code to indicate whether structures are applicable for | ||
| 162 | * the current OMAP chip type by ANDing it against a 'platform' bitfield | ||
| 163 | * in the structure. | ||
| 164 | */ | ||
| 165 | static void __init _set_omap_chip(void) | ||
| 166 | { | ||
| 167 | if (cpu_is_omap343x()) { | ||
| 168 | |||
| 169 | omap_chip.oc = CHIP_IS_OMAP3430; | ||
| 170 | if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0)) | ||
| 171 | omap_chip.oc |= CHIP_IS_OMAP3430ES1; | ||
| 172 | else if (is_sil_rev_greater_than(OMAP3430_REV_ES1_0)) | ||
| 173 | omap_chip.oc |= CHIP_IS_OMAP3430ES2; | ||
| 174 | |||
| 175 | } else if (cpu_is_omap243x()) { | ||
| 176 | |||
| 177 | /* Currently only supports 2430ES2.1 and 2430-all */ | ||
| 178 | omap_chip.oc |= CHIP_IS_OMAP2430; | ||
| 179 | |||
| 180 | } else if (cpu_is_omap242x()) { | ||
| 181 | |||
| 182 | /* Currently only supports 2420ES2.1.1 and 2420-all */ | ||
| 183 | omap_chip.oc |= CHIP_IS_OMAP2420; | ||
| 184 | |||
| 185 | } else { | ||
| 186 | |||
| 187 | /* Current CPU not supported by this code. */ | ||
| 188 | printk(KERN_WARNING "OMAP chip type code does not yet support " | ||
| 189 | "this CPU type.\n"); | ||
| 190 | WARN_ON(1); | ||
| 191 | |||
| 192 | } | ||
| 193 | |||
| 62 | } | 194 | } |
| 63 | 195 | ||
| 64 | void __init omap2_check_revision(void) | 196 | void __init omap2_check_revision(void) |
| @@ -76,21 +208,31 @@ void __init omap2_check_revision(void) | |||
| 76 | rev = (idcode >> 28) & 0x0f; | 208 | rev = (idcode >> 28) & 0x0f; |
| 77 | dev_type = (prod_id >> 16) & 0x0f; | 209 | dev_type = (prod_id >> 16) & 0x0f; |
| 78 | 210 | ||
| 79 | #ifdef DEBUG | 211 | pr_debug("OMAP_TAP_IDCODE 0x%08x REV %i HAWKEYE 0x%04x MANF %03x\n", |
| 80 | printk(KERN_DEBUG "OMAP_TAP_IDCODE 0x%08x REV %i HAWKEYE 0x%04x MANF %03x\n", | 212 | idcode, rev, hawkeye, (idcode >> 1) & 0x7ff); |
| 81 | idcode, rev, hawkeye, (idcode >> 1) & 0x7ff); | 213 | pr_debug("OMAP_TAP_DIE_ID_0: 0x%08x\n", |
| 82 | printk(KERN_DEBUG "OMAP_TAP_DIE_ID_0: 0x%08x\n", | 214 | read_tap_reg(OMAP_TAP_DIE_ID_0)); |
| 83 | read_tap_reg(OMAP_TAP_DIE_ID_0)); | 215 | pr_debug("OMAP_TAP_DIE_ID_1: 0x%08x DEV_REV: %i\n", |
| 84 | printk(KERN_DEBUG "OMAP_TAP_DIE_ID_1: 0x%08x DEV_REV: %i\n", | 216 | read_tap_reg(OMAP_TAP_DIE_ID_1), |
| 85 | read_tap_reg(OMAP_TAP_DIE_ID_1), | 217 | (read_tap_reg(OMAP_TAP_DIE_ID_1) >> 28) & 0xf); |
| 86 | (read_tap_reg(OMAP_TAP_DIE_ID_1) >> 28) & 0xf); | 218 | pr_debug("OMAP_TAP_DIE_ID_2: 0x%08x\n", |
| 87 | printk(KERN_DEBUG "OMAP_TAP_DIE_ID_2: 0x%08x\n", | 219 | read_tap_reg(OMAP_TAP_DIE_ID_2)); |
| 88 | read_tap_reg(OMAP_TAP_DIE_ID_2)); | 220 | pr_debug("OMAP_TAP_DIE_ID_3: 0x%08x\n", |
| 89 | printk(KERN_DEBUG "OMAP_TAP_DIE_ID_3: 0x%08x\n", | 221 | read_tap_reg(OMAP_TAP_DIE_ID_3)); |
| 90 | read_tap_reg(OMAP_TAP_DIE_ID_3)); | 222 | pr_debug("OMAP_TAP_PROD_ID_0: 0x%08x DEV_TYPE: %i\n", |
| 91 | printk(KERN_DEBUG "OMAP_TAP_PROD_ID_0: 0x%08x DEV_TYPE: %i\n", | 223 | prod_id, dev_type); |
| 92 | prod_id, dev_type); | 224 | |
| 93 | #endif | 225 | /* |
| 226 | * Detection for 34xx ES2.0 and above can be done with just | ||
| 227 | * hawkeye and rev. See TRM 1.5.2 Device Identification. | ||
| 228 | * Note that rev cannot be used directly as ES1.0 uses value 0. | ||
| 229 | */ | ||
| 230 | if (hawkeye == 0xb7ae) { | ||
| 231 | system_rev = 0x34300000 | ((1 + rev) << 12); | ||
| 232 | pr_info("OMAP%04x ES2.%i\n", system_rev >> 16, rev); | ||
| 233 | _set_omap_chip(); | ||
| 234 | return; | ||
| 235 | } | ||
| 94 | 236 | ||
| 95 | /* Check hawkeye ids */ | 237 | /* Check hawkeye ids */ |
| 96 | for (i = 0; i < ARRAY_SIZE(omap_ids); i++) { | 238 | for (i = 0; i < ARRAY_SIZE(omap_ids); i++) { |
| @@ -114,16 +256,15 @@ void __init omap2_check_revision(void) | |||
| 114 | omap_ids[i].type >> 16); | 256 | omap_ids[i].type >> 16); |
| 115 | j = i; | 257 | j = i; |
| 116 | } | 258 | } |
| 117 | system_rev = omap_ids[j].type; | ||
| 118 | 259 | ||
| 119 | system_rev |= rev << 8; | 260 | _set_system_rev(omap_ids[j].type, rev); |
| 120 | 261 | ||
| 121 | /* Add the cpu class info (24xx) */ | 262 | _set_omap_chip(); |
| 122 | system_rev |= 0x24; | ||
| 123 | 263 | ||
| 124 | pr_info("OMAP%04x", system_rev >> 16); | 264 | pr_info("OMAP%04x", system_rev >> 16); |
| 125 | if ((system_rev >> 8) & 0x0f) | 265 | if ((system_rev >> 8) & 0x0f) |
| 126 | printk("%x", (system_rev >> 8) & 0x0f); | 266 | pr_info("ES%x", (system_rev >> 12) & 0xf); |
| 127 | printk("\n"); | 267 | pr_info("\n"); |
| 268 | |||
| 128 | } | 269 | } |
| 129 | 270 | ||
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c new file mode 100644 index 000000000000..17cf199d1130 --- /dev/null +++ b/arch/arm/mach-omap2/mcbsp.c | |||
| @@ -0,0 +1,208 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap2/mcbsp.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Instituto Nokia de Tecnologia | ||
| 5 | * Contact: Eduardo Valentin <eduardo.valentin@indt.org.br> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | * | ||
| 11 | * Multichannel mode not supported. | ||
| 12 | */ | ||
| 13 | #include <linux/module.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | #include <linux/clk.h> | ||
| 16 | #include <linux/err.h> | ||
| 17 | #include <linux/io.h> | ||
| 18 | #include <linux/platform_device.h> | ||
| 19 | |||
| 20 | #include <asm/arch/dma.h> | ||
| 21 | #include <asm/arch/mux.h> | ||
| 22 | #include <asm/arch/cpu.h> | ||
| 23 | #include <asm/arch/mcbsp.h> | ||
| 24 | |||
| 25 | struct mcbsp_internal_clk { | ||
| 26 | struct clk clk; | ||
| 27 | struct clk **childs; | ||
| 28 | int n_childs; | ||
| 29 | }; | ||
| 30 | |||
| 31 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | ||
| 32 | static void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk) | ||
| 33 | { | ||
| 34 | const char *clk_names[] = { "mcbsp_ick", "mcbsp_fck" }; | ||
| 35 | int i; | ||
| 36 | |||
| 37 | mclk->n_childs = ARRAY_SIZE(clk_names); | ||
| 38 | mclk->childs = kzalloc(mclk->n_childs * sizeof(struct clk *), | ||
| 39 | GFP_KERNEL); | ||
| 40 | |||
| 41 | for (i = 0; i < mclk->n_childs; i++) { | ||
| 42 | /* We fake a platform device to get correct device id */ | ||
| 43 | struct platform_device pdev; | ||
| 44 | |||
| 45 | pdev.dev.bus = &platform_bus_type; | ||
| 46 | pdev.id = mclk->clk.id; | ||
| 47 | mclk->childs[i] = clk_get(&pdev.dev, clk_names[i]); | ||
| 48 | if (IS_ERR(mclk->childs[i])) | ||
| 49 | printk(KERN_ERR "Could not get clock %s (%d).\n", | ||
| 50 | clk_names[i], mclk->clk.id); | ||
| 51 | } | ||
| 52 | } | ||
| 53 | |||
| 54 | static int omap_mcbsp_clk_enable(struct clk *clk) | ||
| 55 | { | ||
| 56 | struct mcbsp_internal_clk *mclk = container_of(clk, | ||
| 57 | struct mcbsp_internal_clk, clk); | ||
| 58 | int i; | ||
| 59 | |||
| 60 | for (i = 0; i < mclk->n_childs; i++) | ||
| 61 | clk_enable(mclk->childs[i]); | ||
| 62 | return 0; | ||
| 63 | } | ||
| 64 | |||
| 65 | static void omap_mcbsp_clk_disable(struct clk *clk) | ||
| 66 | { | ||
| 67 | struct mcbsp_internal_clk *mclk = container_of(clk, | ||
| 68 | struct mcbsp_internal_clk, clk); | ||
| 69 | int i; | ||
| 70 | |||
| 71 | for (i = 0; i < mclk->n_childs; i++) | ||
| 72 | clk_disable(mclk->childs[i]); | ||
| 73 | } | ||
| 74 | |||
| 75 | static struct mcbsp_internal_clk omap_mcbsp_clks[] = { | ||
| 76 | { | ||
| 77 | .clk = { | ||
| 78 | .name = "mcbsp_clk", | ||
| 79 | .id = 1, | ||
| 80 | .enable = omap_mcbsp_clk_enable, | ||
| 81 | .disable = omap_mcbsp_clk_disable, | ||
| 82 | }, | ||
| 83 | }, | ||
| 84 | { | ||
| 85 | .clk = { | ||
| 86 | .name = "mcbsp_clk", | ||
| 87 | .id = 2, | ||
| 88 | .enable = omap_mcbsp_clk_enable, | ||
| 89 | .disable = omap_mcbsp_clk_disable, | ||
| 90 | }, | ||
| 91 | }, | ||
| 92 | }; | ||
| 93 | |||
| 94 | #define omap_mcbsp_clks_size ARRAY_SIZE(omap_mcbsp_clks) | ||
| 95 | #else | ||
| 96 | #define omap_mcbsp_clks_size 0 | ||
| 97 | static struct mcbsp_internal_clk __initdata *omap_mcbsp_clks; | ||
| 98 | static inline void omap_mcbsp_clk_init(struct clk *clk) | ||
| 99 | { } | ||
| 100 | #endif | ||
| 101 | |||
| 102 | static void omap2_mcbsp2_mux_setup(void) | ||
| 103 | { | ||
| 104 | omap_cfg_reg(Y15_24XX_MCBSP2_CLKX); | ||
| 105 | omap_cfg_reg(R14_24XX_MCBSP2_FSX); | ||
| 106 | omap_cfg_reg(W15_24XX_MCBSP2_DR); | ||
| 107 | omap_cfg_reg(V15_24XX_MCBSP2_DX); | ||
| 108 | omap_cfg_reg(V14_24XX_GPIO117); | ||
| 109 | /* | ||
| 110 | * TODO: Need to add MUX settings for OMAP 2430 SDP | ||
| 111 | */ | ||
| 112 | } | ||
| 113 | |||
| 114 | static void omap2_mcbsp_request(unsigned int id) | ||
| 115 | { | ||
| 116 | if (cpu_is_omap2420() && (id == OMAP_MCBSP2)) | ||
| 117 | omap2_mcbsp2_mux_setup(); | ||
| 118 | } | ||
| 119 | |||
| 120 | static int omap2_mcbsp_check(unsigned int id) | ||
| 121 | { | ||
| 122 | if (id > OMAP_MAX_MCBSP_COUNT - 1) { | ||
| 123 | printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1); | ||
| 124 | return -ENODEV; | ||
| 125 | } | ||
| 126 | return 0; | ||
| 127 | } | ||
| 128 | |||
| 129 | static struct omap_mcbsp_ops omap2_mcbsp_ops = { | ||
| 130 | .request = omap2_mcbsp_request, | ||
| 131 | .check = omap2_mcbsp_check, | ||
| 132 | }; | ||
| 133 | |||
| 134 | #ifdef CONFIG_ARCH_OMAP24XX | ||
| 135 | static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { | ||
| 136 | { | ||
| 137 | .virt_base = IO_ADDRESS(OMAP24XX_MCBSP1_BASE), | ||
| 138 | .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX, | ||
| 139 | .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX, | ||
| 140 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, | ||
| 141 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, | ||
| 142 | .ops = &omap2_mcbsp_ops, | ||
| 143 | .clk_name = "mcbsp_clk", | ||
| 144 | }, | ||
| 145 | { | ||
| 146 | .virt_base = IO_ADDRESS(OMAP24XX_MCBSP2_BASE), | ||
| 147 | .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX, | ||
| 148 | .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX, | ||
| 149 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, | ||
| 150 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, | ||
| 151 | .ops = &omap2_mcbsp_ops, | ||
| 152 | .clk_name = "mcbsp_clk", | ||
| 153 | }, | ||
| 154 | }; | ||
| 155 | #define OMAP24XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap24xx_mcbsp_pdata) | ||
| 156 | #else | ||
| 157 | #define omap24xx_mcbsp_pdata NULL | ||
| 158 | #define OMAP24XX_MCBSP_PDATA_SZ 0 | ||
| 159 | #endif | ||
| 160 | |||
| 161 | #ifdef CONFIG_ARCH_OMAP34XX | ||
| 162 | static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | ||
| 163 | { | ||
| 164 | .virt_base = IO_ADDRESS(OMAP34XX_MCBSP1_BASE), | ||
| 165 | .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX, | ||
| 166 | .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX, | ||
| 167 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, | ||
| 168 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, | ||
| 169 | .ops = &omap2_mcbsp_ops, | ||
| 170 | .clk_name = "mcbsp_clk", | ||
| 171 | }, | ||
| 172 | { | ||
| 173 | .virt_base = IO_ADDRESS(OMAP34XX_MCBSP2_BASE), | ||
| 174 | .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX, | ||
| 175 | .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX, | ||
| 176 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, | ||
| 177 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, | ||
| 178 | .ops = &omap2_mcbsp_ops, | ||
| 179 | .clk_name = "mcbsp_clk", | ||
| 180 | }, | ||
| 181 | }; | ||
| 182 | #define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata) | ||
| 183 | #else | ||
| 184 | #define omap34xx_mcbsp_pdata NULL | ||
| 185 | #define OMAP34XX_MCBSP_PDATA_SZ 0 | ||
| 186 | #endif | ||
| 187 | |||
| 188 | int __init omap2_mcbsp_init(void) | ||
| 189 | { | ||
| 190 | int i; | ||
| 191 | |||
| 192 | for (i = 0; i < omap_mcbsp_clks_size; i++) { | ||
| 193 | /* Once we call clk_get inside init, we do not register it */ | ||
| 194 | omap_mcbsp_clk_init(&omap_mcbsp_clks[i]); | ||
| 195 | clk_register(&omap_mcbsp_clks[i].clk); | ||
| 196 | } | ||
| 197 | |||
| 198 | if (cpu_is_omap24xx()) | ||
| 199 | omap_mcbsp_register_board_cfg(omap24xx_mcbsp_pdata, | ||
| 200 | OMAP24XX_MCBSP_PDATA_SZ); | ||
| 201 | |||
| 202 | if (cpu_is_omap34xx()) | ||
| 203 | omap_mcbsp_register_board_cfg(omap34xx_mcbsp_pdata, | ||
| 204 | OMAP34XX_MCBSP_PDATA_SZ); | ||
| 205 | |||
| 206 | return omap_mcbsp_init(); | ||
| 207 | } | ||
| 208 | arch_initcall(omap2_mcbsp_init); | ||
diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c index 12479081881a..73cadb2c75cf 100644 --- a/arch/arm/mach-omap2/memory.c +++ b/arch/arm/mach-omap2/memory.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 26 | 26 | ||
| 27 | #include <asm/arch/common.h> | ||
| 27 | #include <asm/arch/clock.h> | 28 | #include <asm/arch/clock.h> |
| 28 | #include <asm/arch/sram.h> | 29 | #include <asm/arch/sram.h> |
| 29 | 30 | ||
| @@ -32,8 +33,8 @@ | |||
| 32 | #include "memory.h" | 33 | #include "memory.h" |
| 33 | #include "sdrc.h" | 34 | #include "sdrc.h" |
| 34 | 35 | ||
| 35 | unsigned long omap2_sdrc_base; | 36 | void __iomem *omap2_sdrc_base; |
| 36 | unsigned long omap2_sms_base; | 37 | void __iomem *omap2_sms_base; |
| 37 | 38 | ||
| 38 | static struct memory_timings mem_timings; | 39 | static struct memory_timings mem_timings; |
| 39 | static u32 curr_perf_level = CORE_CLK_SRC_DPLL_X2; | 40 | static u32 curr_perf_level = CORE_CLK_SRC_DPLL_X2; |
| @@ -154,6 +155,12 @@ void omap2_init_memory_params(u32 force_lock_to_unlock_mode) | |||
| 154 | mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8)); | 155 | mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8)); |
| 155 | } | 156 | } |
| 156 | 157 | ||
| 158 | void __init omap2_set_globals_memory(struct omap_globals *omap2_globals) | ||
| 159 | { | ||
| 160 | omap2_sdrc_base = omap2_globals->sdrc; | ||
| 161 | omap2_sms_base = omap2_globals->sms; | ||
| 162 | } | ||
| 163 | |||
| 157 | /* turn on smart idle modes for SDRAM scheduler and controller */ | 164 | /* turn on smart idle modes for SDRAM scheduler and controller */ |
| 158 | void __init omap2_init_memory(void) | 165 | void __init omap2_init_memory(void) |
| 159 | { | 166 | { |
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 930770012a75..8f98b20f30a1 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c | |||
| @@ -236,7 +236,7 @@ void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u8 reg) | |||
| 236 | warn = (orig != reg); | 236 | warn = (orig != reg); |
| 237 | if (debug || warn) | 237 | if (debug || warn) |
| 238 | printk(KERN_WARNING | 238 | printk(KERN_WARNING |
| 239 | "MUX: setup %s (0x%08x): 0x%02x -> 0x%02x\n", | 239 | "MUX: setup %s (0x%p): 0x%04x -> 0x%04x\n", |
| 240 | cfg->name, omap_ctrl_base_get() + cfg->mux_reg, | 240 | cfg->name, omap_ctrl_base_get() + cfg->mux_reg, |
| 241 | orig, reg); | 241 | orig, reg); |
| 242 | } | 242 | } |
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index aad781dcf1b1..d6c9de82ca0c 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
| @@ -57,13 +57,6 @@ void omap2_pm_idle(void) | |||
| 57 | return; | 57 | return; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | /* | ||
| 61 | * Since an interrupt may set up a timer, we don't want to | ||
| 62 | * reprogram the hardware timer with interrupts enabled. | ||
| 63 | * Re-enable interrupts only after returning from idle. | ||
| 64 | */ | ||
| 65 | timer_dyn_reprogram(); | ||
| 66 | |||
| 67 | omap2_sram_idle(); | 60 | omap2_sram_idle(); |
| 68 | local_fiq_enable(); | 61 | local_fiq_enable(); |
| 69 | local_irq_enable(); | 62 | local_irq_enable(); |
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h index cacb34086e35..54c32f482131 100644 --- a/arch/arm/mach-omap2/prcm-common.h +++ b/arch/arm/mach-omap2/prcm-common.h | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | /* Chip-specific module offsets */ | 34 | /* Chip-specific module offsets */ |
| 35 | #define OMAP24XX_GR_MOD OCP_MOD | ||
| 35 | #define OMAP24XX_DSP_MOD 0x800 | 36 | #define OMAP24XX_DSP_MOD 0x800 |
| 36 | 37 | ||
| 37 | #define OMAP2430_MDM_MOD 0xc00 | 38 | #define OMAP2430_MDM_MOD 0xc00 |
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index b12f423b8595..fd92a80f38f2 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
| @@ -16,16 +16,21 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
| 19 | #include <linux/io.h> | ||
| 19 | 20 | ||
| 20 | #include <asm/io.h> | 21 | #include <asm/arch/common.h> |
| 22 | #include <asm/arch/prcm.h> | ||
| 21 | 23 | ||
| 24 | #include "clock.h" | ||
| 22 | #include "prm.h" | 25 | #include "prm.h" |
| 23 | #include "prm-regbits-24xx.h" | 26 | #include "prm-regbits-24xx.h" |
| 24 | 27 | ||
| 25 | extern void omap2_clk_prepare_for_reboot(void); | 28 | static void __iomem *prm_base; |
| 29 | static void __iomem *cm_base; | ||
| 26 | 30 | ||
| 27 | u32 omap_prcm_get_reset_sources(void) | 31 | u32 omap_prcm_get_reset_sources(void) |
| 28 | { | 32 | { |
| 33 | /* XXX This presumably needs modification for 34XX */ | ||
| 29 | return prm_read_mod_reg(WKUP_MOD, RM_RSTST) & 0x7f; | 34 | return prm_read_mod_reg(WKUP_MOD, RM_RSTST) & 0x7f; |
| 30 | } | 35 | } |
| 31 | EXPORT_SYMBOL(omap_prcm_get_reset_sources); | 36 | EXPORT_SYMBOL(omap_prcm_get_reset_sources); |
| @@ -33,11 +38,90 @@ EXPORT_SYMBOL(omap_prcm_get_reset_sources); | |||
| 33 | /* Resets clock rates and reboots the system. Only called from system.h */ | 38 | /* Resets clock rates and reboots the system. Only called from system.h */ |
| 34 | void omap_prcm_arch_reset(char mode) | 39 | void omap_prcm_arch_reset(char mode) |
| 35 | { | 40 | { |
| 36 | u32 wkup; | 41 | s16 prcm_offs; |
| 37 | omap2_clk_prepare_for_reboot(); | 42 | omap2_clk_prepare_for_reboot(); |
| 38 | 43 | ||
| 39 | if (cpu_is_omap24xx()) { | 44 | if (cpu_is_omap24xx()) |
| 40 | wkup = prm_read_mod_reg(WKUP_MOD, RM_RSTCTRL) | OMAP_RST_DPLL3; | 45 | prcm_offs = WKUP_MOD; |
| 41 | prm_write_mod_reg(wkup, WKUP_MOD, RM_RSTCTRL); | 46 | else if (cpu_is_omap34xx()) |
| 42 | } | 47 | prcm_offs = OMAP3430_GR_MOD; |
| 48 | else | ||
| 49 | WARN_ON(1); | ||
| 50 | |||
| 51 | prm_set_mod_reg_bits(OMAP_RST_DPLL3, prcm_offs, RM_RSTCTRL); | ||
| 52 | } | ||
| 53 | |||
| 54 | static inline u32 __omap_prcm_read(void __iomem *base, s16 module, u16 reg) | ||
| 55 | { | ||
| 56 | BUG_ON(!base); | ||
| 57 | return __raw_readl(base + module + reg); | ||
| 58 | } | ||
| 59 | |||
| 60 | static inline void __omap_prcm_write(u32 value, void __iomem *base, | ||
| 61 | s16 module, u16 reg) | ||
| 62 | { | ||
| 63 | BUG_ON(!base); | ||
| 64 | __raw_writel(value, base + module + reg); | ||
| 65 | } | ||
| 66 | |||
| 67 | /* Read a register in a PRM module */ | ||
| 68 | u32 prm_read_mod_reg(s16 module, u16 idx) | ||
| 69 | { | ||
| 70 | return __omap_prcm_read(prm_base, module, idx); | ||
| 71 | } | ||
| 72 | EXPORT_SYMBOL(prm_read_mod_reg); | ||
| 73 | |||
| 74 | /* Write into a register in a PRM module */ | ||
| 75 | void prm_write_mod_reg(u32 val, s16 module, u16 idx) | ||
| 76 | { | ||
| 77 | __omap_prcm_write(val, prm_base, module, idx); | ||
| 78 | } | ||
| 79 | EXPORT_SYMBOL(prm_write_mod_reg); | ||
| 80 | |||
| 81 | /* Read-modify-write a register in a PRM module. Caller must lock */ | ||
| 82 | u32 prm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx) | ||
| 83 | { | ||
| 84 | u32 v; | ||
| 85 | |||
| 86 | v = prm_read_mod_reg(module, idx); | ||
| 87 | v &= ~mask; | ||
| 88 | v |= bits; | ||
| 89 | prm_write_mod_reg(v, module, idx); | ||
| 90 | |||
| 91 | return v; | ||
| 92 | } | ||
| 93 | EXPORT_SYMBOL(prm_rmw_mod_reg_bits); | ||
| 94 | |||
| 95 | /* Read a register in a CM module */ | ||
| 96 | u32 cm_read_mod_reg(s16 module, u16 idx) | ||
| 97 | { | ||
| 98 | return __omap_prcm_read(cm_base, module, idx); | ||
| 99 | } | ||
| 100 | EXPORT_SYMBOL(cm_read_mod_reg); | ||
| 101 | |||
| 102 | /* Write into a register in a CM module */ | ||
| 103 | void cm_write_mod_reg(u32 val, s16 module, u16 idx) | ||
| 104 | { | ||
| 105 | __omap_prcm_write(val, cm_base, module, idx); | ||
| 106 | } | ||
| 107 | EXPORT_SYMBOL(cm_write_mod_reg); | ||
| 108 | |||
| 109 | /* Read-modify-write a register in a CM module. Caller must lock */ | ||
| 110 | u32 cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx) | ||
| 111 | { | ||
| 112 | u32 v; | ||
| 113 | |||
| 114 | v = cm_read_mod_reg(module, idx); | ||
| 115 | v &= ~mask; | ||
| 116 | v |= bits; | ||
| 117 | cm_write_mod_reg(v, module, idx); | ||
| 118 | |||
| 119 | return v; | ||
| 120 | } | ||
| 121 | EXPORT_SYMBOL(cm_rmw_mod_reg_bits); | ||
| 122 | |||
| 123 | void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) | ||
| 124 | { | ||
| 125 | prm_base = omap2_globals->prm; | ||
| 126 | cm_base = omap2_globals->cm; | ||
| 43 | } | 127 | } |
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h index 618f8111658a..bbf41fc8e9a9 100644 --- a/arch/arm/mach-omap2/prm.h +++ b/arch/arm/mach-omap2/prm.h | |||
| @@ -38,13 +38,29 @@ | |||
| 38 | * | 38 | * |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | /* Global 24xx registers in GR_MOD (Same as OCP_MOD for 24xx) */ | ||
| 42 | #define OMAP24XX_PRCM_VOLTCTRL_OFFSET 0x0050 | ||
| 43 | #define OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET 0x0080 | ||
| 44 | |||
| 45 | /* 242x GR_MOD registers, use these only for assembly code */ | ||
| 46 | #define OMAP242X_PRCM_VOLTCTRL OMAP2420_PRM_REGADDR(OMAP24XX_GR_MOD, \ | ||
| 47 | OMAP24XX_PRCM_VOLTCTRL_OFFSET) | ||
| 48 | #define OMAP242X_PRCM_CLKCFG_CTRL OMAP2420_PRM_REGADDR(OMAP24XX_GR_MOD, \ | ||
| 49 | OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET) | ||
| 50 | |||
| 51 | /* 243x GR_MOD registers, use these only for assembly code */ | ||
| 52 | #define OMAP243X_PRCM_VOLTCTRL OMAP2430_PRM_REGADDR(OMAP24XX_GR_MOD, \ | ||
| 53 | OMAP24XX_PRCM_VOLTCTRL_OFFSET) | ||
| 54 | #define OMAP243X_PRCM_CLKCFG_CTRL OMAP2430_PRM_REGADDR(OMAP24XX_GR_MOD, \ | ||
| 55 | OMAP24XX_PRCM_CLKCFG_CTRL_OFFSET) | ||
| 56 | |||
| 57 | /* These will disappear */ | ||
| 41 | #define OMAP24XX_PRCM_REVISION OMAP_PRM_REGADDR(OCP_MOD, 0x0000) | 58 | #define OMAP24XX_PRCM_REVISION OMAP_PRM_REGADDR(OCP_MOD, 0x0000) |
| 42 | #define OMAP24XX_PRCM_SYSCONFIG OMAP_PRM_REGADDR(OCP_MOD, 0x0010) | 59 | #define OMAP24XX_PRCM_SYSCONFIG OMAP_PRM_REGADDR(OCP_MOD, 0x0010) |
| 43 | 60 | ||
| 44 | #define OMAP24XX_PRCM_IRQSTATUS_MPU OMAP_PRM_REGADDR(OCP_MOD, 0x0018) | 61 | #define OMAP24XX_PRCM_IRQSTATUS_MPU OMAP_PRM_REGADDR(OCP_MOD, 0x0018) |
| 45 | #define OMAP24XX_PRCM_IRQENABLE_MPU OMAP_PRM_REGADDR(OCP_MOD, 0x001c) | 62 | #define OMAP24XX_PRCM_IRQENABLE_MPU OMAP_PRM_REGADDR(OCP_MOD, 0x001c) |
| 46 | 63 | ||
| 47 | #define OMAP24XX_PRCM_VOLTCTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0050) | ||
| 48 | #define OMAP24XX_PRCM_VOLTST OMAP_PRM_REGADDR(OCP_MOD, 0x0054) | 64 | #define OMAP24XX_PRCM_VOLTST OMAP_PRM_REGADDR(OCP_MOD, 0x0054) |
| 49 | #define OMAP24XX_PRCM_CLKSRC_CTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0060) | 65 | #define OMAP24XX_PRCM_CLKSRC_CTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0060) |
| 50 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0070) | 66 | #define OMAP24XX_PRCM_CLKOUT_CTRL OMAP_PRM_REGADDR(OCP_MOD, 0x0070) |
| @@ -150,15 +166,19 @@ | |||
| 150 | #ifndef __ASSEMBLER__ | 166 | #ifndef __ASSEMBLER__ |
| 151 | 167 | ||
| 152 | /* Power/reset management domain register get/set */ | 168 | /* Power/reset management domain register get/set */ |
| 169 | extern u32 prm_read_mod_reg(s16 module, u16 idx); | ||
| 170 | extern void prm_write_mod_reg(u32 val, s16 module, u16 idx); | ||
| 171 | extern u32 prm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx); | ||
| 153 | 172 | ||
| 154 | static inline void prm_write_mod_reg(u32 val, s16 module, s16 idx) | 173 | /* Read-modify-write bits in a PRM register (by domain) */ |
| 174 | static inline u32 prm_set_mod_reg_bits(u32 bits, s16 module, s16 idx) | ||
| 155 | { | 175 | { |
| 156 | __raw_writel(val, OMAP_PRM_REGADDR(module, idx)); | 176 | return prm_rmw_mod_reg_bits(bits, bits, module, idx); |
| 157 | } | 177 | } |
| 158 | 178 | ||
| 159 | static inline u32 prm_read_mod_reg(s16 module, s16 idx) | 179 | static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) |
| 160 | { | 180 | { |
| 161 | return __raw_readl(OMAP_PRM_REGADDR(module, idx)); | 181 | return prm_rmw_mod_reg_bits(bits, 0x0, module, idx); |
| 162 | } | 182 | } |
| 163 | 183 | ||
| 164 | #endif | 184 | #endif |
diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h index d7f23bc9550a..1b1fe4f6e030 100644 --- a/arch/arm/mach-omap2/sdrc.h +++ b/arch/arm/mach-omap2/sdrc.h | |||
| @@ -18,13 +18,11 @@ | |||
| 18 | #include <asm/arch/sdrc.h> | 18 | #include <asm/arch/sdrc.h> |
| 19 | 19 | ||
| 20 | #ifndef __ASSEMBLER__ | 20 | #ifndef __ASSEMBLER__ |
| 21 | extern unsigned long omap2_sdrc_base; | 21 | extern void __iomem *omap2_sdrc_base; |
| 22 | extern unsigned long omap2_sms_base; | 22 | extern void __iomem *omap2_sms_base; |
| 23 | 23 | ||
| 24 | #define OMAP_SDRC_REGADDR(reg) \ | 24 | #define OMAP_SDRC_REGADDR(reg) (omap2_sdrc_base + (reg)) |
| 25 | (void __iomem *)IO_ADDRESS(omap2_sdrc_base + (reg)) | 25 | #define OMAP_SMS_REGADDR(reg) (omap2_sms_base + (reg)) |
| 26 | #define OMAP_SMS_REGADDR(reg) \ | ||
| 27 | (void __iomem *)IO_ADDRESS(omap2_sms_base + (reg)) | ||
| 28 | 26 | ||
| 29 | /* SDRC global register get/set */ | 27 | /* SDRC global register get/set */ |
| 30 | 28 | ||
diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram242x.S index 4a9e49140716..4c274510f3e9 100644 --- a/arch/arm/mach-omap2/sram-fn.S +++ b/arch/arm/mach-omap2/sram242x.S | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/mach-omap2/sram-fn.S | 2 | * linux/arch/arm/mach-omap2/sram242x.S |
| 3 | * | 3 | * |
| 4 | * Omap2 specific functions that need to be run in internal SRAM | 4 | * Omap2 specific functions that need to be run in internal SRAM |
| 5 | * | 5 | * |
| @@ -27,22 +27,20 @@ | |||
| 27 | #include <asm/arch/io.h> | 27 | #include <asm/arch/io.h> |
| 28 | #include <asm/hardware.h> | 28 | #include <asm/hardware.h> |
| 29 | 29 | ||
| 30 | #include "sdrc.h" | ||
| 31 | #include "prm.h" | 30 | #include "prm.h" |
| 32 | #include "cm.h" | 31 | #include "cm.h" |
| 33 | 32 | #include "sdrc.h" | |
| 34 | #define TIMER_32KSYNCT_CR_V IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010) | ||
| 35 | 33 | ||
| 36 | .text | 34 | .text |
| 37 | 35 | ||
| 38 | ENTRY(sram_ddr_init) | 36 | ENTRY(omap242x_sram_ddr_init) |
| 39 | stmfd sp!, {r0 - r12, lr} @ save registers on stack | 37 | stmfd sp!, {r0 - r12, lr} @ save registers on stack |
| 40 | 38 | ||
| 41 | mov r12, r2 @ capture CS1 vs CS0 | 39 | mov r12, r2 @ capture CS1 vs CS0 |
| 42 | mov r8, r3 @ capture force parameter | 40 | mov r8, r3 @ capture force parameter |
| 43 | 41 | ||
| 44 | /* frequency shift down */ | 42 | /* frequency shift down */ |
| 45 | ldr r2, cm_clksel2_pll @ get address of dpllout reg | 43 | ldr r2, omap242x_sdi_cm_clksel2_pll @ get address of dpllout reg |
| 46 | mov r3, #0x1 @ value for 1x operation | 44 | mov r3, #0x1 @ value for 1x operation |
| 47 | str r3, [r2] @ go to L1-freq operation | 45 | str r3, [r2] @ go to L1-freq operation |
| 48 | 46 | ||
| @@ -51,7 +49,7 @@ ENTRY(sram_ddr_init) | |||
| 51 | bl voltage_shift @ go drop voltage | 49 | bl voltage_shift @ go drop voltage |
| 52 | 50 | ||
| 53 | /* dll lock mode */ | 51 | /* dll lock mode */ |
| 54 | ldr r11, sdrc_dlla_ctrl @ addr of dlla ctrl | 52 | ldr r11, omap242x_sdi_sdrc_dlla_ctrl @ addr of dlla ctrl |
| 55 | ldr r10, [r11] @ get current val | 53 | ldr r10, [r11] @ get current val |
| 56 | cmp r12, #0x1 @ cs1 base (2422 es2.05/1) | 54 | cmp r12, #0x1 @ cs1 base (2422 es2.05/1) |
| 57 | addeq r11, r11, #0x8 @ if cs1 base, move to DLLB | 55 | addeq r11, r11, #0x8 @ if cs1 base, move to DLLB |
| @@ -102,7 +100,7 @@ i_dll_delay: | |||
| 102 | * wait for it to finish, use 32k sync counter, 1tick=31uS. | 100 | * wait for it to finish, use 32k sync counter, 1tick=31uS. |
| 103 | */ | 101 | */ |
| 104 | voltage_shift: | 102 | voltage_shift: |
| 105 | ldr r4, prcm_voltctrl @ get addr of volt ctrl. | 103 | ldr r4, omap242x_sdi_prcm_voltctrl @ get addr of volt ctrl. |
| 106 | ldr r5, [r4] @ get value. | 104 | ldr r5, [r4] @ get value. |
| 107 | ldr r6, prcm_mask_val @ get value of mask | 105 | ldr r6, prcm_mask_val @ get value of mask |
| 108 | and r5, r5, r6 @ apply mask to clear bits | 106 | and r5, r5, r6 @ apply mask to clear bits |
| @@ -112,7 +110,7 @@ voltage_shift: | |||
| 112 | orr r5, r5, r3 @ build value for force | 110 | orr r5, r5, r3 @ build value for force |
| 113 | str r5, [r4] @ Force transition to L1 | 111 | str r5, [r4] @ Force transition to L1 |
| 114 | 112 | ||
| 115 | ldr r3, timer_32ksynct_cr @ get addr of counter | 113 | ldr r3, omap242x_sdi_timer_32ksynct_cr @ get addr of counter |
| 116 | ldr r5, [r3] @ get value | 114 | ldr r5, [r3] @ get value |
| 117 | add r5, r5, #0x3 @ give it at most 93uS | 115 | add r5, r5, #0x3 @ give it at most 93uS |
| 118 | volt_delay: | 116 | volt_delay: |
| @@ -121,32 +119,31 @@ volt_delay: | |||
| 121 | bhi volt_delay @ not yet->branch | 119 | bhi volt_delay @ not yet->branch |
| 122 | mov pc, lr @ back to caller. | 120 | mov pc, lr @ back to caller. |
| 123 | 121 | ||
| 124 | /* relative load constants */ | 122 | omap242x_sdi_cm_clksel2_pll: |
| 125 | cm_clksel2_pll: | ||
| 126 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKSEL2) | 123 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKSEL2) |
| 127 | sdrc_dlla_ctrl: | 124 | omap242x_sdi_sdrc_dlla_ctrl: |
| 128 | .word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL) | 125 | .word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL) |
| 129 | prcm_voltctrl: | 126 | omap242x_sdi_prcm_voltctrl: |
| 130 | .word OMAP2420_PRM_REGADDR(OCP_MOD, 0x50) | 127 | .word OMAP242X_PRCM_VOLTCTRL |
| 131 | prcm_mask_val: | 128 | prcm_mask_val: |
| 132 | .word 0xFFFF3FFC | 129 | .word 0xFFFF3FFC |
| 133 | timer_32ksynct_cr: | 130 | omap242x_sdi_timer_32ksynct_cr: |
| 134 | .word TIMER_32KSYNCT_CR_V | 131 | .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) |
| 135 | ENTRY(sram_ddr_init_sz) | 132 | ENTRY(omap242x_sram_ddr_init_sz) |
| 136 | .word . - sram_ddr_init | 133 | .word . - omap242x_sram_ddr_init |
| 137 | 134 | ||
| 138 | /* | 135 | /* |
| 139 | * Reprograms memory timings. | 136 | * Reprograms memory timings. |
| 140 | * r0 = [PRCM_FULL | PRCM_HALF] r1 = SDRC_DLLA_CTRL value r2 = [DDR | SDR] | 137 | * r0 = [PRCM_FULL | PRCM_HALF] r1 = SDRC_DLLA_CTRL value r2 = [DDR | SDR] |
| 141 | * PRCM_FULL = 2, PRCM_HALF = 1, DDR = 1, SDR = 0 | 138 | * PRCM_FULL = 2, PRCM_HALF = 1, DDR = 1, SDR = 0 |
| 142 | */ | 139 | */ |
| 143 | ENTRY(sram_reprogram_sdrc) | 140 | ENTRY(omap242x_sram_reprogram_sdrc) |
| 144 | stmfd sp!, {r0 - r10, lr} @ save registers on stack | 141 | stmfd sp!, {r0 - r10, lr} @ save registers on stack |
| 145 | mov r3, #0x0 @ clear for mrc call | 142 | mov r3, #0x0 @ clear for mrc call |
| 146 | mcr p15, 0, r3, c7, c10, 4 @ memory barrier, finish ARM SDR/DDR | 143 | mcr p15, 0, r3, c7, c10, 4 @ memory barrier, finish ARM SDR/DDR |
| 147 | nop | 144 | nop |
| 148 | nop | 145 | nop |
| 149 | ldr r6, ddr_sdrc_rfr_ctrl @ get addr of refresh reg | 146 | ldr r6, omap242x_srs_sdrc_rfr_ctrl @ get addr of refresh reg |
| 150 | ldr r5, [r6] @ get value | 147 | ldr r5, [r6] @ get value |
| 151 | mov r5, r5, lsr #8 @ isolate rfr field and drop burst | 148 | mov r5, r5, lsr #8 @ isolate rfr field and drop burst |
| 152 | 149 | ||
| @@ -160,7 +157,7 @@ ENTRY(sram_reprogram_sdrc) | |||
| 160 | movne r5, r5, lsl #1 @ mult by 2 if to full | 157 | movne r5, r5, lsl #1 @ mult by 2 if to full |
| 161 | mov r5, r5, lsl #8 @ put rfr field back into place | 158 | mov r5, r5, lsl #8 @ put rfr field back into place |
| 162 | add r5, r5, #0x1 @ turn on burst of 1 | 159 | add r5, r5, #0x1 @ turn on burst of 1 |
| 163 | ldr r4, ddr_cm_clksel2_pll @ get address of out reg | 160 | ldr r4, omap242x_srs_cm_clksel2_pll @ get address of out reg |
| 164 | ldr r3, [r4] @ get curr value | 161 | ldr r3, [r4] @ get curr value |
| 165 | orr r3, r3, #0x3 | 162 | orr r3, r3, #0x3 |
| 166 | bic r3, r3, #0x3 @ clear lower bits | 163 | bic r3, r3, #0x3 @ clear lower bits |
| @@ -181,7 +178,7 @@ ENTRY(sram_reprogram_sdrc) | |||
| 181 | bne freq_out @ leave if SDR, no DLL function | 178 | bne freq_out @ leave if SDR, no DLL function |
| 182 | 179 | ||
| 183 | /* With DDR, we need to take care of the DLL for the frequency change */ | 180 | /* With DDR, we need to take care of the DLL for the frequency change */ |
| 184 | ldr r2, ddr_sdrc_dlla_ctrl @ addr of dlla ctrl | 181 | ldr r2, omap242x_srs_sdrc_dlla_ctrl @ addr of dlla ctrl |
| 185 | str r1, [r2] @ write out new SDRC_DLLA_CTRL | 182 | str r1, [r2] @ write out new SDRC_DLLA_CTRL |
| 186 | add r2, r2, #0x8 @ addr to SDRC_DLLB_CTRL | 183 | add r2, r2, #0x8 @ addr to SDRC_DLLB_CTRL |
| 187 | str r1, [r2] @ commit to SDRC_DLLB_CTRL | 184 | str r1, [r2] @ commit to SDRC_DLLB_CTRL |
| @@ -197,7 +194,7 @@ freq_out: | |||
| 197 | * wait for it to finish, use 32k sync counter, 1tick=31uS. | 194 | * wait for it to finish, use 32k sync counter, 1tick=31uS. |
| 198 | */ | 195 | */ |
| 199 | voltage_shift_c: | 196 | voltage_shift_c: |
| 200 | ldr r10, ddr_prcm_voltctrl @ get addr of volt ctrl | 197 | ldr r10, omap242x_srs_prcm_voltctrl @ get addr of volt ctrl |
| 201 | ldr r8, [r10] @ get value | 198 | ldr r8, [r10] @ get value |
| 202 | ldr r7, ddr_prcm_mask_val @ get value of mask | 199 | ldr r7, ddr_prcm_mask_val @ get value of mask |
| 203 | and r8, r8, r7 @ apply mask to clear bits | 200 | and r8, r8, r7 @ apply mask to clear bits |
| @@ -207,7 +204,7 @@ voltage_shift_c: | |||
| 207 | orr r8, r8, r7 @ build value for force | 204 | orr r8, r8, r7 @ build value for force |
| 208 | str r8, [r10] @ Force transition to L1 | 205 | str r8, [r10] @ Force transition to L1 |
| 209 | 206 | ||
| 210 | ldr r10, ddr_timer_32ksynct @ get addr of counter | 207 | ldr r10, omap242x_srs_timer_32ksynct @ get addr of counter |
| 211 | ldr r8, [r10] @ get value | 208 | ldr r8, [r10] @ get value |
| 212 | add r8, r8, #0x2 @ give it at most 62uS (min 31+) | 209 | add r8, r8, #0x2 @ give it at most 62uS (min 31+) |
| 213 | volt_delay_c: | 210 | volt_delay_c: |
| @@ -216,39 +213,39 @@ volt_delay_c: | |||
| 216 | bhi volt_delay_c @ not yet->branch | 213 | bhi volt_delay_c @ not yet->branch |
| 217 | mov pc, lr @ back to caller | 214 | mov pc, lr @ back to caller |
| 218 | 215 | ||
| 219 | ddr_cm_clksel2_pll: | 216 | omap242x_srs_cm_clksel2_pll: |
| 220 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKSEL2) | 217 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKSEL2) |
| 221 | ddr_sdrc_dlla_ctrl: | 218 | omap242x_srs_sdrc_dlla_ctrl: |
| 222 | .word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL) | 219 | .word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL) |
| 223 | ddr_sdrc_rfr_ctrl: | 220 | omap242x_srs_sdrc_rfr_ctrl: |
| 224 | .word OMAP242X_SDRC_REGADDR(SDRC_RFR_CTRL_0) | 221 | .word OMAP242X_SDRC_REGADDR(SDRC_RFR_CTRL_0) |
| 225 | ddr_prcm_voltctrl: | 222 | omap242x_srs_prcm_voltctrl: |
| 226 | .word OMAP2420_PRM_REGADDR(OCP_MOD, 0x50) | 223 | .word OMAP242X_PRCM_VOLTCTRL |
| 227 | ddr_prcm_mask_val: | 224 | ddr_prcm_mask_val: |
| 228 | .word 0xFFFF3FFC | 225 | .word 0xFFFF3FFC |
| 229 | ddr_timer_32ksynct: | 226 | omap242x_srs_timer_32ksynct: |
| 230 | .word TIMER_32KSYNCT_CR_V | 227 | .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) |
| 231 | 228 | ||
| 232 | ENTRY(sram_reprogram_sdrc_sz) | 229 | ENTRY(omap242x_sram_reprogram_sdrc_sz) |
| 233 | .word . - sram_reprogram_sdrc | 230 | .word . - omap242x_sram_reprogram_sdrc |
| 234 | 231 | ||
| 235 | /* | 232 | /* |
| 236 | * Set dividers and pll. Also recalculate DLL value for DDR and unlock mode. | 233 | * Set dividers and pll. Also recalculate DLL value for DDR and unlock mode. |
| 237 | */ | 234 | */ |
| 238 | ENTRY(sram_set_prcm) | 235 | ENTRY(omap242x_sram_set_prcm) |
| 239 | stmfd sp!, {r0-r12, lr} @ regs to stack | 236 | stmfd sp!, {r0-r12, lr} @ regs to stack |
| 240 | adr r4, pbegin @ addr of preload start | 237 | adr r4, pbegin @ addr of preload start |
| 241 | adr r8, pend @ addr of preload end | 238 | adr r8, pend @ addr of preload end |
| 242 | mcrr p15, 1, r8, r4, c12 @ preload into icache | 239 | mcrr p15, 1, r8, r4, c12 @ preload into icache |
| 243 | pbegin: | 240 | pbegin: |
| 244 | /* move into fast relock bypass */ | 241 | /* move into fast relock bypass */ |
| 245 | ldr r8, pll_ctl @ get addr | 242 | ldr r8, omap242x_ssp_pll_ctl @ get addr |
| 246 | ldr r5, [r8] @ get val | 243 | ldr r5, [r8] @ get val |
| 247 | mvn r6, #0x3 @ clear mask | 244 | mvn r6, #0x3 @ clear mask |
| 248 | and r5, r5, r6 @ clear field | 245 | and r5, r5, r6 @ clear field |
| 249 | orr r7, r5, #0x2 @ fast relock val | 246 | orr r7, r5, #0x2 @ fast relock val |
| 250 | str r7, [r8] @ go to fast relock | 247 | str r7, [r8] @ go to fast relock |
| 251 | ldr r4, pll_stat @ addr of stat | 248 | ldr r4, omap242x_ssp_pll_stat @ addr of stat |
| 252 | block: | 249 | block: |
| 253 | /* wait for bypass */ | 250 | /* wait for bypass */ |
| 254 | ldr r8, [r4] @ stat value | 251 | ldr r8, [r4] @ stat value |
| @@ -257,10 +254,10 @@ block: | |||
| 257 | bne block @ loop if not | 254 | bne block @ loop if not |
| 258 | 255 | ||
| 259 | /* set new dpll dividers _after_ in bypass */ | 256 | /* set new dpll dividers _after_ in bypass */ |
| 260 | ldr r4, pll_div @ get addr | 257 | ldr r4, omap242x_ssp_pll_div @ get addr |
| 261 | str r0, [r4] @ set dpll ctrl val | 258 | str r0, [r4] @ set dpll ctrl val |
| 262 | 259 | ||
| 263 | ldr r4, set_config @ get addr | 260 | ldr r4, omap242x_ssp_set_config @ get addr |
| 264 | mov r8, #1 @ valid cfg msk | 261 | mov r8, #1 @ valid cfg msk |
| 265 | str r8, [r4] @ make dividers take | 262 | str r8, [r4] @ make dividers take |
| 266 | 263 | ||
| @@ -274,8 +271,8 @@ wait_a_bit: | |||
| 274 | beq pend @ jump over dpll relock | 271 | beq pend @ jump over dpll relock |
| 275 | 272 | ||
| 276 | /* relock DPLL with new vals */ | 273 | /* relock DPLL with new vals */ |
| 277 | ldr r5, pll_stat @ get addr | 274 | ldr r5, omap242x_ssp_pll_stat @ get addr |
| 278 | ldr r4, pll_ctl @ get addr | 275 | ldr r4, omap242x_ssp_pll_ctl @ get addr |
| 279 | orr r8, r7, #0x3 @ val for lock dpll | 276 | orr r8, r7, #0x3 @ val for lock dpll |
| 280 | str r8, [r4] @ set val | 277 | str r8, [r4] @ set val |
| 281 | mov r0, #1000 @ dead spin a bit | 278 | mov r0, #1000 @ dead spin a bit |
| @@ -289,9 +286,9 @@ wait_lock: | |||
| 289 | bne wait_lock @ wait if not | 286 | bne wait_lock @ wait if not |
| 290 | pend: | 287 | pend: |
| 291 | /* update memory timings & briefly lock dll */ | 288 | /* update memory timings & briefly lock dll */ |
| 292 | ldr r4, sdrc_rfr @ get addr | 289 | ldr r4, omap242x_ssp_sdrc_rfr @ get addr |
| 293 | str r1, [r4] @ update refresh timing | 290 | str r1, [r4] @ update refresh timing |
| 294 | ldr r11, dlla_ctrl @ get addr of DLLA ctrl | 291 | ldr r11, omap242x_ssp_dlla_ctrl @ get addr of DLLA ctrl |
| 295 | ldr r10, [r11] @ get current val | 292 | ldr r10, [r11] @ get current val |
| 296 | mvn r9, #0x4 @ mask to get clear bit2 | 293 | mvn r9, #0x4 @ mask to get clear bit2 |
| 297 | and r10, r10, r9 @ clear bit2 for lock mode | 294 | and r10, r10, r9 @ clear bit2 for lock mode |
| @@ -307,18 +304,18 @@ wait_dll_lock: | |||
| 307 | nop | 304 | nop |
| 308 | ldmfd sp!, {r0-r12, pc} @ restore regs and return | 305 | ldmfd sp!, {r0-r12, pc} @ restore regs and return |
| 309 | 306 | ||
| 310 | set_config: | 307 | omap242x_ssp_set_config: |
| 311 | .word OMAP2420_PRM_REGADDR(OCP_MOD, 0x80) | 308 | .word OMAP242X_PRCM_CLKCFG_CTRL |
| 312 | pll_ctl: | 309 | omap242x_ssp_pll_ctl: |
| 313 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_FCLKEN1) | 310 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKEN) |
| 314 | pll_stat: | 311 | omap242x_ssp_pll_stat: |
| 315 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_IDLEST1) | 312 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_IDLEST) |
| 316 | pll_div: | 313 | omap242x_ssp_pll_div: |
| 317 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKSEL) | 314 | .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKSEL1) |
| 318 | sdrc_rfr: | 315 | omap242x_ssp_sdrc_rfr: |
| 319 | .word OMAP242X_SDRC_REGADDR(SDRC_RFR_CTRL_0) | 316 | .word OMAP242X_SDRC_REGADDR(SDRC_RFR_CTRL_0) |
| 320 | dlla_ctrl: | 317 | omap242x_ssp_dlla_ctrl: |
| 321 | .word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL) | 318 | .word OMAP242X_SDRC_REGADDR(SDRC_DLLA_CTRL) |
| 322 | 319 | ||
| 323 | ENTRY(sram_set_prcm_sz) | 320 | ENTRY(omap242x_sram_set_prcm_sz) |
| 324 | .word . - sram_set_prcm | 321 | .word . - omap242x_sram_set_prcm |
diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S new file mode 100644 index 000000000000..a3fa48dc08cd --- /dev/null +++ b/arch/arm/mach-omap2/sram243x.S | |||
| @@ -0,0 +1,321 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-omap2/sram243x.S | ||
| 3 | * | ||
| 4 | * Omap2 specific functions that need to be run in internal SRAM | ||
| 5 | * | ||
| 6 | * (C) Copyright 2004 | ||
| 7 | * Texas Instruments, <www.ti.com> | ||
| 8 | * Richard Woodruff <r-woodruff2@ti.com> | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License as | ||
| 12 | * published by the Free Software Foundation; either version 2 of | ||
| 13 | * the License, or (at your option) any later version. | ||
| 14 | * | ||
| 15 | * This program is distributed in the hope that it will be useful, | ||
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the | ||
| 18 | * GNU General Public License for more details. | ||
| 19 | * | ||
| 20 | * You should have received a copy of the GNU General Public License | ||
| 21 | * along with this program; if not, write to the Free Software | ||
| 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | ||
| 23 | * MA 02111-1307 USA | ||
| 24 | */ | ||
| 25 | #include <linux/linkage.h> | ||
| 26 | #include <asm/assembler.h> | ||
| 27 | #include <asm/arch/io.h> | ||
| 28 | #include <asm/hardware.h> | ||
| 29 | |||
| 30 | #include "prm.h" | ||
| 31 | #include "cm.h" | ||
| 32 | #include "sdrc.h" | ||
| 33 | |||
| 34 | .text | ||
| 35 | |||
| 36 | ENTRY(omap243x_sram_ddr_init) | ||
| 37 | stmfd sp!, {r0 - r12, lr} @ save registers on stack | ||
| 38 | |||
| 39 | mov r12, r2 @ capture CS1 vs CS0 | ||
| 40 | mov r8, r3 @ capture force parameter | ||
| 41 | |||
| 42 | /* frequency shift down */ | ||
| 43 | ldr r2, omap243x_sdi_cm_clksel2_pll @ get address of dpllout reg | ||
| 44 | mov r3, #0x1 @ value for 1x operation | ||
| 45 | str r3, [r2] @ go to L1-freq operation | ||
| 46 | |||
| 47 | /* voltage shift down */ | ||
| 48 | mov r9, #0x1 @ set up for L1 voltage call | ||
| 49 | bl voltage_shift @ go drop voltage | ||
| 50 | |||
| 51 | /* dll lock mode */ | ||
| 52 | ldr r11, omap243x_sdi_sdrc_dlla_ctrl @ addr of dlla ctrl | ||
| 53 | ldr r10, [r11] @ get current val | ||
| 54 | cmp r12, #0x1 @ cs1 base (2422 es2.05/1) | ||
| 55 | addeq r11, r11, #0x8 @ if cs1 base, move to DLLB | ||
| 56 | mvn r9, #0x4 @ mask to get clear bit2 | ||
| 57 | and r10, r10, r9 @ clear bit2 for lock mode. | ||
| 58 | orr r10, r10, #0x8 @ make sure DLL on (es2 bit pos) | ||
| 59 | orr r10, r10, #0x2 @ 90 degree phase for all below 133Mhz | ||
| 60 | str r10, [r11] @ commit to DLLA_CTRL | ||
| 61 | bl i_dll_wait @ wait for dll to lock | ||
| 62 | |||
| 63 | /* get dll value */ | ||
| 64 | add r11, r11, #0x4 @ get addr of status reg | ||
| 65 | ldr r10, [r11] @ get locked value | ||
| 66 | |||
| 67 | /* voltage shift up */ | ||
| 68 | mov r9, #0x0 @ shift back to L0-voltage | ||
| 69 | bl voltage_shift @ go raise voltage | ||
| 70 | |||
| 71 | /* frequency shift up */ | ||
| 72 | mov r3, #0x2 @ value for 2x operation | ||
| 73 | str r3, [r2] @ go to L0-freq operation | ||
| 74 | |||
| 75 | /* reset entry mode for dllctrl */ | ||
| 76 | sub r11, r11, #0x4 @ move from status to ctrl | ||
| 77 | cmp r12, #0x1 @ normalize if cs1 based | ||
| 78 | subeq r11, r11, #0x8 @ possibly back to DLLA | ||
| 79 | cmp r8, #0x1 @ if forced unlock exit | ||
| 80 | orreq r1, r1, #0x4 @ make sure exit with unlocked value | ||
| 81 | str r1, [r11] @ restore DLLA_CTRL high value | ||
| 82 | add r11, r11, #0x8 @ move to DLLB_CTRL addr | ||
| 83 | str r1, [r11] @ set value DLLB_CTRL | ||
| 84 | bl i_dll_wait @ wait for possible lock | ||
| 85 | |||
| 86 | /* set up for return, DDR should be good */ | ||
| 87 | str r10, [r0] @ write dll_status and return counter | ||
| 88 | ldmfd sp!, {r0 - r12, pc} @ restore regs and return | ||
| 89 | |||
| 90 | /* ensure the DLL has relocked */ | ||
| 91 | i_dll_wait: | ||
| 92 | mov r4, #0x800 @ delay DLL relock, min 0x400 L3 clocks | ||
| 93 | i_dll_delay: | ||
| 94 | subs r4, r4, #0x1 | ||
| 95 | bne i_dll_delay | ||
| 96 | mov pc, lr | ||
| 97 | |||
| 98 | /* | ||
| 99 | * shift up or down voltage, use R9 as input to tell level. | ||
| 100 | * wait for it to finish, use 32k sync counter, 1tick=31uS. | ||
| 101 | */ | ||
| 102 | voltage_shift: | ||
| 103 | ldr r4, omap243x_sdi_prcm_voltctrl @ get addr of volt ctrl. | ||
| 104 | ldr r5, [r4] @ get value. | ||
| 105 | ldr r6, prcm_mask_val @ get value of mask | ||
| 106 | and r5, r5, r6 @ apply mask to clear bits | ||
| 107 | orr r5, r5, r9 @ bulld value for L0/L1-volt operation. | ||
| 108 | str r5, [r4] @ set up for change. | ||
| 109 | mov r3, #0x4000 @ get val for force | ||
| 110 | orr r5, r5, r3 @ build value for force | ||
| 111 | str r5, [r4] @ Force transition to L1 | ||
| 112 | |||
| 113 | ldr r3, omap243x_sdi_timer_32ksynct_cr @ get addr of counter | ||
| 114 | ldr r5, [r3] @ get value | ||
| 115 | add r5, r5, #0x3 @ give it at most 93uS | ||
| 116 | volt_delay: | ||
| 117 | ldr r7, [r3] @ get timer value | ||
| 118 | cmp r5, r7 @ time up? | ||
| 119 | bhi volt_delay @ not yet->branch | ||
| 120 | mov pc, lr @ back to caller. | ||
| 121 | |||
| 122 | omap243x_sdi_cm_clksel2_pll: | ||
| 123 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL2) | ||
| 124 | omap243x_sdi_sdrc_dlla_ctrl: | ||
| 125 | .word OMAP243X_SDRC_REGADDR(SDRC_DLLA_CTRL) | ||
| 126 | omap243x_sdi_prcm_voltctrl: | ||
| 127 | .word OMAP243X_PRCM_VOLTCTRL | ||
| 128 | prcm_mask_val: | ||
| 129 | .word 0xFFFF3FFC | ||
| 130 | omap243x_sdi_timer_32ksynct_cr: | ||
| 131 | .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) | ||
| 132 | ENTRY(omap243x_sram_ddr_init_sz) | ||
| 133 | .word . - omap243x_sram_ddr_init | ||
| 134 | |||
| 135 | /* | ||
| 136 | * Reprograms memory timings. | ||
| 137 | * r0 = [PRCM_FULL | PRCM_HALF] r1 = SDRC_DLLA_CTRL value r2 = [DDR | SDR] | ||
| 138 | * PRCM_FULL = 2, PRCM_HALF = 1, DDR = 1, SDR = 0 | ||
| 139 | */ | ||
| 140 | ENTRY(omap243x_sram_reprogram_sdrc) | ||
| 141 | stmfd sp!, {r0 - r10, lr} @ save registers on stack | ||
| 142 | mov r3, #0x0 @ clear for mrc call | ||
| 143 | mcr p15, 0, r3, c7, c10, 4 @ memory barrier, finish ARM SDR/DDR | ||
| 144 | nop | ||
| 145 | nop | ||
| 146 | ldr r6, omap243x_srs_sdrc_rfr_ctrl @ get addr of refresh reg | ||
| 147 | ldr r5, [r6] @ get value | ||
| 148 | mov r5, r5, lsr #8 @ isolate rfr field and drop burst | ||
| 149 | |||
| 150 | cmp r0, #0x1 @ going to half speed? | ||
| 151 | movne r9, #0x0 @ if up set flag up for pre up, hi volt | ||
| 152 | |||
| 153 | blne voltage_shift_c @ adjust voltage | ||
| 154 | |||
| 155 | cmp r0, #0x1 @ going to half speed (post branch link) | ||
| 156 | moveq r5, r5, lsr #1 @ divide by 2 if to half | ||
| 157 | movne r5, r5, lsl #1 @ mult by 2 if to full | ||
| 158 | mov r5, r5, lsl #8 @ put rfr field back into place | ||
| 159 | add r5, r5, #0x1 @ turn on burst of 1 | ||
| 160 | ldr r4, omap243x_srs_cm_clksel2_pll @ get address of out reg | ||
| 161 | ldr r3, [r4] @ get curr value | ||
| 162 | orr r3, r3, #0x3 | ||
| 163 | bic r3, r3, #0x3 @ clear lower bits | ||
| 164 | orr r3, r3, r0 @ new state value | ||
| 165 | str r3, [r4] @ set new state (pll/x, x=1 or 2) | ||
| 166 | nop | ||
| 167 | nop | ||
| 168 | |||
| 169 | moveq r9, #0x1 @ if speed down, post down, drop volt | ||
| 170 | bleq voltage_shift_c | ||
| 171 | |||
| 172 | mcr p15, 0, r3, c7, c10, 4 @ memory barrier | ||
| 173 | str r5, [r6] @ set new RFR_1 value | ||
| 174 | add r6, r6, #0x30 @ get RFR_2 addr | ||
| 175 | str r5, [r6] @ set RFR_2 | ||
| 176 | nop | ||
| 177 | cmp r2, #0x1 @ (SDR or DDR) do we need to adjust DLL | ||
| 178 | bne freq_out @ leave if SDR, no DLL function | ||
| 179 | |||
| 180 | /* With DDR, we need to take care of the DLL for the frequency change */ | ||
| 181 | ldr r2, omap243x_srs_sdrc_dlla_ctrl @ addr of dlla ctrl | ||
| 182 | str r1, [r2] @ write out new SDRC_DLLA_CTRL | ||
| 183 | add r2, r2, #0x8 @ addr to SDRC_DLLB_CTRL | ||
| 184 | str r1, [r2] @ commit to SDRC_DLLB_CTRL | ||
| 185 | mov r1, #0x2000 @ wait DLL relock, min 0x400 L3 clocks | ||
| 186 | dll_wait: | ||
| 187 | subs r1, r1, #0x1 | ||
| 188 | bne dll_wait | ||
| 189 | freq_out: | ||
| 190 | ldmfd sp!, {r0 - r10, pc} @ restore regs and return | ||
| 191 | |||
| 192 | /* | ||
| 193 | * shift up or down voltage, use R9 as input to tell level. | ||
| 194 | * wait for it to finish, use 32k sync counter, 1tick=31uS. | ||
| 195 | */ | ||
| 196 | voltage_shift_c: | ||
| 197 | ldr r10, omap243x_srs_prcm_voltctrl @ get addr of volt ctrl | ||
| 198 | ldr r8, [r10] @ get value | ||
| 199 | ldr r7, ddr_prcm_mask_val @ get value of mask | ||
| 200 | and r8, r8, r7 @ apply mask to clear bits | ||
| 201 | orr r8, r8, r9 @ bulld value for L0/L1-volt operation. | ||
| 202 | str r8, [r10] @ set up for change. | ||
| 203 | mov r7, #0x4000 @ get val for force | ||
| 204 | orr r8, r8, r7 @ build value for force | ||
| 205 | str r8, [r10] @ Force transition to L1 | ||
| 206 | |||
| 207 | ldr r10, omap243x_srs_timer_32ksynct @ get addr of counter | ||
| 208 | ldr r8, [r10] @ get value | ||
| 209 | add r8, r8, #0x2 @ give it at most 62uS (min 31+) | ||
| 210 | volt_delay_c: | ||
| 211 | ldr r7, [r10] @ get timer value | ||
| 212 | cmp r8, r7 @ time up? | ||
| 213 | bhi volt_delay_c @ not yet->branch | ||
| 214 | mov pc, lr @ back to caller | ||
| 215 | |||
| 216 | omap243x_srs_cm_clksel2_pll: | ||
| 217 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL2) | ||
| 218 | omap243x_srs_sdrc_dlla_ctrl: | ||
| 219 | .word OMAP243X_SDRC_REGADDR(SDRC_DLLA_CTRL) | ||
| 220 | omap243x_srs_sdrc_rfr_ctrl: | ||
| 221 | .word OMAP243X_SDRC_REGADDR(SDRC_RFR_CTRL_0) | ||
| 222 | omap243x_srs_prcm_voltctrl: | ||
| 223 | .word OMAP243X_PRCM_VOLTCTRL | ||
| 224 | ddr_prcm_mask_val: | ||
| 225 | .word 0xFFFF3FFC | ||
| 226 | omap243x_srs_timer_32ksynct: | ||
| 227 | .word IO_ADDRESS(OMAP2_32KSYNCT_BASE + 0x010) | ||
| 228 | |||
| 229 | ENTRY(omap243x_sram_reprogram_sdrc_sz) | ||
| 230 | .word . - omap243x_sram_reprogram_sdrc | ||
| 231 | |||
| 232 | /* | ||
| 233 | * Set dividers and pll. Also recalculate DLL value for DDR and unlock mode. | ||
| 234 | */ | ||
| 235 | ENTRY(omap243x_sram_set_prcm) | ||
| 236 | stmfd sp!, {r0-r12, lr} @ regs to stack | ||
| 237 | adr r4, pbegin @ addr of preload start | ||
| 238 | adr r8, pend @ addr of preload end | ||
| 239 | mcrr p15, 1, r8, r4, c12 @ preload into icache | ||
| 240 | pbegin: | ||
| 241 | /* move into fast relock bypass */ | ||
| 242 | ldr r8, omap243x_ssp_pll_ctl @ get addr | ||
| 243 | ldr r5, [r8] @ get val | ||
| 244 | mvn r6, #0x3 @ clear mask | ||
| 245 | and r5, r5, r6 @ clear field | ||
| 246 | orr r7, r5, #0x2 @ fast relock val | ||
| 247 | str r7, [r8] @ go to fast relock | ||
| 248 | ldr r4, omap243x_ssp_pll_stat @ addr of stat | ||
| 249 | block: | ||
| 250 | /* wait for bypass */ | ||
| 251 | ldr r8, [r4] @ stat value | ||
| 252 | and r8, r8, #0x3 @ mask for stat | ||
| 253 | cmp r8, #0x1 @ there yet | ||
| 254 | bne block @ loop if not | ||
| 255 | |||
| 256 | /* set new dpll dividers _after_ in bypass */ | ||
| 257 | ldr r4, omap243x_ssp_pll_div @ get addr | ||
| 258 | str r0, [r4] @ set dpll ctrl val | ||
| 259 | |||
| 260 | ldr r4, omap243x_ssp_set_config @ get addr | ||
| 261 | mov r8, #1 @ valid cfg msk | ||
| 262 | str r8, [r4] @ make dividers take | ||
| 263 | |||
| 264 | mov r4, #100 @ dead spin a bit | ||
| 265 | wait_a_bit: | ||
| 266 | subs r4, r4, #1 @ dec loop | ||
| 267 | bne wait_a_bit @ delay done? | ||
| 268 | |||
| 269 | /* check if staying in bypass */ | ||
| 270 | cmp r2, #0x1 @ stay in bypass? | ||
| 271 | beq pend @ jump over dpll relock | ||
| 272 | |||
| 273 | /* relock DPLL with new vals */ | ||
| 274 | ldr r5, omap243x_ssp_pll_stat @ get addr | ||
| 275 | ldr r4, omap243x_ssp_pll_ctl @ get addr | ||
| 276 | orr r8, r7, #0x3 @ val for lock dpll | ||
| 277 | str r8, [r4] @ set val | ||
| 278 | mov r0, #1000 @ dead spin a bit | ||
| 279 | wait_more: | ||
| 280 | subs r0, r0, #1 @ dec loop | ||
| 281 | bne wait_more @ delay done? | ||
| 282 | wait_lock: | ||
| 283 | ldr r8, [r5] @ get lock val | ||
| 284 | and r8, r8, #3 @ isolate field | ||
| 285 | cmp r8, #2 @ locked? | ||
| 286 | bne wait_lock @ wait if not | ||
| 287 | pend: | ||
| 288 | /* update memory timings & briefly lock dll */ | ||
| 289 | ldr r4, omap243x_ssp_sdrc_rfr @ get addr | ||
| 290 | str r1, [r4] @ update refresh timing | ||
| 291 | ldr r11, omap243x_ssp_dlla_ctrl @ get addr of DLLA ctrl | ||
| 292 | ldr r10, [r11] @ get current val | ||
| 293 | mvn r9, #0x4 @ mask to get clear bit2 | ||
| 294 | and r10, r10, r9 @ clear bit2 for lock mode | ||
| 295 | orr r10, r10, #0x8 @ make sure DLL on (es2 bit pos) | ||
| 296 | str r10, [r11] @ commit to DLLA_CTRL | ||
| 297 | add r11, r11, #0x8 @ move to dllb | ||
| 298 | str r10, [r11] @ hit DLLB also | ||
| 299 | |||
| 300 | mov r4, #0x800 @ relock time (min 0x400 L3 clocks) | ||
| 301 | wait_dll_lock: | ||
| 302 | subs r4, r4, #0x1 | ||
| 303 | bne wait_dll_lock | ||
| 304 | nop | ||
| 305 | ldmfd sp!, {r0-r12, pc} @ restore regs and return | ||
| 306 | |||
| 307 | omap243x_ssp_set_config: | ||
| 308 | .word OMAP243X_PRCM_CLKCFG_CTRL | ||
| 309 | omap243x_ssp_pll_ctl: | ||
| 310 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKEN) | ||
| 311 | omap243x_ssp_pll_stat: | ||
| 312 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_IDLEST) | ||
| 313 | omap243x_ssp_pll_div: | ||
| 314 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL1) | ||
| 315 | omap243x_ssp_sdrc_rfr: | ||
| 316 | .word OMAP243X_SDRC_REGADDR(SDRC_RFR_CTRL_0) | ||
| 317 | omap243x_ssp_dlla_ctrl: | ||
| 318 | .word OMAP243X_SDRC_REGADDR(SDRC_DLLA_CTRL) | ||
| 319 | |||
| 320 | ENTRY(omap243x_sram_set_prcm_sz) | ||
| 321 | .word . - omap243x_sram_set_prcm | ||
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 78d05f203fff..557603f99313 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c | |||
| @@ -59,8 +59,7 @@ static struct irqaction omap2_gp_timer_irq = { | |||
| 59 | static int omap2_gp_timer_set_next_event(unsigned long cycles, | 59 | static int omap2_gp_timer_set_next_event(unsigned long cycles, |
| 60 | struct clock_event_device *evt) | 60 | struct clock_event_device *evt) |
| 61 | { | 61 | { |
| 62 | omap_dm_timer_set_load(gptimer, 0, 0xffffffff - cycles); | 62 | omap_dm_timer_set_load_start(gptimer, 0, 0xffffffff - cycles); |
| 63 | omap_dm_timer_start(gptimer); | ||
| 64 | 63 | ||
| 65 | return 0; | 64 | return 0; |
| 66 | } | 65 | } |
| @@ -77,8 +76,7 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode, | |||
| 77 | period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ; | 76 | period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ; |
| 78 | period -= 1; | 77 | period -= 1; |
| 79 | 78 | ||
| 80 | omap_dm_timer_set_load(gptimer, 1, 0xffffffff - period); | 79 | omap_dm_timer_set_load_start(gptimer, 1, 0xffffffff - period); |
| 81 | omap_dm_timer_start(gptimer); | ||
| 82 | break; | 80 | break; |
| 83 | case CLOCK_EVT_MODE_ONESHOT: | 81 | case CLOCK_EVT_MODE_ONESHOT: |
| 84 | break; | 82 | break; |
| @@ -172,8 +170,7 @@ static void __init omap2_gp_clocksource_init(void) | |||
| 172 | tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gpt)); | 170 | tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gpt)); |
| 173 | tick_period = (tick_rate / HZ) - 1; | 171 | tick_period = (tick_rate / HZ) - 1; |
| 174 | 172 | ||
| 175 | omap_dm_timer_set_load(gpt, 1, 0); | 173 | omap_dm_timer_set_load_start(gpt, 1, 0); |
| 176 | omap_dm_timer_start(gpt); | ||
| 177 | 174 | ||
| 178 | clocksource_gpt.mult = | 175 | clocksource_gpt.mult = |
| 179 | clocksource_khz2mult(tick_rate/1000, clocksource_gpt.shift); | 176 | clocksource_khz2mult(tick_rate/1000, clocksource_gpt.shift); |
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index 93debf336155..ddcd41b15d17 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig | |||
| @@ -44,6 +44,54 @@ config MACH_LINKSTATION_PRO | |||
| 44 | Buffalo Linkstation Pro/Live platform. Both v1 and | 44 | Buffalo Linkstation Pro/Live platform. Both v1 and |
| 45 | v2 devices are supported. | 45 | v2 devices are supported. |
| 46 | 46 | ||
| 47 | config MACH_TS409 | ||
| 48 | bool "QNAP TS-409" | ||
| 49 | help | ||
| 50 | Say 'Y' here if you want your kernel to support the | ||
| 51 | QNAP TS-409 platform. | ||
| 52 | |||
| 53 | config MACH_WRT350N_V2 | ||
| 54 | bool "Linksys WRT350N v2" | ||
| 55 | help | ||
| 56 | Say 'Y' here if you want your kernel to support the | ||
| 57 | Linksys WRT350N v2 platform. | ||
| 58 | |||
| 59 | config MACH_TS78XX | ||
| 60 | bool "Technologic Systems TS-78xx" | ||
| 61 | help | ||
| 62 | Say 'Y' here if you want your kernel to support the | ||
| 63 | Technologic Systems TS-78xx platform. | ||
| 64 | |||
| 65 | config MACH_MV2120 | ||
| 66 | bool "HP Media Vault mv2120" | ||
| 67 | help | ||
| 68 | Say 'Y' here if you want your kernel to support the | ||
| 69 | HP Media Vault mv2120 or mv5100. | ||
| 70 | |||
| 71 | config MACH_MSS2 | ||
| 72 | bool "Maxtor Shared Storage II" | ||
| 73 | help | ||
| 74 | Say 'Y' here if you want your kernel to support the | ||
| 75 | Maxtor Shared Storage II platform. | ||
| 76 | |||
| 77 | config MACH_WNR854T | ||
| 78 | bool "Netgear WNR854T" | ||
| 79 | help | ||
| 80 | Say 'Y' here if you want your kernel to support the | ||
| 81 | Netgear WNR854T platform. | ||
| 82 | |||
| 83 | config MACH_RD88F5181L_GE | ||
| 84 | bool "Marvell Orion-VoIP GE Reference Design" | ||
| 85 | help | ||
| 86 | Say 'Y' here if you want your kernel to support the | ||
| 87 | Marvell Orion-VoIP GE (88F5181L) RD. | ||
| 88 | |||
| 89 | config MACH_RD88F5181L_FXO | ||
| 90 | bool "Marvell Orion-VoIP FXO Reference Design" | ||
| 91 | help | ||
| 92 | Say 'Y' here if you want your kernel to support the | ||
| 93 | Marvell Orion-VoIP FXO (88F5181L) RD. | ||
| 94 | |||
| 47 | endmenu | 95 | endmenu |
| 48 | 96 | ||
| 49 | endif | 97 | endif |
diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile index 9301bf55910b..fcc48a8864f3 100644 --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile | |||
| @@ -1,7 +1,15 @@ | |||
| 1 | obj-y += common.o addr-map.o pci.o gpio.o irq.o | 1 | obj-y += common.o addr-map.o pci.o gpio.o irq.o mpp.o |
| 2 | obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o | 2 | obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o |
| 3 | obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o | 3 | obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o |
| 4 | obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o | 4 | obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o |
| 5 | obj-$(CONFIG_MACH_LINKSTATION_PRO) += kurobox_pro-setup.o | 5 | obj-$(CONFIG_MACH_LINKSTATION_PRO) += kurobox_pro-setup.o |
| 6 | obj-$(CONFIG_MACH_DNS323) += dns323-setup.o | 6 | obj-$(CONFIG_MACH_DNS323) += dns323-setup.o |
| 7 | obj-$(CONFIG_MACH_TS209) += ts209-setup.o | 7 | obj-$(CONFIG_MACH_TS209) += ts209-setup.o tsx09-common.o |
| 8 | obj-$(CONFIG_MACH_TS409) += ts409-setup.o tsx09-common.o | ||
| 9 | obj-$(CONFIG_MACH_WRT350N_V2) += wrt350n-v2-setup.o | ||
| 10 | obj-$(CONFIG_MACH_TS78XX) += ts78xx-setup.o | ||
| 11 | obj-$(CONFIG_MACH_MV2120) += mv2120-setup.o | ||
| 12 | obj-$(CONFIG_MACH_MSS2) += mss2-setup.o | ||
| 13 | obj-$(CONFIG_MACH_WNR854T) += wnr854t-setup.o | ||
| 14 | obj-$(CONFIG_MACH_RD88F5181L_GE) += rd88f5181l-ge-setup.o | ||
| 15 | obj-$(CONFIG_MACH_RD88F5181L_FXO) += rd88f5181l-fxo-setup.o | ||
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c index e63fb05dc893..6f0dbda6c44c 100644 --- a/arch/arm/mach-orion5x/addr-map.c +++ b/arch/arm/mach-orion5x/addr-map.c | |||
| @@ -70,6 +70,7 @@ | |||
| 70 | 70 | ||
| 71 | 71 | ||
| 72 | struct mbus_dram_target_info orion5x_mbus_dram_info; | 72 | struct mbus_dram_target_info orion5x_mbus_dram_info; |
| 73 | static int __initdata win_alloc_count; | ||
| 73 | 74 | ||
| 74 | static int __init orion5x_cpu_win_can_remap(int win) | 75 | static int __init orion5x_cpu_win_can_remap(int win) |
| 75 | { | 76 | { |
| @@ -87,16 +88,22 @@ static int __init orion5x_cpu_win_can_remap(int win) | |||
| 87 | static void __init setup_cpu_win(int win, u32 base, u32 size, | 88 | static void __init setup_cpu_win(int win, u32 base, u32 size, |
| 88 | u8 target, u8 attr, int remap) | 89 | u8 target, u8 attr, int remap) |
| 89 | { | 90 | { |
| 90 | orion5x_write(CPU_WIN_BASE(win), base & 0xffff0000); | 91 | if (win >= 8) { |
| 91 | orion5x_write(CPU_WIN_CTRL(win), | 92 | printk(KERN_ERR "setup_cpu_win: trying to allocate " |
| 92 | ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1); | 93 | "window %d\n", win); |
| 94 | return; | ||
| 95 | } | ||
| 96 | |||
| 97 | writel(base & 0xffff0000, CPU_WIN_BASE(win)); | ||
| 98 | writel(((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1, | ||
| 99 | CPU_WIN_CTRL(win)); | ||
| 93 | 100 | ||
| 94 | if (orion5x_cpu_win_can_remap(win)) { | 101 | if (orion5x_cpu_win_can_remap(win)) { |
| 95 | if (remap < 0) | 102 | if (remap < 0) |
| 96 | remap = base; | 103 | remap = base; |
| 97 | 104 | ||
| 98 | orion5x_write(CPU_WIN_REMAP_LO(win), remap & 0xffff0000); | 105 | writel(remap & 0xffff0000, CPU_WIN_REMAP_LO(win)); |
| 99 | orion5x_write(CPU_WIN_REMAP_HI(win), 0); | 106 | writel(0, CPU_WIN_REMAP_HI(win)); |
| 100 | } | 107 | } |
| 101 | } | 108 | } |
| 102 | 109 | ||
| @@ -109,11 +116,11 @@ void __init orion5x_setup_cpu_mbus_bridge(void) | |||
| 109 | * First, disable and clear windows. | 116 | * First, disable and clear windows. |
| 110 | */ | 117 | */ |
| 111 | for (i = 0; i < 8; i++) { | 118 | for (i = 0; i < 8; i++) { |
| 112 | orion5x_write(CPU_WIN_BASE(i), 0); | 119 | writel(0, CPU_WIN_BASE(i)); |
| 113 | orion5x_write(CPU_WIN_CTRL(i), 0); | 120 | writel(0, CPU_WIN_CTRL(i)); |
| 114 | if (orion5x_cpu_win_can_remap(i)) { | 121 | if (orion5x_cpu_win_can_remap(i)) { |
| 115 | orion5x_write(CPU_WIN_REMAP_LO(i), 0); | 122 | writel(0, CPU_WIN_REMAP_LO(i)); |
| 116 | orion5x_write(CPU_WIN_REMAP_HI(i), 0); | 123 | writel(0, CPU_WIN_REMAP_HI(i)); |
| 117 | } | 124 | } |
| 118 | } | 125 | } |
| 119 | 126 | ||
| @@ -128,6 +135,7 @@ void __init orion5x_setup_cpu_mbus_bridge(void) | |||
| 128 | TARGET_PCIE, ATTR_PCIE_MEM, -1); | 135 | TARGET_PCIE, ATTR_PCIE_MEM, -1); |
| 129 | setup_cpu_win(3, ORION5X_PCI_MEM_PHYS_BASE, ORION5X_PCI_MEM_SIZE, | 136 | setup_cpu_win(3, ORION5X_PCI_MEM_PHYS_BASE, ORION5X_PCI_MEM_SIZE, |
| 130 | TARGET_PCI, ATTR_PCI_MEM, -1); | 137 | TARGET_PCI, ATTR_PCI_MEM, -1); |
| 138 | win_alloc_count = 4; | ||
| 131 | 139 | ||
| 132 | /* | 140 | /* |
| 133 | * Setup MBUS dram target info. | 141 | * Setup MBUS dram target info. |
| @@ -147,8 +155,8 @@ void __init orion5x_setup_cpu_mbus_bridge(void) | |||
| 147 | w = &orion5x_mbus_dram_info.cs[cs++]; | 155 | w = &orion5x_mbus_dram_info.cs[cs++]; |
| 148 | w->cs_index = i; | 156 | w->cs_index = i; |
| 149 | w->mbus_attr = 0xf & ~(1 << i); | 157 | w->mbus_attr = 0xf & ~(1 << i); |
| 150 | w->base = base & 0xff000000; | 158 | w->base = base & 0xffff0000; |
| 151 | w->size = (size | 0x00ffffff) + 1; | 159 | w->size = (size | 0x0000ffff) + 1; |
| 152 | } | 160 | } |
| 153 | } | 161 | } |
| 154 | orion5x_mbus_dram_info.num_cs = cs; | 162 | orion5x_mbus_dram_info.num_cs = cs; |
| @@ -156,25 +164,30 @@ void __init orion5x_setup_cpu_mbus_bridge(void) | |||
| 156 | 164 | ||
| 157 | void __init orion5x_setup_dev_boot_win(u32 base, u32 size) | 165 | void __init orion5x_setup_dev_boot_win(u32 base, u32 size) |
| 158 | { | 166 | { |
| 159 | setup_cpu_win(4, base, size, TARGET_DEV_BUS, ATTR_DEV_BOOT, -1); | 167 | setup_cpu_win(win_alloc_count++, base, size, |
| 168 | TARGET_DEV_BUS, ATTR_DEV_BOOT, -1); | ||
| 160 | } | 169 | } |
| 161 | 170 | ||
| 162 | void __init orion5x_setup_dev0_win(u32 base, u32 size) | 171 | void __init orion5x_setup_dev0_win(u32 base, u32 size) |
| 163 | { | 172 | { |
| 164 | setup_cpu_win(5, base, size, TARGET_DEV_BUS, ATTR_DEV_CS0, -1); | 173 | setup_cpu_win(win_alloc_count++, base, size, |
| 174 | TARGET_DEV_BUS, ATTR_DEV_CS0, -1); | ||
| 165 | } | 175 | } |
| 166 | 176 | ||
| 167 | void __init orion5x_setup_dev1_win(u32 base, u32 size) | 177 | void __init orion5x_setup_dev1_win(u32 base, u32 size) |
| 168 | { | 178 | { |
| 169 | setup_cpu_win(6, base, size, TARGET_DEV_BUS, ATTR_DEV_CS1, -1); | 179 | setup_cpu_win(win_alloc_count++, base, size, |
| 180 | TARGET_DEV_BUS, ATTR_DEV_CS1, -1); | ||
| 170 | } | 181 | } |
| 171 | 182 | ||
| 172 | void __init orion5x_setup_dev2_win(u32 base, u32 size) | 183 | void __init orion5x_setup_dev2_win(u32 base, u32 size) |
| 173 | { | 184 | { |
| 174 | setup_cpu_win(7, base, size, TARGET_DEV_BUS, ATTR_DEV_CS2, -1); | 185 | setup_cpu_win(win_alloc_count++, base, size, |
| 186 | TARGET_DEV_BUS, ATTR_DEV_CS2, -1); | ||
| 175 | } | 187 | } |
| 176 | 188 | ||
| 177 | void __init orion5x_setup_pcie_wa_win(u32 base, u32 size) | 189 | void __init orion5x_setup_pcie_wa_win(u32 base, u32 size) |
| 178 | { | 190 | { |
| 179 | setup_cpu_win(7, base, size, TARGET_PCIE, ATTR_PCIE_WA, -1); | 191 | setup_cpu_win(win_alloc_count++, base, size, |
| 192 | TARGET_PCIE, ATTR_PCIE_WA, -1); | ||
| 180 | } | 193 | } |
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 4f13fd037f04..faf4e3211918 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
| @@ -39,25 +39,22 @@ static struct map_desc orion5x_io_desc[] __initdata = { | |||
| 39 | .virtual = ORION5X_REGS_VIRT_BASE, | 39 | .virtual = ORION5X_REGS_VIRT_BASE, |
| 40 | .pfn = __phys_to_pfn(ORION5X_REGS_PHYS_BASE), | 40 | .pfn = __phys_to_pfn(ORION5X_REGS_PHYS_BASE), |
| 41 | .length = ORION5X_REGS_SIZE, | 41 | .length = ORION5X_REGS_SIZE, |
| 42 | .type = MT_DEVICE | 42 | .type = MT_DEVICE, |
| 43 | }, | 43 | }, { |
| 44 | { | ||
| 45 | .virtual = ORION5X_PCIE_IO_VIRT_BASE, | 44 | .virtual = ORION5X_PCIE_IO_VIRT_BASE, |
| 46 | .pfn = __phys_to_pfn(ORION5X_PCIE_IO_PHYS_BASE), | 45 | .pfn = __phys_to_pfn(ORION5X_PCIE_IO_PHYS_BASE), |
| 47 | .length = ORION5X_PCIE_IO_SIZE, | 46 | .length = ORION5X_PCIE_IO_SIZE, |
| 48 | .type = MT_DEVICE | 47 | .type = MT_DEVICE, |
| 49 | }, | 48 | }, { |
| 50 | { | ||
| 51 | .virtual = ORION5X_PCI_IO_VIRT_BASE, | 49 | .virtual = ORION5X_PCI_IO_VIRT_BASE, |
| 52 | .pfn = __phys_to_pfn(ORION5X_PCI_IO_PHYS_BASE), | 50 | .pfn = __phys_to_pfn(ORION5X_PCI_IO_PHYS_BASE), |
| 53 | .length = ORION5X_PCI_IO_SIZE, | 51 | .length = ORION5X_PCI_IO_SIZE, |
| 54 | .type = MT_DEVICE | 52 | .type = MT_DEVICE, |
| 55 | }, | 53 | }, { |
| 56 | { | ||
| 57 | .virtual = ORION5X_PCIE_WA_VIRT_BASE, | 54 | .virtual = ORION5X_PCIE_WA_VIRT_BASE, |
| 58 | .pfn = __phys_to_pfn(ORION5X_PCIE_WA_PHYS_BASE), | 55 | .pfn = __phys_to_pfn(ORION5X_PCIE_WA_PHYS_BASE), |
| 59 | .length = ORION5X_PCIE_WA_SIZE, | 56 | .length = ORION5X_PCIE_WA_SIZE, |
| 60 | .type = MT_DEVICE | 57 | .type = MT_DEVICE, |
| 61 | }, | 58 | }, |
| 62 | }; | 59 | }; |
| 63 | 60 | ||
| @@ -66,101 +63,32 @@ void __init orion5x_map_io(void) | |||
| 66 | iotable_init(orion5x_io_desc, ARRAY_SIZE(orion5x_io_desc)); | 63 | iotable_init(orion5x_io_desc, ARRAY_SIZE(orion5x_io_desc)); |
| 67 | } | 64 | } |
| 68 | 65 | ||
| 66 | |||
| 69 | /***************************************************************************** | 67 | /***************************************************************************** |
| 70 | * UART | 68 | * EHCI |
| 71 | ****************************************************************************/ | 69 | ****************************************************************************/ |
| 72 | 70 | static struct orion_ehci_data orion5x_ehci_data = { | |
| 73 | static struct resource orion5x_uart_resources[] = { | 71 | .dram = &orion5x_mbus_dram_info, |
| 74 | { | ||
| 75 | .start = UART0_PHYS_BASE, | ||
| 76 | .end = UART0_PHYS_BASE + 0xff, | ||
| 77 | .flags = IORESOURCE_MEM, | ||
| 78 | }, | ||
| 79 | { | ||
| 80 | .start = IRQ_ORION5X_UART0, | ||
| 81 | .end = IRQ_ORION5X_UART0, | ||
| 82 | .flags = IORESOURCE_IRQ, | ||
| 83 | }, | ||
| 84 | { | ||
| 85 | .start = UART1_PHYS_BASE, | ||
| 86 | .end = UART1_PHYS_BASE + 0xff, | ||
| 87 | .flags = IORESOURCE_MEM, | ||
| 88 | }, | ||
| 89 | { | ||
| 90 | .start = IRQ_ORION5X_UART1, | ||
| 91 | .end = IRQ_ORION5X_UART1, | ||
| 92 | .flags = IORESOURCE_IRQ, | ||
| 93 | }, | ||
| 94 | }; | ||
| 95 | |||
| 96 | static struct plat_serial8250_port orion5x_uart_data[] = { | ||
| 97 | { | ||
| 98 | .mapbase = UART0_PHYS_BASE, | ||
| 99 | .membase = (char *)UART0_VIRT_BASE, | ||
| 100 | .irq = IRQ_ORION5X_UART0, | ||
| 101 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 102 | .iotype = UPIO_MEM, | ||
| 103 | .regshift = 2, | ||
| 104 | .uartclk = ORION5X_TCLK, | ||
| 105 | }, | ||
| 106 | { | ||
| 107 | .mapbase = UART1_PHYS_BASE, | ||
| 108 | .membase = (char *)UART1_VIRT_BASE, | ||
| 109 | .irq = IRQ_ORION5X_UART1, | ||
| 110 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 111 | .iotype = UPIO_MEM, | ||
| 112 | .regshift = 2, | ||
| 113 | .uartclk = ORION5X_TCLK, | ||
| 114 | }, | ||
| 115 | { }, | ||
| 116 | }; | 72 | }; |
| 117 | 73 | ||
| 118 | static struct platform_device orion5x_uart = { | 74 | static u64 ehci_dmamask = 0xffffffffUL; |
| 119 | .name = "serial8250", | ||
| 120 | .id = PLAT8250_DEV_PLATFORM, | ||
| 121 | .dev = { | ||
| 122 | .platform_data = orion5x_uart_data, | ||
| 123 | }, | ||
| 124 | .resource = orion5x_uart_resources, | ||
| 125 | .num_resources = ARRAY_SIZE(orion5x_uart_resources), | ||
| 126 | }; | ||
| 127 | 75 | ||
| 128 | /******************************************************************************* | ||
| 129 | * USB Controller - 2 interfaces | ||
| 130 | ******************************************************************************/ | ||
| 131 | 76 | ||
| 77 | /***************************************************************************** | ||
| 78 | * EHCI0 | ||
| 79 | ****************************************************************************/ | ||
| 132 | static struct resource orion5x_ehci0_resources[] = { | 80 | static struct resource orion5x_ehci0_resources[] = { |
| 133 | { | 81 | { |
| 134 | .start = ORION5X_USB0_PHYS_BASE, | 82 | .start = ORION5X_USB0_PHYS_BASE, |
| 135 | .end = ORION5X_USB0_PHYS_BASE + SZ_4K - 1, | 83 | .end = ORION5X_USB0_PHYS_BASE + SZ_4K - 1, |
| 136 | .flags = IORESOURCE_MEM, | 84 | .flags = IORESOURCE_MEM, |
| 137 | }, | 85 | }, { |
| 138 | { | ||
| 139 | .start = IRQ_ORION5X_USB0_CTRL, | 86 | .start = IRQ_ORION5X_USB0_CTRL, |
| 140 | .end = IRQ_ORION5X_USB0_CTRL, | 87 | .end = IRQ_ORION5X_USB0_CTRL, |
| 141 | .flags = IORESOURCE_IRQ, | 88 | .flags = IORESOURCE_IRQ, |
| 142 | }, | 89 | }, |
| 143 | }; | 90 | }; |
| 144 | 91 | ||
| 145 | static struct resource orion5x_ehci1_resources[] = { | ||
| 146 | { | ||
| 147 | .start = ORION5X_USB1_PHYS_BASE, | ||
| 148 | .end = ORION5X_USB1_PHYS_BASE + SZ_4K - 1, | ||
| 149 | .flags = IORESOURCE_MEM, | ||
| 150 | }, | ||
| 151 | { | ||
| 152 | .start = IRQ_ORION5X_USB1_CTRL, | ||
| 153 | .end = IRQ_ORION5X_USB1_CTRL, | ||
| 154 | .flags = IORESOURCE_IRQ, | ||
| 155 | }, | ||
| 156 | }; | ||
| 157 | |||
| 158 | static struct orion_ehci_data orion5x_ehci_data = { | ||
| 159 | .dram = &orion5x_mbus_dram_info, | ||
| 160 | }; | ||
| 161 | |||
| 162 | static u64 ehci_dmamask = 0xffffffffUL; | ||
| 163 | |||
| 164 | static struct platform_device orion5x_ehci0 = { | 92 | static struct platform_device orion5x_ehci0 = { |
| 165 | .name = "orion-ehci", | 93 | .name = "orion-ehci", |
| 166 | .id = 0, | 94 | .id = 0, |
| @@ -173,6 +101,27 @@ static struct platform_device orion5x_ehci0 = { | |||
| 173 | .num_resources = ARRAY_SIZE(orion5x_ehci0_resources), | 101 | .num_resources = ARRAY_SIZE(orion5x_ehci0_resources), |
| 174 | }; | 102 | }; |
| 175 | 103 | ||
| 104 | void __init orion5x_ehci0_init(void) | ||
| 105 | { | ||
| 106 | platform_device_register(&orion5x_ehci0); | ||
| 107 | } | ||
| 108 | |||
| 109 | |||
| 110 | /***************************************************************************** | ||
| 111 | * EHCI1 | ||
| 112 | ****************************************************************************/ | ||
| 113 | static struct resource orion5x_ehci1_resources[] = { | ||
| 114 | { | ||
| 115 | .start = ORION5X_USB1_PHYS_BASE, | ||
| 116 | .end = ORION5X_USB1_PHYS_BASE + SZ_4K - 1, | ||
| 117 | .flags = IORESOURCE_MEM, | ||
| 118 | }, { | ||
| 119 | .start = IRQ_ORION5X_USB1_CTRL, | ||
| 120 | .end = IRQ_ORION5X_USB1_CTRL, | ||
| 121 | .flags = IORESOURCE_IRQ, | ||
| 122 | }, | ||
| 123 | }; | ||
| 124 | |||
| 176 | static struct platform_device orion5x_ehci1 = { | 125 | static struct platform_device orion5x_ehci1 = { |
| 177 | .name = "orion-ehci", | 126 | .name = "orion-ehci", |
| 178 | .id = 1, | 127 | .id = 1, |
| @@ -185,11 +134,15 @@ static struct platform_device orion5x_ehci1 = { | |||
| 185 | .num_resources = ARRAY_SIZE(orion5x_ehci1_resources), | 134 | .num_resources = ARRAY_SIZE(orion5x_ehci1_resources), |
| 186 | }; | 135 | }; |
| 187 | 136 | ||
| 137 | void __init orion5x_ehci1_init(void) | ||
| 138 | { | ||
| 139 | platform_device_register(&orion5x_ehci1); | ||
| 140 | } | ||
| 141 | |||
| 142 | |||
| 188 | /***************************************************************************** | 143 | /***************************************************************************** |
| 189 | * Gigabit Ethernet port | 144 | * GigE |
| 190 | * (The Orion and Discovery (MV643xx) families use the same Ethernet driver) | ||
| 191 | ****************************************************************************/ | 145 | ****************************************************************************/ |
| 192 | |||
| 193 | struct mv643xx_eth_shared_platform_data orion5x_eth_shared_data = { | 146 | struct mv643xx_eth_shared_platform_data orion5x_eth_shared_data = { |
| 194 | .dram = &orion5x_mbus_dram_info, | 147 | .dram = &orion5x_mbus_dram_info, |
| 195 | .t_clk = ORION5X_TCLK, | 148 | .t_clk = ORION5X_TCLK, |
| @@ -219,7 +172,7 @@ static struct resource orion5x_eth_resources[] = { | |||
| 219 | .start = IRQ_ORION5X_ETH_SUM, | 172 | .start = IRQ_ORION5X_ETH_SUM, |
| 220 | .end = IRQ_ORION5X_ETH_SUM, | 173 | .end = IRQ_ORION5X_ETH_SUM, |
| 221 | .flags = IORESOURCE_IRQ, | 174 | .flags = IORESOURCE_IRQ, |
| 222 | } | 175 | }, |
| 223 | }; | 176 | }; |
| 224 | 177 | ||
| 225 | static struct platform_device orion5x_eth = { | 178 | static struct platform_device orion5x_eth = { |
| @@ -238,11 +191,10 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) | |||
| 238 | platform_device_register(&orion5x_eth); | 191 | platform_device_register(&orion5x_eth); |
| 239 | } | 192 | } |
| 240 | 193 | ||
| 194 | |||
| 241 | /***************************************************************************** | 195 | /***************************************************************************** |
| 242 | * I2C controller | 196 | * I2C |
| 243 | * (The Orion and Discovery (MV643xx) families share the same I2C controller) | ||
| 244 | ****************************************************************************/ | 197 | ****************************************************************************/ |
| 245 | |||
| 246 | static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = { | 198 | static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = { |
| 247 | .freq_m = 8, /* assumes 166 MHz TCLK */ | 199 | .freq_m = 8, /* assumes 166 MHz TCLK */ |
| 248 | .freq_n = 3, | 200 | .freq_n = 3, |
| @@ -251,16 +203,15 @@ static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = { | |||
| 251 | 203 | ||
| 252 | static struct resource orion5x_i2c_resources[] = { | 204 | static struct resource orion5x_i2c_resources[] = { |
| 253 | { | 205 | { |
| 254 | .name = "i2c base", | 206 | .name = "i2c base", |
| 255 | .start = I2C_PHYS_BASE, | 207 | .start = I2C_PHYS_BASE, |
| 256 | .end = I2C_PHYS_BASE + 0x20 -1, | 208 | .end = I2C_PHYS_BASE + 0x1f, |
| 257 | .flags = IORESOURCE_MEM, | 209 | .flags = IORESOURCE_MEM, |
| 258 | }, | 210 | }, { |
| 259 | { | 211 | .name = "i2c irq", |
| 260 | .name = "i2c irq", | 212 | .start = IRQ_ORION5X_I2C, |
| 261 | .start = IRQ_ORION5X_I2C, | 213 | .end = IRQ_ORION5X_I2C, |
| 262 | .end = IRQ_ORION5X_I2C, | 214 | .flags = IORESOURCE_IRQ, |
| 263 | .flags = IORESOURCE_IRQ, | ||
| 264 | }, | 215 | }, |
| 265 | }; | 216 | }; |
| 266 | 217 | ||
| @@ -270,36 +221,41 @@ static struct platform_device orion5x_i2c = { | |||
| 270 | .num_resources = ARRAY_SIZE(orion5x_i2c_resources), | 221 | .num_resources = ARRAY_SIZE(orion5x_i2c_resources), |
| 271 | .resource = orion5x_i2c_resources, | 222 | .resource = orion5x_i2c_resources, |
| 272 | .dev = { | 223 | .dev = { |
| 273 | .platform_data = &orion5x_i2c_pdata, | 224 | .platform_data = &orion5x_i2c_pdata, |
| 274 | }, | 225 | }, |
| 275 | }; | 226 | }; |
| 276 | 227 | ||
| 228 | void __init orion5x_i2c_init(void) | ||
| 229 | { | ||
| 230 | platform_device_register(&orion5x_i2c); | ||
| 231 | } | ||
| 232 | |||
| 233 | |||
| 277 | /***************************************************************************** | 234 | /***************************************************************************** |
| 278 | * Sata port | 235 | * SATA |
| 279 | ****************************************************************************/ | 236 | ****************************************************************************/ |
| 280 | static struct resource orion5x_sata_resources[] = { | 237 | static struct resource orion5x_sata_resources[] = { |
| 281 | { | ||
| 282 | .name = "sata base", | ||
| 283 | .start = ORION5X_SATA_PHYS_BASE, | ||
| 284 | .end = ORION5X_SATA_PHYS_BASE + 0x5000 - 1, | ||
| 285 | .flags = IORESOURCE_MEM, | ||
| 286 | }, | ||
| 287 | { | 238 | { |
| 288 | .name = "sata irq", | 239 | .name = "sata base", |
| 289 | .start = IRQ_ORION5X_SATA, | 240 | .start = ORION5X_SATA_PHYS_BASE, |
| 290 | .end = IRQ_ORION5X_SATA, | 241 | .end = ORION5X_SATA_PHYS_BASE + 0x5000 - 1, |
| 291 | .flags = IORESOURCE_IRQ, | 242 | .flags = IORESOURCE_MEM, |
| 292 | }, | 243 | }, { |
| 244 | .name = "sata irq", | ||
| 245 | .start = IRQ_ORION5X_SATA, | ||
| 246 | .end = IRQ_ORION5X_SATA, | ||
| 247 | .flags = IORESOURCE_IRQ, | ||
| 248 | }, | ||
| 293 | }; | 249 | }; |
| 294 | 250 | ||
| 295 | static struct platform_device orion5x_sata = { | 251 | static struct platform_device orion5x_sata = { |
| 296 | .name = "sata_mv", | 252 | .name = "sata_mv", |
| 297 | .id = 0, | 253 | .id = 0, |
| 298 | .dev = { | 254 | .dev = { |
| 299 | .coherent_dma_mask = 0xffffffff, | 255 | .coherent_dma_mask = 0xffffffff, |
| 300 | }, | 256 | }, |
| 301 | .num_resources = ARRAY_SIZE(orion5x_sata_resources), | 257 | .num_resources = ARRAY_SIZE(orion5x_sata_resources), |
| 302 | .resource = orion5x_sata_resources, | 258 | .resource = orion5x_sata_resources, |
| 303 | }; | 259 | }; |
| 304 | 260 | ||
| 305 | void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data) | 261 | void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data) |
| @@ -309,23 +265,111 @@ void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data) | |||
| 309 | platform_device_register(&orion5x_sata); | 265 | platform_device_register(&orion5x_sata); |
| 310 | } | 266 | } |
| 311 | 267 | ||
| 268 | |||
| 312 | /***************************************************************************** | 269 | /***************************************************************************** |
| 313 | * Time handling | 270 | * UART0 |
| 271 | ****************************************************************************/ | ||
| 272 | static struct plat_serial8250_port orion5x_uart0_data[] = { | ||
| 273 | { | ||
| 274 | .mapbase = UART0_PHYS_BASE, | ||
| 275 | .membase = (char *)UART0_VIRT_BASE, | ||
| 276 | .irq = IRQ_ORION5X_UART0, | ||
| 277 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 278 | .iotype = UPIO_MEM, | ||
| 279 | .regshift = 2, | ||
| 280 | .uartclk = ORION5X_TCLK, | ||
| 281 | }, { | ||
| 282 | }, | ||
| 283 | }; | ||
| 284 | |||
| 285 | static struct resource orion5x_uart0_resources[] = { | ||
| 286 | { | ||
| 287 | .start = UART0_PHYS_BASE, | ||
| 288 | .end = UART0_PHYS_BASE + 0xff, | ||
| 289 | .flags = IORESOURCE_MEM, | ||
| 290 | }, { | ||
| 291 | .start = IRQ_ORION5X_UART0, | ||
| 292 | .end = IRQ_ORION5X_UART0, | ||
| 293 | .flags = IORESOURCE_IRQ, | ||
| 294 | }, | ||
| 295 | }; | ||
| 296 | |||
| 297 | static struct platform_device orion5x_uart0 = { | ||
| 298 | .name = "serial8250", | ||
| 299 | .id = PLAT8250_DEV_PLATFORM, | ||
| 300 | .dev = { | ||
| 301 | .platform_data = orion5x_uart0_data, | ||
| 302 | }, | ||
| 303 | .resource = orion5x_uart0_resources, | ||
| 304 | .num_resources = ARRAY_SIZE(orion5x_uart0_resources), | ||
| 305 | }; | ||
| 306 | |||
| 307 | void __init orion5x_uart0_init(void) | ||
| 308 | { | ||
| 309 | platform_device_register(&orion5x_uart0); | ||
| 310 | } | ||
| 311 | |||
| 312 | |||
| 313 | /***************************************************************************** | ||
| 314 | * UART1 | ||
| 314 | ****************************************************************************/ | 315 | ****************************************************************************/ |
| 316 | static struct plat_serial8250_port orion5x_uart1_data[] = { | ||
| 317 | { | ||
| 318 | .mapbase = UART1_PHYS_BASE, | ||
| 319 | .membase = (char *)UART1_VIRT_BASE, | ||
| 320 | .irq = IRQ_ORION5X_UART1, | ||
| 321 | .flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF, | ||
| 322 | .iotype = UPIO_MEM, | ||
| 323 | .regshift = 2, | ||
| 324 | .uartclk = ORION5X_TCLK, | ||
| 325 | }, { | ||
| 326 | }, | ||
| 327 | }; | ||
| 328 | |||
| 329 | static struct resource orion5x_uart1_resources[] = { | ||
| 330 | { | ||
| 331 | .start = UART1_PHYS_BASE, | ||
| 332 | .end = UART1_PHYS_BASE + 0xff, | ||
| 333 | .flags = IORESOURCE_MEM, | ||
| 334 | }, { | ||
| 335 | .start = IRQ_ORION5X_UART1, | ||
| 336 | .end = IRQ_ORION5X_UART1, | ||
| 337 | .flags = IORESOURCE_IRQ, | ||
| 338 | }, | ||
| 339 | }; | ||
| 340 | |||
| 341 | static struct platform_device orion5x_uart1 = { | ||
| 342 | .name = "serial8250", | ||
| 343 | .id = PLAT8250_DEV_PLATFORM1, | ||
| 344 | .dev = { | ||
| 345 | .platform_data = orion5x_uart1_data, | ||
| 346 | }, | ||
| 347 | .resource = orion5x_uart1_resources, | ||
| 348 | .num_resources = ARRAY_SIZE(orion5x_uart1_resources), | ||
| 349 | }; | ||
| 350 | |||
| 351 | void __init orion5x_uart1_init(void) | ||
| 352 | { | ||
| 353 | platform_device_register(&orion5x_uart1); | ||
| 354 | } | ||
| 355 | |||
| 315 | 356 | ||
| 357 | /***************************************************************************** | ||
| 358 | * Time handling | ||
| 359 | ****************************************************************************/ | ||
| 316 | static void orion5x_timer_init(void) | 360 | static void orion5x_timer_init(void) |
| 317 | { | 361 | { |
| 318 | orion_time_init(IRQ_ORION5X_BRIDGE, ORION5X_TCLK); | 362 | orion_time_init(IRQ_ORION5X_BRIDGE, ORION5X_TCLK); |
| 319 | } | 363 | } |
| 320 | 364 | ||
| 321 | struct sys_timer orion5x_timer = { | 365 | struct sys_timer orion5x_timer = { |
| 322 | .init = orion5x_timer_init, | 366 | .init = orion5x_timer_init, |
| 323 | }; | 367 | }; |
| 324 | 368 | ||
| 369 | |||
| 325 | /***************************************************************************** | 370 | /***************************************************************************** |
| 326 | * General | 371 | * General |
| 327 | ****************************************************************************/ | 372 | ****************************************************************************/ |
| 328 | |||
| 329 | /* | 373 | /* |
| 330 | * Identify device ID and rev from PCIe configuration header space '0'. | 374 | * Identify device ID and rev from PCIe configuration header space '0'. |
| 331 | */ | 375 | */ |
| @@ -350,8 +394,10 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name) | |||
| 350 | } else if (*dev == MV88F5181_DEV_ID) { | 394 | } else if (*dev == MV88F5181_DEV_ID) { |
| 351 | if (*rev == MV88F5181_REV_B1) { | 395 | if (*rev == MV88F5181_REV_B1) { |
| 352 | *dev_name = "MV88F5181-Rev-B1"; | 396 | *dev_name = "MV88F5181-Rev-B1"; |
| 397 | } else if (*rev == MV88F5181L_REV_A1) { | ||
| 398 | *dev_name = "MV88F5181L-Rev-A1"; | ||
| 353 | } else { | 399 | } else { |
| 354 | *dev_name = "MV88F5181-Rev-Unsupported"; | 400 | *dev_name = "MV88F5181(L)-Rev-Unsupported"; |
| 355 | } | 401 | } |
| 356 | } else { | 402 | } else { |
| 357 | *dev_name = "Device-Unknown"; | 403 | *dev_name = "Device-Unknown"; |
| @@ -370,15 +416,6 @@ void __init orion5x_init(void) | |||
| 370 | * Setup Orion address map | 416 | * Setup Orion address map |
| 371 | */ | 417 | */ |
| 372 | orion5x_setup_cpu_mbus_bridge(); | 418 | orion5x_setup_cpu_mbus_bridge(); |
| 373 | |||
| 374 | /* | ||
| 375 | * Register devices. | ||
| 376 | */ | ||
| 377 | platform_device_register(&orion5x_uart); | ||
| 378 | platform_device_register(&orion5x_ehci0); | ||
| 379 | if (dev == MV88F5182_DEV_ID) | ||
| 380 | platform_device_register(&orion5x_ehci1); | ||
| 381 | platform_device_register(&orion5x_i2c); | ||
| 382 | } | 419 | } |
| 383 | 420 | ||
| 384 | /* | 421 | /* |
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index bd0f05de6e18..f72cf0e77544 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h | |||
| @@ -1,10 +1,12 @@ | |||
| 1 | #ifndef __ARCH_ORION5X_COMMON_H | 1 | #ifndef __ARCH_ORION5X_COMMON_H |
| 2 | #define __ARCH_ORION5X_COMMON_H | 2 | #define __ARCH_ORION5X_COMMON_H |
| 3 | 3 | ||
| 4 | struct mv643xx_eth_platform_data; | ||
| 5 | struct mv_sata_platform_data; | ||
| 6 | |||
| 4 | /* | 7 | /* |
| 5 | * Basic Orion init functions used early by machine-setup. | 8 | * Basic Orion init functions used early by machine-setup. |
| 6 | */ | 9 | */ |
| 7 | |||
| 8 | void orion5x_map_io(void); | 10 | void orion5x_map_io(void); |
| 9 | void orion5x_init_irq(void); | 11 | void orion5x_init_irq(void); |
| 10 | void orion5x_init(void); | 12 | void orion5x_init(void); |
| @@ -23,15 +25,22 @@ void orion5x_setup_dev1_win(u32 base, u32 size); | |||
| 23 | void orion5x_setup_dev2_win(u32 base, u32 size); | 25 | void orion5x_setup_dev2_win(u32 base, u32 size); |
| 24 | void orion5x_setup_pcie_wa_win(u32 base, u32 size); | 26 | void orion5x_setup_pcie_wa_win(u32 base, u32 size); |
| 25 | 27 | ||
| 28 | void orion5x_ehci0_init(void); | ||
| 29 | void orion5x_ehci1_init(void); | ||
| 30 | void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 31 | void orion5x_i2c_init(void); | ||
| 32 | void orion5x_sata_init(struct mv_sata_platform_data *sata_data); | ||
| 33 | void orion5x_uart0_init(void); | ||
| 34 | void orion5x_uart1_init(void); | ||
| 35 | |||
| 26 | /* | 36 | /* |
| 27 | * Shared code used internally by other Orion core functions. | 37 | * PCIe/PCI functions. |
| 28 | * (/mach-orion/pci.c) | ||
| 29 | */ | 38 | */ |
| 30 | |||
| 31 | struct pci_sys_data; | ||
| 32 | struct pci_bus; | 39 | struct pci_bus; |
| 40 | struct pci_sys_data; | ||
| 33 | 41 | ||
| 34 | void orion5x_pcie_id(u32 *dev, u32 *rev); | 42 | void orion5x_pcie_id(u32 *dev, u32 *rev); |
| 43 | void orion5x_pci_set_cardbus_mode(void); | ||
| 35 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); | 44 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); |
| 36 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); | 45 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); |
| 37 | int orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); | 46 | int orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); |
| @@ -40,26 +49,9 @@ int orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); | |||
| 40 | * Valid GPIO pins according to MPP setup, used by machine-setup. | 49 | * Valid GPIO pins according to MPP setup, used by machine-setup. |
| 41 | * (/mach-orion/gpio.c). | 50 | * (/mach-orion/gpio.c). |
| 42 | */ | 51 | */ |
| 43 | 52 | void orion5x_gpio_set_valid(unsigned pin, int valid); | |
| 44 | void orion5x_gpio_set_valid_pins(u32 pins); | ||
| 45 | void gpio_display(void); /* debug */ | 53 | void gpio_display(void); /* debug */ |
| 46 | 54 | ||
| 47 | /* | ||
| 48 | * Pull in Orion Ethernet platform_data, used by machine-setup | ||
| 49 | */ | ||
| 50 | |||
| 51 | struct mv643xx_eth_platform_data; | ||
| 52 | |||
| 53 | void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data); | ||
| 54 | |||
| 55 | /* | ||
| 56 | * Orion Sata platform_data, used by machine-setup | ||
| 57 | */ | ||
| 58 | |||
| 59 | struct mv_sata_platform_data; | ||
| 60 | |||
| 61 | void orion5x_sata_init(struct mv_sata_platform_data *sata_data); | ||
| 62 | |||
| 63 | struct machine_desc; | 55 | struct machine_desc; |
| 64 | struct meminfo; | 56 | struct meminfo; |
| 65 | struct tag; | 57 | struct tag; |
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index 44c64342dacb..88405e74e5e3 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <asm/arch/orion5x.h> | 27 | #include <asm/arch/orion5x.h> |
| 28 | #include <asm/plat-orion/orion_nand.h> | 28 | #include <asm/plat-orion/orion_nand.h> |
| 29 | #include "common.h" | 29 | #include "common.h" |
| 30 | #include "mpp.h" | ||
| 30 | 31 | ||
| 31 | /***************************************************************************** | 32 | /***************************************************************************** |
| 32 | * DB-88F5281 on board devices | 33 | * DB-88F5281 on board devices |
| @@ -86,7 +87,7 @@ static struct platform_device db88f5281_boot_flash = { | |||
| 86 | .name = "physmap-flash", | 87 | .name = "physmap-flash", |
| 87 | .id = 0, | 88 | .id = 0, |
| 88 | .dev = { | 89 | .dev = { |
| 89 | .platform_data = &db88f5281_boot_flash_data, | 90 | .platform_data = &db88f5281_boot_flash_data, |
| 90 | }, | 91 | }, |
| 91 | .num_resources = 1, | 92 | .num_resources = 1, |
| 92 | .resource = &db88f5281_boot_flash_resource, | 93 | .resource = &db88f5281_boot_flash_resource, |
| @@ -110,7 +111,7 @@ static struct platform_device db88f5281_nor_flash = { | |||
| 110 | .name = "physmap-flash", | 111 | .name = "physmap-flash", |
| 111 | .id = 1, | 112 | .id = 1, |
| 112 | .dev = { | 113 | .dev = { |
| 113 | .platform_data = &db88f5281_nor_flash_data, | 114 | .platform_data = &db88f5281_nor_flash_data, |
| 114 | }, | 115 | }, |
| 115 | .num_resources = 1, | 116 | .num_resources = 1, |
| 116 | .resource = &db88f5281_nor_flash_resource, | 117 | .resource = &db88f5281_nor_flash_resource, |
| @@ -125,18 +126,15 @@ static struct mtd_partition db88f5281_nand_parts[] = { | |||
| 125 | .name = "kernel", | 126 | .name = "kernel", |
| 126 | .offset = 0, | 127 | .offset = 0, |
| 127 | .size = SZ_2M, | 128 | .size = SZ_2M, |
| 128 | }, | 129 | }, { |
| 129 | { | ||
| 130 | .name = "root", | 130 | .name = "root", |
| 131 | .offset = SZ_2M, | 131 | .offset = SZ_2M, |
| 132 | .size = (SZ_16M - SZ_2M), | 132 | .size = (SZ_16M - SZ_2M), |
| 133 | }, | 133 | }, { |
| 134 | { | ||
| 135 | .name = "user", | 134 | .name = "user", |
| 136 | .offset = SZ_16M, | 135 | .offset = SZ_16M, |
| 137 | .size = SZ_8M, | 136 | .size = SZ_8M, |
| 138 | }, | 137 | }, { |
| 139 | { | ||
| 140 | .name = "recovery", | 138 | .name = "recovery", |
| 141 | .offset = (SZ_16M + SZ_8M), | 139 | .offset = (SZ_16M + SZ_8M), |
| 142 | .size = SZ_8M, | 140 | .size = SZ_8M, |
| @@ -288,7 +286,6 @@ subsys_initcall(db88f5281_pci_init); | |||
| 288 | ****************************************************************************/ | 286 | ****************************************************************************/ |
| 289 | static struct mv643xx_eth_platform_data db88f5281_eth_data = { | 287 | static struct mv643xx_eth_platform_data db88f5281_eth_data = { |
| 290 | .phy_addr = 8, | 288 | .phy_addr = 8, |
| 291 | .force_phy_addr = 1, | ||
| 292 | }; | 289 | }; |
| 293 | 290 | ||
| 294 | /***************************************************************************** | 291 | /***************************************************************************** |
| @@ -301,11 +298,28 @@ static struct i2c_board_info __initdata db88f5281_i2c_rtc = { | |||
| 301 | /***************************************************************************** | 298 | /***************************************************************************** |
| 302 | * General Setup | 299 | * General Setup |
| 303 | ****************************************************************************/ | 300 | ****************************************************************************/ |
| 304 | 301 | static struct orion5x_mpp_mode db88f5281_mpp_modes[] __initdata = { | |
| 305 | static struct platform_device *db88f5281_devs[] __initdata = { | 302 | { 0, MPP_GPIO }, /* USB Over Current */ |
| 306 | &db88f5281_boot_flash, | 303 | { 1, MPP_GPIO }, /* USB Vbat input */ |
| 307 | &db88f5281_nor_flash, | 304 | { 2, MPP_PCI_ARB }, /* PCI_REQn[2] */ |
| 308 | &db88f5281_nand_flash, | 305 | { 3, MPP_PCI_ARB }, /* PCI_GNTn[2] */ |
| 306 | { 4, MPP_PCI_ARB }, /* PCI_REQn[3] */ | ||
| 307 | { 5, MPP_PCI_ARB }, /* PCI_GNTn[3] */ | ||
| 308 | { 6, MPP_GPIO }, /* JP0, CON17.2 */ | ||
| 309 | { 7, MPP_GPIO }, /* JP1, CON17.1 */ | ||
| 310 | { 8, MPP_GPIO }, /* JP2, CON11.2 */ | ||
| 311 | { 9, MPP_GPIO }, /* JP3, CON11.3 */ | ||
| 312 | { 10, MPP_GPIO }, /* RTC int */ | ||
| 313 | { 11, MPP_GPIO }, /* Baud Rate Generator */ | ||
| 314 | { 12, MPP_GPIO }, /* PCI int 1 */ | ||
| 315 | { 13, MPP_GPIO }, /* PCI int 2 */ | ||
| 316 | { 14, MPP_NAND }, /* NAND_REn[2] */ | ||
| 317 | { 15, MPP_NAND }, /* NAND_WEn[2] */ | ||
| 318 | { 16, MPP_UART }, /* UART1_RX */ | ||
| 319 | { 17, MPP_UART }, /* UART1_TX */ | ||
| 320 | { 18, MPP_UART }, /* UART1_CTSn */ | ||
| 321 | { 19, MPP_UART }, /* UART1_RTSn */ | ||
| 322 | { -1 }, | ||
| 309 | }; | 323 | }; |
| 310 | 324 | ||
| 311 | static void __init db88f5281_init(void) | 325 | static void __init db88f5281_init(void) |
| @@ -315,39 +329,31 @@ static void __init db88f5281_init(void) | |||
| 315 | */ | 329 | */ |
| 316 | orion5x_init(); | 330 | orion5x_init(); |
| 317 | 331 | ||
| 332 | orion5x_mpp_conf(db88f5281_mpp_modes); | ||
| 333 | writel(0, MPP_DEV_CTRL); /* DEV_D[31:16] */ | ||
| 334 | |||
| 318 | /* | 335 | /* |
| 319 | * Setup the CPU address decode windows for our on-board devices | 336 | * Configure peripherals. |
| 320 | */ | 337 | */ |
| 338 | orion5x_ehci0_init(); | ||
| 339 | orion5x_eth_init(&db88f5281_eth_data); | ||
| 340 | orion5x_i2c_init(); | ||
| 341 | orion5x_uart0_init(); | ||
| 342 | orion5x_uart1_init(); | ||
| 343 | |||
| 321 | orion5x_setup_dev_boot_win(DB88F5281_NOR_BOOT_BASE, | 344 | orion5x_setup_dev_boot_win(DB88F5281_NOR_BOOT_BASE, |
| 322 | DB88F5281_NOR_BOOT_SIZE); | 345 | DB88F5281_NOR_BOOT_SIZE); |
| 346 | platform_device_register(&db88f5281_boot_flash); | ||
| 347 | |||
| 323 | orion5x_setup_dev0_win(DB88F5281_7SEG_BASE, DB88F5281_7SEG_SIZE); | 348 | orion5x_setup_dev0_win(DB88F5281_7SEG_BASE, DB88F5281_7SEG_SIZE); |
| 324 | orion5x_setup_dev1_win(DB88F5281_NOR_BASE, DB88F5281_NOR_SIZE); | ||
| 325 | orion5x_setup_dev2_win(DB88F5281_NAND_BASE, DB88F5281_NAND_SIZE); | ||
| 326 | 349 | ||
| 327 | /* | 350 | orion5x_setup_dev1_win(DB88F5281_NOR_BASE, DB88F5281_NOR_SIZE); |
| 328 | * Setup Multiplexing Pins: | 351 | platform_device_register(&db88f5281_nor_flash); |
| 329 | * MPP0: GPIO (USB Over Current) MPP1: GPIO (USB Vbat input) | ||
| 330 | * MPP2: PCI_REQn[2] MPP3: PCI_GNTn[2] | ||
| 331 | * MPP4: PCI_REQn[3] MPP5: PCI_GNTn[3] | ||
| 332 | * MPP6: GPIO (JP0, CON17.2) MPP7: GPIO (JP1, CON17.1) | ||
| 333 | * MPP8: GPIO (JP2, CON11.2) MPP9: GPIO (JP3, CON11.3) | ||
| 334 | * MPP10: GPIO (RTC int) MPP11: GPIO (Baud Rate Generator) | ||
| 335 | * MPP12: GPIO (PCI int 1) MPP13: GPIO (PCI int 2) | ||
| 336 | * MPP14: NAND_REn[2] MPP15: NAND_WEn[2] | ||
| 337 | * MPP16: UART1_RX MPP17: UART1_TX | ||
| 338 | * MPP18: UART1_CTS MPP19: UART1_RTS | ||
| 339 | * MPP-DEV: DEV_D[16:31] | ||
| 340 | */ | ||
| 341 | orion5x_write(MPP_0_7_CTRL, 0x00222203); | ||
| 342 | orion5x_write(MPP_8_15_CTRL, 0x44000000); | ||
| 343 | orion5x_write(MPP_16_19_CTRL, 0); | ||
| 344 | orion5x_write(MPP_DEV_CTRL, 0); | ||
| 345 | 352 | ||
| 346 | orion5x_gpio_set_valid_pins(0x00003fc3); | 353 | orion5x_setup_dev2_win(DB88F5281_NAND_BASE, DB88F5281_NAND_SIZE); |
| 354 | platform_device_register(&db88f5281_nand_flash); | ||
| 347 | 355 | ||
| 348 | platform_add_devices(db88f5281_devs, ARRAY_SIZE(db88f5281_devs)); | ||
| 349 | i2c_register_board_info(0, &db88f5281_i2c_rtc, 1); | 356 | i2c_register_board_info(0, &db88f5281_i2c_rtc, 1); |
| 350 | orion5x_eth_init(&db88f5281_eth_data); | ||
| 351 | } | 357 | } |
| 352 | 358 | ||
| 353 | MACHINE_START(DB88F5281, "Marvell Orion-2 Development Board") | 359 | MACHINE_START(DB88F5281, "Marvell Orion-2 Development Board") |
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index 27ce967ab9e5..3791ca6f001a 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <asm/mach/pci.h> | 27 | #include <asm/mach/pci.h> |
| 28 | #include <asm/arch/orion5x.h> | 28 | #include <asm/arch/orion5x.h> |
| 29 | #include "common.h" | 29 | #include "common.h" |
| 30 | #include "mpp.h" | ||
| 30 | 31 | ||
| 31 | #define DNS323_GPIO_LED_RIGHT_AMBER 1 | 32 | #define DNS323_GPIO_LED_RIGHT_AMBER 1 |
| 32 | #define DNS323_GPIO_LED_LEFT_AMBER 2 | 33 | #define DNS323_GPIO_LED_LEFT_AMBER 2 |
| @@ -52,8 +53,6 @@ static int __init dns323_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
| 52 | if (irq != -1) | 53 | if (irq != -1) |
| 53 | return irq; | 54 | return irq; |
| 54 | 55 | ||
| 55 | pr_err("%s: requested mapping for unknown device\n", __func__); | ||
| 56 | |||
| 57 | return -1; | 56 | return -1; |
| 58 | } | 57 | } |
| 59 | 58 | ||
| @@ -81,7 +80,6 @@ subsys_initcall(dns323_pci_init); | |||
| 81 | 80 | ||
| 82 | static struct mv643xx_eth_platform_data dns323_eth_data = { | 81 | static struct mv643xx_eth_platform_data dns323_eth_data = { |
| 83 | .phy_addr = 8, | 82 | .phy_addr = 8, |
| 84 | .force_phy_addr = 1, | ||
| 85 | }; | 83 | }; |
| 86 | 84 | ||
| 87 | /**************************************************************************** | 85 | /**************************************************************************** |
| @@ -119,7 +117,7 @@ static struct mtd_partition dns323_partitions[] = { | |||
| 119 | .name = "u-boot", | 117 | .name = "u-boot", |
| 120 | .size = 0x00030000, | 118 | .size = 0x00030000, |
| 121 | .offset = 0x007d0000, | 119 | .offset = 0x007d0000, |
| 122 | } | 120 | }, |
| 123 | }; | 121 | }; |
| 124 | 122 | ||
| 125 | static struct physmap_flash_data dns323_nor_flash_data = { | 123 | static struct physmap_flash_data dns323_nor_flash_data = { |
| @@ -137,7 +135,9 @@ static struct resource dns323_nor_flash_resource = { | |||
| 137 | static struct platform_device dns323_nor_flash = { | 135 | static struct platform_device dns323_nor_flash = { |
| 138 | .name = "physmap-flash", | 136 | .name = "physmap-flash", |
| 139 | .id = 0, | 137 | .id = 0, |
| 140 | .dev = { .platform_data = &dns323_nor_flash_data, }, | 138 | .dev = { |
| 139 | .platform_data = &dns323_nor_flash_data, | ||
| 140 | }, | ||
| 141 | .resource = &dns323_nor_flash_resource, | 141 | .resource = &dns323_nor_flash_resource, |
| 142 | .num_resources = 1, | 142 | .num_resources = 1, |
| 143 | }; | 143 | }; |
| @@ -170,7 +170,9 @@ static struct gpio_led_platform_data dns323_led_data = { | |||
| 170 | static struct platform_device dns323_gpio_leds = { | 170 | static struct platform_device dns323_gpio_leds = { |
| 171 | .name = "leds-gpio", | 171 | .name = "leds-gpio", |
| 172 | .id = -1, | 172 | .id = -1, |
| 173 | .dev = { .platform_data = &dns323_led_data, }, | 173 | .dev = { |
| 174 | .platform_data = &dns323_led_data, | ||
| 175 | }, | ||
| 174 | }; | 176 | }; |
| 175 | 177 | ||
| 176 | /**************************************************************************** | 178 | /**************************************************************************** |
| @@ -183,35 +185,53 @@ static struct gpio_keys_button dns323_buttons[] = { | |||
| 183 | .gpio = DNS323_GPIO_KEY_RESET, | 185 | .gpio = DNS323_GPIO_KEY_RESET, |
| 184 | .desc = "Reset Button", | 186 | .desc = "Reset Button", |
| 185 | .active_low = 1, | 187 | .active_low = 1, |
| 186 | }, | 188 | }, { |
| 187 | { | ||
| 188 | .code = KEY_POWER, | 189 | .code = KEY_POWER, |
| 189 | .gpio = DNS323_GPIO_KEY_POWER, | 190 | .gpio = DNS323_GPIO_KEY_POWER, |
| 190 | .desc = "Power Button", | 191 | .desc = "Power Button", |
| 191 | .active_low = 1, | 192 | .active_low = 1, |
| 192 | } | 193 | }, |
| 193 | }; | 194 | }; |
| 194 | 195 | ||
| 195 | static struct gpio_keys_platform_data dns323_button_data = { | 196 | static struct gpio_keys_platform_data dns323_button_data = { |
| 196 | .buttons = dns323_buttons, | 197 | .buttons = dns323_buttons, |
| 197 | .nbuttons = ARRAY_SIZE(dns323_buttons), | 198 | .nbuttons = ARRAY_SIZE(dns323_buttons), |
| 198 | }; | 199 | }; |
| 199 | 200 | ||
| 200 | static struct platform_device dns323_button_device = { | 201 | static struct platform_device dns323_button_device = { |
| 201 | .name = "gpio-keys", | 202 | .name = "gpio-keys", |
| 202 | .id = -1, | 203 | .id = -1, |
| 203 | .num_resources = 0, | 204 | .num_resources = 0, |
| 204 | .dev = { .platform_data = &dns323_button_data, }, | 205 | .dev = { |
| 206 | .platform_data = &dns323_button_data, | ||
| 207 | }, | ||
| 205 | }; | 208 | }; |
| 206 | 209 | ||
| 207 | /**************************************************************************** | 210 | /**************************************************************************** |
| 208 | * General Setup | 211 | * General Setup |
| 209 | */ | 212 | */ |
| 210 | 213 | static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = { | |
| 211 | static struct platform_device *dns323_plat_devices[] __initdata = { | 214 | { 0, MPP_PCIE_RST_OUTn }, |
| 212 | &dns323_nor_flash, | 215 | { 1, MPP_GPIO }, /* right amber LED (sata ch0) */ |
| 213 | &dns323_gpio_leds, | 216 | { 2, MPP_GPIO }, /* left amber LED (sata ch1) */ |
| 214 | &dns323_button_device, | 217 | { 3, MPP_UNUSED }, |
| 218 | { 4, MPP_GPIO }, /* power button LED */ | ||
| 219 | { 5, MPP_GPIO }, /* power button LED */ | ||
| 220 | { 6, MPP_GPIO }, /* GMT G751-2f overtemp */ | ||
| 221 | { 7, MPP_GPIO }, /* M41T80 nIRQ/OUT/SQW */ | ||
| 222 | { 8, MPP_GPIO }, /* triggers power off */ | ||
| 223 | { 9, MPP_GPIO }, /* power button switch */ | ||
| 224 | { 10, MPP_GPIO }, /* reset button switch */ | ||
| 225 | { 11, MPP_UNUSED }, | ||
| 226 | { 12, MPP_UNUSED }, | ||
| 227 | { 13, MPP_UNUSED }, | ||
| 228 | { 14, MPP_UNUSED }, | ||
| 229 | { 15, MPP_UNUSED }, | ||
| 230 | { 16, MPP_UNUSED }, | ||
| 231 | { 17, MPP_UNUSED }, | ||
| 232 | { 18, MPP_UNUSED }, | ||
| 233 | { 19, MPP_UNUSED }, | ||
| 234 | { -1 }, | ||
| 215 | }; | 235 | }; |
| 216 | 236 | ||
| 217 | /* | 237 | /* |
| @@ -225,17 +245,15 @@ static struct platform_device *dns323_plat_devices[] __initdata = { | |||
| 225 | static struct i2c_board_info __initdata dns323_i2c_devices[] = { | 245 | static struct i2c_board_info __initdata dns323_i2c_devices[] = { |
| 226 | { | 246 | { |
| 227 | I2C_BOARD_INFO("g760a", 0x3e), | 247 | I2C_BOARD_INFO("g760a", 0x3e), |
| 228 | }, | ||
| 229 | #if 0 | 248 | #if 0 |
| 230 | /* this entry requires the new-style driver model lm75 driver, | 249 | /* this entry requires the new-style driver model lm75 driver, |
| 231 | * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */ | 250 | * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */ |
| 232 | { | 251 | }, { |
| 233 | I2C_BOARD_INFO("g751", 0x48), | 252 | I2C_BOARD_INFO("g751", 0x48), |
| 234 | }, | ||
| 235 | #endif | 253 | #endif |
| 236 | { | 254 | }, { |
| 237 | I2C_BOARD_INFO("m41t80", 0x68), | 255 | I2C_BOARD_INFO("m41t80", 0x68), |
| 238 | } | 256 | }, |
| 239 | }; | 257 | }; |
| 240 | 258 | ||
| 241 | /* DNS-323 specific power off method */ | 259 | /* DNS-323 specific power off method */ |
| @@ -250,62 +268,35 @@ static void __init dns323_init(void) | |||
| 250 | /* Setup basic Orion functions. Need to be called early. */ | 268 | /* Setup basic Orion functions. Need to be called early. */ |
| 251 | orion5x_init(); | 269 | orion5x_init(); |
| 252 | 270 | ||
| 271 | orion5x_mpp_conf(dns323_mpp_modes); | ||
| 272 | writel(0, MPP_DEV_CTRL); /* DEV_D[31:16] */ | ||
| 273 | |||
| 274 | /* | ||
| 275 | * Configure peripherals. | ||
| 276 | */ | ||
| 277 | orion5x_ehci0_init(); | ||
| 278 | orion5x_eth_init(&dns323_eth_data); | ||
| 279 | orion5x_i2c_init(); | ||
| 280 | orion5x_uart0_init(); | ||
| 281 | |||
| 253 | /* setup flash mapping | 282 | /* setup flash mapping |
| 254 | * CS3 holds a 8 MB Spansion S29GL064M90TFIR4 | 283 | * CS3 holds a 8 MB Spansion S29GL064M90TFIR4 |
| 255 | */ | 284 | */ |
| 256 | orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE); | 285 | orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE); |
| 286 | platform_device_register(&dns323_nor_flash); | ||
| 257 | 287 | ||
| 258 | /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIe | 288 | platform_device_register(&dns323_gpio_leds); |
| 259 | * | ||
| 260 | * Open a special address decode windows for the PCIe WA. | ||
| 261 | */ | ||
| 262 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | ||
| 263 | ORION5X_PCIE_WA_SIZE); | ||
| 264 | |||
| 265 | /* set MPP to 0 as D-Link's 2.6.12.6 kernel did */ | ||
| 266 | orion5x_write(MPP_0_7_CTRL, 0); | ||
| 267 | orion5x_write(MPP_8_15_CTRL, 0); | ||
| 268 | orion5x_write(MPP_16_19_CTRL, 0); | ||
| 269 | orion5x_write(MPP_DEV_CTRL, 0); | ||
| 270 | |||
| 271 | /* Define used GPIO pins | ||
| 272 | |||
| 273 | GPIO Map: | ||
| 274 | |||
| 275 | | 0 | | PEX_RST_OUT (not controlled by GPIO) | ||
| 276 | | 1 | Out | right amber LED (= sata ch0 LED) (low-active) | ||
| 277 | | 2 | Out | left amber LED (= sata ch1 LED) (low-active) | ||
| 278 | | 3 | Out | //unknown// | ||
| 279 | | 4 | Out | power button LED (low-active, together with pin #5) | ||
| 280 | | 5 | Out | power button LED (low-active, together with pin #4) | ||
| 281 | | 6 | In | GMT G751-2f overtemp. shutdown signal (low-active) | ||
| 282 | | 7 | In | M41T80 nIRQ/OUT/SQW signal | ||
| 283 | | 8 | Out | triggers power off (high-active) | ||
| 284 | | 9 | In | power button switch (low-active) | ||
| 285 | | 10 | In | reset button switch (low-active) | ||
| 286 | | 11 | Out | //unknown// | ||
| 287 | | 12 | Out | //unknown// | ||
| 288 | | 13 | Out | //unknown// | ||
| 289 | | 14 | Out | //unknown// | ||
| 290 | | 15 | Out | //unknown// | ||
| 291 | */ | ||
| 292 | orion5x_gpio_set_valid_pins(0x07f6); | ||
| 293 | |||
| 294 | /* register dns323 specific power-off method */ | ||
| 295 | if ((gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0) | ||
| 296 | || (gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)) | ||
| 297 | pr_err("DNS323: failed to setup power-off GPIO\n"); | ||
| 298 | |||
| 299 | pm_power_off = dns323_power_off; | ||
| 300 | 289 | ||
| 301 | /* register flash and other platform devices */ | 290 | platform_device_register(&dns323_button_device); |
| 302 | platform_add_devices(dns323_plat_devices, | ||
| 303 | ARRAY_SIZE(dns323_plat_devices)); | ||
| 304 | 291 | ||
| 305 | i2c_register_board_info(0, dns323_i2c_devices, | 292 | i2c_register_board_info(0, dns323_i2c_devices, |
| 306 | ARRAY_SIZE(dns323_i2c_devices)); | 293 | ARRAY_SIZE(dns323_i2c_devices)); |
| 307 | 294 | ||
| 308 | orion5x_eth_init(&dns323_eth_data); | 295 | /* register dns323 specific power-off method */ |
| 296 | if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 || | ||
| 297 | gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0) | ||
| 298 | pr_err("DNS323: failed to setup power-off GPIO\n"); | ||
| 299 | pm_power_off = dns323_power_off; | ||
| 309 | } | 300 | } |
| 310 | 301 | ||
| 311 | /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */ | 302 | /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */ |
diff --git a/arch/arm/mach-orion5x/gpio.c b/arch/arm/mach-orion5x/gpio.c index 8108c316c426..d09797990f41 100644 --- a/arch/arm/mach-orion5x/gpio.c +++ b/arch/arm/mach-orion5x/gpio.c | |||
| @@ -24,9 +24,12 @@ static DEFINE_SPINLOCK(gpio_lock); | |||
| 24 | static unsigned long gpio_valid[BITS_TO_LONGS(GPIO_MAX)]; | 24 | static unsigned long gpio_valid[BITS_TO_LONGS(GPIO_MAX)]; |
| 25 | static const char *gpio_label[GPIO_MAX]; /* non null for allocated GPIOs */ | 25 | static const char *gpio_label[GPIO_MAX]; /* non null for allocated GPIOs */ |
| 26 | 26 | ||
| 27 | void __init orion5x_gpio_set_valid_pins(u32 pins) | 27 | void __init orion5x_gpio_set_valid(unsigned pin, int valid) |
| 28 | { | 28 | { |
| 29 | gpio_valid[0] = pins; | 29 | if (valid) |
| 30 | __set_bit(pin, gpio_valid); | ||
| 31 | else | ||
| 32 | __clear_bit(pin, gpio_valid); | ||
| 30 | } | 33 | } |
| 31 | 34 | ||
| 32 | /* | 35 | /* |
| @@ -93,10 +96,10 @@ int gpio_get_value(unsigned pin) | |||
| 93 | { | 96 | { |
| 94 | int val, mask = 1 << pin; | 97 | int val, mask = 1 << pin; |
| 95 | 98 | ||
| 96 | if (orion5x_read(GPIO_IO_CONF) & mask) | 99 | if (readl(GPIO_IO_CONF) & mask) |
| 97 | val = orion5x_read(GPIO_DATA_IN) ^ orion5x_read(GPIO_IN_POL); | 100 | val = readl(GPIO_DATA_IN) ^ readl(GPIO_IN_POL); |
| 98 | else | 101 | else |
| 99 | val = orion5x_read(GPIO_OUT); | 102 | val = readl(GPIO_OUT); |
| 100 | 103 | ||
| 101 | return val & mask; | 104 | return val & mask; |
| 102 | } | 105 | } |
| @@ -188,39 +191,39 @@ void gpio_display(void) | |||
| 188 | printk("GPIO, free\n"); | 191 | printk("GPIO, free\n"); |
| 189 | } else { | 192 | } else { |
| 190 | printk("GPIO, used by %s, ", gpio_label[i]); | 193 | printk("GPIO, used by %s, ", gpio_label[i]); |
| 191 | if (orion5x_read(GPIO_IO_CONF) & (1 << i)) { | 194 | if (readl(GPIO_IO_CONF) & (1 << i)) { |
| 192 | printk("input, active %s, level %s, edge %s\n", | 195 | printk("input, active %s, level %s, edge %s\n", |
| 193 | ((orion5x_read(GPIO_IN_POL) >> i) & 1) ? "low" : "high", | 196 | ((readl(GPIO_IN_POL) >> i) & 1) ? "low" : "high", |
| 194 | ((orion5x_read(GPIO_LEVEL_MASK) >> i) & 1) ? "enabled" : "masked", | 197 | ((readl(GPIO_LEVEL_MASK) >> i) & 1) ? "enabled" : "masked", |
| 195 | ((orion5x_read(GPIO_EDGE_MASK) >> i) & 1) ? "enabled" : "masked"); | 198 | ((readl(GPIO_EDGE_MASK) >> i) & 1) ? "enabled" : "masked"); |
| 196 | } else { | 199 | } else { |
| 197 | printk("output, val=%d\n", (orion5x_read(GPIO_OUT) >> i) & 1); | 200 | printk("output, val=%d\n", (readl(GPIO_OUT) >> i) & 1); |
| 198 | } | 201 | } |
| 199 | } | 202 | } |
| 200 | } | 203 | } |
| 201 | 204 | ||
| 202 | printk(KERN_DEBUG "MPP_0_7_CTRL (0x%08x) = 0x%08x\n", | 205 | printk(KERN_DEBUG "MPP_0_7_CTRL (0x%08x) = 0x%08x\n", |
| 203 | MPP_0_7_CTRL, orion5x_read(MPP_0_7_CTRL)); | 206 | MPP_0_7_CTRL, readl(MPP_0_7_CTRL)); |
| 204 | printk(KERN_DEBUG "MPP_8_15_CTRL (0x%08x) = 0x%08x\n", | 207 | printk(KERN_DEBUG "MPP_8_15_CTRL (0x%08x) = 0x%08x\n", |
| 205 | MPP_8_15_CTRL, orion5x_read(MPP_8_15_CTRL)); | 208 | MPP_8_15_CTRL, readl(MPP_8_15_CTRL)); |
| 206 | printk(KERN_DEBUG "MPP_16_19_CTRL (0x%08x) = 0x%08x\n", | 209 | printk(KERN_DEBUG "MPP_16_19_CTRL (0x%08x) = 0x%08x\n", |
| 207 | MPP_16_19_CTRL, orion5x_read(MPP_16_19_CTRL)); | 210 | MPP_16_19_CTRL, readl(MPP_16_19_CTRL)); |
| 208 | printk(KERN_DEBUG "MPP_DEV_CTRL (0x%08x) = 0x%08x\n", | 211 | printk(KERN_DEBUG "MPP_DEV_CTRL (0x%08x) = 0x%08x\n", |
| 209 | MPP_DEV_CTRL, orion5x_read(MPP_DEV_CTRL)); | 212 | MPP_DEV_CTRL, readl(MPP_DEV_CTRL)); |
| 210 | printk(KERN_DEBUG "GPIO_OUT (0x%08x) = 0x%08x\n", | 213 | printk(KERN_DEBUG "GPIO_OUT (0x%08x) = 0x%08x\n", |
| 211 | GPIO_OUT, orion5x_read(GPIO_OUT)); | 214 | GPIO_OUT, readl(GPIO_OUT)); |
| 212 | printk(KERN_DEBUG "GPIO_IO_CONF (0x%08x) = 0x%08x\n", | 215 | printk(KERN_DEBUG "GPIO_IO_CONF (0x%08x) = 0x%08x\n", |
| 213 | GPIO_IO_CONF, orion5x_read(GPIO_IO_CONF)); | 216 | GPIO_IO_CONF, readl(GPIO_IO_CONF)); |
| 214 | printk(KERN_DEBUG "GPIO_BLINK_EN (0x%08x) = 0x%08x\n", | 217 | printk(KERN_DEBUG "GPIO_BLINK_EN (0x%08x) = 0x%08x\n", |
| 215 | GPIO_BLINK_EN, orion5x_read(GPIO_BLINK_EN)); | 218 | GPIO_BLINK_EN, readl(GPIO_BLINK_EN)); |
| 216 | printk(KERN_DEBUG "GPIO_IN_POL (0x%08x) = 0x%08x\n", | 219 | printk(KERN_DEBUG "GPIO_IN_POL (0x%08x) = 0x%08x\n", |
| 217 | GPIO_IN_POL, orion5x_read(GPIO_IN_POL)); | 220 | GPIO_IN_POL, readl(GPIO_IN_POL)); |
| 218 | printk(KERN_DEBUG "GPIO_DATA_IN (0x%08x) = 0x%08x\n", | 221 | printk(KERN_DEBUG "GPIO_DATA_IN (0x%08x) = 0x%08x\n", |
| 219 | GPIO_DATA_IN, orion5x_read(GPIO_DATA_IN)); | 222 | GPIO_DATA_IN, readl(GPIO_DATA_IN)); |
| 220 | printk(KERN_DEBUG "GPIO_LEVEL_MASK (0x%08x) = 0x%08x\n", | 223 | printk(KERN_DEBUG "GPIO_LEVEL_MASK (0x%08x) = 0x%08x\n", |
| 221 | GPIO_LEVEL_MASK, orion5x_read(GPIO_LEVEL_MASK)); | 224 | GPIO_LEVEL_MASK, readl(GPIO_LEVEL_MASK)); |
| 222 | printk(KERN_DEBUG "GPIO_EDGE_CAUSE (0x%08x) = 0x%08x\n", | 225 | printk(KERN_DEBUG "GPIO_EDGE_CAUSE (0x%08x) = 0x%08x\n", |
| 223 | GPIO_EDGE_CAUSE, orion5x_read(GPIO_EDGE_CAUSE)); | 226 | GPIO_EDGE_CAUSE, readl(GPIO_EDGE_CAUSE)); |
| 224 | printk(KERN_DEBUG "GPIO_EDGE_MASK (0x%08x) = 0x%08x\n", | 227 | printk(KERN_DEBUG "GPIO_EDGE_MASK (0x%08x) = 0x%08x\n", |
| 225 | GPIO_EDGE_MASK, orion5x_read(GPIO_EDGE_MASK)); | 228 | GPIO_EDGE_MASK, readl(GPIO_EDGE_MASK)); |
| 226 | } | 229 | } |
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c index dd21f38c5d37..e2a0084ab4a3 100644 --- a/arch/arm/mach-orion5x/irq.c +++ b/arch/arm/mach-orion5x/irq.c | |||
| @@ -82,7 +82,7 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type) | |||
| 82 | int pin = irq_to_gpio(irq); | 82 | int pin = irq_to_gpio(irq); |
| 83 | struct irq_desc *desc; | 83 | struct irq_desc *desc; |
| 84 | 84 | ||
| 85 | if ((orion5x_read(GPIO_IO_CONF) & (1 << pin)) == 0) { | 85 | if ((readl(GPIO_IO_CONF) & (1 << pin)) == 0) { |
| 86 | printk(KERN_ERR "orion5x_gpio_set_irq_type failed " | 86 | printk(KERN_ERR "orion5x_gpio_set_irq_type failed " |
| 87 | "(irq %d, pin %d).\n", irq, pin); | 87 | "(irq %d, pin %d).\n", irq, pin); |
| 88 | return -EINVAL; | 88 | return -EINVAL; |
| @@ -117,7 +117,7 @@ static int orion5x_gpio_set_irq_type(u32 irq, u32 type) | |||
| 117 | /* | 117 | /* |
| 118 | * set initial polarity based on current input level | 118 | * set initial polarity based on current input level |
| 119 | */ | 119 | */ |
| 120 | if ((orion5x_read(GPIO_IN_POL) ^ orion5x_read(GPIO_DATA_IN)) | 120 | if ((readl(GPIO_IN_POL) ^ readl(GPIO_DATA_IN)) |
| 121 | & (1 << pin)) | 121 | & (1 << pin)) |
| 122 | orion5x_setbits(GPIO_IN_POL, (1 << pin)); /* falling */ | 122 | orion5x_setbits(GPIO_IN_POL, (1 << pin)); /* falling */ |
| 123 | else | 123 | else |
| @@ -149,8 +149,8 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
| 149 | 149 | ||
| 150 | BUG_ON(irq < IRQ_ORION5X_GPIO_0_7 || irq > IRQ_ORION5X_GPIO_24_31); | 150 | BUG_ON(irq < IRQ_ORION5X_GPIO_0_7 || irq > IRQ_ORION5X_GPIO_24_31); |
| 151 | offs = (irq - IRQ_ORION5X_GPIO_0_7) * 8; | 151 | offs = (irq - IRQ_ORION5X_GPIO_0_7) * 8; |
| 152 | cause = (orion5x_read(GPIO_DATA_IN) & orion5x_read(GPIO_LEVEL_MASK)) | | 152 | cause = (readl(GPIO_DATA_IN) & readl(GPIO_LEVEL_MASK)) | |
| 153 | (orion5x_read(GPIO_EDGE_CAUSE) & orion5x_read(GPIO_EDGE_MASK)); | 153 | (readl(GPIO_EDGE_CAUSE) & readl(GPIO_EDGE_MASK)); |
| 154 | 154 | ||
| 155 | for (pin = offs; pin < offs + 8; pin++) { | 155 | for (pin = offs; pin < offs + 8; pin++) { |
| 156 | if (cause & (1 << pin)) { | 156 | if (cause & (1 << pin)) { |
| @@ -158,9 +158,9 @@ static void orion5x_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) | |||
| 158 | desc = irq_desc + irq; | 158 | desc = irq_desc + irq; |
| 159 | if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) { | 159 | if ((desc->status & IRQ_TYPE_SENSE_MASK) == IRQT_BOTHEDGE) { |
| 160 | /* Swap polarity (race with GPIO line) */ | 160 | /* Swap polarity (race with GPIO line) */ |
| 161 | u32 polarity = orion5x_read(GPIO_IN_POL); | 161 | u32 polarity = readl(GPIO_IN_POL); |
| 162 | polarity ^= 1 << pin; | 162 | polarity ^= 1 << pin; |
| 163 | orion5x_write(GPIO_IN_POL, polarity); | 163 | writel(polarity, GPIO_IN_POL); |
| 164 | } | 164 | } |
| 165 | desc_handle_irq(irq, desc); | 165 | desc_handle_irq(irq, desc); |
| 166 | } | 166 | } |
| @@ -175,9 +175,9 @@ static void __init orion5x_init_gpio_irq(void) | |||
| 175 | /* | 175 | /* |
| 176 | * Mask and clear GPIO IRQ interrupts | 176 | * Mask and clear GPIO IRQ interrupts |
| 177 | */ | 177 | */ |
| 178 | orion5x_write(GPIO_LEVEL_MASK, 0x0); | 178 | writel(0x0, GPIO_LEVEL_MASK); |
| 179 | orion5x_write(GPIO_EDGE_MASK, 0x0); | 179 | writel(0x0, GPIO_EDGE_MASK); |
| 180 | orion5x_write(GPIO_EDGE_CAUSE, 0x0); | 180 | writel(0x0, GPIO_EDGE_CAUSE); |
| 181 | 181 | ||
| 182 | /* | 182 | /* |
| 183 | * Register chained level handlers for GPIO IRQs by default. | 183 | * Register chained level handlers for GPIO IRQs by default. |
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index f5074b877b7f..84feac4a1fe2 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c | |||
| @@ -13,10 +13,12 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 16 | #include <linux/delay.h> | ||
| 16 | #include <linux/mtd/physmap.h> | 17 | #include <linux/mtd/physmap.h> |
| 17 | #include <linux/mtd/nand.h> | 18 | #include <linux/mtd/nand.h> |
| 18 | #include <linux/mv643xx_eth.h> | 19 | #include <linux/mv643xx_eth.h> |
| 19 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/serial_reg.h> | ||
| 20 | #include <linux/ata_platform.h> | 22 | #include <linux/ata_platform.h> |
| 21 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
| 22 | #include <asm/gpio.h> | 24 | #include <asm/gpio.h> |
| @@ -25,6 +27,7 @@ | |||
| 25 | #include <asm/arch/orion5x.h> | 27 | #include <asm/arch/orion5x.h> |
| 26 | #include <asm/plat-orion/orion_nand.h> | 28 | #include <asm/plat-orion/orion_nand.h> |
| 27 | #include "common.h" | 29 | #include "common.h" |
| 30 | #include "mpp.h" | ||
| 28 | 31 | ||
| 29 | /***************************************************************************** | 32 | /***************************************************************************** |
| 30 | * KUROBOX-PRO Info | 33 | * KUROBOX-PRO Info |
| @@ -53,13 +56,11 @@ static struct mtd_partition kurobox_pro_nand_parts[] = { | |||
| 53 | .name = "uImage", | 56 | .name = "uImage", |
| 54 | .offset = 0, | 57 | .offset = 0, |
| 55 | .size = SZ_4M, | 58 | .size = SZ_4M, |
| 56 | }, | 59 | }, { |
| 57 | { | ||
| 58 | .name = "rootfs", | 60 | .name = "rootfs", |
| 59 | .offset = SZ_4M, | 61 | .offset = SZ_4M, |
| 60 | .size = SZ_64M, | 62 | .size = SZ_64M, |
| 61 | }, | 63 | }, { |
| 62 | { | ||
| 63 | .name = "extra", | 64 | .name = "extra", |
| 64 | .offset = SZ_4M + SZ_64M, | 65 | .offset = SZ_4M + SZ_64M, |
| 65 | .size = SZ_256M - (SZ_4M + SZ_64M), | 66 | .size = SZ_256M - (SZ_4M + SZ_64M), |
| @@ -132,8 +133,6 @@ static int __init kurobox_pro_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
| 132 | /* | 133 | /* |
| 133 | * PCI isn't used on the Kuro | 134 | * PCI isn't used on the Kuro |
| 134 | */ | 135 | */ |
| 135 | printk(KERN_ERR "kurobox_pro_pci_map_irq failed, unknown bus\n"); | ||
| 136 | |||
| 137 | return -1; | 136 | return -1; |
| 138 | } | 137 | } |
| 139 | 138 | ||
| @@ -161,7 +160,6 @@ subsys_initcall(kurobox_pro_pci_init); | |||
| 161 | 160 | ||
| 162 | static struct mv643xx_eth_platform_data kurobox_pro_eth_data = { | 161 | static struct mv643xx_eth_platform_data kurobox_pro_eth_data = { |
| 163 | .phy_addr = 8, | 162 | .phy_addr = 8, |
| 164 | .force_phy_addr = 1, | ||
| 165 | }; | 163 | }; |
| 166 | 164 | ||
| 167 | /***************************************************************************** | 165 | /***************************************************************************** |
| @@ -175,12 +173,169 @@ static struct i2c_board_info __initdata kurobox_pro_i2c_rtc = { | |||
| 175 | * SATA | 173 | * SATA |
| 176 | ****************************************************************************/ | 174 | ****************************************************************************/ |
| 177 | static struct mv_sata_platform_data kurobox_pro_sata_data = { | 175 | static struct mv_sata_platform_data kurobox_pro_sata_data = { |
| 178 | .n_ports = 2, | 176 | .n_ports = 2, |
| 179 | }; | 177 | }; |
| 180 | 178 | ||
| 181 | /***************************************************************************** | 179 | /***************************************************************************** |
| 180 | * Kurobox Pro specific power off method via UART1-attached microcontroller | ||
| 181 | ****************************************************************************/ | ||
| 182 | |||
| 183 | #define UART1_REG(x) (UART1_VIRT_BASE + ((UART_##x) << 2)) | ||
| 184 | |||
| 185 | static int kurobox_pro_miconread(unsigned char *buf, int count) | ||
| 186 | { | ||
| 187 | int i; | ||
| 188 | int timeout; | ||
| 189 | |||
| 190 | for (i = 0; i < count; i++) { | ||
| 191 | timeout = 10; | ||
| 192 | |||
| 193 | while (!(readl(UART1_REG(LSR)) & UART_LSR_DR)) { | ||
| 194 | if (--timeout == 0) | ||
| 195 | break; | ||
| 196 | udelay(1000); | ||
| 197 | } | ||
| 198 | |||
| 199 | if (timeout == 0) | ||
| 200 | break; | ||
| 201 | buf[i] = readl(UART1_REG(RX)); | ||
| 202 | } | ||
| 203 | |||
| 204 | /* return read bytes */ | ||
| 205 | return i; | ||
| 206 | } | ||
| 207 | |||
| 208 | static int kurobox_pro_miconwrite(const unsigned char *buf, int count) | ||
| 209 | { | ||
| 210 | int i = 0; | ||
| 211 | |||
| 212 | while (count--) { | ||
| 213 | while (!(readl(UART1_REG(LSR)) & UART_LSR_THRE)) | ||
| 214 | barrier(); | ||
| 215 | writel(buf[i++], UART1_REG(TX)); | ||
| 216 | } | ||
| 217 | |||
| 218 | return 0; | ||
| 219 | } | ||
| 220 | |||
| 221 | static int kurobox_pro_miconsend(const unsigned char *data, int count) | ||
| 222 | { | ||
| 223 | int i; | ||
| 224 | unsigned char checksum = 0; | ||
| 225 | unsigned char recv_buf[40]; | ||
| 226 | unsigned char send_buf[40]; | ||
| 227 | unsigned char correct_ack[3]; | ||
| 228 | int retry = 2; | ||
| 229 | |||
| 230 | /* Generate checksum */ | ||
| 231 | for (i = 0; i < count; i++) | ||
| 232 | checksum -= data[i]; | ||
| 233 | |||
| 234 | do { | ||
| 235 | /* Send data */ | ||
| 236 | kurobox_pro_miconwrite(data, count); | ||
| 237 | |||
| 238 | /* send checksum */ | ||
| 239 | kurobox_pro_miconwrite(&checksum, 1); | ||
| 240 | |||
| 241 | if (kurobox_pro_miconread(recv_buf, sizeof(recv_buf)) <= 3) { | ||
| 242 | printk(KERN_ERR ">%s: receive failed.\n", __func__); | ||
| 243 | |||
| 244 | /* send preamble to clear the receive buffer */ | ||
| 245 | memset(&send_buf, 0xff, sizeof(send_buf)); | ||
| 246 | kurobox_pro_miconwrite(send_buf, sizeof(send_buf)); | ||
| 247 | |||
| 248 | /* make dummy reads */ | ||
| 249 | mdelay(100); | ||
| 250 | kurobox_pro_miconread(recv_buf, sizeof(recv_buf)); | ||
| 251 | } else { | ||
| 252 | /* Generate expected ack */ | ||
| 253 | correct_ack[0] = 0x01; | ||
| 254 | correct_ack[1] = data[1]; | ||
| 255 | correct_ack[2] = 0x00; | ||
| 256 | |||
| 257 | /* checksum Check */ | ||
| 258 | if ((recv_buf[0] + recv_buf[1] + recv_buf[2] + | ||
| 259 | recv_buf[3]) & 0xFF) { | ||
| 260 | printk(KERN_ERR ">%s: Checksum Error : " | ||
| 261 | "Received data[%02x, %02x, %02x, %02x]" | ||
| 262 | "\n", __func__, recv_buf[0], | ||
| 263 | recv_buf[1], recv_buf[2], recv_buf[3]); | ||
| 264 | } else { | ||
| 265 | /* Check Received Data */ | ||
| 266 | if (correct_ack[0] == recv_buf[0] && | ||
| 267 | correct_ack[1] == recv_buf[1] && | ||
| 268 | correct_ack[2] == recv_buf[2]) { | ||
| 269 | /* Interval for next command */ | ||
| 270 | mdelay(10); | ||
| 271 | |||
| 272 | /* Receive ACK */ | ||
| 273 | return 0; | ||
| 274 | } | ||
| 275 | } | ||
| 276 | /* Received NAK or illegal Data */ | ||
| 277 | printk(KERN_ERR ">%s: Error : NAK or Illegal Data " | ||
| 278 | "Received\n", __func__); | ||
| 279 | } | ||
| 280 | } while (retry--); | ||
| 281 | |||
| 282 | /* Interval for next command */ | ||
| 283 | mdelay(10); | ||
| 284 | |||
| 285 | return -1; | ||
| 286 | } | ||
| 287 | |||
| 288 | static void kurobox_pro_power_off(void) | ||
| 289 | { | ||
| 290 | const unsigned char watchdogkill[] = {0x01, 0x35, 0x00}; | ||
| 291 | const unsigned char shutdownwait[] = {0x00, 0x0c}; | ||
| 292 | const unsigned char poweroff[] = {0x00, 0x06}; | ||
| 293 | /* 38400 baud divisor */ | ||
| 294 | const unsigned divisor = ((ORION5X_TCLK + (8 * 38400)) / (16 * 38400)); | ||
| 295 | |||
| 296 | pr_info("%s: triggering power-off...\n", __func__); | ||
| 297 | |||
| 298 | /* hijack uart1 and reset into sane state (38400,8n1,even parity) */ | ||
| 299 | writel(0x83, UART1_REG(LCR)); | ||
| 300 | writel(divisor & 0xff, UART1_REG(DLL)); | ||
| 301 | writel((divisor >> 8) & 0xff, UART1_REG(DLM)); | ||
| 302 | writel(0x1b, UART1_REG(LCR)); | ||
| 303 | writel(0x00, UART1_REG(IER)); | ||
| 304 | writel(0x07, UART1_REG(FCR)); | ||
| 305 | writel(0x00, UART1_REG(MCR)); | ||
| 306 | |||
| 307 | /* Send the commands to shutdown the Kurobox Pro */ | ||
| 308 | kurobox_pro_miconsend(watchdogkill, sizeof(watchdogkill)) ; | ||
| 309 | kurobox_pro_miconsend(shutdownwait, sizeof(shutdownwait)) ; | ||
| 310 | kurobox_pro_miconsend(poweroff, sizeof(poweroff)); | ||
| 311 | } | ||
| 312 | |||
| 313 | /***************************************************************************** | ||
| 182 | * General Setup | 314 | * General Setup |
| 183 | ****************************************************************************/ | 315 | ****************************************************************************/ |
| 316 | static struct orion5x_mpp_mode kurobox_pro_mpp_modes[] __initdata = { | ||
| 317 | { 0, MPP_UNUSED }, | ||
| 318 | { 1, MPP_UNUSED }, | ||
| 319 | { 2, MPP_GPIO }, /* GPIO Micon */ | ||
| 320 | { 3, MPP_GPIO }, /* GPIO Rtc */ | ||
| 321 | { 4, MPP_UNUSED }, | ||
| 322 | { 5, MPP_UNUSED }, | ||
| 323 | { 6, MPP_NAND }, /* NAND Flash REn */ | ||
| 324 | { 7, MPP_NAND }, /* NAND Flash WEn */ | ||
| 325 | { 8, MPP_UNUSED }, | ||
| 326 | { 9, MPP_UNUSED }, | ||
| 327 | { 10, MPP_UNUSED }, | ||
| 328 | { 11, MPP_UNUSED }, | ||
| 329 | { 12, MPP_SATA_LED }, /* SATA 0 presence */ | ||
| 330 | { 13, MPP_SATA_LED }, /* SATA 1 presence */ | ||
| 331 | { 14, MPP_SATA_LED }, /* SATA 0 active */ | ||
| 332 | { 15, MPP_SATA_LED }, /* SATA 1 active */ | ||
| 333 | { 16, MPP_UART }, /* UART1 RXD */ | ||
| 334 | { 17, MPP_UART }, /* UART1 TXD */ | ||
| 335 | { 18, MPP_UART }, /* UART1 CTSn */ | ||
| 336 | { 19, MPP_UART }, /* UART1 RTSn */ | ||
| 337 | { -1 }, | ||
| 338 | }; | ||
| 184 | 339 | ||
| 185 | static void __init kurobox_pro_init(void) | 340 | static void __init kurobox_pro_init(void) |
| 186 | { | 341 | { |
| @@ -189,46 +344,33 @@ static void __init kurobox_pro_init(void) | |||
| 189 | */ | 344 | */ |
| 190 | orion5x_init(); | 345 | orion5x_init(); |
| 191 | 346 | ||
| 192 | /* | 347 | orion5x_mpp_conf(kurobox_pro_mpp_modes); |
| 193 | * Setup the CPU address decode windows for our devices | ||
| 194 | */ | ||
| 195 | orion5x_setup_dev_boot_win(KUROBOX_PRO_NOR_BOOT_BASE, | ||
| 196 | KUROBOX_PRO_NOR_BOOT_SIZE); | ||
| 197 | orion5x_setup_dev0_win(KUROBOX_PRO_NAND_BASE, KUROBOX_PRO_NAND_SIZE); | ||
| 198 | 348 | ||
| 199 | /* | 349 | /* |
| 200 | * Open a special address decode windows for the PCIe WA. | 350 | * Configure peripherals. |
| 201 | */ | 351 | */ |
| 202 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | 352 | orion5x_ehci0_init(); |
| 203 | ORION5X_PCIE_WA_SIZE); | 353 | orion5x_ehci1_init(); |
| 204 | 354 | orion5x_eth_init(&kurobox_pro_eth_data); | |
| 205 | /* | 355 | orion5x_i2c_init(); |
| 206 | * Setup Multiplexing Pins -- | 356 | orion5x_sata_init(&kurobox_pro_sata_data); |
| 207 | * MPP[0-1] Not used | 357 | orion5x_uart0_init(); |
| 208 | * MPP[2] GPIO Micon | 358 | orion5x_uart1_init(); |
| 209 | * MPP[3] GPIO RTC | ||
| 210 | * MPP[4-5] Not used | ||
| 211 | * MPP[6] Nand Flash REn | ||
| 212 | * MPP[7] Nand Flash WEn | ||
| 213 | * MPP[8-11] Not used | ||
| 214 | * MPP[12] SATA 0 presence Indication | ||
| 215 | * MPP[13] SATA 1 presence Indication | ||
| 216 | * MPP[14] SATA 0 active Indication | ||
| 217 | * MPP[15] SATA 1 active indication | ||
| 218 | * MPP[16-19] Not used | ||
| 219 | */ | ||
| 220 | orion5x_write(MPP_0_7_CTRL, 0x44220003); | ||
| 221 | orion5x_write(MPP_8_15_CTRL, 0x55550000); | ||
| 222 | orion5x_write(MPP_16_19_CTRL, 0x0); | ||
| 223 | |||
| 224 | orion5x_gpio_set_valid_pins(0x0000000c); | ||
| 225 | 359 | ||
| 360 | orion5x_setup_dev_boot_win(KUROBOX_PRO_NOR_BOOT_BASE, | ||
| 361 | KUROBOX_PRO_NOR_BOOT_SIZE); | ||
| 226 | platform_device_register(&kurobox_pro_nor_flash); | 362 | platform_device_register(&kurobox_pro_nor_flash); |
| 227 | if (machine_is_kurobox_pro()) | 363 | |
| 364 | if (machine_is_kurobox_pro()) { | ||
| 365 | orion5x_setup_dev0_win(KUROBOX_PRO_NAND_BASE, | ||
| 366 | KUROBOX_PRO_NAND_SIZE); | ||
| 228 | platform_device_register(&kurobox_pro_nand_flash); | 367 | platform_device_register(&kurobox_pro_nand_flash); |
| 368 | } | ||
| 369 | |||
| 229 | i2c_register_board_info(0, &kurobox_pro_i2c_rtc, 1); | 370 | i2c_register_board_info(0, &kurobox_pro_i2c_rtc, 1); |
| 230 | orion5x_eth_init(&kurobox_pro_eth_data); | 371 | |
| 231 | orion5x_sata_init(&kurobox_pro_sata_data); | 372 | /* register Kurobox Pro specific power-off method */ |
| 373 | pm_power_off = kurobox_pro_power_off; | ||
| 232 | } | 374 | } |
| 233 | 375 | ||
| 234 | #ifdef CONFIG_MACH_KUROBOX_PRO | 376 | #ifdef CONFIG_MACH_KUROBOX_PRO |
diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c new file mode 100644 index 000000000000..a48cadb01590 --- /dev/null +++ b/arch/arm/mach-orion5x/mpp.c | |||
| @@ -0,0 +1,163 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/mpp.c | ||
| 3 | * | ||
| 4 | * MPP functions for Marvell Orion 5x SoCs | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/mbus.h> | ||
| 14 | #include <asm/hardware.h> | ||
| 15 | #include <asm/io.h> | ||
| 16 | #include "common.h" | ||
| 17 | #include "mpp.h" | ||
| 18 | |||
| 19 | static int is_5181l(void) | ||
| 20 | { | ||
| 21 | u32 dev; | ||
| 22 | u32 rev; | ||
| 23 | |||
| 24 | orion5x_pcie_id(&dev, &rev); | ||
| 25 | |||
| 26 | return !!(dev == MV88F5181_DEV_ID && rev >= MV88F5181L_REV_A0); | ||
| 27 | } | ||
| 28 | |||
| 29 | static int is_5182(void) | ||
| 30 | { | ||
| 31 | u32 dev; | ||
| 32 | u32 rev; | ||
| 33 | |||
| 34 | orion5x_pcie_id(&dev, &rev); | ||
| 35 | |||
| 36 | return !!(dev == MV88F5182_DEV_ID); | ||
| 37 | } | ||
| 38 | |||
| 39 | static int is_5281(void) | ||
| 40 | { | ||
| 41 | u32 dev; | ||
| 42 | u32 rev; | ||
| 43 | |||
| 44 | orion5x_pcie_id(&dev, &rev); | ||
| 45 | |||
| 46 | return !!(dev == MV88F5281_DEV_ID); | ||
| 47 | } | ||
| 48 | |||
| 49 | static int __init determine_type_encoding(int mpp, enum orion5x_mpp_type type) | ||
| 50 | { | ||
| 51 | switch (type) { | ||
| 52 | case MPP_UNUSED: | ||
| 53 | case MPP_GPIO: | ||
| 54 | if (mpp == 0) | ||
| 55 | return 3; | ||
| 56 | if (mpp >= 1 && mpp <= 15) | ||
| 57 | return 0; | ||
| 58 | if (mpp >= 16 && mpp <= 19) { | ||
| 59 | if (is_5182()) | ||
| 60 | return 5; | ||
| 61 | if (type == MPP_UNUSED) | ||
| 62 | return 0; | ||
| 63 | } | ||
| 64 | return -1; | ||
| 65 | |||
| 66 | case MPP_PCIE_RST_OUTn: | ||
| 67 | if (mpp == 0) | ||
| 68 | return 0; | ||
| 69 | return -1; | ||
| 70 | |||
| 71 | case MPP_PCI_ARB: | ||
| 72 | if (mpp >= 0 && mpp <= 7) | ||
| 73 | return 2; | ||
| 74 | return -1; | ||
| 75 | |||
| 76 | case MPP_PCI_PMEn: | ||
| 77 | if (mpp == 2) | ||
| 78 | return 3; | ||
| 79 | return -1; | ||
| 80 | |||
| 81 | case MPP_GIGE: | ||
| 82 | if (mpp >= 8 && mpp <= 19) | ||
| 83 | return 1; | ||
| 84 | return -1; | ||
| 85 | |||
| 86 | case MPP_NAND: | ||
| 87 | if (is_5182() || is_5281()) { | ||
| 88 | if (mpp >= 4 && mpp <= 7) | ||
| 89 | return 4; | ||
| 90 | if (mpp >= 12 && mpp <= 17) | ||
| 91 | return 4; | ||
| 92 | } | ||
| 93 | return -1; | ||
| 94 | |||
| 95 | case MPP_PCI_CLK: | ||
| 96 | if (is_5181l() && mpp >= 6 && mpp <= 7) | ||
| 97 | return 5; | ||
| 98 | return -1; | ||
| 99 | |||
| 100 | case MPP_SATA_LED: | ||
| 101 | if (is_5182()) { | ||
| 102 | if (mpp >= 4 && mpp <= 7) | ||
| 103 | return 5; | ||
| 104 | if (mpp >= 12 && mpp <= 15) | ||
| 105 | return 5; | ||
| 106 | } | ||
| 107 | return -1; | ||
| 108 | |||
| 109 | case MPP_UART: | ||
| 110 | if (mpp >= 16 && mpp <= 19) | ||
| 111 | return 0; | ||
| 112 | return -1; | ||
| 113 | } | ||
| 114 | |||
| 115 | printk(KERN_INFO "unknown MPP type %d\n", type); | ||
| 116 | |||
| 117 | return -1; | ||
| 118 | } | ||
| 119 | |||
| 120 | void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode) | ||
| 121 | { | ||
| 122 | u32 mpp_0_7_ctrl = readl(MPP_0_7_CTRL); | ||
| 123 | u32 mpp_8_15_ctrl = readl(MPP_8_15_CTRL); | ||
| 124 | u32 mpp_16_19_ctrl = readl(MPP_16_19_CTRL); | ||
| 125 | |||
| 126 | while (mode->mpp >= 0) { | ||
| 127 | u32 *reg; | ||
| 128 | int num_type; | ||
| 129 | int shift; | ||
| 130 | |||
| 131 | if (mode->mpp >= 0 && mode->mpp <= 7) | ||
| 132 | reg = &mpp_0_7_ctrl; | ||
| 133 | else if (mode->mpp >= 8 && mode->mpp <= 15) | ||
| 134 | reg = &mpp_8_15_ctrl; | ||
| 135 | else if (mode->mpp >= 16 && mode->mpp <= 19) | ||
| 136 | reg = &mpp_16_19_ctrl; | ||
| 137 | else { | ||
| 138 | printk(KERN_ERR "orion5x_mpp_conf: invalid MPP " | ||
| 139 | "(%d)\n", mode->mpp); | ||
| 140 | continue; | ||
| 141 | } | ||
| 142 | |||
| 143 | num_type = determine_type_encoding(mode->mpp, mode->type); | ||
| 144 | if (num_type < 0) { | ||
| 145 | printk(KERN_ERR "orion5x_mpp_conf: invalid MPP " | ||
| 146 | "combination (%d, %d)\n", mode->mpp, | ||
| 147 | mode->type); | ||
| 148 | continue; | ||
| 149 | } | ||
| 150 | |||
| 151 | shift = (mode->mpp & 7) << 2; | ||
| 152 | *reg &= ~(0xf << shift); | ||
| 153 | *reg |= (num_type & 0xf) << shift; | ||
| 154 | |||
| 155 | orion5x_gpio_set_valid(mode->mpp, !!(mode->type == MPP_GPIO)); | ||
| 156 | |||
| 157 | mode++; | ||
| 158 | } | ||
| 159 | |||
| 160 | writel(mpp_0_7_ctrl, MPP_0_7_CTRL); | ||
| 161 | writel(mpp_8_15_ctrl, MPP_8_15_CTRL); | ||
| 162 | writel(mpp_16_19_ctrl, MPP_16_19_CTRL); | ||
| 163 | } | ||
diff --git a/arch/arm/mach-orion5x/mpp.h b/arch/arm/mach-orion5x/mpp.h new file mode 100644 index 000000000000..290e610dc012 --- /dev/null +++ b/arch/arm/mach-orion5x/mpp.h | |||
| @@ -0,0 +1,74 @@ | |||
| 1 | #ifndef __ARCH_ORION5X_MPP_H | ||
| 2 | #define __ARCH_ORION5X_MPP_H | ||
| 3 | |||
| 4 | enum orion5x_mpp_type { | ||
| 5 | /* | ||
| 6 | * This MPP is unused. | ||
| 7 | */ | ||
| 8 | MPP_UNUSED, | ||
| 9 | |||
| 10 | /* | ||
| 11 | * This MPP pin is used as a generic GPIO pin. Valid for | ||
| 12 | * MPPs 0-15 and device bus data pins 16-31. On 5182, also | ||
| 13 | * valid for MPPs 16-19. | ||
| 14 | */ | ||
| 15 | MPP_GPIO, | ||
| 16 | |||
| 17 | /* | ||
| 18 | * This MPP is used as PCIe_RST_OUTn pin. Valid for | ||
| 19 | * MPP 0 only. | ||
| 20 | */ | ||
| 21 | MPP_PCIE_RST_OUTn, | ||
| 22 | |||
| 23 | /* | ||
| 24 | * This MPP is used as PCI arbiter pin (REQn/GNTn). | ||
| 25 | * Valid for MPPs 0-7 only. | ||
| 26 | */ | ||
| 27 | MPP_PCI_ARB, | ||
| 28 | |||
| 29 | /* | ||
| 30 | * This MPP is used as PCI_PMEn pin. Valid for MPP 2 only. | ||
| 31 | */ | ||
| 32 | MPP_PCI_PMEn, | ||
| 33 | |||
| 34 | /* | ||
| 35 | * This MPP is used as GigE half-duplex (COL, CRS) or GMII | ||
| 36 | * (RXERR, CRS, TXERR, TXD[7:4], RXD[7:4]) pin. Valid for | ||
| 37 | * MPPs 8-19 only. | ||
| 38 | */ | ||
| 39 | MPP_GIGE, | ||
| 40 | |||
| 41 | /* | ||
| 42 | * This MPP is used as NAND REn/WEn pin. Valid for MPPs | ||
| 43 | * 4-7 and 12-17 only, and only on the 5181l/5182/5281. | ||
| 44 | */ | ||
| 45 | MPP_NAND, | ||
| 46 | |||
| 47 | /* | ||
| 48 | * This MPP is used as a PCI clock output pin. Valid for | ||
| 49 | * MPPs 6-7 only, and only on the 5181l. | ||
| 50 | */ | ||
| 51 | MPP_PCI_CLK, | ||
| 52 | |||
| 53 | /* | ||
| 54 | * This MPP is used as a SATA presence/activity LED. | ||
| 55 | * Valid for MPPs 4-7 and 12-15 only, and only on the 5182. | ||
| 56 | */ | ||
| 57 | MPP_SATA_LED, | ||
| 58 | |||
| 59 | /* | ||
| 60 | * This MPP is used as UART1 RXD/TXD/CTSn/RTSn pin. | ||
| 61 | * Valid for MPPs 16-19 only. | ||
| 62 | */ | ||
| 63 | MPP_UART, | ||
| 64 | }; | ||
| 65 | |||
| 66 | struct orion5x_mpp_mode { | ||
| 67 | int mpp; | ||
| 68 | enum orion5x_mpp_type type; | ||
| 69 | }; | ||
| 70 | |||
| 71 | void orion5x_mpp_conf(struct orion5x_mpp_mode *mode); | ||
| 72 | |||
| 73 | |||
| 74 | #endif | ||
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c new file mode 100644 index 000000000000..7ce9e407d9d1 --- /dev/null +++ b/arch/arm/mach-orion5x/mss2-setup.c | |||
| @@ -0,0 +1,270 @@ | |||
| 1 | /* | ||
| 2 | * Maxtor Shared Storage II Board Setup | ||
| 3 | * | ||
| 4 | * Maintainer: Sylver Bruneau <sylver.bruneau@googlemail.com> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU General Public License | ||
| 8 | * as published by the Free Software Foundation; either version | ||
| 9 | * 2 of the License, or (at your option) any later version. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/kernel.h> | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <linux/platform_device.h> | ||
| 15 | #include <linux/pci.h> | ||
| 16 | #include <linux/irq.h> | ||
| 17 | #include <linux/mtd/physmap.h> | ||
| 18 | #include <linux/mv643xx_eth.h> | ||
| 19 | #include <linux/leds.h> | ||
| 20 | #include <linux/gpio_keys.h> | ||
| 21 | #include <linux/input.h> | ||
| 22 | #include <linux/i2c.h> | ||
| 23 | #include <linux/ata_platform.h> | ||
| 24 | #include <linux/gpio.h> | ||
| 25 | #include <asm/mach-types.h> | ||
| 26 | #include <asm/mach/arch.h> | ||
| 27 | #include <asm/mach/pci.h> | ||
| 28 | #include <asm/arch/orion5x.h> | ||
| 29 | #include "common.h" | ||
| 30 | #include "mpp.h" | ||
| 31 | |||
| 32 | #define MSS2_NOR_BOOT_BASE 0xff800000 | ||
| 33 | #define MSS2_NOR_BOOT_SIZE SZ_256K | ||
| 34 | |||
| 35 | /***************************************************************************** | ||
| 36 | * Maxtor Shared Storage II Info | ||
| 37 | ****************************************************************************/ | ||
| 38 | |||
| 39 | /* | ||
| 40 | * Maxtor Shared Storage II hardware : | ||
| 41 | * - Marvell 88F5182-A2 C500 | ||
| 42 | * - Marvell 88E1111 Gigabit Ethernet PHY | ||
| 43 | * - RTC M41T81 (@0x68) on I2C bus | ||
| 44 | * - 256KB NOR flash | ||
| 45 | * - 64MB of RAM | ||
| 46 | */ | ||
| 47 | |||
| 48 | /***************************************************************************** | ||
| 49 | * 256KB NOR Flash on BOOT Device | ||
| 50 | ****************************************************************************/ | ||
| 51 | |||
| 52 | static struct physmap_flash_data mss2_nor_flash_data = { | ||
| 53 | .width = 1, | ||
| 54 | }; | ||
| 55 | |||
| 56 | static struct resource mss2_nor_flash_resource = { | ||
| 57 | .flags = IORESOURCE_MEM, | ||
| 58 | .start = MSS2_NOR_BOOT_BASE, | ||
| 59 | .end = MSS2_NOR_BOOT_BASE + MSS2_NOR_BOOT_SIZE - 1, | ||
| 60 | }; | ||
| 61 | |||
| 62 | static struct platform_device mss2_nor_flash = { | ||
| 63 | .name = "physmap-flash", | ||
| 64 | .id = 0, | ||
| 65 | .dev = { | ||
| 66 | .platform_data = &mss2_nor_flash_data, | ||
| 67 | }, | ||
| 68 | .resource = &mss2_nor_flash_resource, | ||
| 69 | .num_resources = 1, | ||
| 70 | }; | ||
| 71 | |||
| 72 | /**************************************************************************** | ||
| 73 | * PCI setup | ||
| 74 | ****************************************************************************/ | ||
| 75 | static int __init mss2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 76 | { | ||
| 77 | int irq; | ||
| 78 | |||
| 79 | /* | ||
| 80 | * Check for devices with hard-wired IRQs. | ||
| 81 | */ | ||
| 82 | irq = orion5x_pci_map_irq(dev, slot, pin); | ||
| 83 | if (irq != -1) | ||
| 84 | return irq; | ||
| 85 | |||
| 86 | return -1; | ||
| 87 | } | ||
| 88 | |||
| 89 | static struct hw_pci mss2_pci __initdata = { | ||
| 90 | .nr_controllers = 2, | ||
| 91 | .swizzle = pci_std_swizzle, | ||
| 92 | .setup = orion5x_pci_sys_setup, | ||
| 93 | .scan = orion5x_pci_sys_scan_bus, | ||
| 94 | .map_irq = mss2_pci_map_irq, | ||
| 95 | }; | ||
| 96 | |||
| 97 | static int __init mss2_pci_init(void) | ||
| 98 | { | ||
| 99 | if (machine_is_mss2()) | ||
| 100 | pci_common_init(&mss2_pci); | ||
| 101 | |||
| 102 | return 0; | ||
| 103 | } | ||
| 104 | subsys_initcall(mss2_pci_init); | ||
| 105 | |||
| 106 | |||
| 107 | /***************************************************************************** | ||
| 108 | * Ethernet | ||
| 109 | ****************************************************************************/ | ||
| 110 | |||
| 111 | static struct mv643xx_eth_platform_data mss2_eth_data = { | ||
| 112 | .phy_addr = 8, | ||
| 113 | }; | ||
| 114 | |||
| 115 | /***************************************************************************** | ||
| 116 | * SATA | ||
| 117 | ****************************************************************************/ | ||
| 118 | |||
| 119 | static struct mv_sata_platform_data mss2_sata_data = { | ||
| 120 | .n_ports = 2, | ||
| 121 | }; | ||
| 122 | |||
| 123 | /***************************************************************************** | ||
| 124 | * GPIO buttons | ||
| 125 | ****************************************************************************/ | ||
| 126 | |||
| 127 | #define MSS2_GPIO_KEY_RESET 12 | ||
| 128 | #define MSS2_GPIO_KEY_POWER 11 | ||
| 129 | |||
| 130 | static struct gpio_keys_button mss2_buttons[] = { | ||
| 131 | { | ||
| 132 | .code = KEY_POWER, | ||
| 133 | .gpio = MSS2_GPIO_KEY_POWER, | ||
| 134 | .desc = "Power", | ||
| 135 | .active_low = 1, | ||
| 136 | }, { | ||
| 137 | .code = KEY_RESTART, | ||
| 138 | .gpio = MSS2_GPIO_KEY_RESET, | ||
| 139 | .desc = "Reset", | ||
| 140 | .active_low = 1, | ||
| 141 | }, | ||
| 142 | }; | ||
| 143 | |||
| 144 | static struct gpio_keys_platform_data mss2_button_data = { | ||
| 145 | .buttons = mss2_buttons, | ||
| 146 | .nbuttons = ARRAY_SIZE(mss2_buttons), | ||
| 147 | }; | ||
| 148 | |||
| 149 | static struct platform_device mss2_button_device = { | ||
| 150 | .name = "gpio-keys", | ||
| 151 | .id = -1, | ||
| 152 | .dev = { | ||
| 153 | .platform_data = &mss2_button_data, | ||
| 154 | }, | ||
| 155 | }; | ||
| 156 | |||
| 157 | /***************************************************************************** | ||
| 158 | * RTC m41t81 on I2C bus | ||
| 159 | ****************************************************************************/ | ||
| 160 | |||
| 161 | #define MSS2_GPIO_RTC_IRQ 3 | ||
| 162 | |||
| 163 | static struct i2c_board_info __initdata mss2_i2c_rtc = { | ||
| 164 | I2C_BOARD_INFO("m41t81", 0x68), | ||
| 165 | }; | ||
| 166 | |||
| 167 | /***************************************************************************** | ||
| 168 | * MSS2 power off method | ||
| 169 | ****************************************************************************/ | ||
| 170 | /* | ||
| 171 | * On the Maxtor Shared Storage II, the shutdown process is the following : | ||
| 172 | * - Userland modifies U-boot env to tell U-boot to go idle at next boot | ||
| 173 | * - The board reboots | ||
| 174 | * - U-boot starts and go into an idle mode until the user press "power" | ||
| 175 | */ | ||
| 176 | static void mss2_power_off(void) | ||
| 177 | { | ||
| 178 | u32 reg; | ||
| 179 | |||
| 180 | /* | ||
| 181 | * Enable and issue soft reset | ||
| 182 | */ | ||
| 183 | reg = readl(CPU_RESET_MASK); | ||
| 184 | reg |= 1 << 2; | ||
| 185 | writel(reg, CPU_RESET_MASK); | ||
| 186 | |||
| 187 | reg = readl(CPU_SOFT_RESET); | ||
| 188 | reg |= 1; | ||
| 189 | writel(reg, CPU_SOFT_RESET); | ||
| 190 | } | ||
| 191 | |||
| 192 | /**************************************************************************** | ||
| 193 | * General Setup | ||
| 194 | ****************************************************************************/ | ||
| 195 | static struct orion5x_mpp_mode mss2_mpp_modes[] __initdata = { | ||
| 196 | { 0, MPP_GPIO }, /* Power LED */ | ||
| 197 | { 1, MPP_GPIO }, /* Error LED */ | ||
| 198 | { 2, MPP_UNUSED }, | ||
| 199 | { 3, MPP_GPIO }, /* RTC interrupt */ | ||
| 200 | { 4, MPP_GPIO }, /* HDD ind. (Single/Dual)*/ | ||
| 201 | { 5, MPP_GPIO }, /* HD0 5V control */ | ||
| 202 | { 6, MPP_GPIO }, /* HD0 12V control */ | ||
| 203 | { 7, MPP_GPIO }, /* HD1 5V control */ | ||
| 204 | { 8, MPP_GPIO }, /* HD1 12V control */ | ||
| 205 | { 9, MPP_UNUSED }, | ||
| 206 | { 10, MPP_GPIO }, /* Fan control */ | ||
| 207 | { 11, MPP_GPIO }, /* Power button */ | ||
| 208 | { 12, MPP_GPIO }, /* Reset button */ | ||
| 209 | { 13, MPP_UNUSED }, | ||
| 210 | { 14, MPP_SATA_LED }, /* SATA 0 active */ | ||
| 211 | { 15, MPP_SATA_LED }, /* SATA 1 active */ | ||
| 212 | { 16, MPP_UNUSED }, | ||
| 213 | { 17, MPP_UNUSED }, | ||
| 214 | { 18, MPP_UNUSED }, | ||
| 215 | { 19, MPP_UNUSED }, | ||
| 216 | { -1 }, | ||
| 217 | }; | ||
| 218 | |||
| 219 | static void __init mss2_init(void) | ||
| 220 | { | ||
| 221 | /* Setup basic Orion functions. Need to be called early. */ | ||
| 222 | orion5x_init(); | ||
| 223 | |||
| 224 | orion5x_mpp_conf(mss2_mpp_modes); | ||
| 225 | |||
| 226 | /* | ||
| 227 | * MPP[20] Unused | ||
| 228 | * MPP[21] PCI clock | ||
| 229 | * MPP[22] USB 0 over current | ||
| 230 | * MPP[23] USB 1 over current | ||
| 231 | */ | ||
| 232 | |||
| 233 | /* | ||
| 234 | * Configure peripherals. | ||
| 235 | */ | ||
| 236 | orion5x_ehci0_init(); | ||
| 237 | orion5x_ehci1_init(); | ||
| 238 | orion5x_eth_init(&mss2_eth_data); | ||
| 239 | orion5x_i2c_init(); | ||
| 240 | orion5x_sata_init(&mss2_sata_data); | ||
| 241 | orion5x_uart0_init(); | ||
| 242 | |||
| 243 | orion5x_setup_dev_boot_win(MSS2_NOR_BOOT_BASE, MSS2_NOR_BOOT_SIZE); | ||
| 244 | platform_device_register(&mss2_nor_flash); | ||
| 245 | |||
| 246 | platform_device_register(&mss2_button_device); | ||
| 247 | |||
| 248 | if (gpio_request(MSS2_GPIO_RTC_IRQ, "rtc") == 0) { | ||
| 249 | if (gpio_direction_input(MSS2_GPIO_RTC_IRQ) == 0) | ||
| 250 | mss2_i2c_rtc.irq = gpio_to_irq(MSS2_GPIO_RTC_IRQ); | ||
| 251 | else | ||
| 252 | gpio_free(MSS2_GPIO_RTC_IRQ); | ||
| 253 | } | ||
| 254 | i2c_register_board_info(0, &mss2_i2c_rtc, 1); | ||
| 255 | |||
| 256 | /* register mss2 specific power-off method */ | ||
| 257 | pm_power_off = mss2_power_off; | ||
| 258 | } | ||
| 259 | |||
| 260 | MACHINE_START(MSS2, "Maxtor Shared Storage II") | ||
| 261 | /* Maintainer: Sylver Bruneau <sylver.bruneau@googlemail.com> */ | ||
| 262 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 263 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 264 | .boot_params = 0x00000100, | ||
| 265 | .init_machine = mss2_init, | ||
| 266 | .map_io = orion5x_map_io, | ||
| 267 | .init_irq = orion5x_init_irq, | ||
| 268 | .timer = &orion5x_timer, | ||
| 269 | .fixup = tag_fixup_mem32 | ||
| 270 | MACHINE_END | ||
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c new file mode 100644 index 000000000000..55f3b0fdef8b --- /dev/null +++ b/arch/arm/mach-orion5x/mv2120-setup.c | |||
| @@ -0,0 +1,239 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2007 Herbert Valerio Riedel <hvr@gnu.org> | ||
| 3 | * Copyright (C) 2008 Martin Michlmayr <tbm@cyrius.com> | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU Lesser General Public License as | ||
| 7 | * published by the Free Software Foundation; either version 2 of the | ||
| 8 | * License, or (at your option) any later version. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/irq.h> | ||
| 15 | #include <linux/mtd/physmap.h> | ||
| 16 | #include <linux/mv643xx_eth.h> | ||
| 17 | #include <linux/leds.h> | ||
| 18 | #include <linux/gpio_keys.h> | ||
| 19 | #include <linux/input.h> | ||
| 20 | #include <linux/i2c.h> | ||
| 21 | #include <linux/ata_platform.h> | ||
| 22 | #include <asm/mach-types.h> | ||
| 23 | #include <asm/gpio.h> | ||
| 24 | #include <asm/mach/arch.h> | ||
| 25 | #include <asm/arch/orion5x.h> | ||
| 26 | #include "common.h" | ||
| 27 | #include "mpp.h" | ||
| 28 | |||
| 29 | #define MV2120_NOR_BOOT_BASE 0xf4000000 | ||
| 30 | #define MV2120_NOR_BOOT_SIZE SZ_512K | ||
| 31 | |||
| 32 | #define MV2120_GPIO_RTC_IRQ 3 | ||
| 33 | #define MV2120_GPIO_KEY_RESET 17 | ||
| 34 | #define MV2120_GPIO_KEY_POWER 18 | ||
| 35 | #define MV2120_GPIO_POWER_OFF 19 | ||
| 36 | |||
| 37 | |||
| 38 | /***************************************************************************** | ||
| 39 | * Ethernet | ||
| 40 | ****************************************************************************/ | ||
| 41 | static struct mv643xx_eth_platform_data mv2120_eth_data = { | ||
| 42 | .phy_addr = 8, | ||
| 43 | }; | ||
| 44 | |||
| 45 | static struct mv_sata_platform_data mv2120_sata_data = { | ||
| 46 | .n_ports = 2, | ||
| 47 | }; | ||
| 48 | |||
| 49 | static struct mtd_partition mv2120_partitions[] = { | ||
| 50 | { | ||
| 51 | .name = "firmware", | ||
| 52 | .size = 0x00080000, | ||
| 53 | .offset = 0, | ||
| 54 | }, | ||
| 55 | }; | ||
| 56 | |||
| 57 | static struct physmap_flash_data mv2120_nor_flash_data = { | ||
| 58 | .width = 1, | ||
| 59 | .parts = mv2120_partitions, | ||
| 60 | .nr_parts = ARRAY_SIZE(mv2120_partitions) | ||
| 61 | }; | ||
| 62 | |||
| 63 | static struct resource mv2120_nor_flash_resource = { | ||
| 64 | .flags = IORESOURCE_MEM, | ||
| 65 | .start = MV2120_NOR_BOOT_BASE, | ||
| 66 | .end = MV2120_NOR_BOOT_BASE + MV2120_NOR_BOOT_SIZE - 1, | ||
| 67 | }; | ||
| 68 | |||
| 69 | static struct platform_device mv2120_nor_flash = { | ||
| 70 | .name = "physmap-flash", | ||
| 71 | .id = 0, | ||
| 72 | .dev = { | ||
| 73 | .platform_data = &mv2120_nor_flash_data, | ||
| 74 | }, | ||
| 75 | .resource = &mv2120_nor_flash_resource, | ||
| 76 | .num_resources = 1, | ||
| 77 | }; | ||
| 78 | |||
| 79 | static struct gpio_keys_button mv2120_buttons[] = { | ||
| 80 | { | ||
| 81 | .code = KEY_RESTART, | ||
| 82 | .gpio = MV2120_GPIO_KEY_RESET, | ||
| 83 | .desc = "reset", | ||
| 84 | .active_low = 1, | ||
| 85 | }, { | ||
| 86 | .code = KEY_POWER, | ||
| 87 | .gpio = MV2120_GPIO_KEY_POWER, | ||
| 88 | .desc = "power", | ||
| 89 | .active_low = 1, | ||
| 90 | }, | ||
| 91 | }; | ||
| 92 | |||
| 93 | static struct gpio_keys_platform_data mv2120_button_data = { | ||
| 94 | .buttons = mv2120_buttons, | ||
| 95 | .nbuttons = ARRAY_SIZE(mv2120_buttons), | ||
| 96 | }; | ||
| 97 | |||
| 98 | static struct platform_device mv2120_button_device = { | ||
| 99 | .name = "gpio-keys", | ||
| 100 | .id = -1, | ||
| 101 | .num_resources = 0, | ||
| 102 | .dev = { | ||
| 103 | .platform_data = &mv2120_button_data, | ||
| 104 | }, | ||
| 105 | }; | ||
| 106 | |||
| 107 | |||
| 108 | /**************************************************************************** | ||
| 109 | * General Setup | ||
| 110 | ****************************************************************************/ | ||
| 111 | static struct orion5x_mpp_mode mv2120_mpp_modes[] __initdata = { | ||
| 112 | { 0, MPP_GPIO }, /* Sys status LED */ | ||
| 113 | { 1, MPP_GPIO }, /* Sys error LED */ | ||
| 114 | { 2, MPP_GPIO }, /* OverTemp interrupt */ | ||
| 115 | { 3, MPP_GPIO }, /* RTC interrupt */ | ||
| 116 | { 4, MPP_GPIO }, /* V_LED 5V */ | ||
| 117 | { 5, MPP_GPIO }, /* V_LED 3.3V */ | ||
| 118 | { 6, MPP_UNUSED }, | ||
| 119 | { 7, MPP_UNUSED }, | ||
| 120 | { 8, MPP_GPIO }, /* SATA 0 fail LED */ | ||
| 121 | { 9, MPP_GPIO }, /* SATA 1 fail LED */ | ||
| 122 | { 10, MPP_UNUSED }, | ||
| 123 | { 11, MPP_UNUSED }, | ||
| 124 | { 12, MPP_SATA_LED }, /* SATA 0 presence */ | ||
| 125 | { 13, MPP_SATA_LED }, /* SATA 1 presence */ | ||
| 126 | { 14, MPP_SATA_LED }, /* SATA 0 active */ | ||
| 127 | { 15, MPP_SATA_LED }, /* SATA 1 active */ | ||
| 128 | { 16, MPP_UNUSED }, | ||
| 129 | { 17, MPP_GPIO }, /* Reset button */ | ||
| 130 | { 18, MPP_GPIO }, /* Power button */ | ||
| 131 | { 19, MPP_GPIO }, /* Power off */ | ||
| 132 | { -1 }, | ||
| 133 | }; | ||
| 134 | |||
| 135 | static struct i2c_board_info __initdata mv2120_i2c_rtc = { | ||
| 136 | I2C_BOARD_INFO("pcf8563", 0x51), | ||
| 137 | .irq = 0, | ||
| 138 | }; | ||
| 139 | |||
| 140 | static struct gpio_led mv2120_led_pins[] = { | ||
| 141 | { | ||
| 142 | .name = "mv2120:blue:health", | ||
| 143 | .gpio = 0, | ||
| 144 | }, | ||
| 145 | { | ||
| 146 | .name = "mv2120:red:health", | ||
| 147 | .gpio = 1, | ||
| 148 | }, | ||
| 149 | { | ||
| 150 | .name = "mv2120:led:bright", | ||
| 151 | .gpio = 4, | ||
| 152 | .default_trigger = "default-on", | ||
| 153 | }, | ||
| 154 | { | ||
| 155 | .name = "mv2120:led:dimmed", | ||
| 156 | .gpio = 5, | ||
| 157 | }, | ||
| 158 | { | ||
| 159 | .name = "mv2120:red:sata0", | ||
| 160 | .gpio = 8, | ||
| 161 | .active_low = 1, | ||
| 162 | }, | ||
| 163 | { | ||
| 164 | .name = "mv2120:red:sata1", | ||
| 165 | .gpio = 9, | ||
| 166 | .active_low = 1, | ||
| 167 | }, | ||
| 168 | |||
| 169 | }; | ||
| 170 | |||
| 171 | static struct gpio_led_platform_data mv2120_led_data = { | ||
| 172 | .leds = mv2120_led_pins, | ||
| 173 | .num_leds = ARRAY_SIZE(mv2120_led_pins), | ||
| 174 | }; | ||
| 175 | |||
| 176 | static struct platform_device mv2120_leds = { | ||
| 177 | .name = "leds-gpio", | ||
| 178 | .id = -1, | ||
| 179 | .dev = { | ||
| 180 | .platform_data = &mv2120_led_data, | ||
| 181 | } | ||
| 182 | }; | ||
| 183 | |||
| 184 | static void mv2120_power_off(void) | ||
| 185 | { | ||
| 186 | pr_info("%s: triggering power-off...\n", __func__); | ||
| 187 | gpio_set_value(MV2120_GPIO_POWER_OFF, 0); | ||
| 188 | } | ||
| 189 | |||
| 190 | static void __init mv2120_init(void) | ||
| 191 | { | ||
| 192 | /* Setup basic Orion functions. Need to be called early. */ | ||
| 193 | orion5x_init(); | ||
| 194 | |||
| 195 | orion5x_mpp_conf(mv2120_mpp_modes); | ||
| 196 | |||
| 197 | /* | ||
| 198 | * Configure peripherals. | ||
| 199 | */ | ||
| 200 | orion5x_ehci0_init(); | ||
| 201 | orion5x_ehci1_init(); | ||
| 202 | orion5x_eth_init(&mv2120_eth_data); | ||
| 203 | orion5x_i2c_init(); | ||
| 204 | orion5x_sata_init(&mv2120_sata_data); | ||
| 205 | orion5x_uart0_init(); | ||
| 206 | |||
| 207 | orion5x_setup_dev_boot_win(MV2120_NOR_BOOT_BASE, MV2120_NOR_BOOT_SIZE); | ||
| 208 | platform_device_register(&mv2120_nor_flash); | ||
| 209 | |||
| 210 | platform_device_register(&mv2120_button_device); | ||
| 211 | |||
| 212 | if (gpio_request(MV2120_GPIO_RTC_IRQ, "rtc") == 0) { | ||
| 213 | if (gpio_direction_input(MV2120_GPIO_RTC_IRQ) == 0) | ||
| 214 | mv2120_i2c_rtc.irq = gpio_to_irq(MV2120_GPIO_RTC_IRQ); | ||
| 215 | else | ||
| 216 | gpio_free(MV2120_GPIO_RTC_IRQ); | ||
| 217 | } | ||
| 218 | i2c_register_board_info(0, &mv2120_i2c_rtc, 1); | ||
| 219 | platform_device_register(&mv2120_leds); | ||
| 220 | |||
| 221 | /* register mv2120 specific power-off method */ | ||
| 222 | if (gpio_request(MV2120_GPIO_POWER_OFF, "POWEROFF") != 0 || | ||
| 223 | gpio_direction_output(MV2120_GPIO_POWER_OFF, 1) != 0) | ||
| 224 | pr_err("mv2120: failed to setup power-off GPIO\n"); | ||
| 225 | pm_power_off = mv2120_power_off; | ||
| 226 | } | ||
| 227 | |||
| 228 | /* Warning: HP uses a wrong mach-type (=526) in their bootloader */ | ||
| 229 | MACHINE_START(MV2120, "HP Media Vault mv2120") | ||
| 230 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ | ||
| 231 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 232 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 233 | .boot_params = 0x00000100, | ||
| 234 | .init_machine = mv2120_init, | ||
| 235 | .map_io = orion5x_map_io, | ||
| 236 | .init_irq = orion5x_init_irq, | ||
| 237 | .timer = &orion5x_timer, | ||
| 238 | .fixup = tag_fixup_mem32 | ||
| 239 | MACHINE_END | ||
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 9d5d39fa19c3..256a4f680935 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c | |||
| @@ -152,6 +152,8 @@ static int __init pcie_setup(struct pci_sys_data *sys) | |||
| 152 | if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) { | 152 | if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) { |
| 153 | printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config " | 153 | printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config " |
| 154 | "read transaction workaround\n"); | 154 | "read transaction workaround\n"); |
| 155 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | ||
| 156 | ORION5X_PCIE_WA_SIZE); | ||
| 155 | pcie_ops.read = pcie_rd_conf_wa; | 157 | pcie_ops.read = pcie_rd_conf_wa; |
| 156 | } | 158 | } |
| 157 | 159 | ||
| @@ -240,13 +242,13 @@ static int __init pcie_setup(struct pci_sys_data *sys) | |||
| 240 | * PCI Address Decode Windows registers | 242 | * PCI Address Decode Windows registers |
| 241 | */ | 243 | */ |
| 242 | #define PCI_BAR_SIZE_DDR_CS(n) (((n) == 0) ? ORION5X_PCI_REG(0xc08) : \ | 244 | #define PCI_BAR_SIZE_DDR_CS(n) (((n) == 0) ? ORION5X_PCI_REG(0xc08) : \ |
| 243 | ((n) == 1) ? ORION5X_PCI_REG(0xd08) : \ | 245 | ((n) == 1) ? ORION5X_PCI_REG(0xd08) : \ |
| 244 | ((n) == 2) ? ORION5X_PCI_REG(0xc0c) : \ | 246 | ((n) == 2) ? ORION5X_PCI_REG(0xc0c) : \ |
| 245 | ((n) == 3) ? ORION5X_PCI_REG(0xd0c) : 0) | 247 | ((n) == 3) ? ORION5X_PCI_REG(0xd0c) : 0) |
| 246 | #define PCI_BAR_REMAP_DDR_CS(n) (((n) ==0) ? ORION5X_PCI_REG(0xc48) : \ | 248 | #define PCI_BAR_REMAP_DDR_CS(n) (((n) == 0) ? ORION5X_PCI_REG(0xc48) : \ |
| 247 | ((n) == 1) ? ORION5X_PCI_REG(0xd48) : \ | 249 | ((n) == 1) ? ORION5X_PCI_REG(0xd48) : \ |
| 248 | ((n) == 2) ? ORION5X_PCI_REG(0xc4c) : \ | 250 | ((n) == 2) ? ORION5X_PCI_REG(0xc4c) : \ |
| 249 | ((n) == 3) ? ORION5X_PCI_REG(0xd4c) : 0) | 251 | ((n) == 3) ? ORION5X_PCI_REG(0xd4c) : 0) |
| 250 | #define PCI_BAR_ENABLE ORION5X_PCI_REG(0xc3c) | 252 | #define PCI_BAR_ENABLE ORION5X_PCI_REG(0xc3c) |
| 251 | #define PCI_ADDR_DECODE_CTRL ORION5X_PCI_REG(0xd3c) | 253 | #define PCI_ADDR_DECODE_CTRL ORION5X_PCI_REG(0xd3c) |
| 252 | 254 | ||
| @@ -264,9 +266,11 @@ static int __init pcie_setup(struct pci_sys_data *sys) | |||
| 264 | */ | 266 | */ |
| 265 | static DEFINE_SPINLOCK(orion5x_pci_lock); | 267 | static DEFINE_SPINLOCK(orion5x_pci_lock); |
| 266 | 268 | ||
| 269 | static int orion5x_pci_cardbus_mode; | ||
| 270 | |||
| 267 | static int orion5x_pci_local_bus_nr(void) | 271 | static int orion5x_pci_local_bus_nr(void) |
| 268 | { | 272 | { |
| 269 | u32 conf = orion5x_read(PCI_P2P_CONF); | 273 | u32 conf = readl(PCI_P2P_CONF); |
| 270 | return((conf & PCI_P2P_BUS_MASK) >> PCI_P2P_BUS_OFFS); | 274 | return((conf & PCI_P2P_BUS_MASK) >> PCI_P2P_BUS_OFFS); |
| 271 | } | 275 | } |
| 272 | 276 | ||
| @@ -276,11 +280,11 @@ static int orion5x_pci_hw_rd_conf(int bus, int dev, u32 func, | |||
| 276 | unsigned long flags; | 280 | unsigned long flags; |
| 277 | spin_lock_irqsave(&orion5x_pci_lock, flags); | 281 | spin_lock_irqsave(&orion5x_pci_lock, flags); |
| 278 | 282 | ||
| 279 | orion5x_write(PCI_CONF_ADDR, PCI_CONF_BUS(bus) | | 283 | writel(PCI_CONF_BUS(bus) | |
| 280 | PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | | 284 | PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | |
| 281 | PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN); | 285 | PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); |
| 282 | 286 | ||
| 283 | *val = orion5x_read(PCI_CONF_DATA); | 287 | *val = readl(PCI_CONF_DATA); |
| 284 | 288 | ||
| 285 | if (size == 1) | 289 | if (size == 1) |
| 286 | *val = (*val >> (8*(where & 0x3))) & 0xff; | 290 | *val = (*val >> (8*(where & 0x3))) & 0xff; |
| @@ -300,9 +304,9 @@ static int orion5x_pci_hw_wr_conf(int bus, int dev, u32 func, | |||
| 300 | 304 | ||
| 301 | spin_lock_irqsave(&orion5x_pci_lock, flags); | 305 | spin_lock_irqsave(&orion5x_pci_lock, flags); |
| 302 | 306 | ||
| 303 | orion5x_write(PCI_CONF_ADDR, PCI_CONF_BUS(bus) | | 307 | writel(PCI_CONF_BUS(bus) | |
| 304 | PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | | 308 | PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | |
| 305 | PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN); | 309 | PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); |
| 306 | 310 | ||
| 307 | if (size == 4) { | 311 | if (size == 4) { |
| 308 | __raw_writel(val, PCI_CONF_DATA); | 312 | __raw_writel(val, PCI_CONF_DATA); |
| @@ -319,14 +323,30 @@ static int orion5x_pci_hw_wr_conf(int bus, int dev, u32 func, | |||
| 319 | return ret; | 323 | return ret; |
| 320 | } | 324 | } |
| 321 | 325 | ||
| 326 | static int orion5x_pci_valid_config(int bus, u32 devfn) | ||
| 327 | { | ||
| 328 | if (bus == orion5x_pci_local_bus_nr()) { | ||
| 329 | /* | ||
| 330 | * Don't go out for local device | ||
| 331 | */ | ||
| 332 | if (PCI_SLOT(devfn) == 0 && PCI_FUNC(devfn) != 0) | ||
| 333 | return 0; | ||
| 334 | |||
| 335 | /* | ||
| 336 | * When the PCI signals are directly connected to a | ||
| 337 | * Cardbus slot, ignore all but device IDs 0 and 1. | ||
| 338 | */ | ||
| 339 | if (orion5x_pci_cardbus_mode && PCI_SLOT(devfn) > 1) | ||
| 340 | return 0; | ||
| 341 | } | ||
| 342 | |||
| 343 | return 1; | ||
| 344 | } | ||
| 345 | |||
| 322 | static int orion5x_pci_rd_conf(struct pci_bus *bus, u32 devfn, | 346 | static int orion5x_pci_rd_conf(struct pci_bus *bus, u32 devfn, |
| 323 | int where, int size, u32 *val) | 347 | int where, int size, u32 *val) |
| 324 | { | 348 | { |
| 325 | /* | 349 | if (!orion5x_pci_valid_config(bus->number, devfn)) { |
| 326 | * Don't go out for local device | ||
| 327 | */ | ||
| 328 | if (bus->number == orion5x_pci_local_bus_nr() && | ||
| 329 | PCI_SLOT(devfn) == 0 && PCI_FUNC(devfn) != 0) { | ||
| 330 | *val = 0xffffffff; | 350 | *val = 0xffffffff; |
| 331 | return PCIBIOS_DEVICE_NOT_FOUND; | 351 | return PCIBIOS_DEVICE_NOT_FOUND; |
| 332 | } | 352 | } |
| @@ -338,8 +358,7 @@ static int orion5x_pci_rd_conf(struct pci_bus *bus, u32 devfn, | |||
| 338 | static int orion5x_pci_wr_conf(struct pci_bus *bus, u32 devfn, | 358 | static int orion5x_pci_wr_conf(struct pci_bus *bus, u32 devfn, |
| 339 | int where, int size, u32 val) | 359 | int where, int size, u32 val) |
| 340 | { | 360 | { |
| 341 | if (bus->number == orion5x_pci_local_bus_nr() && | 361 | if (!orion5x_pci_valid_config(bus->number, devfn)) |
| 342 | PCI_SLOT(devfn) == 0 && PCI_FUNC(devfn) != 0) | ||
| 343 | return PCIBIOS_DEVICE_NOT_FOUND; | 362 | return PCIBIOS_DEVICE_NOT_FOUND; |
| 344 | 363 | ||
| 345 | return orion5x_pci_hw_wr_conf(bus->number, PCI_SLOT(devfn), | 364 | return orion5x_pci_hw_wr_conf(bus->number, PCI_SLOT(devfn), |
| @@ -353,9 +372,9 @@ static struct pci_ops pci_ops = { | |||
| 353 | 372 | ||
| 354 | static void __init orion5x_pci_set_bus_nr(int nr) | 373 | static void __init orion5x_pci_set_bus_nr(int nr) |
| 355 | { | 374 | { |
| 356 | u32 p2p = orion5x_read(PCI_P2P_CONF); | 375 | u32 p2p = readl(PCI_P2P_CONF); |
| 357 | 376 | ||
| 358 | if (orion5x_read(PCI_MODE) & PCI_MODE_PCIX) { | 377 | if (readl(PCI_MODE) & PCI_MODE_PCIX) { |
| 359 | /* | 378 | /* |
| 360 | * PCI-X mode | 379 | * PCI-X mode |
| 361 | */ | 380 | */ |
| @@ -372,7 +391,7 @@ static void __init orion5x_pci_set_bus_nr(int nr) | |||
| 372 | */ | 391 | */ |
| 373 | p2p &= ~PCI_P2P_BUS_MASK; | 392 | p2p &= ~PCI_P2P_BUS_MASK; |
| 374 | p2p |= (nr << PCI_P2P_BUS_OFFS); | 393 | p2p |= (nr << PCI_P2P_BUS_OFFS); |
| 375 | orion5x_write(PCI_P2P_CONF, p2p); | 394 | writel(p2p, PCI_P2P_CONF); |
| 376 | } | 395 | } |
| 377 | } | 396 | } |
| 378 | 397 | ||
| @@ -399,7 +418,7 @@ static void __init orion5x_setup_pci_wins(struct mbus_dram_target_info *dram) | |||
| 399 | * First, disable windows. | 418 | * First, disable windows. |
| 400 | */ | 419 | */ |
| 401 | win_enable = 0xffffffff; | 420 | win_enable = 0xffffffff; |
| 402 | orion5x_write(PCI_BAR_ENABLE, win_enable); | 421 | writel(win_enable, PCI_BAR_ENABLE); |
| 403 | 422 | ||
| 404 | /* | 423 | /* |
| 405 | * Setup windows for DDR banks. | 424 | * Setup windows for DDR banks. |
| @@ -425,10 +444,10 @@ static void __init orion5x_setup_pci_wins(struct mbus_dram_target_info *dram) | |||
| 425 | */ | 444 | */ |
| 426 | reg = PCI_CONF_REG_BAR_HI_CS(cs->cs_index); | 445 | reg = PCI_CONF_REG_BAR_HI_CS(cs->cs_index); |
| 427 | orion5x_pci_hw_wr_conf(bus, 0, func, reg, 4, 0); | 446 | orion5x_pci_hw_wr_conf(bus, 0, func, reg, 4, 0); |
| 428 | orion5x_write(PCI_BAR_SIZE_DDR_CS(cs->cs_index), | 447 | writel((cs->size - 1) & 0xfffff000, |
| 429 | (cs->size - 1) & 0xfffff000); | 448 | PCI_BAR_SIZE_DDR_CS(cs->cs_index)); |
| 430 | orion5x_write(PCI_BAR_REMAP_DDR_CS(cs->cs_index), | 449 | writel(cs->base & 0xfffff000, |
| 431 | cs->base & 0xfffff000); | 450 | PCI_BAR_REMAP_DDR_CS(cs->cs_index)); |
| 432 | 451 | ||
| 433 | /* | 452 | /* |
| 434 | * Enable decode window for this chip select. | 453 | * Enable decode window for this chip select. |
| @@ -439,7 +458,7 @@ static void __init orion5x_setup_pci_wins(struct mbus_dram_target_info *dram) | |||
| 439 | /* | 458 | /* |
| 440 | * Re-enable decode windows. | 459 | * Re-enable decode windows. |
| 441 | */ | 460 | */ |
| 442 | orion5x_write(PCI_BAR_ENABLE, win_enable); | 461 | writel(win_enable, PCI_BAR_ENABLE); |
| 443 | 462 | ||
| 444 | /* | 463 | /* |
| 445 | * Disable automatic update of address remaping when writing to BARs. | 464 | * Disable automatic update of address remaping when writing to BARs. |
| @@ -522,6 +541,11 @@ static void __devinit rc_pci_fixup(struct pci_dev *dev) | |||
| 522 | } | 541 | } |
| 523 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); | 542 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); |
| 524 | 543 | ||
| 544 | void __init orion5x_pci_set_cardbus_mode(void) | ||
| 545 | { | ||
| 546 | orion5x_pci_cardbus_mode = 1; | ||
| 547 | } | ||
| 548 | |||
| 525 | int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys) | 549 | int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys) |
| 526 | { | 550 | { |
| 527 | int ret = 0; | 551 | int ret = 0; |
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c new file mode 100644 index 000000000000..d50e3650a09e --- /dev/null +++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | |||
| @@ -0,0 +1,161 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | ||
| 3 | * | ||
| 4 | * Marvell Orion-VoIP FXO Reference Design Setup | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/pci.h> | ||
| 15 | #include <linux/irq.h> | ||
| 16 | #include <linux/mtd/physmap.h> | ||
| 17 | #include <linux/mv643xx_eth.h> | ||
| 18 | #include <asm/mach-types.h> | ||
| 19 | #include <asm/gpio.h> | ||
| 20 | #include <asm/leds.h> | ||
| 21 | #include <asm/mach/arch.h> | ||
| 22 | #include <asm/mach/pci.h> | ||
| 23 | #include <asm/arch/orion5x.h> | ||
| 24 | #include "common.h" | ||
| 25 | #include "mpp.h" | ||
| 26 | |||
| 27 | /***************************************************************************** | ||
| 28 | * RD-88F5181L FXO Info | ||
| 29 | ****************************************************************************/ | ||
| 30 | /* | ||
| 31 | * 8M NOR flash Device bus boot chip select | ||
| 32 | */ | ||
| 33 | #define RD88F5181L_FXO_NOR_BOOT_BASE 0xff800000 | ||
| 34 | #define RD88F5181L_FXO_NOR_BOOT_SIZE SZ_8M | ||
| 35 | |||
| 36 | |||
| 37 | /***************************************************************************** | ||
| 38 | * 8M NOR Flash on Device bus Boot chip select | ||
| 39 | ****************************************************************************/ | ||
| 40 | static struct physmap_flash_data rd88f5181l_fxo_nor_boot_flash_data = { | ||
| 41 | .width = 1, | ||
| 42 | }; | ||
| 43 | |||
| 44 | static struct resource rd88f5181l_fxo_nor_boot_flash_resource = { | ||
| 45 | .flags = IORESOURCE_MEM, | ||
| 46 | .start = RD88F5181L_FXO_NOR_BOOT_BASE, | ||
| 47 | .end = RD88F5181L_FXO_NOR_BOOT_BASE + | ||
| 48 | RD88F5181L_FXO_NOR_BOOT_SIZE - 1, | ||
| 49 | }; | ||
| 50 | |||
| 51 | static struct platform_device rd88f5181l_fxo_nor_boot_flash = { | ||
| 52 | .name = "physmap-flash", | ||
| 53 | .id = 0, | ||
| 54 | .dev = { | ||
| 55 | .platform_data = &rd88f5181l_fxo_nor_boot_flash_data, | ||
| 56 | }, | ||
| 57 | .num_resources = 1, | ||
| 58 | .resource = &rd88f5181l_fxo_nor_boot_flash_resource, | ||
| 59 | }; | ||
| 60 | |||
| 61 | |||
| 62 | /***************************************************************************** | ||
| 63 | * General Setup | ||
| 64 | ****************************************************************************/ | ||
| 65 | static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = { | ||
| 66 | { 0, MPP_GPIO }, /* LED1 CardBus LED (front panel) */ | ||
| 67 | { 1, MPP_GPIO }, /* PCI_intA */ | ||
| 68 | { 2, MPP_GPIO }, /* Hard Reset / Factory Init*/ | ||
| 69 | { 3, MPP_GPIO }, /* FXS or DAA select */ | ||
| 70 | { 4, MPP_GPIO }, /* LED6 - phone LED (front panel) */ | ||
| 71 | { 5, MPP_GPIO }, /* LED5 - phone LED (front panel) */ | ||
| 72 | { 6, MPP_PCI_CLK }, /* CPU PCI refclk */ | ||
| 73 | { 7, MPP_PCI_CLK }, /* PCI/PCIe refclk */ | ||
| 74 | { 8, MPP_GPIO }, /* CardBus reset */ | ||
| 75 | { 9, MPP_GPIO }, /* GE_RXERR */ | ||
| 76 | { 10, MPP_GPIO }, /* LED2 MiniPCI LED (front panel) */ | ||
| 77 | { 11, MPP_GPIO }, /* Lifeline control */ | ||
| 78 | { 12, MPP_GIGE }, /* GE_TXD[4] */ | ||
| 79 | { 13, MPP_GIGE }, /* GE_TXD[5] */ | ||
| 80 | { 14, MPP_GIGE }, /* GE_TXD[6] */ | ||
| 81 | { 15, MPP_GIGE }, /* GE_TXD[7] */ | ||
| 82 | { 16, MPP_GIGE }, /* GE_RXD[4] */ | ||
| 83 | { 17, MPP_GIGE }, /* GE_RXD[5] */ | ||
| 84 | { 18, MPP_GIGE }, /* GE_RXD[6] */ | ||
| 85 | { 19, MPP_GIGE }, /* GE_RXD[7] */ | ||
| 86 | { -1 }, | ||
| 87 | }; | ||
| 88 | |||
| 89 | static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = { | ||
| 90 | .phy_addr = -1, | ||
| 91 | }; | ||
| 92 | |||
| 93 | static void __init rd88f5181l_fxo_init(void) | ||
| 94 | { | ||
| 95 | /* | ||
| 96 | * Setup basic Orion functions. Need to be called early. | ||
| 97 | */ | ||
| 98 | orion5x_init(); | ||
| 99 | |||
| 100 | orion5x_mpp_conf(rd88f5181l_fxo_mpp_modes); | ||
| 101 | |||
| 102 | /* | ||
| 103 | * Configure peripherals. | ||
| 104 | */ | ||
| 105 | orion5x_ehci0_init(); | ||
| 106 | orion5x_eth_init(&rd88f5181l_fxo_eth_data); | ||
| 107 | orion5x_uart0_init(); | ||
| 108 | |||
| 109 | orion5x_setup_dev_boot_win(RD88F5181L_FXO_NOR_BOOT_BASE, | ||
| 110 | RD88F5181L_FXO_NOR_BOOT_SIZE); | ||
| 111 | platform_device_register(&rd88f5181l_fxo_nor_boot_flash); | ||
| 112 | } | ||
| 113 | |||
| 114 | static int __init | ||
| 115 | rd88f5181l_fxo_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 116 | { | ||
| 117 | int irq; | ||
| 118 | |||
| 119 | /* | ||
| 120 | * Check for devices with hard-wired IRQs. | ||
| 121 | */ | ||
| 122 | irq = orion5x_pci_map_irq(dev, slot, pin); | ||
| 123 | if (irq != -1) | ||
| 124 | return irq; | ||
| 125 | |||
| 126 | /* | ||
| 127 | * Mini-PCI / Cardbus slot. | ||
| 128 | */ | ||
| 129 | return gpio_to_irq(1); | ||
| 130 | } | ||
| 131 | |||
| 132 | static struct hw_pci rd88f5181l_fxo_pci __initdata = { | ||
| 133 | .nr_controllers = 2, | ||
| 134 | .swizzle = pci_std_swizzle, | ||
| 135 | .setup = orion5x_pci_sys_setup, | ||
| 136 | .scan = orion5x_pci_sys_scan_bus, | ||
| 137 | .map_irq = rd88f5181l_fxo_pci_map_irq, | ||
| 138 | }; | ||
| 139 | |||
| 140 | static int __init rd88f5181l_fxo_pci_init(void) | ||
| 141 | { | ||
| 142 | if (machine_is_rd88f5181l_fxo()) { | ||
| 143 | orion5x_pci_set_cardbus_mode(); | ||
| 144 | pci_common_init(&rd88f5181l_fxo_pci); | ||
| 145 | } | ||
| 146 | |||
| 147 | return 0; | ||
| 148 | } | ||
| 149 | subsys_initcall(rd88f5181l_fxo_pci_init); | ||
| 150 | |||
| 151 | MACHINE_START(RD88F5181L_FXO, "Marvell Orion-VoIP FXO Reference Design") | ||
| 152 | /* Maintainer: Nicolas Pitre <nico@marvell.com> */ | ||
| 153 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 154 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 155 | .boot_params = 0x00000100, | ||
| 156 | .init_machine = rd88f5181l_fxo_init, | ||
| 157 | .map_io = orion5x_map_io, | ||
| 158 | .init_irq = orion5x_init_irq, | ||
| 159 | .timer = &orion5x_timer, | ||
| 160 | .fixup = tag_fixup_mem32, | ||
| 161 | MACHINE_END | ||
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c new file mode 100644 index 000000000000..b56447d32e17 --- /dev/null +++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | |||
| @@ -0,0 +1,172 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | ||
| 3 | * | ||
| 4 | * Marvell Orion-VoIP GE Reference Design Setup | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/pci.h> | ||
| 15 | #include <linux/irq.h> | ||
| 16 | #include <linux/mtd/physmap.h> | ||
| 17 | #include <linux/mv643xx_eth.h> | ||
| 18 | #include <linux/i2c.h> | ||
| 19 | #include <asm/mach-types.h> | ||
| 20 | #include <asm/gpio.h> | ||
| 21 | #include <asm/leds.h> | ||
| 22 | #include <asm/mach/arch.h> | ||
| 23 | #include <asm/mach/pci.h> | ||
| 24 | #include <asm/arch/orion5x.h> | ||
| 25 | #include "common.h" | ||
| 26 | #include "mpp.h" | ||
| 27 | |||
| 28 | /***************************************************************************** | ||
| 29 | * RD-88F5181L GE Info | ||
| 30 | ****************************************************************************/ | ||
| 31 | /* | ||
| 32 | * 16M NOR flash Device bus boot chip select | ||
| 33 | */ | ||
| 34 | #define RD88F5181L_GE_NOR_BOOT_BASE 0xff000000 | ||
| 35 | #define RD88F5181L_GE_NOR_BOOT_SIZE SZ_16M | ||
| 36 | |||
| 37 | |||
| 38 | /***************************************************************************** | ||
| 39 | * 16M NOR Flash on Device bus Boot chip select | ||
| 40 | ****************************************************************************/ | ||
| 41 | static struct physmap_flash_data rd88f5181l_ge_nor_boot_flash_data = { | ||
| 42 | .width = 1, | ||
| 43 | }; | ||
| 44 | |||
| 45 | static struct resource rd88f5181l_ge_nor_boot_flash_resource = { | ||
| 46 | .flags = IORESOURCE_MEM, | ||
| 47 | .start = RD88F5181L_GE_NOR_BOOT_BASE, | ||
| 48 | .end = RD88F5181L_GE_NOR_BOOT_BASE + | ||
| 49 | RD88F5181L_GE_NOR_BOOT_SIZE - 1, | ||
| 50 | }; | ||
| 51 | |||
| 52 | static struct platform_device rd88f5181l_ge_nor_boot_flash = { | ||
| 53 | .name = "physmap-flash", | ||
| 54 | .id = 0, | ||
| 55 | .dev = { | ||
| 56 | .platform_data = &rd88f5181l_ge_nor_boot_flash_data, | ||
| 57 | }, | ||
| 58 | .num_resources = 1, | ||
| 59 | .resource = &rd88f5181l_ge_nor_boot_flash_resource, | ||
| 60 | }; | ||
| 61 | |||
| 62 | |||
| 63 | /***************************************************************************** | ||
| 64 | * General Setup | ||
| 65 | ****************************************************************************/ | ||
| 66 | static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = { | ||
| 67 | { 0, MPP_GPIO }, /* LED1 */ | ||
| 68 | { 1, MPP_GPIO }, /* LED5 */ | ||
| 69 | { 2, MPP_GPIO }, /* LED4 */ | ||
| 70 | { 3, MPP_GPIO }, /* LED3 */ | ||
| 71 | { 4, MPP_GPIO }, /* PCI_intA */ | ||
| 72 | { 5, MPP_GPIO }, /* RTC interrupt */ | ||
| 73 | { 6, MPP_PCI_CLK }, /* CPU PCI refclk */ | ||
| 74 | { 7, MPP_PCI_CLK }, /* PCI/PCIe refclk */ | ||
| 75 | { 8, MPP_GPIO }, /* 88e6131 interrupt */ | ||
| 76 | { 9, MPP_GPIO }, /* GE_RXERR */ | ||
| 77 | { 10, MPP_GPIO }, /* PCI_intB */ | ||
| 78 | { 11, MPP_GPIO }, /* LED2 */ | ||
| 79 | { 12, MPP_GIGE }, /* GE_TXD[4] */ | ||
| 80 | { 13, MPP_GIGE }, /* GE_TXD[5] */ | ||
| 81 | { 14, MPP_GIGE }, /* GE_TXD[6] */ | ||
| 82 | { 15, MPP_GIGE }, /* GE_TXD[7] */ | ||
| 83 | { 16, MPP_GIGE }, /* GE_RXD[4] */ | ||
| 84 | { 17, MPP_GIGE }, /* GE_RXD[5] */ | ||
| 85 | { 18, MPP_GIGE }, /* GE_RXD[6] */ | ||
| 86 | { 19, MPP_GIGE }, /* GE_RXD[7] */ | ||
| 87 | { -1 }, | ||
| 88 | }; | ||
| 89 | |||
| 90 | static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = { | ||
| 91 | .phy_addr = -1, | ||
| 92 | }; | ||
| 93 | |||
| 94 | static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = { | ||
| 95 | I2C_BOARD_INFO("ds1338", 0x68), | ||
| 96 | }; | ||
| 97 | |||
| 98 | static void __init rd88f5181l_ge_init(void) | ||
| 99 | { | ||
| 100 | /* | ||
| 101 | * Setup basic Orion functions. Need to be called early. | ||
| 102 | */ | ||
| 103 | orion5x_init(); | ||
| 104 | |||
| 105 | orion5x_mpp_conf(rd88f5181l_ge_mpp_modes); | ||
| 106 | |||
| 107 | /* | ||
| 108 | * Configure peripherals. | ||
| 109 | */ | ||
| 110 | orion5x_ehci0_init(); | ||
| 111 | orion5x_eth_init(&rd88f5181l_ge_eth_data); | ||
| 112 | orion5x_i2c_init(); | ||
| 113 | orion5x_uart0_init(); | ||
| 114 | |||
| 115 | orion5x_setup_dev_boot_win(RD88F5181L_GE_NOR_BOOT_BASE, | ||
| 116 | RD88F5181L_GE_NOR_BOOT_SIZE); | ||
| 117 | platform_device_register(&rd88f5181l_ge_nor_boot_flash); | ||
| 118 | |||
| 119 | i2c_register_board_info(0, &rd88f5181l_ge_i2c_rtc, 1); | ||
| 120 | } | ||
| 121 | |||
| 122 | static int __init | ||
| 123 | rd88f5181l_ge_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 124 | { | ||
| 125 | int irq; | ||
| 126 | |||
| 127 | /* | ||
| 128 | * Check for devices with hard-wired IRQs. | ||
| 129 | */ | ||
| 130 | irq = orion5x_pci_map_irq(dev, slot, pin); | ||
| 131 | if (irq != -1) | ||
| 132 | return irq; | ||
| 133 | |||
| 134 | /* | ||
| 135 | * Cardbus slot. | ||
| 136 | */ | ||
| 137 | if (pin == 1) | ||
| 138 | return gpio_to_irq(4); | ||
| 139 | else | ||
| 140 | return gpio_to_irq(10); | ||
| 141 | } | ||
| 142 | |||
| 143 | static struct hw_pci rd88f5181l_ge_pci __initdata = { | ||
| 144 | .nr_controllers = 2, | ||
| 145 | .swizzle = pci_std_swizzle, | ||
| 146 | .setup = orion5x_pci_sys_setup, | ||
| 147 | .scan = orion5x_pci_sys_scan_bus, | ||
| 148 | .map_irq = rd88f5181l_ge_pci_map_irq, | ||
| 149 | }; | ||
| 150 | |||
| 151 | static int __init rd88f5181l_ge_pci_init(void) | ||
| 152 | { | ||
| 153 | if (machine_is_rd88f5181l_ge()) { | ||
| 154 | orion5x_pci_set_cardbus_mode(); | ||
| 155 | pci_common_init(&rd88f5181l_ge_pci); | ||
| 156 | } | ||
| 157 | |||
| 158 | return 0; | ||
| 159 | } | ||
| 160 | subsys_initcall(rd88f5181l_ge_pci_init); | ||
| 161 | |||
| 162 | MACHINE_START(RD88F5181L_GE, "Marvell Orion-VoIP GE Reference Design") | ||
| 163 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ | ||
| 164 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 165 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 166 | .boot_params = 0x00000100, | ||
| 167 | .init_machine = rd88f5181l_ge_init, | ||
| 168 | .map_io = orion5x_map_io, | ||
| 169 | .init_irq = orion5x_init_irq, | ||
| 170 | .timer = &orion5x_timer, | ||
| 171 | .fixup = tag_fixup_mem32, | ||
| 172 | MACHINE_END | ||
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index 81abc1003aae..10ae62864269 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <asm/mach/pci.h> | 26 | #include <asm/mach/pci.h> |
| 27 | #include <asm/arch/orion5x.h> | 27 | #include <asm/arch/orion5x.h> |
| 28 | #include "common.h" | 28 | #include "common.h" |
| 29 | #include "mpp.h" | ||
| 29 | 30 | ||
| 30 | /***************************************************************************** | 31 | /***************************************************************************** |
| 31 | * RD-88F5182 Info | 32 | * RD-88F5182 Info |
| @@ -125,6 +126,7 @@ static int __init rd88f5182_dbgled_init(void) | |||
| 125 | 126 | ||
| 126 | leds_event = rd88f5182_dbgled_event; | 127 | leds_event = rd88f5182_dbgled_event; |
| 127 | } | 128 | } |
| 129 | |||
| 128 | return 0; | 130 | return 0; |
| 129 | } | 131 | } |
| 130 | 132 | ||
| @@ -220,7 +222,6 @@ subsys_initcall(rd88f5182_pci_init); | |||
| 220 | 222 | ||
| 221 | static struct mv643xx_eth_platform_data rd88f5182_eth_data = { | 223 | static struct mv643xx_eth_platform_data rd88f5182_eth_data = { |
| 222 | .phy_addr = 8, | 224 | .phy_addr = 8, |
| 223 | .force_phy_addr = 1, | ||
| 224 | }; | 225 | }; |
| 225 | 226 | ||
| 226 | /***************************************************************************** | 227 | /***************************************************************************** |
| @@ -234,15 +235,34 @@ static struct i2c_board_info __initdata rd88f5182_i2c_rtc = { | |||
| 234 | * Sata | 235 | * Sata |
| 235 | ****************************************************************************/ | 236 | ****************************************************************************/ |
| 236 | static struct mv_sata_platform_data rd88f5182_sata_data = { | 237 | static struct mv_sata_platform_data rd88f5182_sata_data = { |
| 237 | .n_ports = 2, | 238 | .n_ports = 2, |
| 238 | }; | 239 | }; |
| 239 | 240 | ||
| 240 | /***************************************************************************** | 241 | /***************************************************************************** |
| 241 | * General Setup | 242 | * General Setup |
| 242 | ****************************************************************************/ | 243 | ****************************************************************************/ |
| 243 | 244 | static struct orion5x_mpp_mode rd88f5182_mpp_modes[] __initdata = { | |
| 244 | static struct platform_device *rd88f5182_devices[] __initdata = { | 245 | { 0, MPP_GPIO }, /* Debug Led */ |
| 245 | &rd88f5182_nor_flash, | 246 | { 1, MPP_GPIO }, /* Reset Switch */ |
| 247 | { 2, MPP_UNUSED }, | ||
| 248 | { 3, MPP_GPIO }, /* RTC Int */ | ||
| 249 | { 4, MPP_GPIO }, | ||
| 250 | { 5, MPP_GPIO }, | ||
| 251 | { 6, MPP_GPIO }, /* PCI_intA */ | ||
| 252 | { 7, MPP_GPIO }, /* PCI_intB */ | ||
| 253 | { 8, MPP_UNUSED }, | ||
| 254 | { 9, MPP_UNUSED }, | ||
| 255 | { 10, MPP_UNUSED }, | ||
| 256 | { 11, MPP_UNUSED }, | ||
| 257 | { 12, MPP_SATA_LED }, /* SATA 0 presence */ | ||
| 258 | { 13, MPP_SATA_LED }, /* SATA 1 presence */ | ||
| 259 | { 14, MPP_SATA_LED }, /* SATA 0 active */ | ||
| 260 | { 15, MPP_SATA_LED }, /* SATA 1 active */ | ||
| 261 | { 16, MPP_UNUSED }, | ||
| 262 | { 17, MPP_UNUSED }, | ||
| 263 | { 18, MPP_UNUSED }, | ||
| 264 | { 19, MPP_UNUSED }, | ||
| 265 | { -1 }, | ||
| 246 | }; | 266 | }; |
| 247 | 267 | ||
| 248 | static void __init rd88f5182_init(void) | 268 | static void __init rd88f5182_init(void) |
| @@ -252,35 +272,9 @@ static void __init rd88f5182_init(void) | |||
| 252 | */ | 272 | */ |
| 253 | orion5x_init(); | 273 | orion5x_init(); |
| 254 | 274 | ||
| 255 | /* | 275 | orion5x_mpp_conf(rd88f5182_mpp_modes); |
| 256 | * Setup the CPU address decode windows for our devices | ||
| 257 | */ | ||
| 258 | orion5x_setup_dev_boot_win(RD88F5182_NOR_BOOT_BASE, | ||
| 259 | RD88F5182_NOR_BOOT_SIZE); | ||
| 260 | orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE); | ||
| 261 | |||
| 262 | /* | ||
| 263 | * Open a special address decode windows for the PCIe WA. | ||
| 264 | */ | ||
| 265 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | ||
| 266 | ORION5X_PCIE_WA_SIZE); | ||
| 267 | 276 | ||
| 268 | /* | 277 | /* |
| 269 | * Setup Multiplexing Pins -- | ||
| 270 | * MPP[0] Debug Led (GPIO - Out) | ||
| 271 | * MPP[1] Debug Led (GPIO - Out) | ||
| 272 | * MPP[2] N/A | ||
| 273 | * MPP[3] RTC_Int (GPIO - In) | ||
| 274 | * MPP[4] GPIO | ||
| 275 | * MPP[5] GPIO | ||
| 276 | * MPP[6] PCI_intA (GPIO - In) | ||
| 277 | * MPP[7] PCI_intB (GPIO - In) | ||
| 278 | * MPP[8-11] N/A | ||
| 279 | * MPP[12] SATA 0 presence Indication | ||
| 280 | * MPP[13] SATA 1 presence Indication | ||
| 281 | * MPP[14] SATA 0 active Indication | ||
| 282 | * MPP[15] SATA 1 active indication | ||
| 283 | * MPP[16-19] Not used | ||
| 284 | * MPP[20] PCI Clock to MV88F5182 | 278 | * MPP[20] PCI Clock to MV88F5182 |
| 285 | * MPP[21] PCI Clock to mini PCI CON11 | 279 | * MPP[21] PCI Clock to mini PCI CON11 |
| 286 | * MPP[22] USB 0 over current indication | 280 | * MPP[22] USB 0 over current indication |
| @@ -289,16 +283,23 @@ static void __init rd88f5182_init(void) | |||
| 289 | * MPP[25] USB 0 over current enable | 283 | * MPP[25] USB 0 over current enable |
| 290 | */ | 284 | */ |
| 291 | 285 | ||
| 292 | orion5x_write(MPP_0_7_CTRL, 0x00000003); | 286 | /* |
| 293 | orion5x_write(MPP_8_15_CTRL, 0x55550000); | 287 | * Configure peripherals. |
| 294 | orion5x_write(MPP_16_19_CTRL, 0x5555); | 288 | */ |
| 289 | orion5x_ehci0_init(); | ||
| 290 | orion5x_ehci1_init(); | ||
| 291 | orion5x_eth_init(&rd88f5182_eth_data); | ||
| 292 | orion5x_i2c_init(); | ||
| 293 | orion5x_sata_init(&rd88f5182_sata_data); | ||
| 294 | orion5x_uart0_init(); | ||
| 295 | 295 | ||
| 296 | orion5x_gpio_set_valid_pins(0x000000fb); | 296 | orion5x_setup_dev_boot_win(RD88F5182_NOR_BOOT_BASE, |
| 297 | RD88F5182_NOR_BOOT_SIZE); | ||
| 298 | |||
| 299 | orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE); | ||
| 300 | platform_device_register(&rd88f5182_nor_flash); | ||
| 297 | 301 | ||
| 298 | platform_add_devices(rd88f5182_devices, ARRAY_SIZE(rd88f5182_devices)); | ||
| 299 | i2c_register_board_info(0, &rd88f5182_i2c_rtc, 1); | 302 | i2c_register_board_info(0, &rd88f5182_i2c_rtc, 1); |
| 300 | orion5x_eth_init(&rd88f5182_eth_data); | ||
| 301 | orion5x_sata_init(&rd88f5182_sata_data); | ||
| 302 | } | 303 | } |
| 303 | 304 | ||
| 304 | MACHINE_START(RD88F5182, "Marvell Orion-NAS Reference Design") | 305 | MACHINE_START(RD88F5182, "Marvell Orion-NAS Reference Design") |
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index 9afb41ee6e07..a9cef9703d5b 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c | |||
| @@ -28,6 +28,8 @@ | |||
| 28 | #include <asm/mach/pci.h> | 28 | #include <asm/mach/pci.h> |
| 29 | #include <asm/arch/orion5x.h> | 29 | #include <asm/arch/orion5x.h> |
| 30 | #include "common.h" | 30 | #include "common.h" |
| 31 | #include "mpp.h" | ||
| 32 | #include "tsx09-common.h" | ||
| 31 | 33 | ||
| 32 | #define QNAP_TS209_NOR_BOOT_BASE 0xf4000000 | 34 | #define QNAP_TS209_NOR_BOOT_BASE 0xf4000000 |
| 33 | #define QNAP_TS209_NOR_BOOT_SIZE SZ_8M | 35 | #define QNAP_TS209_NOR_BOOT_SIZE SZ_8M |
| @@ -47,52 +49,54 @@ | |||
| 47 | ***************************************************************************/ | 49 | ***************************************************************************/ |
| 48 | static struct mtd_partition qnap_ts209_partitions[] = { | 50 | static struct mtd_partition qnap_ts209_partitions[] = { |
| 49 | { | 51 | { |
| 50 | .name = "U-Boot", | 52 | .name = "U-Boot", |
| 51 | .size = 0x00080000, | 53 | .size = 0x00080000, |
| 52 | .offset = 0x00780000, | 54 | .offset = 0x00780000, |
| 53 | .mask_flags = MTD_WRITEABLE, | 55 | .mask_flags = MTD_WRITEABLE, |
| 54 | }, { | 56 | }, { |
| 55 | .name = "Kernel", | 57 | .name = "Kernel", |
| 56 | .size = 0x00200000, | 58 | .size = 0x00200000, |
| 57 | .offset = 0, | 59 | .offset = 0, |
| 58 | }, { | 60 | }, { |
| 59 | .name = "RootFS1", | 61 | .name = "RootFS1", |
| 60 | .size = 0x00400000, | 62 | .size = 0x00400000, |
| 61 | .offset = 0x00200000, | 63 | .offset = 0x00200000, |
| 62 | }, { | 64 | }, { |
| 63 | .name = "RootFS2", | 65 | .name = "RootFS2", |
| 64 | .size = 0x00100000, | 66 | .size = 0x00100000, |
| 65 | .offset = 0x00600000, | 67 | .offset = 0x00600000, |
| 66 | }, { | 68 | }, { |
| 67 | .name = "U-Boot Config", | 69 | .name = "U-Boot Config", |
| 68 | .size = 0x00020000, | 70 | .size = 0x00020000, |
| 69 | .offset = 0x00760000, | 71 | .offset = 0x00760000, |
| 70 | }, { | 72 | }, { |
| 71 | .name = "NAS Config", | 73 | .name = "NAS Config", |
| 72 | .size = 0x00060000, | 74 | .size = 0x00060000, |
| 73 | .offset = 0x00700000, | 75 | .offset = 0x00700000, |
| 74 | .mask_flags = MTD_WRITEABLE, | 76 | .mask_flags = MTD_WRITEABLE, |
| 75 | } | 77 | }, |
| 76 | }; | 78 | }; |
| 77 | 79 | ||
| 78 | static struct physmap_flash_data qnap_ts209_nor_flash_data = { | 80 | static struct physmap_flash_data qnap_ts209_nor_flash_data = { |
| 79 | .width = 1, | 81 | .width = 1, |
| 80 | .parts = qnap_ts209_partitions, | 82 | .parts = qnap_ts209_partitions, |
| 81 | .nr_parts = ARRAY_SIZE(qnap_ts209_partitions) | 83 | .nr_parts = ARRAY_SIZE(qnap_ts209_partitions) |
| 82 | }; | 84 | }; |
| 83 | 85 | ||
| 84 | static struct resource qnap_ts209_nor_flash_resource = { | 86 | static struct resource qnap_ts209_nor_flash_resource = { |
| 85 | .flags = IORESOURCE_MEM, | 87 | .flags = IORESOURCE_MEM, |
| 86 | .start = QNAP_TS209_NOR_BOOT_BASE, | 88 | .start = QNAP_TS209_NOR_BOOT_BASE, |
| 87 | .end = QNAP_TS209_NOR_BOOT_BASE + QNAP_TS209_NOR_BOOT_SIZE - 1, | 89 | .end = QNAP_TS209_NOR_BOOT_BASE + QNAP_TS209_NOR_BOOT_SIZE - 1, |
| 88 | }; | 90 | }; |
| 89 | 91 | ||
| 90 | static struct platform_device qnap_ts209_nor_flash = { | 92 | static struct platform_device qnap_ts209_nor_flash = { |
| 91 | .name = "physmap-flash", | 93 | .name = "physmap-flash", |
| 92 | .id = 0, | 94 | .id = 0, |
| 93 | .dev = { .platform_data = &qnap_ts209_nor_flash_data, }, | 95 | .dev = { |
| 94 | .resource = &qnap_ts209_nor_flash_resource, | 96 | .platform_data = &qnap_ts209_nor_flash_data, |
| 95 | .num_resources = 1, | 97 | }, |
| 98 | .resource = &qnap_ts209_nor_flash_resource, | ||
| 99 | .num_resources = 1, | ||
| 96 | }; | 100 | }; |
| 97 | 101 | ||
| 98 | /***************************************************************************** | 102 | /***************************************************************************** |
| @@ -164,12 +168,12 @@ static int __init qnap_ts209_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
| 164 | } | 168 | } |
| 165 | 169 | ||
| 166 | static struct hw_pci qnap_ts209_pci __initdata = { | 170 | static struct hw_pci qnap_ts209_pci __initdata = { |
| 167 | .nr_controllers = 2, | 171 | .nr_controllers = 2, |
| 168 | .preinit = qnap_ts209_pci_preinit, | 172 | .preinit = qnap_ts209_pci_preinit, |
| 169 | .swizzle = pci_std_swizzle, | 173 | .swizzle = pci_std_swizzle, |
| 170 | .setup = orion5x_pci_sys_setup, | 174 | .setup = orion5x_pci_sys_setup, |
| 171 | .scan = orion5x_pci_sys_scan_bus, | 175 | .scan = orion5x_pci_sys_scan_bus, |
| 172 | .map_irq = qnap_ts209_pci_map_irq, | 176 | .map_irq = qnap_ts209_pci_map_irq, |
| 173 | }; | 177 | }; |
| 174 | 178 | ||
| 175 | static int __init qnap_ts209_pci_init(void) | 179 | static int __init qnap_ts209_pci_init(void) |
| @@ -183,96 +187,6 @@ static int __init qnap_ts209_pci_init(void) | |||
| 183 | subsys_initcall(qnap_ts209_pci_init); | 187 | subsys_initcall(qnap_ts209_pci_init); |
| 184 | 188 | ||
| 185 | /***************************************************************************** | 189 | /***************************************************************************** |
| 186 | * Ethernet | ||
| 187 | ****************************************************************************/ | ||
| 188 | |||
| 189 | static struct mv643xx_eth_platform_data qnap_ts209_eth_data = { | ||
| 190 | .phy_addr = 8, | ||
| 191 | .force_phy_addr = 1, | ||
| 192 | }; | ||
| 193 | |||
| 194 | static int __init parse_hex_nibble(char n) | ||
| 195 | { | ||
| 196 | if (n >= '0' && n <= '9') | ||
| 197 | return n - '0'; | ||
| 198 | |||
| 199 | if (n >= 'A' && n <= 'F') | ||
| 200 | return n - 'A' + 10; | ||
| 201 | |||
| 202 | if (n >= 'a' && n <= 'f') | ||
| 203 | return n - 'a' + 10; | ||
| 204 | |||
| 205 | return -1; | ||
| 206 | } | ||
| 207 | |||
| 208 | static int __init parse_hex_byte(const char *b) | ||
| 209 | { | ||
| 210 | int hi; | ||
| 211 | int lo; | ||
| 212 | |||
| 213 | hi = parse_hex_nibble(b[0]); | ||
| 214 | lo = parse_hex_nibble(b[1]); | ||
| 215 | |||
| 216 | if (hi < 0 || lo < 0) | ||
| 217 | return -1; | ||
| 218 | |||
| 219 | return (hi << 4) | lo; | ||
| 220 | } | ||
| 221 | |||
| 222 | static int __init check_mac_addr(const char *addr_str) | ||
| 223 | { | ||
| 224 | u_int8_t addr[6]; | ||
| 225 | int i; | ||
| 226 | |||
| 227 | for (i = 0; i < 6; i++) { | ||
| 228 | int byte; | ||
| 229 | |||
| 230 | /* | ||
| 231 | * Enforce "xx:xx:xx:xx:xx:xx\n" format. | ||
| 232 | */ | ||
| 233 | if (addr_str[(i * 3) + 2] != ((i < 5) ? ':' : '\n')) | ||
| 234 | return -1; | ||
| 235 | |||
| 236 | byte = parse_hex_byte(addr_str + (i * 3)); | ||
| 237 | if (byte < 0) | ||
| 238 | return -1; | ||
| 239 | addr[i] = byte; | ||
| 240 | } | ||
| 241 | |||
| 242 | printk(KERN_INFO "ts209: found ethernet mac address "); | ||
| 243 | for (i = 0; i < 6; i++) | ||
| 244 | printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n"); | ||
| 245 | |||
| 246 | memcpy(qnap_ts209_eth_data.mac_addr, addr, 6); | ||
| 247 | |||
| 248 | return 0; | ||
| 249 | } | ||
| 250 | |||
| 251 | /* | ||
| 252 | * The 'NAS Config' flash partition has an ext2 filesystem which | ||
| 253 | * contains a file that has the ethernet MAC address in plain text | ||
| 254 | * (format "xx:xx:xx:xx:xx:xx\n".) | ||
| 255 | */ | ||
| 256 | static void __init ts209_find_mac_addr(void) | ||
| 257 | { | ||
| 258 | unsigned long addr; | ||
| 259 | |||
| 260 | for (addr = 0x00700000; addr < 0x00760000; addr += 1024) { | ||
| 261 | char *nor_page; | ||
| 262 | int ret = 0; | ||
| 263 | |||
| 264 | nor_page = ioremap(QNAP_TS209_NOR_BOOT_BASE + addr, 1024); | ||
| 265 | if (nor_page != NULL) { | ||
| 266 | ret = check_mac_addr(nor_page); | ||
| 267 | iounmap(nor_page); | ||
| 268 | } | ||
| 269 | |||
| 270 | if (ret == 0) | ||
| 271 | break; | ||
| 272 | } | ||
| 273 | } | ||
| 274 | |||
| 275 | /***************************************************************************** | ||
| 276 | * RTC S35390A on I2C bus | 190 | * RTC S35390A on I2C bus |
| 277 | ****************************************************************************/ | 191 | ****************************************************************************/ |
| 278 | 192 | ||
| @@ -280,7 +194,7 @@ static void __init ts209_find_mac_addr(void) | |||
| 280 | 194 | ||
| 281 | static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = { | 195 | static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = { |
| 282 | I2C_BOARD_INFO("s35390a", 0x30), | 196 | I2C_BOARD_INFO("s35390a", 0x30), |
| 283 | .irq = 0, | 197 | .irq = 0, |
| 284 | }; | 198 | }; |
| 285 | 199 | ||
| 286 | /**************************************************************************** | 200 | /**************************************************************************** |
| @@ -297,70 +211,63 @@ static struct gpio_keys_button qnap_ts209_buttons[] = { | |||
| 297 | .gpio = QNAP_TS209_GPIO_KEY_MEDIA, | 211 | .gpio = QNAP_TS209_GPIO_KEY_MEDIA, |
| 298 | .desc = "USB Copy Button", | 212 | .desc = "USB Copy Button", |
| 299 | .active_low = 1, | 213 | .active_low = 1, |
| 300 | }, | 214 | }, { |
| 301 | { | ||
| 302 | .code = KEY_POWER, | 215 | .code = KEY_POWER, |
| 303 | .gpio = QNAP_TS209_GPIO_KEY_RESET, | 216 | .gpio = QNAP_TS209_GPIO_KEY_RESET, |
| 304 | .desc = "Reset Button", | 217 | .desc = "Reset Button", |
| 305 | .active_low = 1, | 218 | .active_low = 1, |
| 306 | } | 219 | }, |
| 307 | }; | 220 | }; |
| 308 | 221 | ||
| 309 | static struct gpio_keys_platform_data qnap_ts209_button_data = { | 222 | static struct gpio_keys_platform_data qnap_ts209_button_data = { |
| 310 | .buttons = qnap_ts209_buttons, | 223 | .buttons = qnap_ts209_buttons, |
| 311 | .nbuttons = ARRAY_SIZE(qnap_ts209_buttons), | 224 | .nbuttons = ARRAY_SIZE(qnap_ts209_buttons), |
| 312 | }; | 225 | }; |
| 313 | 226 | ||
| 314 | static struct platform_device qnap_ts209_button_device = { | 227 | static struct platform_device qnap_ts209_button_device = { |
| 315 | .name = "gpio-keys", | 228 | .name = "gpio-keys", |
| 316 | .id = -1, | 229 | .id = -1, |
| 317 | .num_resources = 0, | 230 | .num_resources = 0, |
| 318 | .dev = { .platform_data = &qnap_ts209_button_data, }, | 231 | .dev = { |
| 232 | .platform_data = &qnap_ts209_button_data, | ||
| 233 | }, | ||
| 319 | }; | 234 | }; |
| 320 | 235 | ||
| 321 | /***************************************************************************** | 236 | /***************************************************************************** |
| 322 | * SATA | 237 | * SATA |
| 323 | ****************************************************************************/ | 238 | ****************************************************************************/ |
| 324 | static struct mv_sata_platform_data qnap_ts209_sata_data = { | 239 | static struct mv_sata_platform_data qnap_ts209_sata_data = { |
| 325 | .n_ports = 2, | 240 | .n_ports = 2, |
| 326 | }; | 241 | }; |
| 327 | 242 | ||
| 328 | /***************************************************************************** | 243 | /***************************************************************************** |
| 329 | 244 | ||
| 330 | * General Setup | 245 | * General Setup |
| 331 | ****************************************************************************/ | 246 | ****************************************************************************/ |
| 332 | 247 | static struct orion5x_mpp_mode ts209_mpp_modes[] __initdata = { | |
| 333 | static struct platform_device *qnap_ts209_devices[] __initdata = { | 248 | { 0, MPP_UNUSED }, |
| 334 | &qnap_ts209_nor_flash, | 249 | { 1, MPP_GPIO }, /* USB copy button */ |
| 335 | &qnap_ts209_button_device, | 250 | { 2, MPP_GPIO }, /* Load defaults button */ |
| 251 | { 3, MPP_GPIO }, /* GPIO RTC */ | ||
| 252 | { 4, MPP_UNUSED }, | ||
| 253 | { 5, MPP_UNUSED }, | ||
| 254 | { 6, MPP_GPIO }, /* PCI Int A */ | ||
| 255 | { 7, MPP_GPIO }, /* PCI Int B */ | ||
| 256 | { 8, MPP_UNUSED }, | ||
| 257 | { 9, MPP_UNUSED }, | ||
| 258 | { 10, MPP_UNUSED }, | ||
| 259 | { 11, MPP_UNUSED }, | ||
| 260 | { 12, MPP_SATA_LED }, /* SATA 0 presence */ | ||
| 261 | { 13, MPP_SATA_LED }, /* SATA 1 presence */ | ||
| 262 | { 14, MPP_SATA_LED }, /* SATA 0 active */ | ||
| 263 | { 15, MPP_SATA_LED }, /* SATA 1 active */ | ||
| 264 | { 16, MPP_UART }, /* UART1 RXD */ | ||
| 265 | { 17, MPP_UART }, /* UART1 TXD */ | ||
| 266 | { 18, MPP_GPIO }, /* SW_RST */ | ||
| 267 | { 19, MPP_UNUSED }, | ||
| 268 | { -1 }, | ||
| 336 | }; | 269 | }; |
| 337 | 270 | ||
| 338 | /* | ||
| 339 | * QNAP TS-[12]09 specific power off method via UART1-attached PIC | ||
| 340 | */ | ||
| 341 | |||
| 342 | #define UART1_REG(x) (UART1_VIRT_BASE + ((UART_##x) << 2)) | ||
| 343 | |||
| 344 | static void qnap_ts209_power_off(void) | ||
| 345 | { | ||
| 346 | /* 19200 baud divisor */ | ||
| 347 | const unsigned divisor = ((ORION5X_TCLK + (8 * 19200)) / (16 * 19200)); | ||
| 348 | |||
| 349 | pr_info("%s: triggering power-off...\n", __func__); | ||
| 350 | |||
| 351 | /* hijack uart1 and reset into sane state (19200,8n1) */ | ||
| 352 | orion5x_write(UART1_REG(LCR), 0x83); | ||
| 353 | orion5x_write(UART1_REG(DLL), divisor & 0xff); | ||
| 354 | orion5x_write(UART1_REG(DLM), (divisor >> 8) & 0xff); | ||
| 355 | orion5x_write(UART1_REG(LCR), 0x03); | ||
| 356 | orion5x_write(UART1_REG(IER), 0x00); | ||
| 357 | orion5x_write(UART1_REG(FCR), 0x00); | ||
| 358 | orion5x_write(UART1_REG(MCR), 0x00); | ||
| 359 | |||
| 360 | /* send the power-off command 'A' to PIC */ | ||
| 361 | orion5x_write(UART1_REG(TX), 'A'); | ||
| 362 | } | ||
| 363 | |||
| 364 | static void __init qnap_ts209_init(void) | 271 | static void __init qnap_ts209_init(void) |
| 365 | { | 272 | { |
| 366 | /* | 273 | /* |
| @@ -368,51 +275,33 @@ static void __init qnap_ts209_init(void) | |||
| 368 | */ | 275 | */ |
| 369 | orion5x_init(); | 276 | orion5x_init(); |
| 370 | 277 | ||
| 371 | /* | 278 | orion5x_mpp_conf(ts209_mpp_modes); |
| 372 | * Setup flash mapping | ||
| 373 | */ | ||
| 374 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, | ||
| 375 | QNAP_TS209_NOR_BOOT_SIZE); | ||
| 376 | |||
| 377 | /* | ||
| 378 | * Open a special address decode windows for the PCIe WA. | ||
| 379 | */ | ||
| 380 | orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE, | ||
| 381 | ORION5X_PCIE_WA_SIZE); | ||
| 382 | 279 | ||
| 383 | /* | 280 | /* |
| 384 | * Setup Multiplexing Pins -- | ||
| 385 | * MPP[0] Reserved | ||
| 386 | * MPP[1] USB copy button (0 active) | ||
| 387 | * MPP[2] Load defaults button (0 active) | ||
| 388 | * MPP[3] GPIO RTC | ||
| 389 | * MPP[4-5] Reserved | ||
| 390 | * MPP[6] PCI Int A | ||
| 391 | * MPP[7] PCI Int B | ||
| 392 | * MPP[8-11] Reserved | ||
| 393 | * MPP[12] SATA 0 presence | ||
| 394 | * MPP[13] SATA 1 presence | ||
| 395 | * MPP[14] SATA 0 active | ||
| 396 | * MPP[15] SATA 1 active | ||
| 397 | * MPP[16] UART1 RXD | ||
| 398 | * MPP[17] UART1 TXD | ||
| 399 | * MPP[18] SW_RST (0 active) | ||
| 400 | * MPP[19] Reserved | ||
| 401 | * MPP[20] PCI clock 0 | 281 | * MPP[20] PCI clock 0 |
| 402 | * MPP[21] PCI clock 1 | 282 | * MPP[21] PCI clock 1 |
| 403 | * MPP[22] USB 0 over current | 283 | * MPP[22] USB 0 over current |
| 404 | * MPP[23-25] Reserved | 284 | * MPP[23-25] Reserved |
| 405 | */ | 285 | */ |
| 406 | orion5x_write(MPP_0_7_CTRL, 0x3); | ||
| 407 | orion5x_write(MPP_8_15_CTRL, 0x55550000); | ||
| 408 | orion5x_write(MPP_16_19_CTRL, 0x5500); | ||
| 409 | orion5x_gpio_set_valid_pins(0x3cc0fff); | ||
| 410 | 286 | ||
| 411 | /* register ts209 specific power-off method */ | 287 | /* |
| 412 | pm_power_off = qnap_ts209_power_off; | 288 | * Configure peripherals. |
| 289 | */ | ||
| 290 | orion5x_ehci0_init(); | ||
| 291 | orion5x_ehci1_init(); | ||
| 292 | qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + | ||
| 293 | qnap_ts209_partitions[5].offset, | ||
| 294 | qnap_ts209_partitions[5].size); | ||
| 295 | orion5x_eth_init(&qnap_tsx09_eth_data); | ||
| 296 | orion5x_i2c_init(); | ||
| 297 | orion5x_sata_init(&qnap_ts209_sata_data); | ||
| 298 | orion5x_uart0_init(); | ||
| 299 | |||
| 300 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, | ||
| 301 | QNAP_TS209_NOR_BOOT_SIZE); | ||
| 302 | platform_device_register(&qnap_ts209_nor_flash); | ||
| 413 | 303 | ||
| 414 | platform_add_devices(qnap_ts209_devices, | 304 | platform_device_register(&qnap_ts209_button_device); |
| 415 | ARRAY_SIZE(qnap_ts209_devices)); | ||
| 416 | 305 | ||
| 417 | /* Get RTC IRQ and register the chip */ | 306 | /* Get RTC IRQ and register the chip */ |
| 418 | if (gpio_request(TS209_RTC_GPIO, "rtc") == 0) { | 307 | if (gpio_request(TS209_RTC_GPIO, "rtc") == 0) { |
| @@ -425,14 +314,12 @@ static void __init qnap_ts209_init(void) | |||
| 425 | pr_warning("qnap_ts209_init: failed to get RTC IRQ\n"); | 314 | pr_warning("qnap_ts209_init: failed to get RTC IRQ\n"); |
| 426 | i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1); | 315 | i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1); |
| 427 | 316 | ||
| 428 | ts209_find_mac_addr(); | 317 | /* register tsx09 specific power-off method */ |
| 429 | orion5x_eth_init(&qnap_ts209_eth_data); | 318 | pm_power_off = qnap_tsx09_power_off; |
| 430 | |||
| 431 | orion5x_sata_init(&qnap_ts209_sata_data); | ||
| 432 | } | 319 | } |
| 433 | 320 | ||
| 434 | MACHINE_START(TS209, "QNAP TS-109/TS-209") | 321 | MACHINE_START(TS209, "QNAP TS-109/TS-209") |
| 435 | /* Maintainer: Byron Bradley <byron.bbradley@gmail.com> */ | 322 | /* Maintainer: Byron Bradley <byron.bbradley@gmail.com> */ |
| 436 | .phys_io = ORION5X_REGS_PHYS_BASE, | 323 | .phys_io = ORION5X_REGS_PHYS_BASE, |
| 437 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | 324 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, |
| 438 | .boot_params = 0x00000100, | 325 | .boot_params = 0x00000100, |
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c new file mode 100644 index 000000000000..32f0ff073b7e --- /dev/null +++ b/arch/arm/mach-orion5x/ts409-setup.c | |||
| @@ -0,0 +1,273 @@ | |||
| 1 | /* | ||
| 2 | * QNAP TS-409 Board Setup | ||
| 3 | * | ||
| 4 | * Maintainer: Sylver Bruneau <sylver.bruneau@gmail.com> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU General Public License | ||
| 8 | * as published by the Free Software Foundation; either version | ||
| 9 | * 2 of the License, or (at your option) any later version. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/kernel.h> | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <linux/platform_device.h> | ||
| 15 | #include <linux/pci.h> | ||
| 16 | #include <linux/irq.h> | ||
| 17 | #include <linux/mtd/physmap.h> | ||
| 18 | #include <linux/mv643xx_eth.h> | ||
| 19 | #include <linux/gpio_keys.h> | ||
| 20 | #include <linux/input.h> | ||
| 21 | #include <linux/i2c.h> | ||
| 22 | #include <linux/serial_reg.h> | ||
| 23 | #include <asm/mach-types.h> | ||
| 24 | #include <asm/gpio.h> | ||
| 25 | #include <asm/mach/arch.h> | ||
| 26 | #include <asm/mach/pci.h> | ||
| 27 | #include <asm/arch/orion5x.h> | ||
| 28 | #include "common.h" | ||
| 29 | #include "mpp.h" | ||
| 30 | #include "tsx09-common.h" | ||
| 31 | |||
| 32 | /***************************************************************************** | ||
| 33 | * QNAP TS-409 Info | ||
| 34 | ****************************************************************************/ | ||
| 35 | |||
| 36 | /* | ||
| 37 | * QNAP TS-409 hardware : | ||
| 38 | * - Marvell 88F5281-D0 | ||
| 39 | * - Marvell 88SX7042 SATA controller (PCIe) | ||
| 40 | * - Marvell 88E1118 Gigabit Ethernet PHY | ||
| 41 | * - RTC S35390A (@0x30) on I2C bus | ||
| 42 | * - 8MB NOR flash | ||
| 43 | * - 256MB of DDR-2 RAM | ||
| 44 | */ | ||
| 45 | |||
| 46 | /* | ||
| 47 | * 8MB NOR flash Device bus boot chip select | ||
| 48 | */ | ||
| 49 | |||
| 50 | #define QNAP_TS409_NOR_BOOT_BASE 0xff800000 | ||
| 51 | #define QNAP_TS409_NOR_BOOT_SIZE SZ_8M | ||
| 52 | |||
| 53 | /**************************************************************************** | ||
| 54 | * 8MiB NOR flash. The struct mtd_partition is not in the same order as the | ||
| 55 | * partitions on the device because we want to keep compatability with | ||
| 56 | * existing QNAP firmware. | ||
| 57 | * | ||
| 58 | * Layout as used by QNAP: | ||
| 59 | * [2] 0x00000000-0x00200000 : "Kernel" | ||
| 60 | * [3] 0x00200000-0x00600000 : "RootFS1" | ||
| 61 | * [4] 0x00600000-0x00700000 : "RootFS2" | ||
| 62 | * [6] 0x00700000-0x00760000 : "NAS Config" (read-only) | ||
| 63 | * [5] 0x00760000-0x00780000 : "U-Boot Config" | ||
| 64 | * [1] 0x00780000-0x00800000 : "U-Boot" (read-only) | ||
| 65 | ***************************************************************************/ | ||
| 66 | static struct mtd_partition qnap_ts409_partitions[] = { | ||
| 67 | { | ||
| 68 | .name = "U-Boot", | ||
| 69 | .size = 0x00080000, | ||
| 70 | .offset = 0x00780000, | ||
| 71 | .mask_flags = MTD_WRITEABLE, | ||
| 72 | }, { | ||
| 73 | .name = "Kernel", | ||
| 74 | .size = 0x00200000, | ||
| 75 | .offset = 0, | ||
| 76 | }, { | ||
| 77 | .name = "RootFS1", | ||
| 78 | .size = 0x00400000, | ||
| 79 | .offset = 0x00200000, | ||
| 80 | }, { | ||
| 81 | .name = "RootFS2", | ||
| 82 | .size = 0x00100000, | ||
| 83 | .offset = 0x00600000, | ||
| 84 | }, { | ||
| 85 | .name = "U-Boot Config", | ||
| 86 | .size = 0x00020000, | ||
| 87 | .offset = 0x00760000, | ||
| 88 | }, { | ||
| 89 | .name = "NAS Config", | ||
| 90 | .size = 0x00060000, | ||
| 91 | .offset = 0x00700000, | ||
| 92 | .mask_flags = MTD_WRITEABLE, | ||
| 93 | }, | ||
| 94 | }; | ||
| 95 | |||
| 96 | static struct physmap_flash_data qnap_ts409_nor_flash_data = { | ||
| 97 | .width = 1, | ||
| 98 | .parts = qnap_ts409_partitions, | ||
| 99 | .nr_parts = ARRAY_SIZE(qnap_ts409_partitions) | ||
| 100 | }; | ||
| 101 | |||
| 102 | static struct resource qnap_ts409_nor_flash_resource = { | ||
| 103 | .flags = IORESOURCE_MEM, | ||
| 104 | .start = QNAP_TS409_NOR_BOOT_BASE, | ||
| 105 | .end = QNAP_TS409_NOR_BOOT_BASE + QNAP_TS409_NOR_BOOT_SIZE - 1, | ||
| 106 | }; | ||
| 107 | |||
| 108 | static struct platform_device qnap_ts409_nor_flash = { | ||
| 109 | .name = "physmap-flash", | ||
| 110 | .id = 0, | ||
| 111 | .dev = { .platform_data = &qnap_ts409_nor_flash_data, }, | ||
| 112 | .num_resources = 1, | ||
| 113 | .resource = &qnap_ts409_nor_flash_resource, | ||
| 114 | }; | ||
| 115 | |||
| 116 | /***************************************************************************** | ||
| 117 | * PCI | ||
| 118 | ****************************************************************************/ | ||
| 119 | |||
| 120 | static int __init qnap_ts409_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 121 | { | ||
| 122 | int irq; | ||
| 123 | |||
| 124 | /* | ||
| 125 | * Check for devices with hard-wired IRQs. | ||
| 126 | */ | ||
| 127 | irq = orion5x_pci_map_irq(dev, slot, pin); | ||
| 128 | if (irq != -1) | ||
| 129 | return irq; | ||
| 130 | |||
| 131 | /* | ||
| 132 | * PCI isn't used on the TS-409 | ||
| 133 | */ | ||
| 134 | return -1; | ||
| 135 | } | ||
| 136 | |||
| 137 | static struct hw_pci qnap_ts409_pci __initdata = { | ||
| 138 | .nr_controllers = 2, | ||
| 139 | .swizzle = pci_std_swizzle, | ||
| 140 | .setup = orion5x_pci_sys_setup, | ||
| 141 | .scan = orion5x_pci_sys_scan_bus, | ||
| 142 | .map_irq = qnap_ts409_pci_map_irq, | ||
| 143 | }; | ||
| 144 | |||
| 145 | static int __init qnap_ts409_pci_init(void) | ||
| 146 | { | ||
| 147 | if (machine_is_ts409()) | ||
| 148 | pci_common_init(&qnap_ts409_pci); | ||
| 149 | |||
| 150 | return 0; | ||
| 151 | } | ||
| 152 | |||
| 153 | subsys_initcall(qnap_ts409_pci_init); | ||
| 154 | |||
| 155 | /***************************************************************************** | ||
| 156 | * RTC S35390A on I2C bus | ||
| 157 | ****************************************************************************/ | ||
| 158 | |||
| 159 | #define TS409_RTC_GPIO 10 | ||
| 160 | |||
| 161 | static struct i2c_board_info __initdata qnap_ts409_i2c_rtc = { | ||
| 162 | I2C_BOARD_INFO("s35390a", 0x30), | ||
| 163 | }; | ||
| 164 | |||
| 165 | /**************************************************************************** | ||
| 166 | * GPIO Attached Keys | ||
| 167 | * Power button is attached to the PIC microcontroller | ||
| 168 | ****************************************************************************/ | ||
| 169 | |||
| 170 | #define QNAP_TS409_GPIO_KEY_MEDIA 15 | ||
| 171 | |||
| 172 | static struct gpio_keys_button qnap_ts409_buttons[] = { | ||
| 173 | { | ||
| 174 | .code = KEY_RESTART, | ||
| 175 | .gpio = QNAP_TS409_GPIO_KEY_MEDIA, | ||
| 176 | .desc = "USB Copy Button", | ||
| 177 | .active_low = 1, | ||
| 178 | }, | ||
| 179 | }; | ||
| 180 | |||
| 181 | static struct gpio_keys_platform_data qnap_ts409_button_data = { | ||
| 182 | .buttons = qnap_ts409_buttons, | ||
| 183 | .nbuttons = ARRAY_SIZE(qnap_ts409_buttons), | ||
| 184 | }; | ||
| 185 | |||
| 186 | static struct platform_device qnap_ts409_button_device = { | ||
| 187 | .name = "gpio-keys", | ||
| 188 | .id = -1, | ||
| 189 | .num_resources = 0, | ||
| 190 | .dev = { | ||
| 191 | .platform_data = &qnap_ts409_button_data, | ||
| 192 | }, | ||
| 193 | }; | ||
| 194 | |||
| 195 | /***************************************************************************** | ||
| 196 | * General Setup | ||
| 197 | ****************************************************************************/ | ||
| 198 | static struct orion5x_mpp_mode ts409_mpp_modes[] __initdata = { | ||
| 199 | { 0, MPP_UNUSED }, | ||
| 200 | { 1, MPP_UNUSED }, | ||
| 201 | { 2, MPP_UNUSED }, | ||
| 202 | { 3, MPP_UNUSED }, | ||
| 203 | { 4, MPP_GPIO }, /* HDD 1 status */ | ||
| 204 | { 5, MPP_GPIO }, /* HDD 2 status */ | ||
| 205 | { 6, MPP_GPIO }, /* HDD 3 status */ | ||
| 206 | { 7, MPP_GPIO }, /* HDD 4 status */ | ||
| 207 | { 8, MPP_UNUSED }, | ||
| 208 | { 9, MPP_UNUSED }, | ||
| 209 | { 10, MPP_GPIO }, /* RTC int */ | ||
| 210 | { 11, MPP_UNUSED }, | ||
| 211 | { 12, MPP_UNUSED }, | ||
| 212 | { 13, MPP_UNUSED }, | ||
| 213 | { 14, MPP_GPIO }, /* SW_RST */ | ||
| 214 | { 15, MPP_GPIO }, /* USB copy button */ | ||
| 215 | { 16, MPP_UART }, /* UART1 RXD */ | ||
| 216 | { 17, MPP_UART }, /* UART1 TXD */ | ||
| 217 | { 18, MPP_UNUSED }, | ||
| 218 | { 19, MPP_UNUSED }, | ||
| 219 | { -1 }, | ||
| 220 | }; | ||
| 221 | |||
| 222 | static void __init qnap_ts409_init(void) | ||
| 223 | { | ||
| 224 | /* | ||
| 225 | * Setup basic Orion functions. Need to be called early. | ||
| 226 | */ | ||
| 227 | orion5x_init(); | ||
| 228 | |||
| 229 | orion5x_mpp_conf(ts409_mpp_modes); | ||
| 230 | |||
| 231 | /* | ||
| 232 | * Configure peripherals. | ||
| 233 | */ | ||
| 234 | orion5x_ehci0_init(); | ||
| 235 | qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE + | ||
| 236 | qnap_ts409_partitions[5].offset, | ||
| 237 | qnap_ts409_partitions[5].size); | ||
| 238 | orion5x_eth_init(&qnap_tsx09_eth_data); | ||
| 239 | orion5x_i2c_init(); | ||
| 240 | orion5x_uart0_init(); | ||
| 241 | |||
| 242 | orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE, | ||
| 243 | QNAP_TS409_NOR_BOOT_SIZE); | ||
| 244 | platform_device_register(&qnap_ts409_nor_flash); | ||
| 245 | |||
| 246 | platform_device_register(&qnap_ts409_button_device); | ||
| 247 | |||
| 248 | /* Get RTC IRQ and register the chip */ | ||
| 249 | if (gpio_request(TS409_RTC_GPIO, "rtc") == 0) { | ||
| 250 | if (gpio_direction_input(TS409_RTC_GPIO) == 0) | ||
| 251 | qnap_ts409_i2c_rtc.irq = gpio_to_irq(TS409_RTC_GPIO); | ||
| 252 | else | ||
| 253 | gpio_free(TS409_RTC_GPIO); | ||
| 254 | } | ||
| 255 | if (qnap_ts409_i2c_rtc.irq == 0) | ||
| 256 | pr_warning("qnap_ts409_init: failed to get RTC IRQ\n"); | ||
| 257 | i2c_register_board_info(0, &qnap_ts409_i2c_rtc, 1); | ||
| 258 | |||
| 259 | /* register tsx09 specific power-off method */ | ||
| 260 | pm_power_off = qnap_tsx09_power_off; | ||
| 261 | } | ||
| 262 | |||
| 263 | MACHINE_START(TS409, "QNAP TS-409") | ||
| 264 | /* Maintainer: Sylver Bruneau <sylver.bruneau@gmail.com> */ | ||
| 265 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 266 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 267 | .boot_params = 0x00000100, | ||
| 268 | .init_machine = qnap_ts409_init, | ||
| 269 | .map_io = orion5x_map_io, | ||
| 270 | .init_irq = orion5x_init_irq, | ||
| 271 | .timer = &orion5x_timer, | ||
| 272 | .fixup = tag_fixup_mem32, | ||
| 273 | MACHINE_END | ||
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c new file mode 100644 index 000000000000..77e9f351f07a --- /dev/null +++ b/arch/arm/mach-orion5x/ts78xx-setup.c | |||
| @@ -0,0 +1,277 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/ts78xx-setup.c | ||
| 3 | * | ||
| 4 | * Maintainer: Alexander Clouter <alex@digriz.org.uk> | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <linux/mtd/physmap.h> | ||
| 15 | #include <linux/mv643xx_eth.h> | ||
| 16 | #include <linux/ata_platform.h> | ||
| 17 | #include <linux/m48t86.h> | ||
| 18 | #include <asm/mach-types.h> | ||
| 19 | #include <asm/mach/arch.h> | ||
| 20 | #include <asm/mach/map.h> | ||
| 21 | #include <asm/arch/orion5x.h> | ||
| 22 | #include "common.h" | ||
| 23 | #include "mpp.h" | ||
| 24 | |||
| 25 | /***************************************************************************** | ||
| 26 | * TS-78xx Info | ||
| 27 | ****************************************************************************/ | ||
| 28 | |||
| 29 | /* | ||
| 30 | * FPGA - lives where the PCI bus would be at ORION5X_PCI_MEM_PHYS_BASE | ||
| 31 | */ | ||
| 32 | #define TS78XX_FPGA_REGS_PHYS_BASE 0xe8000000 | ||
| 33 | #define TS78XX_FPGA_REGS_VIRT_BASE 0xff900000 | ||
| 34 | #define TS78XX_FPGA_REGS_SIZE SZ_1M | ||
| 35 | |||
| 36 | #define TS78XX_FPGA_REGS_SYSCON_ID (TS78XX_FPGA_REGS_VIRT_BASE | 0x000) | ||
| 37 | #define TS78XX_FPGA_REGS_SYSCON_LCDI (TS78XX_FPGA_REGS_VIRT_BASE | 0x004) | ||
| 38 | #define TS78XX_FPGA_REGS_SYSCON_LCDO (TS78XX_FPGA_REGS_VIRT_BASE | 0x008) | ||
| 39 | |||
| 40 | #define TS78XX_FPGA_REGS_RTC_CTRL (TS78XX_FPGA_REGS_VIRT_BASE | 0x808) | ||
| 41 | #define TS78XX_FPGA_REGS_RTC_DATA (TS78XX_FPGA_REGS_VIRT_BASE | 0x80c) | ||
| 42 | |||
| 43 | /* | ||
| 44 | * 512kB NOR flash Device | ||
| 45 | */ | ||
| 46 | #define TS78XX_NOR_BOOT_BASE 0xff800000 | ||
| 47 | #define TS78XX_NOR_BOOT_SIZE SZ_512K | ||
| 48 | |||
| 49 | /***************************************************************************** | ||
| 50 | * I/O Address Mapping | ||
| 51 | ****************************************************************************/ | ||
| 52 | static struct map_desc ts78xx_io_desc[] __initdata = { | ||
| 53 | { | ||
| 54 | .virtual = TS78XX_FPGA_REGS_VIRT_BASE, | ||
| 55 | .pfn = __phys_to_pfn(TS78XX_FPGA_REGS_PHYS_BASE), | ||
| 56 | .length = TS78XX_FPGA_REGS_SIZE, | ||
| 57 | .type = MT_DEVICE, | ||
| 58 | }, | ||
| 59 | }; | ||
| 60 | |||
| 61 | void __init ts78xx_map_io(void) | ||
| 62 | { | ||
| 63 | orion5x_map_io(); | ||
| 64 | iotable_init(ts78xx_io_desc, ARRAY_SIZE(ts78xx_io_desc)); | ||
| 65 | } | ||
| 66 | |||
| 67 | /***************************************************************************** | ||
| 68 | * 512kB NOR Boot Flash - the chip is a M25P40 | ||
| 69 | ****************************************************************************/ | ||
| 70 | static struct mtd_partition ts78xx_nor_boot_flash_resources[] = { | ||
| 71 | { | ||
| 72 | .name = "ts-bootrom", | ||
| 73 | .offset = 0, | ||
| 74 | /* only the first 256kB is used */ | ||
| 75 | .size = SZ_256K, | ||
| 76 | .mask_flags = MTD_WRITEABLE, | ||
| 77 | }, | ||
| 78 | }; | ||
| 79 | |||
| 80 | static struct physmap_flash_data ts78xx_nor_boot_flash_data = { | ||
| 81 | .width = 1, | ||
| 82 | .parts = ts78xx_nor_boot_flash_resources, | ||
| 83 | .nr_parts = ARRAY_SIZE(ts78xx_nor_boot_flash_resources), | ||
| 84 | }; | ||
| 85 | |||
| 86 | static struct resource ts78xx_nor_boot_flash_resource = { | ||
| 87 | .flags = IORESOURCE_MEM, | ||
| 88 | .start = TS78XX_NOR_BOOT_BASE, | ||
| 89 | .end = TS78XX_NOR_BOOT_BASE + TS78XX_NOR_BOOT_SIZE - 1, | ||
| 90 | }; | ||
| 91 | |||
| 92 | static struct platform_device ts78xx_nor_boot_flash = { | ||
| 93 | .name = "physmap-flash", | ||
| 94 | .id = -1, | ||
| 95 | .dev = { | ||
| 96 | .platform_data = &ts78xx_nor_boot_flash_data, | ||
| 97 | }, | ||
| 98 | .num_resources = 1, | ||
| 99 | .resource = &ts78xx_nor_boot_flash_resource, | ||
| 100 | }; | ||
| 101 | |||
| 102 | /***************************************************************************** | ||
| 103 | * Ethernet | ||
| 104 | ****************************************************************************/ | ||
| 105 | static struct mv643xx_eth_platform_data ts78xx_eth_data = { | ||
| 106 | .phy_addr = 0, | ||
| 107 | .force_phy_addr = 1, | ||
| 108 | }; | ||
| 109 | |||
| 110 | /***************************************************************************** | ||
| 111 | * RTC M48T86 - nicked^Wborrowed from arch/arm/mach-ep93xx/ts72xx.c | ||
| 112 | ****************************************************************************/ | ||
| 113 | #ifdef CONFIG_RTC_DRV_M48T86 | ||
| 114 | static unsigned char ts78xx_rtc_readbyte(unsigned long addr) | ||
| 115 | { | ||
| 116 | writeb(addr, TS78XX_FPGA_REGS_RTC_CTRL); | ||
| 117 | return readb(TS78XX_FPGA_REGS_RTC_DATA); | ||
| 118 | } | ||
| 119 | |||
| 120 | static void ts78xx_rtc_writebyte(unsigned char value, unsigned long addr) | ||
| 121 | { | ||
| 122 | writeb(addr, TS78XX_FPGA_REGS_RTC_CTRL); | ||
| 123 | writeb(value, TS78XX_FPGA_REGS_RTC_DATA); | ||
| 124 | } | ||
| 125 | |||
| 126 | static struct m48t86_ops ts78xx_rtc_ops = { | ||
| 127 | .readbyte = ts78xx_rtc_readbyte, | ||
| 128 | .writebyte = ts78xx_rtc_writebyte, | ||
| 129 | }; | ||
| 130 | |||
| 131 | static struct platform_device ts78xx_rtc_device = { | ||
| 132 | .name = "rtc-m48t86", | ||
| 133 | .id = -1, | ||
| 134 | .dev = { | ||
| 135 | .platform_data = &ts78xx_rtc_ops, | ||
| 136 | }, | ||
| 137 | .num_resources = 0, | ||
| 138 | }; | ||
| 139 | |||
| 140 | /* | ||
| 141 | * TS uses some of the user storage space on the RTC chip so see if it is | ||
| 142 | * present; as it's an optional feature at purchase time and not all boards | ||
| 143 | * will have it present | ||
| 144 | * | ||
| 145 | * I've used the method TS use in their rtc7800.c example for the detection | ||
| 146 | * | ||
| 147 | * TODO: track down a guinea pig without an RTC to see if we can work out a | ||
| 148 | * better RTC detection routine | ||
| 149 | */ | ||
| 150 | static int __init ts78xx_rtc_init(void) | ||
| 151 | { | ||
| 152 | unsigned char tmp_rtc0, tmp_rtc1; | ||
| 153 | |||
| 154 | tmp_rtc0 = ts78xx_rtc_readbyte(126); | ||
| 155 | tmp_rtc1 = ts78xx_rtc_readbyte(127); | ||
| 156 | |||
| 157 | ts78xx_rtc_writebyte(0x00, 126); | ||
| 158 | ts78xx_rtc_writebyte(0x55, 127); | ||
| 159 | if (ts78xx_rtc_readbyte(127) == 0x55) { | ||
| 160 | ts78xx_rtc_writebyte(0xaa, 127); | ||
| 161 | if (ts78xx_rtc_readbyte(127) == 0xaa | ||
| 162 | && ts78xx_rtc_readbyte(126) == 0x00) { | ||
| 163 | ts78xx_rtc_writebyte(tmp_rtc0, 126); | ||
| 164 | ts78xx_rtc_writebyte(tmp_rtc1, 127); | ||
| 165 | platform_device_register(&ts78xx_rtc_device); | ||
| 166 | return 1; | ||
| 167 | } | ||
| 168 | } | ||
| 169 | |||
| 170 | return 0; | ||
| 171 | }; | ||
| 172 | #else | ||
| 173 | static int __init ts78xx_rtc_init(void) | ||
| 174 | { | ||
| 175 | return 0; | ||
| 176 | } | ||
| 177 | #endif | ||
| 178 | |||
| 179 | /***************************************************************************** | ||
| 180 | * SATA | ||
| 181 | ****************************************************************************/ | ||
| 182 | static struct mv_sata_platform_data ts78xx_sata_data = { | ||
| 183 | .n_ports = 2, | ||
| 184 | }; | ||
| 185 | |||
| 186 | /***************************************************************************** | ||
| 187 | * print some information regarding the board | ||
| 188 | ****************************************************************************/ | ||
| 189 | static void __init ts78xx_print_board_id(void) | ||
| 190 | { | ||
| 191 | unsigned int board_info; | ||
| 192 | |||
| 193 | board_info = readl(TS78XX_FPGA_REGS_SYSCON_ID); | ||
| 194 | printk(KERN_INFO "TS-78xx Info: FPGA rev=%.2x, Board Magic=%.6x, ", | ||
| 195 | board_info & 0xff, | ||
| 196 | (board_info >> 8) & 0xffffff); | ||
| 197 | board_info = readl(TS78XX_FPGA_REGS_SYSCON_LCDI); | ||
| 198 | printk("JP1=%d, JP2=%d\n", | ||
| 199 | (board_info >> 30) & 0x1, | ||
| 200 | (board_info >> 31) & 0x1); | ||
| 201 | }; | ||
| 202 | |||
| 203 | /***************************************************************************** | ||
| 204 | * General Setup | ||
| 205 | ****************************************************************************/ | ||
| 206 | static struct orion5x_mpp_mode ts78xx_mpp_modes[] __initdata = { | ||
| 207 | { 0, MPP_UNUSED }, | ||
| 208 | { 1, MPP_GPIO }, /* JTAG Clock */ | ||
| 209 | { 2, MPP_GPIO }, /* JTAG Data In */ | ||
| 210 | { 3, MPP_GPIO }, /* Lat ECP2 256 FPGA - PB2B */ | ||
| 211 | { 4, MPP_GPIO }, /* JTAG Data Out */ | ||
| 212 | { 5, MPP_GPIO }, /* JTAG TMS */ | ||
| 213 | { 6, MPP_GPIO }, /* Lat ECP2 256 FPGA - PB31A_CLK4+ */ | ||
| 214 | { 7, MPP_GPIO }, /* Lat ECP2 256 FPGA - PB22B */ | ||
| 215 | { 8, MPP_UNUSED }, | ||
| 216 | { 9, MPP_UNUSED }, | ||
| 217 | { 10, MPP_UNUSED }, | ||
| 218 | { 11, MPP_UNUSED }, | ||
| 219 | { 12, MPP_UNUSED }, | ||
| 220 | { 13, MPP_UNUSED }, | ||
| 221 | { 14, MPP_UNUSED }, | ||
| 222 | { 15, MPP_UNUSED }, | ||
| 223 | { 16, MPP_UART }, | ||
| 224 | { 17, MPP_UART }, | ||
| 225 | { 18, MPP_UART }, | ||
| 226 | { 19, MPP_UART }, | ||
| 227 | { -1 }, | ||
| 228 | }; | ||
| 229 | |||
| 230 | static void __init ts78xx_init(void) | ||
| 231 | { | ||
| 232 | /* | ||
| 233 | * Setup basic Orion functions. Need to be called early. | ||
| 234 | */ | ||
| 235 | orion5x_init(); | ||
| 236 | |||
| 237 | ts78xx_print_board_id(); | ||
| 238 | |||
| 239 | orion5x_mpp_conf(ts78xx_mpp_modes); | ||
| 240 | |||
| 241 | /* | ||
| 242 | * MPP[20] PCI Clock Out 1 | ||
| 243 | * MPP[21] PCI Clock Out 0 | ||
| 244 | * MPP[22] Unused | ||
| 245 | * MPP[23] Unused | ||
| 246 | * MPP[24] Unused | ||
| 247 | * MPP[25] Unused | ||
| 248 | */ | ||
| 249 | |||
| 250 | /* | ||
| 251 | * Configure peripherals. | ||
| 252 | */ | ||
| 253 | orion5x_ehci0_init(); | ||
| 254 | orion5x_ehci1_init(); | ||
| 255 | orion5x_eth_init(&ts78xx_eth_data); | ||
| 256 | orion5x_sata_init(&ts78xx_sata_data); | ||
| 257 | orion5x_uart0_init(); | ||
| 258 | orion5x_uart1_init(); | ||
| 259 | |||
| 260 | orion5x_setup_dev_boot_win(TS78XX_NOR_BOOT_BASE, | ||
| 261 | TS78XX_NOR_BOOT_SIZE); | ||
| 262 | platform_device_register(&ts78xx_nor_boot_flash); | ||
| 263 | |||
| 264 | if (!ts78xx_rtc_init()) | ||
| 265 | printk(KERN_INFO "TS-78xx RTC not detected or enabled\n"); | ||
| 266 | } | ||
| 267 | |||
| 268 | MACHINE_START(TS78XX, "Technologic Systems TS-78xx SBC") | ||
| 269 | /* Maintainer: Alexander Clouter <alex@digriz.org.uk> */ | ||
| 270 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 271 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 272 | .boot_params = 0x00000100, | ||
| 273 | .init_machine = ts78xx_init, | ||
| 274 | .map_io = ts78xx_map_io, | ||
| 275 | .init_irq = orion5x_init_irq, | ||
| 276 | .timer = &orion5x_timer, | ||
| 277 | MACHINE_END | ||
diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c new file mode 100644 index 000000000000..83feac3147a6 --- /dev/null +++ b/arch/arm/mach-orion5x/tsx09-common.c | |||
| @@ -0,0 +1,133 @@ | |||
| 1 | /* | ||
| 2 | * QNAP TS-x09 Boards common functions | ||
| 3 | * | ||
| 4 | * Maintainers: Lennert Buytenhek <buytenh@marvell.com> | ||
| 5 | * Byron Bradley <byron.bbradley@gmail.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of the GNU General Public License | ||
| 9 | * as published by the Free Software Foundation; either version | ||
| 10 | * 2 of the License, or (at your option) any later version. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/pci.h> | ||
| 15 | #include <linux/mv643xx_eth.h> | ||
| 16 | #include <linux/timex.h> | ||
| 17 | #include <linux/serial_reg.h> | ||
| 18 | #include "tsx09-common.h" | ||
| 19 | |||
| 20 | /***************************************************************************** | ||
| 21 | * QNAP TS-x09 specific power off method via UART1-attached PIC | ||
| 22 | ****************************************************************************/ | ||
| 23 | |||
| 24 | #define UART1_REG(x) (UART1_VIRT_BASE + ((UART_##x) << 2)) | ||
| 25 | |||
| 26 | void qnap_tsx09_power_off(void) | ||
| 27 | { | ||
| 28 | /* 19200 baud divisor */ | ||
| 29 | const unsigned divisor = ((ORION5X_TCLK + (8 * 19200)) / (16 * 19200)); | ||
| 30 | |||
| 31 | pr_info("%s: triggering power-off...\n", __func__); | ||
| 32 | |||
| 33 | /* hijack uart1 and reset into sane state (19200,8n1) */ | ||
| 34 | writel(0x83, UART1_REG(LCR)); | ||
| 35 | writel(divisor & 0xff, UART1_REG(DLL)); | ||
| 36 | writel((divisor >> 8) & 0xff, UART1_REG(DLM)); | ||
| 37 | writel(0x03, UART1_REG(LCR)); | ||
| 38 | writel(0x00, UART1_REG(IER)); | ||
| 39 | writel(0x00, UART1_REG(FCR)); | ||
| 40 | writel(0x00, UART1_REG(MCR)); | ||
| 41 | |||
| 42 | /* send the power-off command 'A' to PIC */ | ||
| 43 | writel('A', UART1_REG(TX)); | ||
| 44 | } | ||
| 45 | |||
| 46 | /***************************************************************************** | ||
| 47 | * Ethernet | ||
| 48 | ****************************************************************************/ | ||
| 49 | |||
| 50 | struct mv643xx_eth_platform_data qnap_tsx09_eth_data = { | ||
| 51 | .phy_addr = 8, | ||
| 52 | }; | ||
| 53 | |||
| 54 | static int __init qnap_tsx09_parse_hex_nibble(char n) | ||
| 55 | { | ||
| 56 | if (n >= '0' && n <= '9') | ||
| 57 | return n - '0'; | ||
| 58 | |||
| 59 | if (n >= 'A' && n <= 'F') | ||
| 60 | return n - 'A' + 10; | ||
| 61 | |||
| 62 | if (n >= 'a' && n <= 'f') | ||
| 63 | return n - 'a' + 10; | ||
| 64 | |||
| 65 | return -1; | ||
| 66 | } | ||
| 67 | |||
| 68 | static int __init qnap_tsx09_parse_hex_byte(const char *b) | ||
| 69 | { | ||
| 70 | int hi; | ||
| 71 | int lo; | ||
| 72 | |||
| 73 | hi = qnap_tsx09_parse_hex_nibble(b[0]); | ||
| 74 | lo = qnap_tsx09_parse_hex_nibble(b[1]); | ||
| 75 | |||
| 76 | if (hi < 0 || lo < 0) | ||
| 77 | return -1; | ||
| 78 | |||
| 79 | return (hi << 4) | lo; | ||
| 80 | } | ||
| 81 | |||
| 82 | static int __init qnap_tsx09_check_mac_addr(const char *addr_str) | ||
| 83 | { | ||
| 84 | u_int8_t addr[6]; | ||
| 85 | int i; | ||
| 86 | |||
| 87 | for (i = 0; i < 6; i++) { | ||
| 88 | int byte; | ||
| 89 | |||
| 90 | /* | ||
| 91 | * Enforce "xx:xx:xx:xx:xx:xx\n" format. | ||
| 92 | */ | ||
| 93 | if (addr_str[(i * 3) + 2] != ((i < 5) ? ':' : '\n')) | ||
| 94 | return -1; | ||
| 95 | |||
| 96 | byte = qnap_tsx09_parse_hex_byte(addr_str + (i * 3)); | ||
| 97 | if (byte < 0) | ||
| 98 | return -1; | ||
| 99 | addr[i] = byte; | ||
| 100 | } | ||
| 101 | |||
| 102 | printk(KERN_INFO "tsx09: found ethernet mac address "); | ||
| 103 | for (i = 0; i < 6; i++) | ||
| 104 | printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n"); | ||
| 105 | |||
| 106 | memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6); | ||
| 107 | |||
| 108 | return 0; | ||
| 109 | } | ||
| 110 | |||
| 111 | /* | ||
| 112 | * The 'NAS Config' flash partition has an ext2 filesystem which | ||
| 113 | * contains a file that has the ethernet MAC address in plain text | ||
| 114 | * (format "xx:xx:xx:xx:xx:xx\n"). | ||
| 115 | */ | ||
| 116 | void __init qnap_tsx09_find_mac_addr(u32 mem_base, u32 size) | ||
| 117 | { | ||
| 118 | unsigned long addr; | ||
| 119 | |||
| 120 | for (addr = mem_base; addr < (mem_base + size); addr += 1024) { | ||
| 121 | char *nor_page; | ||
| 122 | int ret = 0; | ||
| 123 | |||
| 124 | nor_page = ioremap(addr, 1024); | ||
| 125 | if (nor_page != NULL) { | ||
| 126 | ret = qnap_tsx09_check_mac_addr(nor_page); | ||
| 127 | iounmap(nor_page); | ||
| 128 | } | ||
| 129 | |||
| 130 | if (ret == 0) | ||
| 131 | break; | ||
| 132 | } | ||
| 133 | } | ||
diff --git a/arch/arm/mach-orion5x/tsx09-common.h b/arch/arm/mach-orion5x/tsx09-common.h new file mode 100644 index 000000000000..0984264616f0 --- /dev/null +++ b/arch/arm/mach-orion5x/tsx09-common.h | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | #ifndef __ARCH_ORION5X_TSX09_COMMON_H | ||
| 2 | #define __ARCH_ORION5X_TSX09_COMMON_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * QNAP TS-x09 Boards power-off function | ||
| 6 | */ | ||
| 7 | extern void qnap_tsx09_power_off(void); | ||
| 8 | |||
| 9 | /* | ||
| 10 | * QNAP TS-x09 Boards function to find Ethernet MAC address in flash memory | ||
| 11 | */ | ||
| 12 | extern void __init qnap_tsx09_find_mac_addr(u32 mem_base, u32 size); | ||
| 13 | |||
| 14 | /* | ||
| 15 | * QNAP TS-x09 Boards ethernet declaration | ||
| 16 | */ | ||
| 17 | extern struct mv643xx_eth_platform_data qnap_tsx09_eth_data; | ||
| 18 | |||
| 19 | |||
| 20 | #endif | ||
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c new file mode 100644 index 000000000000..1af093ff8cf3 --- /dev/null +++ b/arch/arm/mach-orion5x/wnr854t-setup.c | |||
| @@ -0,0 +1,164 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/wnr854t-setup.c | ||
| 3 | * | ||
| 4 | * This file is licensed under the terms of the GNU General Public | ||
| 5 | * License version 2. This program is licensed "as is" without any | ||
| 6 | * warranty of any kind, whether express or implied. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #include <linux/kernel.h> | ||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/platform_device.h> | ||
| 12 | #include <linux/pci.h> | ||
| 13 | #include <linux/irq.h> | ||
| 14 | #include <linux/delay.h> | ||
| 15 | #include <linux/mtd/physmap.h> | ||
| 16 | #include <linux/mv643xx_eth.h> | ||
| 17 | #include <asm/mach-types.h> | ||
| 18 | #include <asm/gpio.h> | ||
| 19 | #include <asm/mach/arch.h> | ||
| 20 | #include <asm/mach/pci.h> | ||
| 21 | #include <asm/arch/orion5x.h> | ||
| 22 | #include "common.h" | ||
| 23 | #include "mpp.h" | ||
| 24 | |||
| 25 | static struct orion5x_mpp_mode wnr854t_mpp_modes[] __initdata = { | ||
| 26 | { 0, MPP_GPIO }, /* Power LED green (0=on) */ | ||
| 27 | { 1, MPP_GPIO }, /* Reset Button (0=off) */ | ||
| 28 | { 2, MPP_GPIO }, /* Power LED blink (0=off) */ | ||
| 29 | { 3, MPP_GPIO }, /* WAN Status LED amber (0=off) */ | ||
| 30 | { 4, MPP_GPIO }, /* PCI int */ | ||
| 31 | { 5, MPP_GPIO }, /* ??? */ | ||
| 32 | { 6, MPP_GPIO }, /* ??? */ | ||
| 33 | { 7, MPP_GPIO }, /* ??? */ | ||
| 34 | { 8, MPP_UNUSED }, /* ??? */ | ||
| 35 | { 9, MPP_GIGE }, /* GE_RXERR */ | ||
| 36 | { 10, MPP_UNUSED }, /* ??? */ | ||
| 37 | { 11, MPP_UNUSED }, /* ??? */ | ||
| 38 | { 12, MPP_GIGE }, /* GE_TXD[4] */ | ||
| 39 | { 13, MPP_GIGE }, /* GE_TXD[5] */ | ||
| 40 | { 14, MPP_GIGE }, /* GE_TXD[6] */ | ||
| 41 | { 15, MPP_GIGE }, /* GE_TXD[7] */ | ||
| 42 | { 16, MPP_GIGE }, /* GE_RXD[4] */ | ||
| 43 | { 17, MPP_GIGE }, /* GE_RXD[5] */ | ||
| 44 | { 18, MPP_GIGE }, /* GE_RXD[6] */ | ||
| 45 | { 19, MPP_GIGE }, /* GE_RXD[7] */ | ||
| 46 | { -1 }, | ||
| 47 | }; | ||
| 48 | |||
| 49 | /* | ||
| 50 | * 8M NOR flash Device bus boot chip select | ||
| 51 | */ | ||
| 52 | #define WNR854T_NOR_BOOT_BASE 0xf4000000 | ||
| 53 | #define WNR854T_NOR_BOOT_SIZE SZ_8M | ||
| 54 | |||
| 55 | static struct mtd_partition wnr854t_nor_flash_partitions[] = { | ||
| 56 | { | ||
| 57 | .name = "kernel", | ||
| 58 | .offset = 0x00000000, | ||
| 59 | .size = 0x00100000, | ||
| 60 | }, { | ||
| 61 | .name = "rootfs", | ||
| 62 | .offset = 0x00100000, | ||
| 63 | .size = 0x00660000, | ||
| 64 | }, { | ||
| 65 | .name = "uboot", | ||
| 66 | .offset = 0x00760000, | ||
| 67 | .size = 0x00040000, | ||
| 68 | }, | ||
| 69 | }; | ||
| 70 | |||
| 71 | static struct physmap_flash_data wnr854t_nor_flash_data = { | ||
| 72 | .width = 2, | ||
| 73 | .parts = wnr854t_nor_flash_partitions, | ||
| 74 | .nr_parts = ARRAY_SIZE(wnr854t_nor_flash_partitions), | ||
| 75 | }; | ||
| 76 | |||
| 77 | static struct resource wnr854t_nor_flash_resource = { | ||
| 78 | .flags = IORESOURCE_MEM, | ||
| 79 | .start = WNR854T_NOR_BOOT_BASE, | ||
| 80 | .end = WNR854T_NOR_BOOT_BASE + WNR854T_NOR_BOOT_SIZE - 1, | ||
| 81 | }; | ||
| 82 | |||
| 83 | static struct platform_device wnr854t_nor_flash = { | ||
| 84 | .name = "physmap-flash", | ||
| 85 | .id = 0, | ||
| 86 | .dev = { | ||
| 87 | .platform_data = &wnr854t_nor_flash_data, | ||
| 88 | }, | ||
| 89 | .num_resources = 1, | ||
| 90 | .resource = &wnr854t_nor_flash_resource, | ||
| 91 | }; | ||
| 92 | |||
| 93 | static struct mv643xx_eth_platform_data wnr854t_eth_data = { | ||
| 94 | .phy_addr = -1, | ||
| 95 | }; | ||
| 96 | |||
| 97 | static void __init wnr854t_init(void) | ||
| 98 | { | ||
| 99 | /* | ||
| 100 | * Setup basic Orion functions. Need to be called early. | ||
| 101 | */ | ||
| 102 | orion5x_init(); | ||
| 103 | |||
| 104 | orion5x_mpp_conf(wnr854t_mpp_modes); | ||
| 105 | |||
| 106 | /* | ||
| 107 | * Configure peripherals. | ||
| 108 | */ | ||
| 109 | orion5x_eth_init(&wnr854t_eth_data); | ||
| 110 | orion5x_uart0_init(); | ||
| 111 | |||
| 112 | orion5x_setup_dev_boot_win(WNR854T_NOR_BOOT_BASE, | ||
| 113 | WNR854T_NOR_BOOT_SIZE); | ||
| 114 | platform_device_register(&wnr854t_nor_flash); | ||
| 115 | } | ||
| 116 | |||
| 117 | static int __init wnr854t_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 118 | { | ||
| 119 | int irq; | ||
| 120 | |||
| 121 | /* | ||
| 122 | * Check for devices with hard-wired IRQs. | ||
| 123 | */ | ||
| 124 | irq = orion5x_pci_map_irq(dev, slot, pin); | ||
| 125 | if (irq != -1) | ||
| 126 | return irq; | ||
| 127 | |||
| 128 | /* | ||
| 129 | * Mini-PCI slot. | ||
| 130 | */ | ||
| 131 | if (slot == 7) | ||
| 132 | return gpio_to_irq(4); | ||
| 133 | |||
| 134 | return -1; | ||
| 135 | } | ||
| 136 | |||
| 137 | static struct hw_pci wnr854t_pci __initdata = { | ||
| 138 | .nr_controllers = 2, | ||
| 139 | .swizzle = pci_std_swizzle, | ||
| 140 | .setup = orion5x_pci_sys_setup, | ||
| 141 | .scan = orion5x_pci_sys_scan_bus, | ||
| 142 | .map_irq = wnr854t_pci_map_irq, | ||
| 143 | }; | ||
| 144 | |||
| 145 | static int __init wnr854t_pci_init(void) | ||
| 146 | { | ||
| 147 | if (machine_is_wnr854t()) | ||
| 148 | pci_common_init(&wnr854t_pci); | ||
| 149 | |||
| 150 | return 0; | ||
| 151 | } | ||
| 152 | subsys_initcall(wnr854t_pci_init); | ||
| 153 | |||
| 154 | MACHINE_START(WNR854T, "Netgear WNR854T") | ||
| 155 | /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ | ||
| 156 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 157 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 158 | .boot_params = 0x00000100, | ||
| 159 | .init_machine = wnr854t_init, | ||
| 160 | .map_io = orion5x_map_io, | ||
| 161 | .init_irq = orion5x_init_irq, | ||
| 162 | .timer = &orion5x_timer, | ||
| 163 | .fixup = tag_fixup_mem32, | ||
| 164 | MACHINE_END | ||
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c new file mode 100644 index 000000000000..aeab55c6a82d --- /dev/null +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c | |||
| @@ -0,0 +1,173 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/wrt350n-v2-setup.c | ||
| 3 | * | ||
| 4 | * This file is licensed under the terms of the GNU General Public | ||
| 5 | * License version 2. This program is licensed "as is" without any | ||
| 6 | * warranty of any kind, whether express or implied. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #include <linux/kernel.h> | ||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/platform_device.h> | ||
| 12 | #include <linux/pci.h> | ||
| 13 | #include <linux/irq.h> | ||
| 14 | #include <linux/delay.h> | ||
| 15 | #include <linux/mtd/physmap.h> | ||
| 16 | #include <linux/mv643xx_eth.h> | ||
| 17 | #include <asm/mach-types.h> | ||
| 18 | #include <asm/gpio.h> | ||
| 19 | #include <asm/mach/arch.h> | ||
| 20 | #include <asm/mach/pci.h> | ||
| 21 | #include <asm/arch/orion5x.h> | ||
| 22 | #include "common.h" | ||
| 23 | #include "mpp.h" | ||
| 24 | |||
| 25 | static struct orion5x_mpp_mode wrt350n_v2_mpp_modes[] __initdata = { | ||
| 26 | { 0, MPP_GPIO }, /* Power LED green (0=on) */ | ||
| 27 | { 1, MPP_GPIO }, /* Security LED (0=on) */ | ||
| 28 | { 2, MPP_GPIO }, /* Internal Button (0=on) */ | ||
| 29 | { 3, MPP_GPIO }, /* Reset Button (0=on) */ | ||
| 30 | { 4, MPP_GPIO }, /* PCI int */ | ||
| 31 | { 5, MPP_GPIO }, /* Power LED orange (0=on) */ | ||
| 32 | { 6, MPP_GPIO }, /* USB LED (0=on) */ | ||
| 33 | { 7, MPP_GPIO }, /* Wireless LED (0=on) */ | ||
| 34 | { 8, MPP_UNUSED }, /* ??? */ | ||
| 35 | { 9, MPP_GIGE }, /* GE_RXERR */ | ||
| 36 | { 10, MPP_UNUSED }, /* ??? */ | ||
| 37 | { 11, MPP_UNUSED }, /* ??? */ | ||
| 38 | { 12, MPP_GIGE }, /* GE_TXD[4] */ | ||
| 39 | { 13, MPP_GIGE }, /* GE_TXD[5] */ | ||
| 40 | { 14, MPP_GIGE }, /* GE_TXD[6] */ | ||
| 41 | { 15, MPP_GIGE }, /* GE_TXD[7] */ | ||
| 42 | { 16, MPP_GIGE }, /* GE_RXD[4] */ | ||
| 43 | { 17, MPP_GIGE }, /* GE_RXD[5] */ | ||
| 44 | { 18, MPP_GIGE }, /* GE_RXD[6] */ | ||
| 45 | { 19, MPP_GIGE }, /* GE_RXD[7] */ | ||
| 46 | { -1 }, | ||
| 47 | }; | ||
| 48 | |||
| 49 | /* | ||
| 50 | * 8M NOR flash Device bus boot chip select | ||
| 51 | */ | ||
| 52 | #define WRT350N_V2_NOR_BOOT_BASE 0xf4000000 | ||
| 53 | #define WRT350N_V2_NOR_BOOT_SIZE SZ_8M | ||
| 54 | |||
| 55 | static struct mtd_partition wrt350n_v2_nor_flash_partitions[] = { | ||
| 56 | { | ||
| 57 | .name = "kernel", | ||
| 58 | .offset = 0x00000000, | ||
| 59 | .size = 0x00760000, | ||
| 60 | }, { | ||
| 61 | .name = "rootfs", | ||
| 62 | .offset = 0x001a0000, | ||
| 63 | .size = 0x005c0000, | ||
| 64 | }, { | ||
| 65 | .name = "lang", | ||
| 66 | .offset = 0x00760000, | ||
| 67 | .size = 0x00040000, | ||
| 68 | }, { | ||
| 69 | .name = "nvram", | ||
| 70 | .offset = 0x007a0000, | ||
| 71 | .size = 0x00020000, | ||
| 72 | }, { | ||
| 73 | .name = "u-boot", | ||
| 74 | .offset = 0x007c0000, | ||
| 75 | .size = 0x00040000, | ||
| 76 | }, | ||
| 77 | }; | ||
| 78 | |||
| 79 | static struct physmap_flash_data wrt350n_v2_nor_flash_data = { | ||
| 80 | .width = 1, | ||
| 81 | .parts = wrt350n_v2_nor_flash_partitions, | ||
| 82 | .nr_parts = ARRAY_SIZE(wrt350n_v2_nor_flash_partitions), | ||
| 83 | }; | ||
| 84 | |||
| 85 | static struct resource wrt350n_v2_nor_flash_resource = { | ||
| 86 | .flags = IORESOURCE_MEM, | ||
| 87 | .start = WRT350N_V2_NOR_BOOT_BASE, | ||
| 88 | .end = WRT350N_V2_NOR_BOOT_BASE + WRT350N_V2_NOR_BOOT_SIZE - 1, | ||
| 89 | }; | ||
| 90 | |||
| 91 | static struct platform_device wrt350n_v2_nor_flash = { | ||
| 92 | .name = "physmap-flash", | ||
| 93 | .id = 0, | ||
| 94 | .dev = { | ||
| 95 | .platform_data = &wrt350n_v2_nor_flash_data, | ||
| 96 | }, | ||
| 97 | .num_resources = 1, | ||
| 98 | .resource = &wrt350n_v2_nor_flash_resource, | ||
| 99 | }; | ||
| 100 | |||
| 101 | static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = { | ||
| 102 | .phy_addr = -1, | ||
| 103 | }; | ||
| 104 | |||
| 105 | static void __init wrt350n_v2_init(void) | ||
| 106 | { | ||
| 107 | /* | ||
| 108 | * Setup basic Orion functions. Need to be called early. | ||
| 109 | */ | ||
| 110 | orion5x_init(); | ||
| 111 | |||
| 112 | orion5x_mpp_conf(wrt350n_v2_mpp_modes); | ||
| 113 | |||
| 114 | /* | ||
| 115 | * Configure peripherals. | ||
| 116 | */ | ||
| 117 | orion5x_ehci0_init(); | ||
| 118 | orion5x_eth_init(&wrt350n_v2_eth_data); | ||
| 119 | orion5x_uart0_init(); | ||
| 120 | |||
| 121 | orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE, | ||
| 122 | WRT350N_V2_NOR_BOOT_SIZE); | ||
| 123 | platform_device_register(&wrt350n_v2_nor_flash); | ||
| 124 | } | ||
| 125 | |||
| 126 | static int __init wrt350n_v2_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
| 127 | { | ||
| 128 | int irq; | ||
| 129 | |||
| 130 | /* | ||
| 131 | * Check for devices with hard-wired IRQs. | ||
| 132 | */ | ||
| 133 | irq = orion5x_pci_map_irq(dev, slot, pin); | ||
| 134 | if (irq != -1) | ||
| 135 | return irq; | ||
| 136 | |||
| 137 | /* | ||
| 138 | * Mini-PCI slot. | ||
| 139 | */ | ||
| 140 | if (slot == 7) | ||
| 141 | return gpio_to_irq(4); | ||
| 142 | |||
| 143 | return -1; | ||
| 144 | } | ||
| 145 | |||
| 146 | static struct hw_pci wrt350n_v2_pci __initdata = { | ||
| 147 | .nr_controllers = 2, | ||
| 148 | .swizzle = pci_std_swizzle, | ||
| 149 | .setup = orion5x_pci_sys_setup, | ||
| 150 | .scan = orion5x_pci_sys_scan_bus, | ||
| 151 | .map_irq = wrt350n_v2_pci_map_irq, | ||
| 152 | }; | ||
| 153 | |||
| 154 | static int __init wrt350n_v2_pci_init(void) | ||
| 155 | { | ||
| 156 | if (machine_is_wrt350n_v2()) | ||
| 157 | pci_common_init(&wrt350n_v2_pci); | ||
| 158 | |||
| 159 | return 0; | ||
| 160 | } | ||
| 161 | subsys_initcall(wrt350n_v2_pci_init); | ||
| 162 | |||
| 163 | MACHINE_START(WRT350N_V2, "Linksys WRT350N v2") | ||
| 164 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ | ||
| 165 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 166 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 167 | .boot_params = 0x00000100, | ||
| 168 | .init_machine = wrt350n_v2_init, | ||
| 169 | .map_io = orion5x_map_io, | ||
| 170 | .init_irq = orion5x_init_irq, | ||
| 171 | .timer = &orion5x_timer, | ||
| 172 | .fixup = tag_fixup_mem32, | ||
| 173 | MACHINE_END | ||
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index 6d4416a4f378..f5851d1adc25 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c | |||
| @@ -59,7 +59,7 @@ static struct resource cmx270_dm9k_resource[] = { | |||
| 59 | [2] = { | 59 | [2] = { |
| 60 | .start = CMX270_ETHIRQ, | 60 | .start = CMX270_ETHIRQ, |
| 61 | .end = CMX270_ETHIRQ, | 61 | .end = CMX270_ETHIRQ, |
| 62 | .flags = IORESOURCE_IRQ, | 62 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
| 63 | } | 63 | } |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index edc4f07a230d..9c57700ee5c2 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
| @@ -50,7 +50,7 @@ static struct resource em_x270_dm9k_resource[] = { | |||
| 50 | [2] = { | 50 | [2] = { |
| 51 | .start = EM_X270_ETHIRQ, | 51 | .start = EM_X270_ETHIRQ, |
| 52 | .end = EM_X270_ETHIRQ, | 52 | .end = EM_X270_ETHIRQ, |
| 53 | .flags = IORESOURCE_IRQ, | 53 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, |
| 54 | } | 54 | } |
| 55 | }; | 55 | }; |
| 56 | 56 | ||
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index dace3820f1ee..e7d0fcd9b43f 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <asm/arch/pxa-regs.h> | 38 | #include <asm/arch/pxa-regs.h> |
| 39 | #include <asm/arch/pxa2xx-regs.h> | 39 | #include <asm/arch/pxa2xx-regs.h> |
| 40 | #include <asm/arch/pxa2xx-gpio.h> | 40 | #include <asm/arch/pxa2xx-gpio.h> |
| 41 | #include <asm/arch/pxa27x-udc.h> | ||
| 42 | #include <asm/arch/irda.h> | 41 | #include <asm/arch/irda.h> |
| 43 | #include <asm/arch/mmc.h> | 42 | #include <asm/arch/mmc.h> |
| 44 | #include <asm/arch/ohci.h> | 43 | #include <asm/arch/ohci.h> |
diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c index 00af7f2fed66..0bb31982fb6f 100644 --- a/arch/arm/mach-pxa/ssp.c +++ b/arch/arm/mach-pxa/ssp.c | |||
| @@ -330,7 +330,7 @@ struct ssp_device *ssp_request(int port, const char *label) | |||
| 330 | 330 | ||
| 331 | mutex_unlock(&ssp_lock); | 331 | mutex_unlock(&ssp_lock); |
| 332 | 332 | ||
| 333 | if (ssp->port_id != port) | 333 | if (&ssp->node == &ssp_list) |
| 334 | return NULL; | 334 | return NULL; |
| 335 | 335 | ||
| 336 | return ssp; | 336 | return ssp; |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index c2cbd66db814..ab4a9f579913 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -467,8 +467,8 @@ static struct platform_device *devices[] __initdata = { | |||
| 467 | 467 | ||
| 468 | static void tosa_poweroff(void) | 468 | static void tosa_poweroff(void) |
| 469 | { | 469 | { |
| 470 | pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT); | 470 | gpio_direction_output(TOSA_GPIO_ON_RESET, 0); |
| 471 | GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET); | 471 | gpio_set_value(TOSA_GPIO_ON_RESET, 1); |
| 472 | 472 | ||
| 473 | mdelay(1000); | 473 | mdelay(1000); |
| 474 | arm_machine_restart('h'); | 474 | arm_machine_restart('h'); |
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index 3e57428affee..8e813ed57519 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c | |||
| @@ -74,6 +74,8 @@ static DEFINE_SPINLOCK(boot_lock); | |||
| 74 | 74 | ||
| 75 | void __cpuinit platform_secondary_init(unsigned int cpu) | 75 | void __cpuinit platform_secondary_init(unsigned int cpu) |
| 76 | { | 76 | { |
| 77 | trace_hardirqs_off(); | ||
| 78 | |||
| 77 | /* | 79 | /* |
| 78 | * the primary core may have used a "cross call" soft interrupt | 80 | * the primary core may have used a "cross call" soft interrupt |
| 79 | * to get this processor out of WFI in the BootMonitor - make | 81 | * to get this processor out of WFI in the BootMonitor - make |
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index cd3dc0834b3b..99fdc736698c 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig | |||
| @@ -37,6 +37,17 @@ config S3C2410_CLOCK | |||
| 37 | help | 37 | help |
| 38 | Clock code for the S3C2410, and similar processors | 38 | Clock code for the S3C2410, and similar processors |
| 39 | 39 | ||
| 40 | config SIMTEC_NOR | ||
| 41 | bool | ||
| 42 | help | ||
| 43 | Internal node to specify machine has simtec NOR mapping | ||
| 44 | |||
| 45 | config MACH_BAST_IDE | ||
| 46 | bool | ||
| 47 | select HAVE_PATA_PLATFORM | ||
| 48 | help | ||
| 49 | Internal node for machines with an BAST style IDE | ||
| 50 | interface | ||
| 40 | 51 | ||
| 41 | menu "S3C2410 Machines" | 52 | menu "S3C2410 Machines" |
| 42 | 53 | ||
| @@ -61,15 +72,18 @@ config PM_H1940 | |||
| 61 | Internal node for H1940 and related PM | 72 | Internal node for H1940 and related PM |
| 62 | 73 | ||
| 63 | config MACH_N30 | 74 | config MACH_N30 |
| 64 | bool "Acer N30" | 75 | bool "Acer N30 family" |
| 65 | select CPU_S3C2410 | 76 | select CPU_S3C2410 |
| 66 | help | 77 | help |
| 67 | Say Y here if you are using the Acer N30 | 78 | Say Y here if you want suppt for the Acer N30, Acer N35, |
| 79 | Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs. | ||
| 68 | 80 | ||
| 69 | config ARCH_BAST | 81 | config ARCH_BAST |
| 70 | bool "Simtec Electronics BAST (EB2410ITX)" | 82 | bool "Simtec Electronics BAST (EB2410ITX)" |
| 71 | select CPU_S3C2410 | 83 | select CPU_S3C2410 |
| 72 | select PM_SIMTEC if PM | 84 | select PM_SIMTEC if PM |
| 85 | select SIMTEC_NOR | ||
| 86 | select MACH_BAST_IDE | ||
| 73 | select ISA | 87 | select ISA |
| 74 | help | 88 | help |
| 75 | Say Y here if you are using the Simtec Electronics EB2410ITX | 89 | Say Y here if you are using the Simtec Electronics EB2410ITX |
| @@ -107,6 +121,8 @@ config MACH_TCT_HAMMER | |||
| 107 | config MACH_VR1000 | 121 | config MACH_VR1000 |
| 108 | bool "Thorcom VR1000" | 122 | bool "Thorcom VR1000" |
| 109 | select PM_SIMTEC if PM | 123 | select PM_SIMTEC if PM |
| 124 | select SIMTEC_NOR | ||
| 125 | select MACH_BAST_IDE | ||
| 110 | select CPU_S3C2410 | 126 | select CPU_S3C2410 |
| 111 | help | 127 | help |
| 112 | Say Y here if you are using the Thorcom VR1000 board. | 128 | Say Y here if you are using the Thorcom VR1000 board. |
| @@ -118,4 +134,3 @@ config MACH_QT2410 | |||
| 118 | Say Y here if you are using the Armzone QT2410 | 134 | Say Y here if you are using the Armzone QT2410 |
| 119 | 135 | ||
| 120 | endmenu | 136 | endmenu |
| 121 | |||
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile index cabc13ce09e4..00f31f8c4e78 100644 --- a/arch/arm/mach-s3c2410/Makefile +++ b/arch/arm/mach-s3c2410/Makefile | |||
| @@ -30,3 +30,11 @@ obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o | |||
| 30 | obj-$(CONFIG_MACH_TCT_HAMMER) += mach-tct_hammer.o | 30 | obj-$(CONFIG_MACH_TCT_HAMMER) += mach-tct_hammer.o |
| 31 | obj-$(CONFIG_MACH_VR1000) += mach-vr1000.o usb-simtec.o | 31 | obj-$(CONFIG_MACH_VR1000) += mach-vr1000.o usb-simtec.o |
| 32 | obj-$(CONFIG_MACH_QT2410) += mach-qt2410.o | 32 | obj-$(CONFIG_MACH_QT2410) += mach-qt2410.o |
| 33 | |||
| 34 | # Common bits of machine support | ||
| 35 | |||
| 36 | obj-$(CONFIG_SIMTEC_NOR) += nor-simtec.o | ||
| 37 | |||
| 38 | # machine additions | ||
| 39 | |||
| 40 | obj-$(CONFIG_MACH_BAST_IDE) += bast-ide.o | ||
diff --git a/arch/arm/mach-s3c2410/bast-ide.c b/arch/arm/mach-s3c2410/bast-ide.c new file mode 100644 index 000000000000..df95fe37cdc8 --- /dev/null +++ b/arch/arm/mach-s3c2410/bast-ide.c | |||
| @@ -0,0 +1,112 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2410/bast-ide.c | ||
| 2 | * | ||
| 3 | * Copyright 2007 Simtec Electronics | ||
| 4 | * http://www.simtec.co.uk/products/EB2410ITX/ | ||
| 5 | * http://armlinux.simtec.co.uk/ | ||
| 6 | * Ben Dooks <ben@simtec.co.uk> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/types.h> | ||
| 15 | #include <linux/init.h> | ||
| 16 | #include <linux/interrupt.h> | ||
| 17 | |||
| 18 | #include <linux/platform_device.h> | ||
| 19 | #include <linux/ata_platform.h> | ||
| 20 | |||
| 21 | #include <asm/mach-types.h> | ||
| 22 | |||
| 23 | #include <asm/mach/arch.h> | ||
| 24 | #include <asm/mach/map.h> | ||
| 25 | #include <asm/mach/irq.h> | ||
| 26 | |||
| 27 | #include <asm/arch/map.h> | ||
| 28 | #include <asm/arch/bast-map.h> | ||
| 29 | #include <asm/arch/bast-irq.h> | ||
| 30 | |||
| 31 | /* IDE ports */ | ||
| 32 | |||
| 33 | static struct pata_platform_info bast_ide_platdata = { | ||
| 34 | .ioport_shift = 5, | ||
| 35 | }; | ||
| 36 | |||
| 37 | #define IDE_CS S3C2410_CS5 | ||
| 38 | |||
| 39 | static struct resource bast_ide0_resource[] = { | ||
| 40 | [0] = { | ||
| 41 | .start = IDE_CS + BAST_PA_IDEPRI, | ||
| 42 | .end = IDE_CS + BAST_PA_IDEPRI + (8 * 0x20) - 1, | ||
| 43 | .flags = IORESOURCE_MEM, | ||
| 44 | }, | ||
| 45 | [1] = { | ||
| 46 | .start = IDE_CS + BAST_PA_IDEPRIAUX + (6 * 0x20) , | ||
| 47 | .end = IDE_CS + BAST_PA_IDEPRIAUX + (7 * 0x20) - 1, | ||
| 48 | .flags = IORESOURCE_MEM, | ||
| 49 | }, | ||
| 50 | [2] = { | ||
| 51 | .start = IRQ_IDE0, | ||
| 52 | .end = IRQ_IDE0, | ||
| 53 | .flags = IORESOURCE_IRQ, | ||
| 54 | }, | ||
| 55 | }; | ||
| 56 | |||
| 57 | static struct platform_device bast_device_ide0 = { | ||
| 58 | .name = "pata_platform", | ||
| 59 | .id = 0, | ||
| 60 | .num_resources = ARRAY_SIZE(bast_ide0_resource), | ||
| 61 | .resource = bast_ide0_resource, | ||
| 62 | .dev = { | ||
| 63 | .platform_data = &bast_ide_platdata, | ||
| 64 | .coherent_dma_mask = ~0, | ||
| 65 | } | ||
| 66 | |||
| 67 | }; | ||
| 68 | |||
| 69 | static struct resource bast_ide1_resource[] = { | ||
| 70 | [0] = { | ||
| 71 | .start = IDE_CS + BAST_PA_IDESEC, | ||
| 72 | .end = IDE_CS + BAST_PA_IDESEC + (8 * 0x20) - 1, | ||
| 73 | .flags = IORESOURCE_MEM, | ||
| 74 | }, | ||
| 75 | [1] = { | ||
| 76 | .start = IDE_CS + BAST_PA_IDESECAUX + (6 * 0x20), | ||
| 77 | .end = IDE_CS + BAST_PA_IDESECAUX + (7 * 0x20) - 1, | ||
| 78 | .flags = IORESOURCE_MEM, | ||
| 79 | }, | ||
| 80 | [2] = { | ||
| 81 | .start = IRQ_IDE1, | ||
| 82 | .end = IRQ_IDE1, | ||
| 83 | .flags = IORESOURCE_IRQ, | ||
| 84 | }, | ||
| 85 | }; | ||
| 86 | |||
| 87 | static struct platform_device bast_device_ide1 = { | ||
| 88 | .name = "pata_platform", | ||
| 89 | .id = 1, | ||
| 90 | .num_resources = ARRAY_SIZE(bast_ide1_resource), | ||
| 91 | .resource = bast_ide1_resource, | ||
| 92 | .dev = { | ||
| 93 | .platform_data = &bast_ide_platdata, | ||
| 94 | .coherent_dma_mask = ~0, | ||
| 95 | } | ||
| 96 | }; | ||
| 97 | |||
| 98 | static struct platform_device *bast_ide_devices[] __initdata = { | ||
| 99 | &bast_device_ide0, | ||
| 100 | &bast_device_ide1, | ||
| 101 | }; | ||
| 102 | |||
| 103 | static __init int bast_ide_init(void) | ||
| 104 | { | ||
| 105 | if (machine_is_bast() || machine_is_vr1000()) | ||
| 106 | return platform_add_devices(bast_ide_devices, | ||
| 107 | ARRAY_SIZE(bast_ide_devices)); | ||
| 108 | |||
| 109 | return 0; | ||
| 110 | } | ||
| 111 | |||
| 112 | fs_initcall(bast_ide_init); | ||
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 661a2358ac22..965f27129707 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2410/mach-bast.c | 1 | /* linux/arch/arm/mach-s3c2410/mach-bast.c |
| 2 | * | 2 | * |
| 3 | * Copyright (c) 2003-2005 Simtec Electronics | 3 | * Copyright (c) 2003-2005,2008 Simtec Electronics |
| 4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
| 5 | * | 5 | * |
| 6 | * http://www.simtec.co.uk/products/EB2410ITX/ | 6 | * http://www.simtec.co.uk/products/EB2410ITX/ |
| @@ -20,6 +20,8 @@ | |||
| 20 | #include <linux/serial_core.h> | 20 | #include <linux/serial_core.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/dm9000.h> | 22 | #include <linux/dm9000.h> |
| 23 | #include <linux/ata_platform.h> | ||
| 24 | #include <linux/i2c.h> | ||
| 23 | 25 | ||
| 24 | #include <net/ax88796.h> | 26 | #include <net/ax88796.h> |
| 25 | 27 | ||
| @@ -56,7 +58,9 @@ | |||
| 56 | #include <asm/plat-s3c24xx/clock.h> | 58 | #include <asm/plat-s3c24xx/clock.h> |
| 57 | #include <asm/plat-s3c24xx/devs.h> | 59 | #include <asm/plat-s3c24xx/devs.h> |
| 58 | #include <asm/plat-s3c24xx/cpu.h> | 60 | #include <asm/plat-s3c24xx/cpu.h> |
| 61 | |||
| 59 | #include "usb-simtec.h" | 62 | #include "usb-simtec.h" |
| 63 | #include "nor-simtec.h" | ||
| 60 | 64 | ||
| 61 | #define COPYRIGHT ", (c) 2004-2005 Simtec Electronics" | 65 | #define COPYRIGHT ", (c) 2004-2005 Simtec Electronics" |
| 62 | 66 | ||
| @@ -134,37 +138,21 @@ static struct map_desc bast_iodesc[] __initdata = { | |||
| 134 | { VA_C2(BAST_VA_ISAIO), PA_CS2(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, | 138 | { VA_C2(BAST_VA_ISAIO), PA_CS2(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, |
| 135 | { VA_C2(BAST_VA_ISAMEM), PA_CS2(BAST_PA_ISAMEM), SZ_16M, MT_DEVICE }, | 139 | { VA_C2(BAST_VA_ISAMEM), PA_CS2(BAST_PA_ISAMEM), SZ_16M, MT_DEVICE }, |
| 136 | { VA_C2(BAST_VA_SUPERIO), PA_CS2(BAST_PA_SUPERIO), SZ_1M, MT_DEVICE }, | 140 | { VA_C2(BAST_VA_SUPERIO), PA_CS2(BAST_PA_SUPERIO), SZ_1M, MT_DEVICE }, |
| 137 | { VA_C2(BAST_VA_IDEPRI), PA_CS3(BAST_PA_IDEPRI), SZ_1M, MT_DEVICE }, | ||
| 138 | { VA_C2(BAST_VA_IDESEC), PA_CS3(BAST_PA_IDESEC), SZ_1M, MT_DEVICE }, | ||
| 139 | { VA_C2(BAST_VA_IDEPRIAUX), PA_CS3(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE }, | ||
| 140 | { VA_C2(BAST_VA_IDESECAUX), PA_CS3(BAST_PA_IDESECAUX), SZ_1M, MT_DEVICE }, | ||
| 141 | 141 | ||
| 142 | /* slow, word */ | 142 | /* slow, word */ |
| 143 | { VA_C3(BAST_VA_ISAIO), PA_CS3(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, | 143 | { VA_C3(BAST_VA_ISAIO), PA_CS3(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, |
| 144 | { VA_C3(BAST_VA_ISAMEM), PA_CS3(BAST_PA_ISAMEM), SZ_16M, MT_DEVICE }, | 144 | { VA_C3(BAST_VA_ISAMEM), PA_CS3(BAST_PA_ISAMEM), SZ_16M, MT_DEVICE }, |
| 145 | { VA_C3(BAST_VA_SUPERIO), PA_CS3(BAST_PA_SUPERIO), SZ_1M, MT_DEVICE }, | 145 | { VA_C3(BAST_VA_SUPERIO), PA_CS3(BAST_PA_SUPERIO), SZ_1M, MT_DEVICE }, |
| 146 | { VA_C3(BAST_VA_IDEPRI), PA_CS3(BAST_PA_IDEPRI), SZ_1M, MT_DEVICE }, | ||
| 147 | { VA_C3(BAST_VA_IDESEC), PA_CS3(BAST_PA_IDESEC), SZ_1M, MT_DEVICE }, | ||
| 148 | { VA_C3(BAST_VA_IDEPRIAUX), PA_CS3(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE }, | ||
| 149 | { VA_C3(BAST_VA_IDESECAUX), PA_CS3(BAST_PA_IDESECAUX), SZ_1M, MT_DEVICE }, | ||
| 150 | 146 | ||
| 151 | /* fast, byte */ | 147 | /* fast, byte */ |
| 152 | { VA_C4(BAST_VA_ISAIO), PA_CS4(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, | 148 | { VA_C4(BAST_VA_ISAIO), PA_CS4(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, |
| 153 | { VA_C4(BAST_VA_ISAMEM), PA_CS4(BAST_PA_ISAMEM), SZ_16M, MT_DEVICE }, | 149 | { VA_C4(BAST_VA_ISAMEM), PA_CS4(BAST_PA_ISAMEM), SZ_16M, MT_DEVICE }, |
| 154 | { VA_C4(BAST_VA_SUPERIO), PA_CS4(BAST_PA_SUPERIO), SZ_1M, MT_DEVICE }, | 150 | { VA_C4(BAST_VA_SUPERIO), PA_CS4(BAST_PA_SUPERIO), SZ_1M, MT_DEVICE }, |
| 155 | { VA_C4(BAST_VA_IDEPRI), PA_CS5(BAST_PA_IDEPRI), SZ_1M, MT_DEVICE }, | ||
| 156 | { VA_C4(BAST_VA_IDESEC), PA_CS5(BAST_PA_IDESEC), SZ_1M, MT_DEVICE }, | ||
| 157 | { VA_C4(BAST_VA_IDEPRIAUX), PA_CS5(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE }, | ||
| 158 | { VA_C4(BAST_VA_IDESECAUX), PA_CS5(BAST_PA_IDESECAUX), SZ_1M, MT_DEVICE }, | ||
| 159 | 151 | ||
| 160 | /* fast, word */ | 152 | /* fast, word */ |
| 161 | { VA_C5(BAST_VA_ISAIO), PA_CS5(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, | 153 | { VA_C5(BAST_VA_ISAIO), PA_CS5(BAST_PA_ISAIO), SZ_16M, MT_DEVICE }, |
| 162 | { VA_C5(BAST_VA_ISAMEM), PA_CS5(BAST_PA_ISAMEM), SZ_16M, MT_DEVICE }, | 154 | { VA_C5(BAST_VA_ISAMEM), PA_CS5(BAST_PA_ISAMEM), SZ_16M, MT_DEVICE }, |
| 163 | { VA_C5(BAST_VA_SUPERIO), PA_CS5(BAST_PA_SUPERIO), SZ_1M, MT_DEVICE }, | 155 | { VA_C5(BAST_VA_SUPERIO), PA_CS5(BAST_PA_SUPERIO), SZ_1M, MT_DEVICE }, |
| 164 | { VA_C5(BAST_VA_IDEPRI), PA_CS5(BAST_PA_IDEPRI), SZ_1M, MT_DEVICE }, | ||
| 165 | { VA_C5(BAST_VA_IDESEC), PA_CS5(BAST_PA_IDESEC), SZ_1M, MT_DEVICE }, | ||
| 166 | { VA_C5(BAST_VA_IDEPRIAUX), PA_CS5(BAST_PA_IDEPRIAUX), SZ_1M, MT_DEVICE }, | ||
| 167 | { VA_C5(BAST_VA_IDESECAUX), PA_CS5(BAST_PA_IDESECAUX), SZ_1M, MT_DEVICE }, | ||
| 168 | }; | 156 | }; |
| 169 | 157 | ||
| 170 | #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK | 158 | #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK |
| @@ -218,23 +206,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = { | |||
| 218 | } | 206 | } |
| 219 | }; | 207 | }; |
| 220 | 208 | ||
| 221 | /* NOR Flash on BAST board */ | ||
| 222 | |||
| 223 | static struct resource bast_nor_resource[] = { | ||
| 224 | [0] = { | ||
| 225 | .start = S3C2410_CS1 + 0x4000000, | ||
| 226 | .end = S3C2410_CS1 + 0x4000000 + (32*1024*1024) - 1, | ||
| 227 | .flags = IORESOURCE_MEM, | ||
| 228 | } | ||
| 229 | }; | ||
| 230 | |||
| 231 | static struct platform_device bast_device_nor = { | ||
| 232 | .name = "bast-nor", | ||
| 233 | .id = -1, | ||
| 234 | .num_resources = ARRAY_SIZE(bast_nor_resource), | ||
| 235 | .resource = bast_nor_resource, | ||
| 236 | }; | ||
| 237 | |||
| 238 | /* NAND Flash on BAST board */ | 209 | /* NAND Flash on BAST board */ |
| 239 | 210 | ||
| 240 | #ifdef CONFIG_PM | 211 | #ifdef CONFIG_PM |
| @@ -374,7 +345,7 @@ static struct resource bast_dm9k_resource[] = { | |||
| 374 | [2] = { | 345 | [2] = { |
| 375 | .start = IRQ_DM9000, | 346 | .start = IRQ_DM9000, |
| 376 | .end = IRQ_DM9000, | 347 | .end = IRQ_DM9000, |
| 377 | .flags = IORESOURCE_IRQ, | 348 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
| 378 | } | 349 | } |
| 379 | 350 | ||
| 380 | }; | 351 | }; |
| @@ -564,6 +535,18 @@ static struct s3c2410fb_mach_info __initdata bast_fb_info = { | |||
| 564 | .default_display = 1, | 535 | .default_display = 1, |
| 565 | }; | 536 | }; |
| 566 | 537 | ||
| 538 | /* I2C devices fitted. */ | ||
| 539 | |||
| 540 | static struct i2c_board_info bast_i2c_devs[] __initdata = { | ||
| 541 | { | ||
| 542 | I2C_BOARD_INFO("tlv320aic23", 0x1a), | ||
| 543 | }, { | ||
| 544 | I2C_BOARD_INFO("simtec-pmu", 0x6b), | ||
| 545 | }, { | ||
| 546 | I2C_BOARD_INFO("ch7013", 0x75), | ||
| 547 | }, | ||
| 548 | }; | ||
| 549 | |||
| 567 | /* Standard BAST devices */ | 550 | /* Standard BAST devices */ |
| 568 | 551 | ||
| 569 | static struct platform_device *bast_devices[] __initdata = { | 552 | static struct platform_device *bast_devices[] __initdata = { |
| @@ -573,7 +556,6 @@ static struct platform_device *bast_devices[] __initdata = { | |||
| 573 | &s3c_device_i2c, | 556 | &s3c_device_i2c, |
| 574 | &s3c_device_rtc, | 557 | &s3c_device_rtc, |
| 575 | &s3c_device_nand, | 558 | &s3c_device_nand, |
| 576 | &bast_device_nor, | ||
| 577 | &bast_device_dm9k, | 559 | &bast_device_dm9k, |
| 578 | &bast_device_asix, | 560 | &bast_device_asix, |
| 579 | &bast_device_axpp, | 561 | &bast_device_axpp, |
| @@ -622,6 +604,11 @@ static void __init bast_init(void) | |||
| 622 | 604 | ||
| 623 | s3c24xx_fb_set_platdata(&bast_fb_info); | 605 | s3c24xx_fb_set_platdata(&bast_fb_info); |
| 624 | platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices)); | 606 | platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices)); |
| 607 | |||
| 608 | i2c_register_board_info(0, bast_i2c_devs, | ||
| 609 | ARRAY_SIZE(bast_i2c_devs)); | ||
| 610 | |||
| 611 | nor_simtec_init(); | ||
| 625 | } | 612 | } |
| 626 | 613 | ||
| 627 | MACHINE_START(BAST, "Simtec-BAST") | 614 | MACHINE_START(BAST, "Simtec-BAST") |
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index 621f548da610..43c2e915c5bf 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2410/mach-n30.c | 1 | /* Machine specific code for the Acer n30, Acer N35, Navman PiN 570, |
| 2 | * Yakumo AlphaX and Airis NC05 PDAs. | ||
| 2 | * | 3 | * |
| 3 | * Copyright (c) 2003-2005 Simtec Electronics | 4 | * Copyright (c) 2003-2005 Simtec Electronics |
| 4 | * Ben Dooks <ben@simtec.co.uk> | 5 | * Ben Dooks <ben@simtec.co.uk> |
| 5 | * | 6 | * |
| 6 | * Copyright (c) 2005 Christer Weinigel <christer@weinigel.se> | 7 | * Copyright (c) 2005-2008 Christer Weinigel <christer@weinigel.se> |
| 7 | * | 8 | * |
| 8 | * There is a wiki with more information about the n30 port at | 9 | * There is a wiki with more information about the n30 port at |
| 9 | * http://handhelds.org/moin/moin.cgi/AcerN30Documentation . | 10 | * http://handhelds.org/moin/moin.cgi/AcerN30Documentation . |
| @@ -11,36 +12,42 @@ | |||
| 11 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
| 12 | * it under the terms of the GNU General Public License version 2 as | 13 | * it under the terms of the GNU General Public License version 2 as |
| 13 | * published by the Free Software Foundation. | 14 | * published by the Free Software Foundation. |
| 14 | */ | 15 | */ |
| 15 | 16 | ||
| 16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 17 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 18 | #include <linux/interrupt.h> | 19 | |
| 19 | #include <linux/list.h> | ||
| 20 | #include <linux/timer.h> | ||
| 21 | #include <linux/init.h> | ||
| 22 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 23 | #include <linux/serial_core.h> | 21 | #include <linux/gpio_keys.h> |
| 22 | #include <linux/init.h> | ||
| 23 | #include <linux/input.h> | ||
| 24 | #include <linux/interrupt.h> | ||
| 24 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 25 | #include <linux/kthread.h> | 26 | #include <linux/serial_core.h> |
| 26 | 27 | #include <linux/timer.h> | |
| 27 | #include <asm/mach/arch.h> | ||
| 28 | #include <asm/mach/map.h> | ||
| 29 | #include <asm/mach/irq.h> | ||
| 30 | 28 | ||
| 31 | #include <asm/hardware.h> | 29 | #include <asm/hardware.h> |
| 32 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 33 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
| 34 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 35 | 33 | ||
| 36 | #include <asm/plat-s3c/regs-serial.h> | 34 | #include <asm/arch/fb.h> |
| 35 | #include <asm/arch/leds-gpio.h> | ||
| 37 | #include <asm/arch/regs-gpio.h> | 36 | #include <asm/arch/regs-gpio.h> |
| 37 | #include <asm/arch/regs-lcd.h> | ||
| 38 | |||
| 39 | #include <asm/mach/arch.h> | ||
| 40 | #include <asm/mach/irq.h> | ||
| 41 | #include <asm/mach/map.h> | ||
| 42 | |||
| 38 | #include <asm/plat-s3c/iic.h> | 43 | #include <asm/plat-s3c/iic.h> |
| 44 | #include <asm/plat-s3c/regs-serial.h> | ||
| 39 | 45 | ||
| 40 | #include <asm/plat-s3c24xx/s3c2410.h> | ||
| 41 | #include <asm/plat-s3c24xx/clock.h> | 46 | #include <asm/plat-s3c24xx/clock.h> |
| 42 | #include <asm/plat-s3c24xx/devs.h> | ||
| 43 | #include <asm/plat-s3c24xx/cpu.h> | 47 | #include <asm/plat-s3c24xx/cpu.h> |
| 48 | #include <asm/plat-s3c24xx/devs.h> | ||
| 49 | #include <asm/plat-s3c24xx/s3c2410.h> | ||
| 50 | #include <asm/plat-s3c24xx/udc.h> | ||
| 44 | 51 | ||
| 45 | static struct map_desc n30_iodesc[] __initdata = { | 52 | static struct map_desc n30_iodesc[] __initdata = { |
| 46 | /* nothing here yet */ | 53 | /* nothing here yet */ |
| @@ -64,7 +71,8 @@ static struct s3c2410_uartcfg n30_uartcfgs[] = { | |||
| 64 | .ulcon = 0x43, | 71 | .ulcon = 0x43, |
| 65 | .ufcon = 0x51, | 72 | .ufcon = 0x51, |
| 66 | }, | 73 | }, |
| 67 | /* The BlueTooth controller is connected to port 2 */ | 74 | /* On the N30 the bluetooth controller is connected here. |
| 75 | * On the N35 and variants the GPS receiver is connected here. */ | ||
| 68 | [2] = { | 76 | [2] = { |
| 69 | .hwport = 2, | 77 | .hwport = 2, |
| 70 | .flags = 0, | 78 | .flags = 0, |
| @@ -74,13 +82,260 @@ static struct s3c2410_uartcfg n30_uartcfgs[] = { | |||
| 74 | }, | 82 | }, |
| 75 | }; | 83 | }; |
| 76 | 84 | ||
| 85 | static void n30_udc_pullup(enum s3c2410_udc_cmd_e cmd) | ||
| 86 | { | ||
| 87 | switch (cmd) { | ||
| 88 | case S3C2410_UDC_P_ENABLE : | ||
| 89 | s3c2410_gpio_setpin(S3C2410_GPB3, 1); | ||
| 90 | break; | ||
| 91 | case S3C2410_UDC_P_DISABLE : | ||
| 92 | s3c2410_gpio_setpin(S3C2410_GPB3, 0); | ||
| 93 | break; | ||
| 94 | case S3C2410_UDC_P_RESET : | ||
| 95 | break; | ||
| 96 | default: | ||
| 97 | break; | ||
| 98 | } | ||
| 99 | } | ||
| 100 | |||
| 101 | static struct s3c2410_udc_mach_info n30_udc_cfg __initdata = { | ||
| 102 | .udc_command = n30_udc_pullup, | ||
| 103 | .vbus_pin = S3C2410_GPG1, | ||
| 104 | .vbus_pin_inverted = 0, | ||
| 105 | }; | ||
| 106 | |||
| 107 | static struct gpio_keys_button n30_buttons[] = { | ||
| 108 | { | ||
| 109 | .gpio = S3C2410_GPF0, | ||
| 110 | .code = KEY_POWER, | ||
| 111 | .desc = "Power", | ||
| 112 | .active_low = 0, | ||
| 113 | }, | ||
| 114 | { | ||
| 115 | .gpio = S3C2410_GPG9, | ||
| 116 | .code = KEY_UP, | ||
| 117 | .desc = "Thumbwheel Up", | ||
| 118 | .active_low = 0, | ||
| 119 | }, | ||
| 120 | { | ||
| 121 | .gpio = S3C2410_GPG8, | ||
| 122 | .code = KEY_DOWN, | ||
| 123 | .desc = "Thumbwheel Down", | ||
| 124 | .active_low = 0, | ||
| 125 | }, | ||
| 126 | { | ||
| 127 | .gpio = S3C2410_GPG7, | ||
| 128 | .code = KEY_ENTER, | ||
| 129 | .desc = "Thumbwheel Press", | ||
| 130 | .active_low = 0, | ||
| 131 | }, | ||
| 132 | { | ||
| 133 | .gpio = S3C2410_GPF7, | ||
| 134 | .code = KEY_HOMEPAGE, | ||
| 135 | .desc = "Home", | ||
| 136 | .active_low = 0, | ||
| 137 | }, | ||
| 138 | { | ||
| 139 | .gpio = S3C2410_GPF6, | ||
| 140 | .code = KEY_CALENDAR, | ||
| 141 | .desc = "Calendar", | ||
| 142 | .active_low = 0, | ||
| 143 | }, | ||
| 144 | { | ||
| 145 | .gpio = S3C2410_GPF5, | ||
| 146 | .code = KEY_ADDRESSBOOK, | ||
| 147 | .desc = "Contacts", | ||
| 148 | .active_low = 0, | ||
| 149 | }, | ||
| 150 | { | ||
| 151 | .gpio = S3C2410_GPF4, | ||
| 152 | .code = KEY_MAIL, | ||
| 153 | .desc = "Mail", | ||
| 154 | .active_low = 0, | ||
| 155 | }, | ||
| 156 | }; | ||
| 157 | |||
| 158 | static struct gpio_keys_platform_data n30_button_data = { | ||
| 159 | .buttons = n30_buttons, | ||
| 160 | .nbuttons = ARRAY_SIZE(n30_buttons), | ||
| 161 | }; | ||
| 162 | |||
| 163 | static struct platform_device n30_button_device = { | ||
| 164 | .name = "gpio-keys", | ||
| 165 | .id = -1, | ||
| 166 | .dev = { | ||
| 167 | .platform_data = &n30_button_data, | ||
| 168 | } | ||
| 169 | }; | ||
| 170 | |||
| 171 | static struct gpio_keys_button n35_buttons[] = { | ||
| 172 | { | ||
| 173 | .gpio = S3C2410_GPF0, | ||
| 174 | .code = KEY_POWER, | ||
| 175 | .desc = "Power", | ||
| 176 | .active_low = 0, | ||
| 177 | }, | ||
| 178 | { | ||
| 179 | .gpio = S3C2410_GPG9, | ||
| 180 | .code = KEY_UP, | ||
| 181 | .desc = "Joystick Up", | ||
| 182 | .active_low = 0, | ||
| 183 | }, | ||
| 184 | { | ||
| 185 | .gpio = S3C2410_GPG8, | ||
| 186 | .code = KEY_DOWN, | ||
| 187 | .desc = "Joystick Down", | ||
| 188 | .active_low = 0, | ||
| 189 | }, | ||
| 190 | { | ||
| 191 | .gpio = S3C2410_GPG6, | ||
| 192 | .code = KEY_DOWN, | ||
| 193 | .desc = "Joystick Left", | ||
| 194 | .active_low = 0, | ||
| 195 | }, | ||
| 196 | { | ||
| 197 | .gpio = S3C2410_GPG5, | ||
| 198 | .code = KEY_DOWN, | ||
| 199 | .desc = "Joystick Right", | ||
| 200 | .active_low = 0, | ||
| 201 | }, | ||
| 202 | { | ||
| 203 | .gpio = S3C2410_GPG7, | ||
| 204 | .code = KEY_ENTER, | ||
| 205 | .desc = "Joystick Press", | ||
| 206 | .active_low = 0, | ||
| 207 | }, | ||
| 208 | { | ||
| 209 | .gpio = S3C2410_GPF7, | ||
| 210 | .code = KEY_HOMEPAGE, | ||
| 211 | .desc = "Home", | ||
| 212 | .active_low = 0, | ||
| 213 | }, | ||
| 214 | { | ||
| 215 | .gpio = S3C2410_GPF6, | ||
| 216 | .code = KEY_CALENDAR, | ||
| 217 | .desc = "Calendar", | ||
| 218 | .active_low = 0, | ||
| 219 | }, | ||
| 220 | { | ||
| 221 | .gpio = S3C2410_GPF5, | ||
| 222 | .code = KEY_ADDRESSBOOK, | ||
| 223 | .desc = "Contacts", | ||
| 224 | .active_low = 0, | ||
| 225 | }, | ||
| 226 | { | ||
| 227 | .gpio = S3C2410_GPF4, | ||
| 228 | .code = KEY_MAIL, | ||
| 229 | .desc = "Mail", | ||
| 230 | .active_low = 0, | ||
| 231 | }, | ||
| 232 | { | ||
| 233 | .gpio = S3C2410_GPF3, | ||
| 234 | .code = SW_RADIO, | ||
| 235 | .desc = "GPS Antenna", | ||
| 236 | .active_low = 0, | ||
| 237 | }, | ||
| 238 | { | ||
| 239 | .gpio = S3C2410_GPG2, | ||
| 240 | .code = SW_HEADPHONE_INSERT, | ||
| 241 | .desc = "Headphone", | ||
| 242 | .active_low = 0, | ||
| 243 | }, | ||
| 244 | }; | ||
| 245 | |||
| 246 | static struct gpio_keys_platform_data n35_button_data = { | ||
| 247 | .buttons = n35_buttons, | ||
| 248 | .nbuttons = ARRAY_SIZE(n35_buttons), | ||
| 249 | }; | ||
| 250 | |||
| 251 | static struct platform_device n35_button_device = { | ||
| 252 | .name = "gpio-keys", | ||
| 253 | .id = -1, | ||
| 254 | .num_resources = 0, | ||
| 255 | .dev = { | ||
| 256 | .platform_data = &n35_button_data, | ||
| 257 | } | ||
| 258 | }; | ||
| 259 | |||
| 260 | /* This is the bluetooth LED on the device. */ | ||
| 261 | static struct s3c24xx_led_platdata n30_blue_led_pdata = { | ||
| 262 | .name = "blue_led", | ||
| 263 | .gpio = S3C2410_GPG6, | ||
| 264 | .def_trigger = "", | ||
| 265 | }; | ||
| 266 | |||
| 267 | /* This LED is driven by the battery microcontroller, and is blinking | ||
| 268 | * red, blinking green or solid green when the battery is low, | ||
| 269 | * charging or full respectively. By driving GPD9 low, it's possible | ||
| 270 | * to force the LED to blink red, so call that warning LED. */ | ||
| 271 | static struct s3c24xx_led_platdata n30_warning_led_pdata = { | ||
| 272 | .name = "warning_led", | ||
| 273 | .flags = S3C24XX_LEDF_ACTLOW, | ||
| 274 | .gpio = S3C2410_GPD9, | ||
| 275 | .def_trigger = "", | ||
| 276 | }; | ||
| 277 | |||
| 278 | static struct platform_device n30_blue_led = { | ||
| 279 | .name = "s3c24xx_led", | ||
| 280 | .id = 1, | ||
| 281 | .dev = { | ||
| 282 | .platform_data = &n30_blue_led_pdata, | ||
| 283 | }, | ||
| 284 | }; | ||
| 285 | |||
| 286 | static struct platform_device n30_warning_led = { | ||
| 287 | .name = "s3c24xx_led", | ||
| 288 | .id = 2, | ||
| 289 | .dev = { | ||
| 290 | .platform_data = &n30_warning_led_pdata, | ||
| 291 | }, | ||
| 292 | }; | ||
| 293 | |||
| 294 | static struct s3c2410fb_display n30_display __initdata = { | ||
| 295 | .type = S3C2410_LCDCON1_TFT, | ||
| 296 | .width = 240, | ||
| 297 | .height = 320, | ||
| 298 | .pixclock = 170000, | ||
| 299 | |||
| 300 | .xres = 240, | ||
| 301 | .yres = 320, | ||
| 302 | .bpp = 16, | ||
| 303 | .left_margin = 3, | ||
| 304 | .right_margin = 40, | ||
| 305 | .hsync_len = 40, | ||
| 306 | .upper_margin = 2, | ||
| 307 | .lower_margin = 3, | ||
| 308 | .vsync_len = 2, | ||
| 309 | |||
| 310 | .lcdcon5 = S3C2410_LCDCON5_INVVLINE | S3C2410_LCDCON5_INVVFRAME, | ||
| 311 | }; | ||
| 312 | |||
| 313 | static struct s3c2410fb_mach_info n30_fb_info __initdata = { | ||
| 314 | .displays = &n30_display, | ||
| 315 | .num_displays = 1, | ||
| 316 | .default_display = 0, | ||
| 317 | .lpcsel = 0x06, | ||
| 318 | }; | ||
| 319 | |||
| 77 | static struct platform_device *n30_devices[] __initdata = { | 320 | static struct platform_device *n30_devices[] __initdata = { |
| 321 | &s3c_device_lcd, | ||
| 322 | &s3c_device_wdt, | ||
| 323 | &s3c_device_i2c, | ||
| 324 | &s3c_device_iis, | ||
| 78 | &s3c_device_usb, | 325 | &s3c_device_usb, |
| 326 | &s3c_device_usbgadget, | ||
| 327 | &n30_button_device, | ||
| 328 | &n30_blue_led, | ||
| 329 | &n30_warning_led, | ||
| 330 | }; | ||
| 331 | |||
| 332 | static struct platform_device *n35_devices[] __initdata = { | ||
| 79 | &s3c_device_lcd, | 333 | &s3c_device_lcd, |
| 80 | &s3c_device_wdt, | 334 | &s3c_device_wdt, |
| 81 | &s3c_device_i2c, | 335 | &s3c_device_i2c, |
| 82 | &s3c_device_iis, | 336 | &s3c_device_iis, |
| 83 | &s3c_device_usbgadget, | 337 | &s3c_device_usbgadget, |
| 338 | &n35_button_device, | ||
| 84 | }; | 339 | }; |
| 85 | 340 | ||
| 86 | static struct s3c2410_platform_i2c n30_i2ccfg = { | 341 | static struct s3c2410_platform_i2c n30_i2ccfg = { |
| @@ -90,9 +345,148 @@ static struct s3c2410_platform_i2c n30_i2ccfg = { | |||
| 90 | .max_freq = 10*1000, | 345 | .max_freq = 10*1000, |
| 91 | }; | 346 | }; |
| 92 | 347 | ||
| 348 | /* Lots of hardcoded stuff, but it sets up the hardware in a useful | ||
| 349 | * state so that we can boot Linux directly from flash. */ | ||
| 350 | static void __init n30_hwinit(void) | ||
| 351 | { | ||
| 352 | /* GPA0-11 special functions -- unknown what they do | ||
| 353 | * GPA12 N30 special function -- unknown what it does | ||
| 354 | * N35/PiN output -- unknown what it does | ||
| 355 | * | ||
| 356 | * A12 is nGCS1 on the N30 and an output on the N35/PiN. I | ||
| 357 | * don't think it does anything useful on the N30, so I ought | ||
| 358 | * to make it an output there too since it always driven to 0 | ||
| 359 | * as far as I can tell. */ | ||
| 360 | if (machine_is_n30()) | ||
| 361 | __raw_writel(0x007fffff, S3C2410_GPACON); | ||
| 362 | if (machine_is_n35()) | ||
| 363 | __raw_writel(0x007fefff, S3C2410_GPACON); | ||
| 364 | __raw_writel(0x00000000, S3C2410_GPADAT); | ||
| 365 | |||
| 366 | /* GPB0 TOUT0 backlight level | ||
| 367 | * GPB1 output 1=backlight on | ||
| 368 | * GPB2 output IrDA enable 0=transceiver enabled, 1=disabled | ||
| 369 | * GPB3 output USB D+ pull up 0=disabled, 1=enabled | ||
| 370 | * GPB4 N30 output -- unknown function | ||
| 371 | * N30/PiN GPS control 0=GPS enabled, 1=GPS disabled | ||
| 372 | * GPB5 output -- unknown function | ||
| 373 | * GPB6 input -- unknown function | ||
| 374 | * GPB7 output -- unknown function | ||
| 375 | * GPB8 output -- probably LCD driver enable | ||
| 376 | * GPB9 output -- probably LCD VSYNC driver enable | ||
| 377 | * GPB10 output -- probably LCD HSYNC driver enable | ||
| 378 | */ | ||
| 379 | __raw_writel(0x00154556, S3C2410_GPBCON); | ||
| 380 | __raw_writel(0x00000750, S3C2410_GPBDAT); | ||
| 381 | __raw_writel(0x00000073, S3C2410_GPBUP); | ||
| 382 | |||
| 383 | /* GPC0 input RS232 DCD/DSR/RI | ||
| 384 | * GPC1 LCD | ||
| 385 | * GPC2 output RS232 DTR? | ||
| 386 | * GPC3 input RS232 DCD/DSR/RI | ||
| 387 | * GPC4 LCD | ||
| 388 | * GPC5 output 0=NAND write enabled, 1=NAND write protect | ||
| 389 | * GPC6 input -- unknown function | ||
| 390 | * GPC7 input charger status 0=charger connected | ||
| 391 | * this input can be triggered by power on the USB device | ||
| 392 | * port too, but will go back to disconnected soon after. | ||
| 393 | * GPC8 N30/N35 output -- unknown function, always driven to 1 | ||
| 394 | * PiN input -- unknown function, always read as 1 | ||
| 395 | * Make it an input with a pull up for all models. | ||
| 396 | * GPC9-15 LCD | ||
| 397 | */ | ||
| 398 | __raw_writel(0xaaa80618, S3C2410_GPCCON); | ||
| 399 | __raw_writel(0x0000014c, S3C2410_GPCDAT); | ||
| 400 | __raw_writel(0x0000fef2, S3C2410_GPCUP); | ||
| 401 | |||
| 402 | /* GPD0 input -- unknown function | ||
| 403 | * GPD1-D7 LCD | ||
| 404 | * GPD8 N30 output -- unknown function | ||
| 405 | * N35/PiN output 1=GPS LED on | ||
| 406 | * GPD9 output 0=power led blinks red, 1=normal power led function | ||
| 407 | * GPD10 output -- unknown function | ||
| 408 | * GPD11-15 LCD drivers | ||
| 409 | */ | ||
| 410 | __raw_writel(0xaa95aaa4, S3C2410_GPDCON); | ||
| 411 | __raw_writel(0x00000601, S3C2410_GPDDAT); | ||
| 412 | __raw_writel(0x0000fbfe, S3C2410_GPDUP); | ||
| 413 | |||
| 414 | /* GPE0-4 I2S audio bus | ||
| 415 | * GPE5-10 SD/MMC bus | ||
| 416 | * E11-13 outputs -- unknown function, probably power management | ||
| 417 | * E14-15 I2C bus connected to the battery controller | ||
| 418 | */ | ||
| 419 | __raw_writel(0xa56aaaaa, S3C2410_GPECON); | ||
| 420 | __raw_writel(0x0000efc5, S3C2410_GPEDAT); | ||
| 421 | __raw_writel(0x0000f81f, S3C2410_GPEUP); | ||
| 422 | |||
| 423 | /* GPF0 input 0=power button pressed | ||
| 424 | * GPF1 input SD/MMC switch 0=card present | ||
| 425 | * GPF2 N30 1=reset button pressed (inverted compared to the rest) | ||
| 426 | * N35/PiN 0=reset button pressed | ||
| 427 | * GPF3 N30/PiN input -- unknown function | ||
| 428 | * N35 input GPS antenna position, 0=antenna closed, 1=open | ||
| 429 | * GPF4 input 0=button 4 pressed | ||
| 430 | * GPF5 input 0=button 3 pressed | ||
| 431 | * GPF6 input 0=button 2 pressed | ||
| 432 | * GPF7 input 0=button 1 pressed | ||
| 433 | */ | ||
| 434 | __raw_writel(0x0000aaaa, S3C2410_GPFCON); | ||
| 435 | __raw_writel(0x00000000, S3C2410_GPFDAT); | ||
| 436 | __raw_writel(0x000000ff, S3C2410_GPFUP); | ||
| 437 | |||
| 438 | /* GPG0 input RS232 DCD/DSR/RI | ||
| 439 | * GPG1 input 1=USB gadget port has power from a host | ||
| 440 | * GPG2 N30 input -- unknown function | ||
| 441 | * N35/PiN input 0=headphones plugged in, 1=not plugged in | ||
| 442 | * GPG3 N30 output -- unknown function | ||
| 443 | * N35/PiN input with unknown function | ||
| 444 | * GPG4 N30 output 0=MMC enabled, 1=MMC disabled | ||
| 445 | * GPG5 N30 output 0=BlueTooth chip disabled, 1=enabled | ||
| 446 | * N35/PiN input joystick right | ||
| 447 | * GPG6 N30 output 0=blue led on, 1=off | ||
| 448 | * N35/PiN input joystick left | ||
| 449 | * GPG7 input 0=thumbwheel pressed | ||
| 450 | * GPG8 input 0=thumbwheel down | ||
| 451 | * GPG9 input 0=thumbwheel up | ||
| 452 | * GPG10 input SD/MMC write protect switch | ||
| 453 | * GPG11 N30 input -- unknown function | ||
| 454 | * N35 output 0=GPS antenna powered, 1=not powered | ||
| 455 | * PiN output -- unknown function | ||
| 456 | * GPG12-15 touch screen functions | ||
| 457 | * | ||
| 458 | * The pullups differ between the models, so enable all | ||
| 459 | * pullups that are enabled on any of the models. | ||
| 460 | */ | ||
| 461 | if (machine_is_n30()) | ||
| 462 | __raw_writel(0xff0a956a, S3C2410_GPGCON); | ||
| 463 | if (machine_is_n35()) | ||
| 464 | __raw_writel(0xff4aa92a, S3C2410_GPGCON); | ||
| 465 | __raw_writel(0x0000e800, S3C2410_GPGDAT); | ||
| 466 | __raw_writel(0x0000f86f, S3C2410_GPGUP); | ||
| 467 | |||
| 468 | /* GPH0/1/2/3 RS232 serial port | ||
| 469 | * GPH4/5 IrDA serial port | ||
| 470 | * GPH6/7 N30 BlueTooth serial port | ||
| 471 | * N35/PiN GPS receiver | ||
| 472 | * GPH8 input -- unknown function | ||
| 473 | * GPH9 CLKOUT0 HCLK -- unknown use | ||
| 474 | * GPH10 CLKOUT1 FCLK -- unknown use | ||
| 475 | * | ||
| 476 | * The pull ups for H6/H7 are enabled on N30 but not on the | ||
| 477 | * N35/PiN. I suppose is useful for a budget model of the N30 | ||
| 478 | * with no bluetooh. It doesn't hurt to have the pull ups | ||
| 479 | * enabled on the N35, so leave them enabled for all models. | ||
| 480 | */ | ||
| 481 | __raw_writel(0x0028aaaa, S3C2410_GPHCON); | ||
| 482 | __raw_writel(0x000005ef, S3C2410_GPHDAT); | ||
| 483 | __raw_writel(0x0000063f, S3C2410_GPHUP); | ||
| 484 | } | ||
| 485 | |||
| 93 | static void __init n30_map_io(void) | 486 | static void __init n30_map_io(void) |
| 94 | { | 487 | { |
| 95 | s3c24xx_init_io(n30_iodesc, ARRAY_SIZE(n30_iodesc)); | 488 | s3c24xx_init_io(n30_iodesc, ARRAY_SIZE(n30_iodesc)); |
| 489 | n30_hwinit(); | ||
| 96 | s3c24xx_init_clocks(0); | 490 | s3c24xx_init_clocks(0); |
| 97 | s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); | 491 | s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); |
| 98 | } | 492 | } |
| @@ -106,7 +500,9 @@ static void __init n30_init_irq(void) | |||
| 106 | 500 | ||
| 107 | static void __init n30_init(void) | 501 | static void __init n30_init(void) |
| 108 | { | 502 | { |
| 503 | s3c24xx_fb_set_platdata(&n30_fb_info); | ||
| 109 | s3c_device_i2c.dev.platform_data = &n30_i2ccfg; | 504 | s3c_device_i2c.dev.platform_data = &n30_i2ccfg; |
| 505 | s3c24xx_udc_set_platdata(&n30_udc_cfg); | ||
| 110 | 506 | ||
| 111 | /* Turn off suspend on both USB ports, and switch the | 507 | /* Turn off suspend on both USB ports, and switch the |
| 112 | * selectable USB port to USB device mode. */ | 508 | * selectable USB port to USB device mode. */ |
| @@ -115,7 +511,32 @@ static void __init n30_init(void) | |||
| 115 | S3C2410_MISCCR_USBSUSPND0 | | 511 | S3C2410_MISCCR_USBSUSPND0 | |
| 116 | S3C2410_MISCCR_USBSUSPND1, 0x0); | 512 | S3C2410_MISCCR_USBSUSPND1, 0x0); |
| 117 | 513 | ||
| 118 | platform_add_devices(n30_devices, ARRAY_SIZE(n30_devices)); | 514 | if (machine_is_n30()) { |
| 515 | /* Turn off suspend on both USB ports, and switch the | ||
| 516 | * selectable USB port to USB device mode. */ | ||
| 517 | s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | | ||
| 518 | S3C2410_MISCCR_USBSUSPND0 | | ||
| 519 | S3C2410_MISCCR_USBSUSPND1, 0x0); | ||
| 520 | |||
| 521 | platform_add_devices(n30_devices, ARRAY_SIZE(n30_devices)); | ||
| 522 | } | ||
| 523 | |||
| 524 | if (machine_is_n35()) { | ||
| 525 | /* Turn off suspend and switch the selectable USB port | ||
| 526 | * to USB device mode. Turn on suspend for the host | ||
| 527 | * port since it is not connected on the N35. | ||
| 528 | * | ||
| 529 | * Actually, the host port is available at some pads | ||
| 530 | * on the back of the device, so it would actually be | ||
| 531 | * possible to add a USB device inside the N35 if you | ||
| 532 | * are willing to do some hardware modifications. */ | ||
| 533 | s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | | ||
| 534 | S3C2410_MISCCR_USBSUSPND0 | | ||
| 535 | S3C2410_MISCCR_USBSUSPND1, | ||
| 536 | S3C2410_MISCCR_USBSUSPND1); | ||
| 537 | |||
| 538 | platform_add_devices(n35_devices, ARRAY_SIZE(n35_devices)); | ||
| 539 | } | ||
| 119 | } | 540 | } |
| 120 | 541 | ||
| 121 | MACHINE_START(N30, "Acer-N30") | 542 | MACHINE_START(N30, "Acer-N30") |
| @@ -131,9 +552,14 @@ MACHINE_START(N30, "Acer-N30") | |||
| 131 | .map_io = n30_map_io, | 552 | .map_io = n30_map_io, |
| 132 | MACHINE_END | 553 | MACHINE_END |
| 133 | 554 | ||
| 134 | /* | 555 | MACHINE_START(N35, "Acer-N35") |
| 135 | Local variables: | 556 | /* Maintainer: Christer Weinigel <christer@weinigel.se> |
| 136 | compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.." | 557 | */ |
| 137 | c-basic-offset: 8 | 558 | .phys_io = S3C2410_PA_UART, |
| 138 | End: | 559 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, |
| 139 | */ | 560 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
| 561 | .timer = &s3c24xx_timer, | ||
| 562 | .init_machine = n30_init, | ||
| 563 | .init_irq = n30_init_irq, | ||
| 564 | .map_io = n30_map_io, | ||
| 565 | MACHINE_END | ||
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index c56423373ff3..9a0965ac5e11 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2410/mach-vr1000.c | 1 | /* linux/arch/arm/mach-s3c2410/mach-vr1000.c |
| 2 | * | 2 | * |
| 3 | * Copyright (c) 2003-2005 Simtec Electronics | 3 | * Copyright (c) 2003-2005,2008 Simtec Electronics |
| 4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
| 5 | * | 5 | * |
| 6 | * Machine support for Thorcom VR1000 board. Designed for Thorcom by | 6 | * Machine support for Thorcom VR1000 board. Designed for Thorcom by |
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/dm9000.h> | 21 | #include <linux/dm9000.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/serial.h> | 24 | #include <linux/serial.h> |
| 24 | #include <linux/tty.h> | 25 | #include <linux/tty.h> |
| @@ -46,7 +47,9 @@ | |||
| 46 | #include <asm/plat-s3c24xx/clock.h> | 47 | #include <asm/plat-s3c24xx/clock.h> |
| 47 | #include <asm/plat-s3c24xx/devs.h> | 48 | #include <asm/plat-s3c24xx/devs.h> |
| 48 | #include <asm/plat-s3c24xx/cpu.h> | 49 | #include <asm/plat-s3c24xx/cpu.h> |
| 50 | |||
| 49 | #include "usb-simtec.h" | 51 | #include "usb-simtec.h" |
| 52 | #include "nor-simtec.h" | ||
| 50 | 53 | ||
| 51 | /* macros for virtual address mods for the io space entries */ | 54 | /* macros for virtual address mods for the io space entries */ |
| 52 | #define VA_C5(item) ((unsigned long)(item) + BAST_VAM_CS5) | 55 | #define VA_C5(item) ((unsigned long)(item) + BAST_VAM_CS5) |
| @@ -97,34 +100,6 @@ static struct map_desc vr1000_iodesc[] __initdata = { | |||
| 97 | .length = SZ_1M, | 100 | .length = SZ_1M, |
| 98 | .type = MT_DEVICE, | 101 | .type = MT_DEVICE, |
| 99 | }, | 102 | }, |
| 100 | |||
| 101 | /* peripheral space... one for each of fast/slow/byte/16bit */ | ||
| 102 | /* note, ide is only decoded in word space, even though some registers | ||
| 103 | * are only 8bit */ | ||
| 104 | |||
| 105 | /* slow, byte */ | ||
| 106 | { VA_C2(VR1000_VA_IDEPRI), PA_CS3(VR1000_PA_IDEPRI), SZ_1M, MT_DEVICE }, | ||
| 107 | { VA_C2(VR1000_VA_IDESEC), PA_CS3(VR1000_PA_IDESEC), SZ_1M, MT_DEVICE }, | ||
| 108 | { VA_C2(VR1000_VA_IDEPRIAUX), PA_CS3(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE }, | ||
| 109 | { VA_C2(VR1000_VA_IDESECAUX), PA_CS3(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE }, | ||
| 110 | |||
| 111 | /* slow, word */ | ||
| 112 | { VA_C3(VR1000_VA_IDEPRI), PA_CS3(VR1000_PA_IDEPRI), SZ_1M, MT_DEVICE }, | ||
| 113 | { VA_C3(VR1000_VA_IDESEC), PA_CS3(VR1000_PA_IDESEC), SZ_1M, MT_DEVICE }, | ||
| 114 | { VA_C3(VR1000_VA_IDEPRIAUX), PA_CS3(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE }, | ||
| 115 | { VA_C3(VR1000_VA_IDESECAUX), PA_CS3(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE }, | ||
| 116 | |||
| 117 | /* fast, byte */ | ||
| 118 | { VA_C4(VR1000_VA_IDEPRI), PA_CS5(VR1000_PA_IDEPRI), SZ_1M, MT_DEVICE }, | ||
| 119 | { VA_C4(VR1000_VA_IDESEC), PA_CS5(VR1000_PA_IDESEC), SZ_1M, MT_DEVICE }, | ||
| 120 | { VA_C4(VR1000_VA_IDEPRIAUX), PA_CS5(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE }, | ||
| 121 | { VA_C4(VR1000_VA_IDESECAUX), PA_CS5(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE }, | ||
| 122 | |||
| 123 | /* fast, word */ | ||
| 124 | { VA_C5(VR1000_VA_IDEPRI), PA_CS5(VR1000_PA_IDEPRI), SZ_1M, MT_DEVICE }, | ||
| 125 | { VA_C5(VR1000_VA_IDESEC), PA_CS5(VR1000_PA_IDESEC), SZ_1M, MT_DEVICE }, | ||
| 126 | { VA_C5(VR1000_VA_IDEPRIAUX), PA_CS5(VR1000_PA_IDEPRIAUX), SZ_1M, MT_DEVICE }, | ||
| 127 | { VA_C5(VR1000_VA_IDESECAUX), PA_CS5(VR1000_PA_IDESECAUX), SZ_1M, MT_DEVICE }, | ||
| 128 | }; | 103 | }; |
| 129 | 104 | ||
| 130 | #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK | 105 | #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK |
| @@ -230,23 +205,6 @@ static struct platform_device serial_device = { | |||
| 230 | }, | 205 | }, |
| 231 | }; | 206 | }; |
| 232 | 207 | ||
| 233 | /* MTD NOR Flash */ | ||
| 234 | |||
| 235 | static struct resource vr1000_nor_resource[] = { | ||
| 236 | [0] = { | ||
| 237 | .start = S3C2410_CS1 + 0x4000000, | ||
| 238 | .end = S3C2410_CS1 + 0x4000000 + SZ_16M - 1, | ||
| 239 | .flags = IORESOURCE_MEM, | ||
| 240 | } | ||
| 241 | }; | ||
| 242 | |||
| 243 | static struct platform_device vr1000_nor = { | ||
| 244 | .name = "bast-nor", | ||
| 245 | .id = -1, | ||
| 246 | .num_resources = ARRAY_SIZE(vr1000_nor_resource), | ||
| 247 | .resource = vr1000_nor_resource, | ||
| 248 | }; | ||
| 249 | |||
| 250 | /* DM9000 ethernet devices */ | 208 | /* DM9000 ethernet devices */ |
| 251 | 209 | ||
| 252 | static struct resource vr1000_dm9k0_resource[] = { | 210 | static struct resource vr1000_dm9k0_resource[] = { |
| @@ -263,7 +221,7 @@ static struct resource vr1000_dm9k0_resource[] = { | |||
| 263 | [2] = { | 221 | [2] = { |
| 264 | .start = IRQ_VR1000_DM9000A, | 222 | .start = IRQ_VR1000_DM9000A, |
| 265 | .end = IRQ_VR1000_DM9000A, | 223 | .end = IRQ_VR1000_DM9000A, |
| 266 | .flags = IORESOURCE_IRQ | 224 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
| 267 | } | 225 | } |
| 268 | 226 | ||
| 269 | }; | 227 | }; |
| @@ -282,7 +240,7 @@ static struct resource vr1000_dm9k1_resource[] = { | |||
| 282 | [2] = { | 240 | [2] = { |
| 283 | .start = IRQ_VR1000_DM9000N, | 241 | .start = IRQ_VR1000_DM9000N, |
| 284 | .end = IRQ_VR1000_DM9000N, | 242 | .end = IRQ_VR1000_DM9000N, |
| 285 | .flags = IORESOURCE_IRQ | 243 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
| 286 | } | 244 | } |
| 287 | }; | 245 | }; |
| 288 | 246 | ||
| @@ -358,6 +316,18 @@ static struct platform_device vr1000_led3 = { | |||
| 358 | }, | 316 | }, |
| 359 | }; | 317 | }; |
| 360 | 318 | ||
| 319 | /* I2C devices. */ | ||
| 320 | |||
| 321 | static struct i2c_board_info vr1000_i2c_devs[] __initdata = { | ||
| 322 | { | ||
| 323 | I2C_BOARD_INFO("tlv320aic23", 0x1a), | ||
| 324 | }, { | ||
| 325 | I2C_BOARD_INFO("tmp101", 0x48), | ||
| 326 | }, { | ||
| 327 | I2C_BOARD_INFO("m41st87", 0x68), | ||
| 328 | }, | ||
| 329 | }; | ||
| 330 | |||
| 361 | /* devices for this board */ | 331 | /* devices for this board */ |
| 362 | 332 | ||
| 363 | static struct platform_device *vr1000_devices[] __initdata = { | 333 | static struct platform_device *vr1000_devices[] __initdata = { |
| @@ -367,7 +337,6 @@ static struct platform_device *vr1000_devices[] __initdata = { | |||
| 367 | &s3c_device_i2c, | 337 | &s3c_device_i2c, |
| 368 | &s3c_device_adc, | 338 | &s3c_device_adc, |
| 369 | &serial_device, | 339 | &serial_device, |
| 370 | &vr1000_nor, | ||
| 371 | &vr1000_dm9k0, | 340 | &vr1000_dm9k0, |
| 372 | &vr1000_dm9k1, | 341 | &vr1000_dm9k1, |
| 373 | &vr1000_led1, | 342 | &vr1000_led1, |
| @@ -416,6 +385,11 @@ static void __init vr1000_map_io(void) | |||
| 416 | static void __init vr1000_init(void) | 385 | static void __init vr1000_init(void) |
| 417 | { | 386 | { |
| 418 | platform_add_devices(vr1000_devices, ARRAY_SIZE(vr1000_devices)); | 387 | platform_add_devices(vr1000_devices, ARRAY_SIZE(vr1000_devices)); |
| 388 | |||
| 389 | i2c_register_board_info(0, vr1000_i2c_devs, | ||
| 390 | ARRAY_SIZE(vr1000_i2c_devs)); | ||
| 391 | |||
| 392 | nor_simtec_init(); | ||
| 419 | } | 393 | } |
| 420 | 394 | ||
| 421 | MACHINE_START(VR1000, "Thorcom-VR1000") | 395 | MACHINE_START(VR1000, "Thorcom-VR1000") |
diff --git a/arch/arm/mach-s3c2410/nor-simtec.c b/arch/arm/mach-s3c2410/nor-simtec.c new file mode 100644 index 000000000000..f44e21b9c3ba --- /dev/null +++ b/arch/arm/mach-s3c2410/nor-simtec.c | |||
| @@ -0,0 +1,86 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2410/nor-simtec.c | ||
| 2 | * | ||
| 3 | * Copyright (c) 2008 Simtec Electronics | ||
| 4 | * http://armlinux.simtec.co.uk/ | ||
| 5 | * Ben Dooks <ben@simtec.co.uk> | ||
| 6 | * | ||
| 7 | * Simtec NOR mapping | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License version 2 as | ||
| 11 | * published by the Free Software Foundation. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/module.h> | ||
| 15 | #include <linux/types.h> | ||
| 16 | #include <linux/init.h> | ||
| 17 | #include <linux/kernel.h> | ||
| 18 | #include <linux/platform_device.h> | ||
| 19 | |||
| 20 | #include <linux/mtd/mtd.h> | ||
| 21 | #include <linux/mtd/map.h> | ||
| 22 | #include <linux/mtd/physmap.h> | ||
| 23 | #include <linux/mtd/partitions.h> | ||
| 24 | |||
| 25 | #include <asm/mach/arch.h> | ||
| 26 | #include <asm/mach/map.h> | ||
| 27 | #include <asm/mach/irq.h> | ||
| 28 | |||
| 29 | #include <asm/arch/map.h> | ||
| 30 | #include <asm/arch/bast-map.h> | ||
| 31 | #include <asm/arch/bast-cpld.h> | ||
| 32 | |||
| 33 | |||
| 34 | static void simtec_nor_vpp(struct map_info *map, int vpp) | ||
| 35 | { | ||
| 36 | unsigned int val; | ||
| 37 | unsigned long flags; | ||
| 38 | |||
| 39 | local_irq_save(flags); | ||
| 40 | val = __raw_readb(BAST_VA_CTRL3); | ||
| 41 | |||
| 42 | printk(KERN_DEBUG "%s(%d)\n", __func__, vpp); | ||
| 43 | |||
| 44 | if (vpp) | ||
| 45 | val |= BAST_CPLD_CTRL3_ROMWEN; | ||
| 46 | else | ||
| 47 | val &= ~BAST_CPLD_CTRL3_ROMWEN; | ||
| 48 | |||
| 49 | __raw_writeb(val, BAST_VA_CTRL3); | ||
| 50 | local_irq_restore(flags); | ||
| 51 | } | ||
| 52 | |||
| 53 | struct physmap_flash_data simtec_nor_pdata = { | ||
| 54 | .width = 2, | ||
| 55 | .set_vpp = simtec_nor_vpp, | ||
| 56 | .nr_parts = 0, | ||
| 57 | }; | ||
| 58 | |||
| 59 | static struct resource simtec_nor_resource[] = { | ||
| 60 | [0] = { | ||
| 61 | .start = S3C2410_CS1 + 0x4000000, | ||
| 62 | .end = S3C2410_CS1 + 0x4000000 + SZ_8M - 1, | ||
| 63 | .flags = IORESOURCE_MEM, | ||
| 64 | } | ||
| 65 | }; | ||
| 66 | |||
| 67 | static struct platform_device simtec_device_nor = { | ||
| 68 | .name = "physmap-flash", | ||
| 69 | .id = -1, | ||
| 70 | .num_resources = ARRAY_SIZE(simtec_nor_resource), | ||
| 71 | .resource = simtec_nor_resource, | ||
| 72 | .dev = { | ||
| 73 | .platform_data = &simtec_nor_pdata, | ||
| 74 | }, | ||
| 75 | }; | ||
| 76 | |||
| 77 | void __init nor_simtec_init(void) | ||
| 78 | { | ||
| 79 | int ret; | ||
| 80 | |||
| 81 | ret = platform_device_register(&simtec_device_nor); | ||
| 82 | if (ret < 0) | ||
| 83 | printk(KERN_ERR "failed to register physmap-flash device\n"); | ||
| 84 | else | ||
| 85 | simtec_nor_vpp(NULL, 1); | ||
| 86 | } | ||
diff --git a/arch/arm/mach-s3c2410/nor-simtec.h b/arch/arm/mach-s3c2410/nor-simtec.h new file mode 100644 index 000000000000..f619c1e0d0c8 --- /dev/null +++ b/arch/arm/mach-s3c2410/nor-simtec.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2410/nor-simtec.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2008 Simtec Electronics | ||
| 4 | * http://armlinux.simtec.co.uk/ | ||
| 5 | * Ben Dooks <ben@simtec.co.uk> | ||
| 6 | * | ||
| 7 | * Simtec NOR mapping | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License version 2 as | ||
| 11 | * published by the Free Software Foundation. | ||
| 12 | */ | ||
| 13 | |||
| 14 | extern void nor_simtec_init(void); | ||
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig index 0b43431d4b75..c59a9d2ee9a6 100644 --- a/arch/arm/mach-s3c2412/Kconfig +++ b/arch/arm/mach-s3c2412/Kconfig | |||
| @@ -34,6 +34,16 @@ config S3C2412_PM | |||
| 34 | 34 | ||
| 35 | menu "S3C2412 Machines" | 35 | menu "S3C2412 Machines" |
| 36 | 36 | ||
| 37 | config MACH_JIVE | ||
| 38 | bool "Logitech Jive" | ||
| 39 | select CPU_S3C2412 | ||
| 40 | help | ||
| 41 | Say Y here if you are using the Logitech Jive. | ||
| 42 | |||
| 43 | config MACH_JIVE_SHOW_BOOTLOADER | ||
| 44 | bool "Allow access to bootloader partitions in MTD" | ||
| 45 | depends on MACH_JIVE && EXPERIMENTAL | ||
| 46 | |||
| 37 | config MACH_SMDK2413 | 47 | config MACH_SMDK2413 |
| 38 | bool "SMDK2413" | 48 | bool "SMDK2413" |
| 39 | select CPU_S3C2412 | 49 | select CPU_S3C2412 |
diff --git a/arch/arm/mach-s3c2412/Makefile b/arch/arm/mach-s3c2412/Makefile index 267f3348301e..20918d5dc6a9 100644 --- a/arch/arm/mach-s3c2412/Makefile +++ b/arch/arm/mach-s3c2412/Makefile | |||
| @@ -18,5 +18,6 @@ obj-$(CONFIG_S3C2412_PM) += pm.o sleep.o | |||
| 18 | 18 | ||
| 19 | # Machine support | 19 | # Machine support |
| 20 | 20 | ||
| 21 | obj-$(CONFIG_MACH_JIVE) += mach-jive.o | ||
| 21 | obj-$(CONFIG_MACH_SMDK2413) += mach-smdk2413.o | 22 | obj-$(CONFIG_MACH_SMDK2413) += mach-smdk2413.o |
| 22 | obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o | 23 | obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o |
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c index 2697a65ba727..1157b5a16263 100644 --- a/arch/arm/mach-s3c2412/clock.c +++ b/arch/arm/mach-s3c2412/clock.c | |||
| @@ -631,6 +631,17 @@ static struct clk_init clks_src[] __initdata = { | |||
| 631 | .bit = S3C2412_CLKSRC_USBCLK_HCLK, | 631 | .bit = S3C2412_CLKSRC_USBCLK_HCLK, |
| 632 | .src_0 = &clk_usysclk, | 632 | .src_0 = &clk_usysclk, |
| 633 | .src_1 = &clk_h, | 633 | .src_1 = &clk_h, |
| 634 | /* here we assume OM[4] select xtal */ | ||
| 635 | }, { | ||
| 636 | .clk = &clk_erefclk, | ||
| 637 | .bit = S3C2412_CLKSRC_EREFCLK_EXTCLK, | ||
| 638 | .src_0 = &clk_xtal, | ||
| 639 | .src_1 = &clk_ext, | ||
| 640 | }, { | ||
| 641 | .clk = &clk_urefclk, | ||
| 642 | .bit = S3C2412_CLKSRC_UREFCLK_EXTCLK, | ||
| 643 | .src_0 = &clk_xtal, | ||
| 644 | .src_1 = &clk_ext, | ||
| 634 | }, | 645 | }, |
| 635 | }; | 646 | }; |
| 636 | 647 | ||
| @@ -666,8 +677,6 @@ static void __init s3c2412_clk_initparents(void) | |||
| 666 | static struct clk *clks[] __initdata = { | 677 | static struct clk *clks[] __initdata = { |
| 667 | &clk_ext, | 678 | &clk_ext, |
| 668 | &clk_usb_bus, | 679 | &clk_usb_bus, |
| 669 | &clk_erefclk, | ||
| 670 | &clk_urefclk, | ||
| 671 | &clk_mrefclk, | 680 | &clk_mrefclk, |
| 672 | &clk_armclk, | 681 | &clk_armclk, |
| 673 | }; | 682 | }; |
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c new file mode 100644 index 000000000000..7f5924713485 --- /dev/null +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
| @@ -0,0 +1,687 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2410/mach-jive.c | ||
| 2 | * | ||
| 3 | * Copyright 2007 Simtec Electronics | ||
| 4 | * Ben Dooks <ben@simtec.co.uk> | ||
| 5 | * | ||
| 6 | * http://armlinux.simtec.co.uk/ | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/kernel.h> | ||
| 14 | #include <linux/types.h> | ||
| 15 | #include <linux/interrupt.h> | ||
| 16 | #include <linux/list.h> | ||
| 17 | #include <linux/timer.h> | ||
| 18 | #include <linux/init.h> | ||
| 19 | #include <linux/sysdev.h> | ||
| 20 | #include <linux/delay.h> | ||
| 21 | #include <linux/serial_core.h> | ||
| 22 | #include <linux/platform_device.h> | ||
| 23 | #include <linux/i2c.h> | ||
| 24 | |||
| 25 | #include <video/ili9320.h> | ||
| 26 | |||
| 27 | #include <linux/spi/spi.h> | ||
| 28 | |||
| 29 | #include <linux/mtd/mtd.h> | ||
| 30 | #include <linux/mtd/partitions.h> | ||
| 31 | |||
| 32 | #include <asm/mach/arch.h> | ||
| 33 | #include <asm/mach/map.h> | ||
| 34 | #include <asm/mach/irq.h> | ||
| 35 | |||
| 36 | #include <asm/plat-s3c/regs-serial.h> | ||
| 37 | #include <asm/plat-s3c/nand.h> | ||
| 38 | #include <asm/plat-s3c/iic.h> | ||
| 39 | |||
| 40 | #include <asm/arch/regs-power.h> | ||
| 41 | #include <asm/arch/regs-gpio.h> | ||
| 42 | #include <asm/arch/regs-mem.h> | ||
| 43 | #include <asm/arch/regs-lcd.h> | ||
| 44 | #include <asm/arch/spi-gpio.h> | ||
| 45 | #include <asm/arch/fb.h> | ||
| 46 | |||
| 47 | #include <asm/mach-types.h> | ||
| 48 | |||
| 49 | #include <linux/mtd/mtd.h> | ||
| 50 | #include <linux/mtd/nand.h> | ||
| 51 | #include <linux/mtd/nand_ecc.h> | ||
| 52 | #include <linux/mtd/partitions.h> | ||
| 53 | |||
| 54 | #include <asm/plat-s3c24xx/clock.h> | ||
| 55 | #include <asm/plat-s3c24xx/devs.h> | ||
| 56 | #include <asm/plat-s3c24xx/cpu.h> | ||
| 57 | #include <asm/plat-s3c24xx/pm.h> | ||
| 58 | #include <asm/plat-s3c24xx/udc.h> | ||
| 59 | |||
| 60 | static struct map_desc jive_iodesc[] __initdata = { | ||
| 61 | }; | ||
| 62 | |||
| 63 | #define UCON S3C2410_UCON_DEFAULT | ||
| 64 | #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | ||
| 65 | #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE | ||
| 66 | |||
| 67 | static struct s3c2410_uartcfg jive_uartcfgs[] = { | ||
| 68 | [0] = { | ||
| 69 | .hwport = 0, | ||
| 70 | .flags = 0, | ||
| 71 | .ucon = UCON, | ||
| 72 | .ulcon = ULCON, | ||
| 73 | .ufcon = UFCON, | ||
| 74 | }, | ||
| 75 | [1] = { | ||
| 76 | .hwport = 1, | ||
| 77 | .flags = 0, | ||
| 78 | .ucon = UCON, | ||
| 79 | .ulcon = ULCON, | ||
| 80 | .ufcon = UFCON, | ||
| 81 | }, | ||
| 82 | [2] = { | ||
| 83 | .hwport = 2, | ||
| 84 | .flags = 0, | ||
| 85 | .ucon = UCON, | ||
| 86 | .ulcon = ULCON, | ||
| 87 | .ufcon = UFCON, | ||
| 88 | } | ||
| 89 | }; | ||
| 90 | |||
| 91 | /* Jive flash assignment | ||
| 92 | * | ||
| 93 | * 0x00000000-0x00028000 : uboot | ||
| 94 | * 0x00028000-0x0002c000 : uboot env | ||
| 95 | * 0x0002c000-0x00030000 : spare | ||
| 96 | * 0x00030000-0x00200000 : zimage A | ||
| 97 | * 0x00200000-0x01600000 : cramfs A | ||
| 98 | * 0x01600000-0x017d0000 : zimage B | ||
| 99 | * 0x017d0000-0x02bd0000 : cramfs B | ||
| 100 | * 0x02bd0000-0x03fd0000 : yaffs | ||
| 101 | */ | ||
| 102 | static struct mtd_partition jive_imageA_nand_part[] = { | ||
| 103 | |||
| 104 | #ifdef CONFIG_MACH_JIVE_SHOW_BOOTLOADER | ||
| 105 | /* Don't allow access to the bootloader from linux */ | ||
| 106 | { | ||
| 107 | .name = "uboot", | ||
| 108 | .offset = 0, | ||
| 109 | .size = (160 * SZ_1K), | ||
| 110 | .mask_flags = MTD_WRITEABLE, /* force read-only */ | ||
| 111 | }, | ||
| 112 | |||
| 113 | /* spare */ | ||
| 114 | { | ||
| 115 | .name = "spare", | ||
| 116 | .offset = (176 * SZ_1K), | ||
| 117 | .size = (16 * SZ_1K), | ||
| 118 | }, | ||
| 119 | #endif | ||
| 120 | |||
| 121 | /* booted images */ | ||
| 122 | { | ||
| 123 | .name = "kernel (ro)", | ||
| 124 | .offset = (192 * SZ_1K), | ||
| 125 | .size = (SZ_2M) - (192 * SZ_1K), | ||
| 126 | .mask_flags = MTD_WRITEABLE, /* force read-only */ | ||
| 127 | }, { | ||
| 128 | .name = "root (ro)", | ||
| 129 | .offset = (SZ_2M), | ||
| 130 | .size = (20 * SZ_1M), | ||
| 131 | .mask_flags = MTD_WRITEABLE, /* force read-only */ | ||
| 132 | }, | ||
| 133 | |||
| 134 | /* yaffs */ | ||
| 135 | { | ||
| 136 | .name = "yaffs", | ||
| 137 | .offset = (44 * SZ_1M), | ||
| 138 | .size = (20 * SZ_1M), | ||
| 139 | }, | ||
| 140 | |||
| 141 | /* bootloader environment */ | ||
| 142 | { | ||
| 143 | .name = "env", | ||
| 144 | .offset = (160 * SZ_1K), | ||
| 145 | .size = (16 * SZ_1K), | ||
| 146 | }, | ||
| 147 | |||
| 148 | /* upgrade images */ | ||
| 149 | { | ||
| 150 | .name = "zimage", | ||
| 151 | .offset = (22 * SZ_1M), | ||
| 152 | .size = (2 * SZ_1M) - (192 * SZ_1K), | ||
| 153 | }, { | ||
| 154 | .name = "cramfs", | ||
| 155 | .offset = (24 * SZ_1M) - (192*SZ_1K), | ||
| 156 | .size = (20 * SZ_1M), | ||
| 157 | }, | ||
| 158 | }; | ||
| 159 | |||
| 160 | static struct mtd_partition jive_imageB_nand_part[] = { | ||
| 161 | |||
| 162 | #ifdef CONFIG_MACH_JIVE_SHOW_BOOTLOADER | ||
| 163 | /* Don't allow access to the bootloader from linux */ | ||
| 164 | { | ||
| 165 | .name = "uboot", | ||
| 166 | .offset = 0, | ||
| 167 | .size = (160 * SZ_1K), | ||
| 168 | .mask_flags = MTD_WRITEABLE, /* force read-only */ | ||
| 169 | }, | ||
| 170 | |||
| 171 | /* spare */ | ||
| 172 | { | ||
| 173 | .name = "spare", | ||
| 174 | .offset = (176 * SZ_1K), | ||
| 175 | .size = (16 * SZ_1K), | ||
| 176 | }, | ||
| 177 | #endif | ||
| 178 | |||
| 179 | /* booted images */ | ||
| 180 | { | ||
| 181 | .name = "kernel (ro)", | ||
| 182 | .offset = (22 * SZ_1M), | ||
| 183 | .size = (2 * SZ_1M) - (192 * SZ_1K), | ||
| 184 | .mask_flags = MTD_WRITEABLE, /* force read-only */ | ||
| 185 | }, | ||
| 186 | { | ||
| 187 | .name = "root (ro)", | ||
| 188 | .offset = (24 * SZ_1M) - (192 * SZ_1K), | ||
| 189 | .size = (20 * SZ_1M), | ||
| 190 | .mask_flags = MTD_WRITEABLE, /* force read-only */ | ||
| 191 | }, | ||
| 192 | |||
| 193 | /* yaffs */ | ||
| 194 | { | ||
| 195 | .name = "yaffs", | ||
| 196 | .offset = (44 * SZ_1M), | ||
| 197 | .size = (20 * SZ_1M), | ||
| 198 | }, | ||
| 199 | |||
| 200 | /* bootloader environment */ | ||
| 201 | { | ||
| 202 | .name = "env", | ||
| 203 | .offset = (160 * SZ_1K), | ||
| 204 | .size = (16 * SZ_1K), | ||
| 205 | }, | ||
| 206 | |||
| 207 | /* upgrade images */ | ||
| 208 | { | ||
| 209 | .name = "zimage", | ||
| 210 | .offset = (192 * SZ_1K), | ||
| 211 | .size = (2 * SZ_1M) - (192 * SZ_1K), | ||
| 212 | }, { | ||
| 213 | .name = "cramfs", | ||
| 214 | .offset = (2 * SZ_1M), | ||
| 215 | .size = (20 * SZ_1M), | ||
| 216 | }, | ||
| 217 | }; | ||
| 218 | |||
| 219 | static struct s3c2410_nand_set jive_nand_sets[] = { | ||
| 220 | [0] = { | ||
| 221 | .name = "flash", | ||
| 222 | .nr_chips = 1, | ||
| 223 | .nr_partitions = ARRAY_SIZE(jive_imageA_nand_part), | ||
| 224 | .partitions = jive_imageA_nand_part, | ||
| 225 | }, | ||
| 226 | }; | ||
| 227 | |||
| 228 | static struct s3c2410_platform_nand jive_nand_info = { | ||
| 229 | /* set taken from osiris nand timings, possibly still conservative */ | ||
| 230 | .tacls = 30, | ||
| 231 | .twrph0 = 55, | ||
| 232 | .twrph1 = 40, | ||
| 233 | .sets = jive_nand_sets, | ||
| 234 | .nr_sets = ARRAY_SIZE(jive_nand_sets), | ||
| 235 | }; | ||
| 236 | |||
| 237 | static int __init jive_mtdset(char *options) | ||
| 238 | { | ||
| 239 | struct s3c2410_nand_set *nand = &jive_nand_sets[0]; | ||
| 240 | unsigned long set; | ||
| 241 | |||
| 242 | if (options == NULL || options[0] == '\0') | ||
| 243 | return 0; | ||
| 244 | |||
| 245 | if (strict_strtoul(options, 10, &set)) { | ||
| 246 | printk(KERN_ERR "failed to parse mtdset=%s\n", options); | ||
| 247 | return 0; | ||
| 248 | } | ||
| 249 | |||
| 250 | switch (set) { | ||
| 251 | case 1: | ||
| 252 | nand->nr_partitions = ARRAY_SIZE(jive_imageB_nand_part); | ||
| 253 | nand->partitions = jive_imageB_nand_part; | ||
| 254 | case 0: | ||
| 255 | /* this is already setup in the nand info */ | ||
| 256 | break; | ||
| 257 | default: | ||
| 258 | printk(KERN_ERR "Unknown mtd set %ld specified," | ||
| 259 | "using default.", set); | ||
| 260 | } | ||
| 261 | |||
| 262 | return 0; | ||
| 263 | } | ||
| 264 | |||
| 265 | /* parse the mtdset= option given to the kernel command line */ | ||
| 266 | __setup("mtdset=", jive_mtdset); | ||
| 267 | |||
| 268 | /* LCD timing and setup */ | ||
| 269 | |||
| 270 | #define LCD_XRES (240) | ||
| 271 | #define LCD_YRES (320) | ||
| 272 | #define LCD_LEFT_MARGIN (12) | ||
| 273 | #define LCD_RIGHT_MARGIN (12) | ||
| 274 | #define LCD_LOWER_MARGIN (12) | ||
| 275 | #define LCD_UPPER_MARGIN (12) | ||
| 276 | #define LCD_VSYNC (2) | ||
| 277 | #define LCD_HSYNC (2) | ||
| 278 | |||
| 279 | #define LCD_REFRESH (60) | ||
| 280 | |||
| 281 | #define LCD_HTOT (LCD_HSYNC + LCD_LEFT_MARGIN + LCD_XRES + LCD_RIGHT_MARGIN) | ||
| 282 | #define LCD_VTOT (LCD_VSYNC + LCD_LOWER_MARGIN + LCD_YRES + LCD_UPPER_MARGIN) | ||
| 283 | |||
| 284 | struct s3c2410fb_display jive_vgg2432a4_display[] = { | ||
| 285 | [0] = { | ||
| 286 | .width = LCD_XRES, | ||
| 287 | .height = LCD_YRES, | ||
| 288 | .xres = LCD_XRES, | ||
| 289 | .yres = LCD_YRES, | ||
| 290 | .left_margin = LCD_LEFT_MARGIN, | ||
| 291 | .right_margin = LCD_RIGHT_MARGIN, | ||
| 292 | .upper_margin = LCD_UPPER_MARGIN, | ||
| 293 | .lower_margin = LCD_LOWER_MARGIN, | ||
| 294 | .hsync_len = LCD_HSYNC, | ||
| 295 | .vsync_len = LCD_VSYNC, | ||
| 296 | |||
| 297 | .pixclock = (1000000000000LL / | ||
| 298 | (LCD_REFRESH * LCD_HTOT * LCD_VTOT)), | ||
| 299 | |||
| 300 | .bpp = 16, | ||
| 301 | .type = (S3C2410_LCDCON1_TFT16BPP | | ||
| 302 | S3C2410_LCDCON1_TFT), | ||
| 303 | |||
| 304 | .lcdcon5 = (S3C2410_LCDCON5_FRM565 | | ||
| 305 | S3C2410_LCDCON5_INVVLINE | | ||
| 306 | S3C2410_LCDCON5_INVVFRAME | | ||
| 307 | S3C2410_LCDCON5_INVVDEN | | ||
| 308 | S3C2410_LCDCON5_PWREN), | ||
| 309 | }, | ||
| 310 | }; | ||
| 311 | |||
| 312 | /* todo - put into gpio header */ | ||
| 313 | |||
| 314 | #define S3C2410_GPCCON_MASK(x) (3 << ((x) * 2)) | ||
| 315 | #define S3C2410_GPDCON_MASK(x) (3 << ((x) * 2)) | ||
| 316 | |||
| 317 | struct s3c2410fb_mach_info jive_lcd_config = { | ||
| 318 | .displays = jive_vgg2432a4_display, | ||
| 319 | .num_displays = ARRAY_SIZE(jive_vgg2432a4_display), | ||
| 320 | .default_display = 0, | ||
| 321 | |||
| 322 | /* Enable VD[2..7], VD[10..15], VD[18..23] and VCLK, syncs, VDEN | ||
| 323 | * and disable the pull down resistors on pins we are using for LCD | ||
| 324 | * data. */ | ||
| 325 | |||
| 326 | .gpcup = (0xf << 1) | (0x3f << 10), | ||
| 327 | |||
| 328 | .gpccon = (S3C2410_GPC1_VCLK | S3C2410_GPC2_VLINE | | ||
| 329 | S3C2410_GPC3_VFRAME | S3C2410_GPC4_VM | | ||
| 330 | S3C2410_GPC10_VD2 | S3C2410_GPC11_VD3 | | ||
| 331 | S3C2410_GPC12_VD4 | S3C2410_GPC13_VD5 | | ||
| 332 | S3C2410_GPC14_VD6 | S3C2410_GPC15_VD7), | ||
| 333 | |||
| 334 | .gpccon_mask = (S3C2410_GPCCON_MASK(1) | S3C2410_GPCCON_MASK(2) | | ||
| 335 | S3C2410_GPCCON_MASK(3) | S3C2410_GPCCON_MASK(4) | | ||
| 336 | S3C2410_GPCCON_MASK(10) | S3C2410_GPCCON_MASK(11) | | ||
| 337 | S3C2410_GPCCON_MASK(12) | S3C2410_GPCCON_MASK(13) | | ||
| 338 | S3C2410_GPCCON_MASK(14) | S3C2410_GPCCON_MASK(15)), | ||
| 339 | |||
| 340 | .gpdup = (0x3f << 2) | (0x3f << 10), | ||
| 341 | |||
| 342 | .gpdcon = (S3C2410_GPD2_VD10 | S3C2410_GPD3_VD11 | | ||
| 343 | S3C2410_GPD4_VD12 | S3C2410_GPD5_VD13 | | ||
| 344 | S3C2410_GPD6_VD14 | S3C2410_GPD7_VD15 | | ||
| 345 | S3C2410_GPD10_VD18 | S3C2410_GPD11_VD19 | | ||
| 346 | S3C2410_GPD12_VD20 | S3C2410_GPD13_VD21 | | ||
| 347 | S3C2410_GPD14_VD22 | S3C2410_GPD15_VD23), | ||
| 348 | |||
| 349 | .gpdcon_mask = (S3C2410_GPDCON_MASK(2) | S3C2410_GPDCON_MASK(3) | | ||
| 350 | S3C2410_GPDCON_MASK(4) | S3C2410_GPDCON_MASK(5) | | ||
| 351 | S3C2410_GPDCON_MASK(6) | S3C2410_GPDCON_MASK(7) | | ||
| 352 | S3C2410_GPDCON_MASK(10) | S3C2410_GPDCON_MASK(11)| | ||
| 353 | S3C2410_GPDCON_MASK(12) | S3C2410_GPDCON_MASK(13)| | ||
| 354 | S3C2410_GPDCON_MASK(14) | S3C2410_GPDCON_MASK(15)), | ||
| 355 | }; | ||
| 356 | |||
| 357 | /* ILI9320 support. */ | ||
| 358 | |||
| 359 | static void jive_lcm_reset(unsigned int set) | ||
| 360 | { | ||
| 361 | printk(KERN_DEBUG "%s(%d)\n", __func__, set); | ||
| 362 | |||
| 363 | s3c2410_gpio_setpin(S3C2410_GPG13, set); | ||
| 364 | s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPIO_OUTPUT); | ||
| 365 | } | ||
| 366 | |||
| 367 | #undef LCD_UPPER_MARGIN | ||
| 368 | #define LCD_UPPER_MARGIN 2 | ||
| 369 | |||
| 370 | static struct ili9320_platdata jive_lcm_config = { | ||
| 371 | .hsize = LCD_XRES, | ||
| 372 | .vsize = LCD_YRES, | ||
| 373 | |||
| 374 | .reset = jive_lcm_reset, | ||
| 375 | .suspend = ILI9320_SUSPEND_DEEP, | ||
| 376 | |||
| 377 | .entry_mode = ILI9320_ENTRYMODE_ID(3) | ILI9320_ENTRYMODE_BGR, | ||
| 378 | .display2 = (ILI9320_DISPLAY2_FP(LCD_UPPER_MARGIN) | | ||
| 379 | ILI9320_DISPLAY2_BP(LCD_LOWER_MARGIN)), | ||
| 380 | .display3 = 0x0, | ||
| 381 | .display4 = 0x0, | ||
| 382 | .rgb_if1 = (ILI9320_RGBIF1_RIM_RGB18 | | ||
| 383 | ILI9320_RGBIF1_RM | ILI9320_RGBIF1_CLK_RGBIF), | ||
| 384 | .rgb_if2 = ILI9320_RGBIF2_DPL, | ||
| 385 | .interface2 = 0x0, | ||
| 386 | .interface3 = 0x3, | ||
| 387 | .interface4 = (ILI9320_INTERFACE4_RTNE(16) | | ||
| 388 | ILI9320_INTERFACE4_DIVE(1)), | ||
| 389 | .interface5 = 0x0, | ||
| 390 | .interface6 = 0x0, | ||
| 391 | }; | ||
| 392 | |||
| 393 | /* LCD SPI support */ | ||
| 394 | |||
| 395 | static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs) | ||
| 396 | { | ||
| 397 | s3c2410_gpio_setpin(S3C2410_GPB7, cs ? 0 : 1); | ||
| 398 | } | ||
| 399 | |||
| 400 | static struct s3c2410_spigpio_info jive_lcd_spi = { | ||
| 401 | .bus_num = 0, | ||
| 402 | .pin_clk = S3C2410_GPG8, | ||
| 403 | .pin_mosi = S3C2410_GPB8, | ||
| 404 | .chip_select = jive_lcd_spi_chipselect, | ||
| 405 | }; | ||
| 406 | |||
| 407 | static struct platform_device jive_device_lcdspi = { | ||
| 408 | .name = "s3c24xx-spi-gpio", | ||
| 409 | .id = 1, | ||
| 410 | .num_resources = 0, | ||
| 411 | .dev.platform_data = &jive_lcd_spi, | ||
| 412 | }; | ||
| 413 | |||
| 414 | /* WM8750 audio code SPI definition */ | ||
| 415 | |||
| 416 | static void jive_wm8750_chipselect(struct s3c2410_spigpio_info *spi, int cs) | ||
| 417 | { | ||
| 418 | s3c2410_gpio_setpin(S3C2410_GPH10, cs ? 0 : 1); | ||
| 419 | } | ||
| 420 | |||
| 421 | static struct s3c2410_spigpio_info jive_wm8750_spi = { | ||
| 422 | .bus_num = 2, | ||
| 423 | .pin_clk = S3C2410_GPB4, | ||
| 424 | .pin_mosi = S3C2410_GPB9, | ||
| 425 | .chip_select = jive_wm8750_chipselect, | ||
| 426 | }; | ||
| 427 | |||
| 428 | static struct platform_device jive_device_wm8750 = { | ||
| 429 | .name = "s3c24xx-spi-gpio", | ||
| 430 | .id = 2, | ||
| 431 | .num_resources = 0, | ||
| 432 | .dev.platform_data = &jive_wm8750_spi, | ||
| 433 | }; | ||
| 434 | |||
| 435 | /* JIVE SPI devices. */ | ||
| 436 | |||
| 437 | static struct spi_board_info __initdata jive_spi_devs[] = { | ||
| 438 | [0] = { | ||
| 439 | .modalias = "VGG2432A4", | ||
| 440 | .bus_num = 1, | ||
| 441 | .chip_select = 0, | ||
| 442 | .mode = SPI_MODE_3, /* CPOL=1, CPHA=1 */ | ||
| 443 | .max_speed_hz = 100000, | ||
| 444 | .platform_data = &jive_lcm_config, | ||
| 445 | }, { | ||
| 446 | .modalias = "WM8750", | ||
| 447 | .bus_num = 2, | ||
| 448 | .chip_select = 0, | ||
| 449 | .mode = SPI_MODE_0, /* CPOL=0, CPHA=0 */ | ||
| 450 | .max_speed_hz = 100000, | ||
| 451 | }, | ||
| 452 | }; | ||
| 453 | |||
| 454 | /* I2C bus and device configuration. */ | ||
| 455 | |||
| 456 | static struct s3c2410_platform_i2c jive_i2c_cfg = { | ||
| 457 | .max_freq = 80 * 1000, | ||
| 458 | .bus_freq = 50 * 1000, | ||
| 459 | .flags = S3C_IICFLG_FILTER, | ||
| 460 | .sda_delay = 2, | ||
| 461 | }; | ||
| 462 | |||
| 463 | static struct i2c_board_info jive_i2c_devs[] = { | ||
| 464 | [0] = { | ||
| 465 | I2C_BOARD_INFO("lis302dl", 0x1c), | ||
| 466 | .irq = IRQ_EINT14, | ||
| 467 | }, | ||
| 468 | }; | ||
| 469 | |||
| 470 | /* The platform devices being used. */ | ||
| 471 | |||
| 472 | static struct platform_device *jive_devices[] __initdata = { | ||
| 473 | &s3c_device_usb, | ||
| 474 | &s3c_device_rtc, | ||
| 475 | &s3c_device_wdt, | ||
| 476 | &s3c_device_i2c, | ||
| 477 | &s3c_device_lcd, | ||
| 478 | &jive_device_lcdspi, | ||
| 479 | &jive_device_wm8750, | ||
| 480 | &s3c_device_nand, | ||
| 481 | &s3c_device_usbgadget, | ||
| 482 | }; | ||
| 483 | |||
| 484 | static struct s3c2410_udc_mach_info jive_udc_cfg __initdata = { | ||
| 485 | .vbus_pin = S3C2410_GPG1, /* detect is on GPG1 */ | ||
| 486 | }; | ||
| 487 | |||
| 488 | /* Jive power management device */ | ||
| 489 | |||
| 490 | #ifdef CONFIG_PM | ||
| 491 | static int jive_pm_suspend(struct sys_device *sd, pm_message_t state) | ||
| 492 | { | ||
| 493 | /* Write the magic value u-boot uses to check for resume into | ||
| 494 | * the INFORM0 register, and ensure INFORM1 is set to the | ||
| 495 | * correct address to resume from. */ | ||
| 496 | |||
| 497 | __raw_writel(0x2BED, S3C2412_INFORM0); | ||
| 498 | __raw_writel(virt_to_phys(s3c2410_cpu_resume), S3C2412_INFORM1); | ||
| 499 | |||
| 500 | return 0; | ||
| 501 | } | ||
| 502 | |||
| 503 | static int jive_pm_resume(struct sys_device *sd) | ||
| 504 | { | ||
| 505 | __raw_writel(0x0, S3C2412_INFORM0); | ||
| 506 | return 0; | ||
| 507 | } | ||
| 508 | |||
| 509 | #else | ||
| 510 | #define jive_pm_suspend NULL | ||
| 511 | #define jive_pm_resume NULL | ||
| 512 | #endif | ||
| 513 | |||
| 514 | static struct sysdev_class jive_pm_sysclass = { | ||
| 515 | .name = "jive-pm", | ||
| 516 | .suspend = jive_pm_suspend, | ||
| 517 | .resume = jive_pm_resume, | ||
| 518 | }; | ||
| 519 | |||
| 520 | static struct sys_device jive_pm_sysdev = { | ||
| 521 | .cls = &jive_pm_sysclass, | ||
| 522 | }; | ||
| 523 | |||
| 524 | static void __init jive_map_io(void) | ||
| 525 | { | ||
| 526 | s3c24xx_init_io(jive_iodesc, ARRAY_SIZE(jive_iodesc)); | ||
| 527 | s3c24xx_init_clocks(12000000); | ||
| 528 | s3c24xx_init_uarts(jive_uartcfgs, ARRAY_SIZE(jive_uartcfgs)); | ||
| 529 | } | ||
| 530 | |||
| 531 | static void jive_power_off(void) | ||
| 532 | { | ||
| 533 | printk(KERN_INFO "powering system down...\n"); | ||
| 534 | |||
| 535 | s3c2410_gpio_setpin(S3C2410_GPC5, 1); | ||
| 536 | s3c2410_gpio_cfgpin(S3C2410_GPC5, S3C2410_GPIO_OUTPUT); | ||
| 537 | } | ||
| 538 | |||
| 539 | static void __init jive_machine_init(void) | ||
| 540 | { | ||
| 541 | /* register system devices for managing low level suspend */ | ||
| 542 | |||
| 543 | sysdev_class_register(&jive_pm_sysclass); | ||
| 544 | sysdev_register(&jive_pm_sysdev); | ||
| 545 | |||
| 546 | /* write our sleep configurations for the IO. Pull down all unused | ||
| 547 | * IO, ensure that we have turned off all peripherals we do not | ||
| 548 | * need, and configure the ones we do need. */ | ||
| 549 | |||
| 550 | /* Port B sleep */ | ||
| 551 | |||
| 552 | __raw_writel(S3C2412_SLPCON_IN(0) | | ||
| 553 | S3C2412_SLPCON_PULL(1) | | ||
| 554 | S3C2412_SLPCON_HIGH(2) | | ||
| 555 | S3C2412_SLPCON_PULL(3) | | ||
| 556 | S3C2412_SLPCON_PULL(4) | | ||
| 557 | S3C2412_SLPCON_PULL(5) | | ||
| 558 | S3C2412_SLPCON_PULL(6) | | ||
| 559 | S3C2412_SLPCON_HIGH(7) | | ||
| 560 | S3C2412_SLPCON_PULL(8) | | ||
| 561 | S3C2412_SLPCON_PULL(9) | | ||
| 562 | S3C2412_SLPCON_PULL(10), S3C2412_GPBSLPCON); | ||
| 563 | |||
| 564 | /* Port C sleep */ | ||
| 565 | |||
| 566 | __raw_writel(S3C2412_SLPCON_PULL(0) | | ||
| 567 | S3C2412_SLPCON_PULL(1) | | ||
| 568 | S3C2412_SLPCON_PULL(2) | | ||
| 569 | S3C2412_SLPCON_PULL(3) | | ||
| 570 | S3C2412_SLPCON_PULL(4) | | ||
| 571 | S3C2412_SLPCON_PULL(5) | | ||
| 572 | S3C2412_SLPCON_LOW(6) | | ||
| 573 | S3C2412_SLPCON_PULL(6) | | ||
| 574 | S3C2412_SLPCON_PULL(7) | | ||
| 575 | S3C2412_SLPCON_PULL(8) | | ||
| 576 | S3C2412_SLPCON_PULL(9) | | ||
| 577 | S3C2412_SLPCON_PULL(10) | | ||
| 578 | S3C2412_SLPCON_PULL(11) | | ||
| 579 | S3C2412_SLPCON_PULL(12) | | ||
| 580 | S3C2412_SLPCON_PULL(13) | | ||
| 581 | S3C2412_SLPCON_PULL(14) | | ||
| 582 | S3C2412_SLPCON_PULL(15), S3C2412_GPCSLPCON); | ||
| 583 | |||
| 584 | /* Port D sleep */ | ||
| 585 | |||
| 586 | __raw_writel(S3C2412_SLPCON_ALL_PULL, S3C2412_GPDSLPCON); | ||
| 587 | |||
| 588 | /* Port F sleep */ | ||
| 589 | |||
| 590 | __raw_writel(S3C2412_SLPCON_LOW(0) | | ||
| 591 | S3C2412_SLPCON_LOW(1) | | ||
| 592 | S3C2412_SLPCON_LOW(2) | | ||
| 593 | S3C2412_SLPCON_EINT(3) | | ||
| 594 | S3C2412_SLPCON_EINT(4) | | ||
| 595 | S3C2412_SLPCON_EINT(5) | | ||
| 596 | S3C2412_SLPCON_EINT(6) | | ||
| 597 | S3C2412_SLPCON_EINT(7), S3C2412_GPFSLPCON); | ||
| 598 | |||
| 599 | /* Port G sleep */ | ||
| 600 | |||
| 601 | __raw_writel(S3C2412_SLPCON_IN(0) | | ||
| 602 | S3C2412_SLPCON_IN(1) | | ||
| 603 | S3C2412_SLPCON_IN(2) | | ||
| 604 | S3C2412_SLPCON_IN(3) | | ||
| 605 | S3C2412_SLPCON_IN(4) | | ||
| 606 | S3C2412_SLPCON_IN(5) | | ||
| 607 | S3C2412_SLPCON_IN(6) | | ||
| 608 | S3C2412_SLPCON_IN(7) | | ||
| 609 | S3C2412_SLPCON_PULL(8) | | ||
| 610 | S3C2412_SLPCON_PULL(9) | | ||
| 611 | S3C2412_SLPCON_IN(10) | | ||
| 612 | S3C2412_SLPCON_PULL(11) | | ||
| 613 | S3C2412_SLPCON_PULL(12) | | ||
| 614 | S3C2412_SLPCON_PULL(13) | | ||
| 615 | S3C2412_SLPCON_IN(14) | | ||
| 616 | S3C2412_SLPCON_PULL(15), S3C2412_GPGSLPCON); | ||
| 617 | |||
| 618 | /* Port H sleep */ | ||
| 619 | |||
| 620 | __raw_writel(S3C2412_SLPCON_PULL(0) | | ||
| 621 | S3C2412_SLPCON_PULL(1) | | ||
| 622 | S3C2412_SLPCON_PULL(2) | | ||
| 623 | S3C2412_SLPCON_PULL(3) | | ||
| 624 | S3C2412_SLPCON_PULL(4) | | ||
| 625 | S3C2412_SLPCON_PULL(5) | | ||
| 626 | S3C2412_SLPCON_PULL(6) | | ||
| 627 | S3C2412_SLPCON_IN(7) | | ||
| 628 | S3C2412_SLPCON_IN(8) | | ||
| 629 | S3C2412_SLPCON_PULL(9) | | ||
| 630 | S3C2412_SLPCON_IN(10), S3C2412_GPHSLPCON); | ||
| 631 | |||
| 632 | /* initialise the power management now we've setup everything. */ | ||
| 633 | |||
| 634 | s3c2410_pm_init(); | ||
| 635 | |||
| 636 | s3c_device_nand.dev.platform_data = &jive_nand_info; | ||
| 637 | |||
| 638 | /* initialise the spi */ | ||
| 639 | |||
| 640 | s3c2410_gpio_setpin(S3C2410_GPG13, 0); | ||
| 641 | s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPIO_OUTPUT); | ||
| 642 | |||
| 643 | s3c2410_gpio_setpin(S3C2410_GPB7, 1); | ||
| 644 | s3c2410_gpio_cfgpin(S3C2410_GPB7, S3C2410_GPIO_OUTPUT); | ||
| 645 | |||
| 646 | s3c2410_gpio_setpin(S3C2410_GPB6, 0); | ||
| 647 | s3c2410_gpio_cfgpin(S3C2410_GPB6, S3C2410_GPIO_OUTPUT); | ||
| 648 | |||
| 649 | s3c2410_gpio_setpin(S3C2410_GPG8, 1); | ||
| 650 | s3c2410_gpio_cfgpin(S3C2410_GPG8, S3C2410_GPIO_OUTPUT); | ||
| 651 | |||
| 652 | /* initialise the WM8750 spi */ | ||
| 653 | |||
| 654 | s3c2410_gpio_setpin(S3C2410_GPH10, 1); | ||
| 655 | s3c2410_gpio_cfgpin(S3C2410_GPH10, S3C2410_GPIO_OUTPUT); | ||
| 656 | |||
| 657 | /* Turn off suspend on both USB ports, and switch the | ||
| 658 | * selectable USB port to USB device mode. */ | ||
| 659 | |||
| 660 | s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST | | ||
| 661 | S3C2410_MISCCR_USBSUSPND0 | | ||
| 662 | S3C2410_MISCCR_USBSUSPND1, 0x0); | ||
| 663 | |||
| 664 | s3c24xx_udc_set_platdata(&jive_udc_cfg); | ||
| 665 | s3c24xx_fb_set_platdata(&jive_lcd_config); | ||
| 666 | |||
| 667 | spi_register_board_info(jive_spi_devs, ARRAY_SIZE(jive_spi_devs)); | ||
| 668 | |||
| 669 | s3c_device_i2c.dev.platform_data = &jive_i2c_cfg; | ||
| 670 | i2c_register_board_info(0, jive_i2c_devs, ARRAY_SIZE(jive_i2c_devs)); | ||
| 671 | |||
| 672 | pm_power_off = jive_power_off; | ||
| 673 | |||
| 674 | platform_add_devices(jive_devices, ARRAY_SIZE(jive_devices)); | ||
| 675 | } | ||
| 676 | |||
| 677 | MACHINE_START(JIVE, "JIVE") | ||
| 678 | /* Maintainer: Ben Dooks <ben@fluff.org> */ | ||
| 679 | .phys_io = S3C2410_PA_UART, | ||
| 680 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
| 681 | .boot_params = S3C2410_SDRAM_PA + 0x100, | ||
| 682 | |||
| 683 | .init_irq = s3c24xx_init_irq, | ||
| 684 | .map_io = jive_map_io, | ||
| 685 | .init_machine = jive_machine_init, | ||
| 686 | .timer = &s3c24xx_timer, | ||
| 687 | MACHINE_END | ||
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index f1915bd61d15..25de042ab996 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig | |||
| @@ -29,6 +29,7 @@ config MACH_ANUBIS | |||
| 29 | bool "Simtec Electronics ANUBIS" | 29 | bool "Simtec Electronics ANUBIS" |
| 30 | select CPU_S3C2440 | 30 | select CPU_S3C2440 |
| 31 | select PM_SIMTEC if PM | 31 | select PM_SIMTEC if PM |
| 32 | select HAVE_PATA_PLATFORM | ||
| 32 | help | 33 | help |
| 33 | Say Y here if you are using the Simtec Electronics ANUBIS | 34 | Say Y here if you are using the Simtec Electronics ANUBIS |
| 34 | development system | 35 | development system |
| @@ -67,6 +68,11 @@ config SMDK2440_CPU2440 | |||
| 67 | default y if ARCH_S3C2440 | 68 | default y if ARCH_S3C2440 |
| 68 | select CPU_S3C2440 | 69 | select CPU_S3C2440 |
| 69 | 70 | ||
| 71 | config MACH_AT2440EVB | ||
| 72 | bool "Avantech AT2440EVB development board" | ||
| 73 | select CPU_S3C2440 | ||
| 74 | help | ||
| 75 | Say Y here if you are using the AT2440EVB development board | ||
| 70 | 76 | ||
| 71 | endmenu | 77 | endmenu |
| 72 | 78 | ||
diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile index c81ed6248dcb..0b4440e79b90 100644 --- a/arch/arm/mach-s3c2440/Makefile +++ b/arch/arm/mach-s3c2440/Makefile | |||
| @@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_OSIRIS) += mach-osiris.o | |||
| 21 | obj-$(CONFIG_MACH_RX3715) += mach-rx3715.o | 21 | obj-$(CONFIG_MACH_RX3715) += mach-rx3715.o |
| 22 | obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o | 22 | obj-$(CONFIG_ARCH_S3C2440) += mach-smdk2440.o |
| 23 | obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o | 23 | obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o |
| 24 | obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o | ||
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index 47258915a2f9..09af8b23500b 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2440/mach-anubis.c | 1 | /* linux/arch/arm/mach-s3c2440/mach-anubis.c |
| 2 | * | 2 | * |
| 3 | * Copyright (c) 2003-2005 Simtec Electronics | 3 | * Copyright (c) 2003-2005,2008 Simtec Electronics |
| 4 | * http://armlinux.simtec.co.uk/ | 4 | * http://armlinux.simtec.co.uk/ |
| 5 | * Ben Dooks <ben@simtec.co.uk> | 5 | * Ben Dooks <ben@simtec.co.uk> |
| 6 | * | 6 | * |
| @@ -17,6 +17,8 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/serial_core.h> | 18 | #include <linux/serial_core.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/ata_platform.h> | ||
| 21 | #include <linux/i2c.h> | ||
| 20 | 22 | ||
| 21 | #include <linux/sm501.h> | 23 | #include <linux/sm501.h> |
| 22 | #include <linux/sm501-regs.h> | 24 | #include <linux/sm501-regs.h> |
| @@ -241,14 +243,18 @@ static struct s3c2410_platform_nand anubis_nand_info = { | |||
| 241 | 243 | ||
| 242 | /* IDE channels */ | 244 | /* IDE channels */ |
| 243 | 245 | ||
| 246 | struct pata_platform_info anubis_ide_platdata = { | ||
| 247 | .ioport_shift = 5, | ||
| 248 | }; | ||
| 249 | |||
| 244 | static struct resource anubis_ide0_resource[] = { | 250 | static struct resource anubis_ide0_resource[] = { |
| 245 | { | 251 | { |
| 246 | .start = S3C2410_CS3, | 252 | .start = S3C2410_CS3, |
| 247 | .end = S3C2410_CS3 + (8*32) - 1, | 253 | .end = S3C2410_CS3 + (8*32) - 1, |
| 248 | .flags = IORESOURCE_MEM, | 254 | .flags = IORESOURCE_MEM, |
| 249 | }, { | 255 | }, { |
| 250 | .start = S3C2410_CS3 + (1<<26), | 256 | .start = S3C2410_CS3 + (1<<26) + (6*32), |
| 251 | .end = S3C2410_CS3 + (1<<26) + (8*32) - 1, | 257 | .end = S3C2410_CS3 + (1<<26) + (7*32) - 1, |
| 252 | .flags = IORESOURCE_MEM, | 258 | .flags = IORESOURCE_MEM, |
| 253 | }, { | 259 | }, { |
| 254 | .start = IRQ_IDE0, | 260 | .start = IRQ_IDE0, |
| @@ -258,10 +264,14 @@ static struct resource anubis_ide0_resource[] = { | |||
| 258 | }; | 264 | }; |
| 259 | 265 | ||
| 260 | static struct platform_device anubis_device_ide0 = { | 266 | static struct platform_device anubis_device_ide0 = { |
| 261 | .name = "simtec-ide", | 267 | .name = "pata_platform", |
| 262 | .id = 0, | 268 | .id = 0, |
| 263 | .num_resources = ARRAY_SIZE(anubis_ide0_resource), | 269 | .num_resources = ARRAY_SIZE(anubis_ide0_resource), |
| 264 | .resource = anubis_ide0_resource, | 270 | .resource = anubis_ide0_resource, |
| 271 | .dev = { | ||
| 272 | .platform_data = &anubis_ide_platdata, | ||
| 273 | .coherent_dma_mask = ~0, | ||
| 274 | }, | ||
| 265 | }; | 275 | }; |
| 266 | 276 | ||
| 267 | static struct resource anubis_ide1_resource[] = { | 277 | static struct resource anubis_ide1_resource[] = { |
| @@ -270,8 +280,8 @@ static struct resource anubis_ide1_resource[] = { | |||
| 270 | .end = S3C2410_CS4 + (8*32) - 1, | 280 | .end = S3C2410_CS4 + (8*32) - 1, |
| 271 | .flags = IORESOURCE_MEM, | 281 | .flags = IORESOURCE_MEM, |
| 272 | }, { | 282 | }, { |
| 273 | .start = S3C2410_CS4 + (1<<26), | 283 | .start = S3C2410_CS4 + (1<<26) + (6*32), |
| 274 | .end = S3C2410_CS4 + (1<<26) + (8*32) - 1, | 284 | .end = S3C2410_CS4 + (1<<26) + (7*32) - 1, |
| 275 | .flags = IORESOURCE_MEM, | 285 | .flags = IORESOURCE_MEM, |
| 276 | }, { | 286 | }, { |
| 277 | .start = IRQ_IDE0, | 287 | .start = IRQ_IDE0, |
| @@ -280,12 +290,15 @@ static struct resource anubis_ide1_resource[] = { | |||
| 280 | }, | 290 | }, |
| 281 | }; | 291 | }; |
| 282 | 292 | ||
| 283 | |||
| 284 | static struct platform_device anubis_device_ide1 = { | 293 | static struct platform_device anubis_device_ide1 = { |
| 285 | .name = "simtec-ide", | 294 | .name = "pata_platform", |
| 286 | .id = 1, | 295 | .id = 1, |
| 287 | .num_resources = ARRAY_SIZE(anubis_ide1_resource), | 296 | .num_resources = ARRAY_SIZE(anubis_ide1_resource), |
| 288 | .resource = anubis_ide1_resource, | 297 | .resource = anubis_ide1_resource, |
| 298 | .dev = { | ||
| 299 | .platform_data = &anubis_ide_platdata, | ||
| 300 | .coherent_dma_mask = ~0, | ||
| 301 | }, | ||
| 289 | }; | 302 | }; |
| 290 | 303 | ||
| 291 | /* Asix AX88796 10/100 ethernet controller */ | 304 | /* Asix AX88796 10/100 ethernet controller */ |
| @@ -409,6 +422,15 @@ static struct clk *anubis_clocks[] = { | |||
| 409 | &s3c24xx_uclk, | 422 | &s3c24xx_uclk, |
| 410 | }; | 423 | }; |
| 411 | 424 | ||
| 425 | /* I2C devices. */ | ||
| 426 | |||
| 427 | static struct i2c_board_info anubis_i2c_devs[] __initdata = { | ||
| 428 | { | ||
| 429 | I2C_BOARD_INFO("tps65011", 0x48), | ||
| 430 | .irq = IRQ_EINT20, | ||
| 431 | } | ||
| 432 | }; | ||
| 433 | |||
| 412 | static void __init anubis_map_io(void) | 434 | static void __init anubis_map_io(void) |
| 413 | { | 435 | { |
| 414 | /* initialise the clocks */ | 436 | /* initialise the clocks */ |
| @@ -448,6 +470,9 @@ static void __init anubis_map_io(void) | |||
| 448 | static void __init anubis_init(void) | 470 | static void __init anubis_init(void) |
| 449 | { | 471 | { |
| 450 | platform_add_devices(anubis_devices, ARRAY_SIZE(anubis_devices)); | 472 | platform_add_devices(anubis_devices, ARRAY_SIZE(anubis_devices)); |
| 473 | |||
| 474 | i2c_register_board_info(0, anubis_i2c_devs, | ||
| 475 | ARRAY_SIZE(anubis_i2c_devs)); | ||
| 451 | } | 476 | } |
| 452 | 477 | ||
| 453 | 478 | ||
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c new file mode 100644 index 000000000000..f5e3c7f27639 --- /dev/null +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
| @@ -0,0 +1,198 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2440/mach-at2440evb.c | ||
| 2 | * | ||
| 3 | * Copyright (c) 2008 Ramax Lo <ramaxlo@gmail.com> | ||
| 4 | * Based on mach-anubis.c by Ben Dooks <ben@simtec.co.uk> | ||
| 5 | * and modifications by SBZ <sbz@spgui.org> and | ||
| 6 | * Weibing <http://weibing.blogbus.com> | ||
| 7 | * | ||
| 8 | * For product information, visit http://www.arm9e.com/ | ||
| 9 | * | ||
| 10 | * This program is free software; you can redistribute it and/or modify | ||
| 11 | * it under the terms of the GNU General Public License version 2 as | ||
| 12 | * published by the Free Software Foundation. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include <linux/kernel.h> | ||
| 16 | #include <linux/types.h> | ||
| 17 | #include <linux/interrupt.h> | ||
| 18 | #include <linux/list.h> | ||
| 19 | #include <linux/timer.h> | ||
| 20 | #include <linux/init.h> | ||
| 21 | #include <linux/io.h> | ||
| 22 | #include <linux/serial_core.h> | ||
| 23 | #include <linux/dm9000.h> | ||
| 24 | #include <linux/platform_device.h> | ||
| 25 | |||
| 26 | #include <asm/mach/arch.h> | ||
| 27 | #include <asm/mach/map.h> | ||
| 28 | #include <asm/mach/irq.h> | ||
| 29 | |||
| 30 | #include <asm/hardware.h> | ||
| 31 | #include <asm/irq.h> | ||
| 32 | #include <asm/mach-types.h> | ||
| 33 | |||
| 34 | #include <asm/plat-s3c/regs-serial.h> | ||
| 35 | #include <asm/arch/regs-gpio.h> | ||
| 36 | #include <asm/arch/regs-mem.h> | ||
| 37 | #include <asm/arch/regs-lcd.h> | ||
| 38 | #include <asm/plat-s3c/nand.h> | ||
| 39 | |||
| 40 | #include <linux/mtd/mtd.h> | ||
| 41 | #include <linux/mtd/nand.h> | ||
| 42 | #include <linux/mtd/nand_ecc.h> | ||
| 43 | #include <linux/mtd/partitions.h> | ||
| 44 | |||
| 45 | #include <asm/plat-s3c24xx/clock.h> | ||
| 46 | #include <asm/plat-s3c24xx/devs.h> | ||
| 47 | #include <asm/plat-s3c24xx/cpu.h> | ||
| 48 | |||
| 49 | static struct map_desc at2440evb_iodesc[] __initdata = { | ||
| 50 | /* Nothing here */ | ||
| 51 | }; | ||
| 52 | |||
| 53 | #define UCON S3C2410_UCON_DEFAULT | ||
| 54 | #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE) | ||
| 55 | #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE) | ||
| 56 | |||
| 57 | static struct s3c24xx_uart_clksrc at2440evb_serial_clocks[] = { | ||
| 58 | [0] = { | ||
| 59 | .name = "uclk", | ||
| 60 | .divisor = 1, | ||
| 61 | .min_baud = 0, | ||
| 62 | .max_baud = 0, | ||
| 63 | }, | ||
| 64 | [1] = { | ||
| 65 | .name = "pclk", | ||
| 66 | .divisor = 1, | ||
| 67 | .min_baud = 0, | ||
| 68 | .max_baud = 0, | ||
| 69 | } | ||
| 70 | }; | ||
| 71 | |||
| 72 | |||
| 73 | static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = { | ||
| 74 | [0] = { | ||
| 75 | .hwport = 0, | ||
| 76 | .flags = 0, | ||
| 77 | .ucon = UCON, | ||
| 78 | .ulcon = ULCON, | ||
| 79 | .ufcon = UFCON, | ||
| 80 | .clocks = at2440evb_serial_clocks, | ||
| 81 | .clocks_size = ARRAY_SIZE(at2440evb_serial_clocks), | ||
| 82 | }, | ||
| 83 | [1] = { | ||
| 84 | .hwport = 1, | ||
| 85 | .flags = 0, | ||
| 86 | .ucon = UCON, | ||
| 87 | .ulcon = ULCON, | ||
| 88 | .ufcon = UFCON, | ||
| 89 | .clocks = at2440evb_serial_clocks, | ||
| 90 | .clocks_size = ARRAY_SIZE(at2440evb_serial_clocks), | ||
| 91 | }, | ||
| 92 | }; | ||
| 93 | |||
| 94 | /* NAND Flash on AT2440EVB board */ | ||
| 95 | |||
| 96 | static struct mtd_partition at2440evb_default_nand_part[] = { | ||
| 97 | [0] = { | ||
| 98 | .name = "Boot Agent", | ||
| 99 | .size = SZ_256K, | ||
| 100 | .offset = 0, | ||
| 101 | }, | ||
| 102 | [1] = { | ||
| 103 | .name = "Kernel", | ||
| 104 | .size = SZ_2M, | ||
| 105 | .offset = SZ_256K, | ||
| 106 | }, | ||
| 107 | [2] = { | ||
| 108 | .name = "Root", | ||
| 109 | .offset = SZ_256K + SZ_2M, | ||
| 110 | .size = MTDPART_SIZ_FULL, | ||
| 111 | }, | ||
| 112 | }; | ||
| 113 | |||
| 114 | static struct s3c2410_nand_set at2440evb_nand_sets[] = { | ||
| 115 | [0] = { | ||
| 116 | .name = "nand", | ||
| 117 | .nr_chips = 1, | ||
| 118 | .nr_partitions = ARRAY_SIZE(at2440evb_default_nand_part), | ||
| 119 | .partitions = at2440evb_default_nand_part, | ||
| 120 | }, | ||
| 121 | }; | ||
| 122 | |||
| 123 | static struct s3c2410_platform_nand at2440evb_nand_info = { | ||
| 124 | .tacls = 25, | ||
| 125 | .twrph0 = 55, | ||
| 126 | .twrph1 = 40, | ||
| 127 | .nr_sets = ARRAY_SIZE(at2440evb_nand_sets), | ||
| 128 | .sets = at2440evb_nand_sets, | ||
| 129 | }; | ||
| 130 | |||
| 131 | /* DM9000AEP 10/100 ethernet controller */ | ||
| 132 | |||
| 133 | static struct resource at2440evb_dm9k_resource[] = { | ||
| 134 | [0] = { | ||
| 135 | .start = S3C2410_CS3, | ||
| 136 | .end = S3C2410_CS3 + 3, | ||
| 137 | .flags = IORESOURCE_MEM | ||
| 138 | }, | ||
| 139 | [1] = { | ||
| 140 | .start = S3C2410_CS3 + 4, | ||
| 141 | .end = S3C2410_CS3 + 7, | ||
| 142 | .flags = IORESOURCE_MEM | ||
| 143 | }, | ||
| 144 | [2] = { | ||
| 145 | .start = IRQ_EINT7, | ||
| 146 | .end = IRQ_EINT7, | ||
| 147 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, | ||
| 148 | } | ||
| 149 | }; | ||
| 150 | |||
| 151 | static struct dm9000_plat_data at2440evb_dm9k_pdata = { | ||
| 152 | .flags = (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM), | ||
| 153 | }; | ||
| 154 | |||
| 155 | static struct platform_device at2440evb_device_eth = { | ||
| 156 | .name = "dm9000", | ||
| 157 | .id = -1, | ||
| 158 | .num_resources = ARRAY_SIZE(at2440evb_dm9k_resource), | ||
| 159 | .resource = at2440evb_dm9k_resource, | ||
| 160 | .dev = { | ||
| 161 | .platform_data = &at2440evb_dm9k_pdata, | ||
| 162 | }, | ||
| 163 | }; | ||
| 164 | |||
| 165 | static struct platform_device *at2440evb_devices[] __initdata = { | ||
| 166 | &s3c_device_usb, | ||
| 167 | &s3c_device_wdt, | ||
| 168 | &s3c_device_adc, | ||
| 169 | &s3c_device_i2c, | ||
| 170 | &s3c_device_rtc, | ||
| 171 | &s3c_device_nand, | ||
| 172 | &at2440evb_device_eth, | ||
| 173 | }; | ||
| 174 | |||
| 175 | static void __init at2440evb_map_io(void) | ||
| 176 | { | ||
| 177 | s3c_device_nand.dev.platform_data = &at2440evb_nand_info; | ||
| 178 | |||
| 179 | s3c24xx_init_io(at2440evb_iodesc, ARRAY_SIZE(at2440evb_iodesc)); | ||
| 180 | s3c24xx_init_clocks(16934400); | ||
| 181 | s3c24xx_init_uarts(at2440evb_uartcfgs, ARRAY_SIZE(at2440evb_uartcfgs)); | ||
| 182 | } | ||
| 183 | |||
| 184 | static void __init at2440evb_init(void) | ||
| 185 | { | ||
| 186 | platform_add_devices(at2440evb_devices, ARRAY_SIZE(at2440evb_devices)); | ||
| 187 | } | ||
| 188 | |||
| 189 | |||
| 190 | MACHINE_START(AT2440EVB, "AT2440EVB") | ||
| 191 | .phys_io = S3C2410_PA_UART, | ||
| 192 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
| 193 | .boot_params = S3C2410_SDRAM_PA + 0x100, | ||
| 194 | .map_io = at2440evb_map_io, | ||
| 195 | .init_machine = at2440evb_init, | ||
| 196 | .init_irq = s3c24xx_init_irq, | ||
| 197 | .timer = &s3c24xx_timer, | ||
| 198 | MACHINE_END | ||
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 8a8acdbd072d..af996b0e91e8 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* linux/arch/arm/mach-s3c2440/mach-osiris.c | 1 | /* linux/arch/arm/mach-s3c2440/mach-osiris.c |
| 2 | * | 2 | * |
| 3 | * Copyright (c) 2005 Simtec Electronics | 3 | * Copyright (c) 2005,2008 Simtec Electronics |
| 4 | * http://armlinux.simtec.co.uk/ | 4 | * http://armlinux.simtec.co.uk/ |
| 5 | * Ben Dooks <ben@simtec.co.uk> | 5 | * Ben Dooks <ben@simtec.co.uk> |
| 6 | * | 6 | * |
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/sysdev.h> | 19 | #include <linux/sysdev.h> |
| 20 | #include <linux/serial_core.h> | 20 | #include <linux/serial_core.h> |
| 21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 22 | #include <linux/i2c.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
| 24 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
| @@ -322,6 +323,15 @@ static struct sys_device osiris_pm_sysdev = { | |||
| 322 | .cls = &osiris_pm_sysclass, | 323 | .cls = &osiris_pm_sysclass, |
| 323 | }; | 324 | }; |
| 324 | 325 | ||
| 326 | /* I2C devices fitted. */ | ||
| 327 | |||
| 328 | static struct i2c_board_info osiris_i2c_devs[] __initdata = { | ||
| 329 | { | ||
| 330 | I2C_BOARD_INFO("tps65011", 0x48), | ||
| 331 | .irq = IRQ_EINT20, | ||
| 332 | }, | ||
| 333 | }; | ||
| 334 | |||
| 325 | /* Standard Osiris devices */ | 335 | /* Standard Osiris devices */ |
| 326 | 336 | ||
| 327 | static struct platform_device *osiris_devices[] __initdata = { | 337 | static struct platform_device *osiris_devices[] __initdata = { |
| @@ -388,6 +398,9 @@ static void __init osiris_init(void) | |||
| 388 | sysdev_class_register(&osiris_pm_sysclass); | 398 | sysdev_class_register(&osiris_pm_sysclass); |
| 389 | sysdev_register(&osiris_pm_sysdev); | 399 | sysdev_register(&osiris_pm_sysdev); |
| 390 | 400 | ||
| 401 | i2c_register_board_info(0, osiris_i2c_devs, | ||
| 402 | ARRAY_SIZE(osiris_i2c_devs)); | ||
| 403 | |||
| 391 | platform_add_devices(osiris_devices, ARRAY_SIZE(osiris_devices)); | 404 | platform_add_devices(osiris_devices, ARRAY_SIZE(osiris_devices)); |
| 392 | }; | 405 | }; |
| 393 | 406 | ||
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index b42f956738d0..17f064fabdaf 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
| @@ -81,7 +81,7 @@ static int s3c2443_clkcon_enable_p(struct clk *clk, int enable) | |||
| 81 | else | 81 | else |
| 82 | clkcon &= ~clocks; | 82 | clkcon &= ~clocks; |
| 83 | 83 | ||
| 84 | __raw_writel(clkcon, S3C2443_HCLKCON); | 84 | __raw_writel(clkcon, S3C2443_PCLKCON); |
| 85 | 85 | ||
| 86 | return 0; | 86 | return 0; |
| 87 | } | 87 | } |
| @@ -221,7 +221,6 @@ static struct clk clk_mdivclk = { | |||
| 221 | .get_rate = s3c2443_getrate_mdivclk, | 221 | .get_rate = s3c2443_getrate_mdivclk, |
| 222 | }; | 222 | }; |
| 223 | 223 | ||
| 224 | |||
| 225 | static int s3c2443_setparent_msysclk(struct clk *clk, struct clk *parent) | 224 | static int s3c2443_setparent_msysclk(struct clk *clk, struct clk *parent) |
| 226 | { | 225 | { |
| 227 | unsigned long clksrc = __raw_readl(S3C2443_CLKSRC); | 226 | unsigned long clksrc = __raw_readl(S3C2443_CLKSRC); |
| @@ -249,6 +248,46 @@ static struct clk clk_msysclk = { | |||
| 249 | .set_parent = s3c2443_setparent_msysclk, | 248 | .set_parent = s3c2443_setparent_msysclk, |
| 250 | }; | 249 | }; |
| 251 | 250 | ||
| 251 | /* armdiv | ||
| 252 | * | ||
| 253 | * this clock is sourced from msysclk and can have a number of | ||
| 254 | * divider values applied to it to then be fed into armclk. | ||
| 255 | */ | ||
| 256 | |||
| 257 | static struct clk clk_armdiv = { | ||
| 258 | .name = "armdiv", | ||
| 259 | .id = -1, | ||
| 260 | .parent = &clk_msysclk, | ||
| 261 | }; | ||
| 262 | |||
| 263 | /* armclk | ||
| 264 | * | ||
| 265 | * this is the clock fed into the ARM core itself, either from | ||
| 266 | * armdiv or from hclk. | ||
| 267 | */ | ||
| 268 | |||
| 269 | static int s3c2443_setparent_armclk(struct clk *clk, struct clk *parent) | ||
| 270 | { | ||
| 271 | unsigned long clkdiv0; | ||
| 272 | |||
| 273 | clkdiv0 = __raw_readl(S3C2443_CLKDIV0); | ||
| 274 | |||
| 275 | if (parent == &clk_armdiv) | ||
| 276 | clkdiv0 &= ~S3C2443_CLKDIV0_DVS; | ||
| 277 | else if (parent == &clk_h) | ||
| 278 | clkdiv0 |= S3C2443_CLKDIV0_DVS; | ||
| 279 | else | ||
| 280 | return -EINVAL; | ||
| 281 | |||
| 282 | __raw_writel(clkdiv0, S3C2443_CLKDIV0); | ||
| 283 | return 0; | ||
| 284 | } | ||
| 285 | |||
| 286 | static struct clk clk_arm = { | ||
| 287 | .name = "armclk", | ||
| 288 | .id = -1, | ||
| 289 | .set_parent = s3c2443_setparent_armclk, | ||
| 290 | }; | ||
| 252 | 291 | ||
| 253 | /* esysclk | 292 | /* esysclk |
| 254 | * | 293 | * |
| @@ -639,6 +678,29 @@ static struct clk clk_display = { | |||
| 639 | .round_rate = s3c2443_roundrate_clksrc256, | 678 | .round_rate = s3c2443_roundrate_clksrc256, |
| 640 | }; | 679 | }; |
| 641 | 680 | ||
| 681 | /* prediv | ||
| 682 | * | ||
| 683 | * this divides the msysclk down to pass to h/p/etc. | ||
| 684 | */ | ||
| 685 | |||
| 686 | static unsigned long s3c2443_prediv_getrate(struct clk *clk) | ||
| 687 | { | ||
| 688 | unsigned long rate = clk_get_rate(clk->parent); | ||
| 689 | unsigned long clkdiv0 = __raw_readl(S3C2443_CLKDIV0); | ||
| 690 | |||
| 691 | clkdiv0 &= S3C2443_CLKDIV0_PREDIV_MASK; | ||
| 692 | clkdiv0 >>= S3C2443_CLKDIV0_PREDIV_SHIFT; | ||
| 693 | |||
| 694 | return rate / (clkdiv0 + 1); | ||
| 695 | } | ||
| 696 | |||
| 697 | static struct clk clk_prediv = { | ||
| 698 | .name = "prediv", | ||
| 699 | .id = -1, | ||
| 700 | .parent = &clk_msysclk, | ||
| 701 | .get_rate = s3c2443_prediv_getrate, | ||
| 702 | }; | ||
| 703 | |||
| 642 | /* standard clock definitions */ | 704 | /* standard clock definitions */ |
| 643 | 705 | ||
| 644 | static struct clk init_clocks_disable[] = { | 706 | static struct clk init_clocks_disable[] = { |
| @@ -887,6 +949,15 @@ static void __init s3c2443_clk_initparents(void) | |||
| 887 | } | 949 | } |
| 888 | 950 | ||
| 889 | clk_init_set_parent(&clk_msysclk, parent); | 951 | clk_init_set_parent(&clk_msysclk, parent); |
| 952 | |||
| 953 | /* arm */ | ||
| 954 | |||
| 955 | if (__raw_readl(S3C2443_CLKDIV0) & S3C2443_CLKDIV0_DVS) | ||
| 956 | parent = &clk_h; | ||
| 957 | else | ||
| 958 | parent = &clk_armdiv; | ||
| 959 | |||
| 960 | clk_init_set_parent(&clk_arm, parent); | ||
| 890 | } | 961 | } |
| 891 | 962 | ||
| 892 | /* armdiv divisor table */ | 963 | /* armdiv divisor table */ |
| @@ -909,10 +980,9 @@ static inline unsigned int s3c2443_fclk_div(unsigned long clkcon0) | |||
| 909 | return armdiv[clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT]; | 980 | return armdiv[clkcon0 >> S3C2443_CLKDIV0_ARMDIV_SHIFT]; |
| 910 | } | 981 | } |
| 911 | 982 | ||
| 912 | static inline unsigned long s3c2443_get_prediv(unsigned long clkcon0) | 983 | static inline unsigned long s3c2443_get_hdiv(unsigned long clkcon0) |
| 913 | { | 984 | { |
| 914 | clkcon0 &= S3C2443_CLKDIV0_PREDIV_MASK; | 985 | clkcon0 &= S3C2443_CLKDIV0_HCLKDIV_MASK; |
| 915 | clkcon0 >>= S3C2443_CLKDIV0_PREDIV_SHIFT; | ||
| 916 | 986 | ||
| 917 | return clkcon0 + 1; | 987 | return clkcon0 + 1; |
| 918 | } | 988 | } |
| @@ -936,6 +1006,9 @@ static struct clk *clks[] __initdata = { | |||
| 936 | &clk_hsspi, | 1006 | &clk_hsspi, |
| 937 | &clk_hsmmc_div, | 1007 | &clk_hsmmc_div, |
| 938 | &clk_hsmmc, | 1008 | &clk_hsmmc, |
| 1009 | &clk_armdiv, | ||
| 1010 | &clk_arm, | ||
| 1011 | &clk_prediv, | ||
| 939 | }; | 1012 | }; |
| 940 | 1013 | ||
| 941 | void __init s3c2443_init_clocks(int xtal) | 1014 | void __init s3c2443_init_clocks(int xtal) |
| @@ -951,10 +1024,16 @@ void __init s3c2443_init_clocks(int xtal) | |||
| 951 | int ret; | 1024 | int ret; |
| 952 | int ptr; | 1025 | int ptr; |
| 953 | 1026 | ||
| 1027 | /* s3c2443 parents h and p clocks from prediv */ | ||
| 1028 | clk_h.parent = &clk_prediv; | ||
| 1029 | clk_p.parent = &clk_prediv; | ||
| 1030 | |||
| 954 | pll = s3c2443_get_mpll(mpllcon, xtal); | 1031 | pll = s3c2443_get_mpll(mpllcon, xtal); |
| 1032 | clk_msysclk.rate = pll; | ||
| 955 | 1033 | ||
| 956 | fclk = pll / s3c2443_fclk_div(clkdiv0); | 1034 | fclk = pll / s3c2443_fclk_div(clkdiv0); |
| 957 | hclk = fclk / s3c2443_get_prediv(clkdiv0); | 1035 | hclk = s3c2443_prediv_getrate(&clk_prediv); |
| 1036 | hclk = hclk / s3c2443_get_hdiv(clkdiv0); | ||
| 958 | hclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_HCLK) ? 2 : 1); | 1037 | hclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_HCLK) ? 2 : 1); |
| 959 | pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1); | 1038 | pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1); |
| 960 | 1039 | ||
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 6496eb645cee..2f772a3965c4 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -225,26 +225,28 @@ static void __init collie_init(void) | |||
| 225 | int ret = 0; | 225 | int ret = 0; |
| 226 | 226 | ||
| 227 | /* cpu initialize */ | 227 | /* cpu initialize */ |
| 228 | GAFR = ( GPIO_SSP_TXD | \ | 228 | GAFR = GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SSP_CLK | |
| 229 | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SSP_CLK | GPIO_TIC_ACK | \ | 229 | GPIO_MCP_CLK | GPIO_32_768kHz; |
| 230 | GPIO_32_768kHz ); | 230 | |
| 231 | 231 | GPDR = GPIO_LDD8 | GPIO_LDD9 | GPIO_LDD10 | GPIO_LDD11 | GPIO_LDD12 | | |
| 232 | GPDR = ( GPIO_LDD8 | GPIO_LDD9 | GPIO_LDD10 | GPIO_LDD11 | GPIO_LDD12 | \ | 232 | GPIO_LDD13 | GPIO_LDD14 | GPIO_LDD15 | GPIO_SSP_TXD | |
| 233 | GPIO_LDD13 | GPIO_LDD14 | GPIO_LDD15 | GPIO_SSP_TXD | \ | 233 | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SDLC_SCLK | |
| 234 | GPIO_SSP_SCLK | GPIO_SSP_SFRM | GPIO_SDLC_SCLK | \ | 234 | COLLIE_GPIO_UCB1x00_RESET | COLLIE_GPIO_nMIC_ON | |
| 235 | GPIO_SDLC_AAF | GPIO_UART_SCLK1 | GPIO_32_768kHz ); | 235 | COLLIE_GPIO_nREMOCON_ON | GPIO_32_768kHz; |
| 236 | GPLR = GPIO_GPIO18; | 236 | |
| 237 | 237 | PPDR = PPC_LDD0 | PPC_LDD1 | PPC_LDD2 | PPC_LDD3 | PPC_LDD4 | PPC_LDD5 | | |
| 238 | // PPC pin setting | 238 | PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | |
| 239 | PPDR = ( PPC_LDD0 | PPC_LDD1 | PPC_LDD2 | PPC_LDD3 | PPC_LDD4 | PPC_LDD5 | \ | 239 | PPC_TXD1 | PPC_TXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM; |
| 240 | PPC_LDD6 | PPC_LDD7 | PPC_L_PCLK | PPC_L_LCLK | PPC_L_FCLK | PPC_L_BIAS | \ | 240 | |
| 241 | PPC_TXD1 | PPC_TXD2 | PPC_RXD2 | PPC_TXD3 | PPC_TXD4 | PPC_SCLK | PPC_SFRM ); | 241 | PWER = COLLIE_GPIO_AC_IN | COLLIE_GPIO_CO | COLLIE_GPIO_ON_KEY | |
| 242 | 242 | COLLIE_GPIO_WAKEUP | COLLIE_GPIO_nREMOCON_INT | PWER_RTC; | |
| 243 | PSDR = ( PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4 ); | 243 | |
| 244 | 244 | PGSR = COLLIE_GPIO_nREMOCON_ON; | |
| 245 | GAFR |= GPIO_32_768kHz; | 245 | |
| 246 | GPDR |= GPIO_32_768kHz; | 246 | PSDR = PPC_RXD1 | PPC_RXD2 | PPC_RXD3 | PPC_RXD4; |
| 247 | TUCR = TUCR_32_768kHz; | 247 | |
| 248 | PCFR = PCFR_OPDE; | ||
| 249 | |||
| 248 | 250 | ||
| 249 | platform_scoop_config = &collie_pcmcia_config; | 251 | platform_scoop_config = &collie_pcmcia_config; |
| 250 | 252 | ||
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 750d895cd287..a2c8b006d710 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -365,7 +365,7 @@ config CPU_XSC3 | |||
| 365 | # Feroceon | 365 | # Feroceon |
| 366 | config CPU_FEROCEON | 366 | config CPU_FEROCEON |
| 367 | bool | 367 | bool |
| 368 | depends on ARCH_ORION5X | 368 | depends on ARCH_ORION5X || ARCH_LOKI || ARCH_KIRKWOOD || ARCH_MV78XX0 |
| 369 | default y | 369 | default y |
| 370 | select CPU_32v5 | 370 | select CPU_32v5 |
| 371 | select CPU_ABRT_EV5T | 371 | select CPU_ABRT_EV5T |
| @@ -373,7 +373,7 @@ config CPU_FEROCEON | |||
| 373 | select CPU_CACHE_VIVT | 373 | select CPU_CACHE_VIVT |
| 374 | select CPU_CP15_MMU | 374 | select CPU_CP15_MMU |
| 375 | select CPU_COPY_FEROCEON if MMU | 375 | select CPU_COPY_FEROCEON if MMU |
| 376 | select CPU_TLB_V4WBI if MMU | 376 | select CPU_TLB_FEROCEON if MMU |
| 377 | 377 | ||
| 378 | config CPU_FEROCEON_OLD_ID | 378 | config CPU_FEROCEON_OLD_ID |
| 379 | bool "Accept early Feroceon cores with an ARM926 ID" | 379 | bool "Accept early Feroceon cores with an ARM926 ID" |
| @@ -551,6 +551,11 @@ config CPU_TLB_V4WBI | |||
| 551 | ARM Architecture Version 4 TLB with writeback cache and invalidate | 551 | ARM Architecture Version 4 TLB with writeback cache and invalidate |
| 552 | instruction cache entry. | 552 | instruction cache entry. |
| 553 | 553 | ||
| 554 | config CPU_TLB_FEROCEON | ||
| 555 | bool | ||
| 556 | help | ||
| 557 | Feroceon TLB (v4wbi with non-outer-cachable page table walks). | ||
| 558 | |||
| 554 | config CPU_TLB_V6 | 559 | config CPU_TLB_V6 |
| 555 | bool | 560 | bool |
| 556 | 561 | ||
| @@ -709,6 +714,14 @@ config OUTER_CACHE | |||
| 709 | bool | 714 | bool |
| 710 | default n | 715 | default n |
| 711 | 716 | ||
| 717 | config CACHE_FEROCEON_L2 | ||
| 718 | bool "Enable the Feroceon L2 cache controller" | ||
| 719 | depends on ARCH_KIRKWOOD || ARCH_MV78XX0 | ||
| 720 | default y | ||
| 721 | select OUTER_CACHE | ||
| 722 | help | ||
| 723 | This option enables the Feroceon L2 cache controller. | ||
| 724 | |||
| 712 | config CACHE_L2X0 | 725 | config CACHE_L2X0 |
| 713 | bool "Enable the L2x0 outer cache controller" | 726 | bool "Enable the L2x0 outer cache controller" |
| 714 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 | 727 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 |
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 32b2d2d213a6..f64b92557b11 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile | |||
| @@ -46,6 +46,7 @@ obj-$(CONFIG_CPU_TLB_V3) += tlb-v3.o | |||
| 46 | obj-$(CONFIG_CPU_TLB_V4WT) += tlb-v4.o | 46 | obj-$(CONFIG_CPU_TLB_V4WT) += tlb-v4.o |
| 47 | obj-$(CONFIG_CPU_TLB_V4WB) += tlb-v4wb.o | 47 | obj-$(CONFIG_CPU_TLB_V4WB) += tlb-v4wb.o |
| 48 | obj-$(CONFIG_CPU_TLB_V4WBI) += tlb-v4wbi.o | 48 | obj-$(CONFIG_CPU_TLB_V4WBI) += tlb-v4wbi.o |
| 49 | obj-$(CONFIG_CPU_TLB_FEROCEON) += tlb-v4wbi.o # reuse v4wbi TLB functions | ||
| 49 | obj-$(CONFIG_CPU_TLB_V6) += tlb-v6.o | 50 | obj-$(CONFIG_CPU_TLB_V6) += tlb-v6.o |
| 50 | obj-$(CONFIG_CPU_TLB_V7) += tlb-v7.o | 51 | obj-$(CONFIG_CPU_TLB_V7) += tlb-v7.o |
| 51 | 52 | ||
| @@ -73,4 +74,5 @@ obj-$(CONFIG_CPU_FEROCEON) += proc-feroceon.o | |||
| 73 | obj-$(CONFIG_CPU_V6) += proc-v6.o | 74 | obj-$(CONFIG_CPU_V6) += proc-v6.o |
| 74 | obj-$(CONFIG_CPU_V7) += proc-v7.o | 75 | obj-$(CONFIG_CPU_V7) += proc-v7.o |
| 75 | 76 | ||
| 77 | obj-$(CONFIG_CACHE_FEROCEON_L2) += cache-feroceon-l2.o | ||
| 76 | obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o | 78 | obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o |
diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c new file mode 100644 index 000000000000..20eec4ba173f --- /dev/null +++ b/arch/arm/mm/cache-feroceon-l2.c | |||
| @@ -0,0 +1,318 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mm/cache-feroceon-l2.c - Feroceon L2 cache controller support | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 Marvell Semiconductor | ||
| 5 | * | ||
| 6 | * This file is licensed under the terms of the GNU General Public | ||
| 7 | * License version 2. This program is licensed "as is" without any | ||
| 8 | * warranty of any kind, whether express or implied. | ||
| 9 | * | ||
| 10 | * References: | ||
| 11 | * - Unified Layer 2 Cache for Feroceon CPU Cores, | ||
| 12 | * Document ID MV-S104858-00, Rev. A, October 23 2007. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include <linux/init.h> | ||
| 16 | #include <asm/cacheflush.h> | ||
| 17 | #include <asm/plat-orion/cache-feroceon-l2.h> | ||
| 18 | |||
| 19 | |||
| 20 | /* | ||
| 21 | * Low-level cache maintenance operations. | ||
| 22 | * | ||
| 23 | * As well as the regular 'clean/invalidate/flush L2 cache line by | ||
| 24 | * MVA' instructions, the Feroceon L2 cache controller also features | ||
| 25 | * 'clean/invalidate L2 range by MVA' operations. | ||
| 26 | * | ||
| 27 | * Cache range operations are initiated by writing the start and | ||
| 28 | * end addresses to successive cp15 registers, and process every | ||
| 29 | * cache line whose first byte address lies in the inclusive range | ||
| 30 | * [start:end]. | ||
| 31 | * | ||
| 32 | * The cache range operations stall the CPU pipeline until completion. | ||
| 33 | * | ||
| 34 | * The range operations require two successive cp15 writes, in | ||
| 35 | * between which we don't want to be preempted. | ||
| 36 | */ | ||
| 37 | static inline void l2_clean_pa(unsigned long addr) | ||
| 38 | { | ||
| 39 | __asm__("mcr p15, 1, %0, c15, c9, 3" : : "r" (addr)); | ||
| 40 | } | ||
| 41 | |||
| 42 | static inline void l2_clean_mva_range(unsigned long start, unsigned long end) | ||
| 43 | { | ||
| 44 | unsigned long flags; | ||
| 45 | |||
| 46 | /* | ||
| 47 | * Make sure 'start' and 'end' reference the same page, as | ||
| 48 | * L2 is PIPT and range operations only do a TLB lookup on | ||
| 49 | * the start address. | ||
| 50 | */ | ||
| 51 | BUG_ON((start ^ end) & ~(PAGE_SIZE - 1)); | ||
| 52 | |||
| 53 | raw_local_irq_save(flags); | ||
| 54 | __asm__("mcr p15, 1, %0, c15, c9, 4" : : "r" (start)); | ||
| 55 | __asm__("mcr p15, 1, %0, c15, c9, 5" : : "r" (end)); | ||
| 56 | raw_local_irq_restore(flags); | ||
| 57 | } | ||
| 58 | |||
| 59 | static inline void l2_clean_pa_range(unsigned long start, unsigned long end) | ||
| 60 | { | ||
| 61 | l2_clean_mva_range(__phys_to_virt(start), __phys_to_virt(end)); | ||
| 62 | } | ||
| 63 | |||
| 64 | static inline void l2_clean_inv_pa(unsigned long addr) | ||
| 65 | { | ||
| 66 | __asm__("mcr p15, 1, %0, c15, c10, 3" : : "r" (addr)); | ||
| 67 | } | ||
| 68 | |||
| 69 | static inline void l2_inv_pa(unsigned long addr) | ||
| 70 | { | ||
| 71 | __asm__("mcr p15, 1, %0, c15, c11, 3" : : "r" (addr)); | ||
| 72 | } | ||
| 73 | |||
| 74 | static inline void l2_inv_mva_range(unsigned long start, unsigned long end) | ||
| 75 | { | ||
| 76 | unsigned long flags; | ||
| 77 | |||
| 78 | /* | ||
| 79 | * Make sure 'start' and 'end' reference the same page, as | ||
| 80 | * L2 is PIPT and range operations only do a TLB lookup on | ||
| 81 | * the start address. | ||
| 82 | */ | ||
| 83 | BUG_ON((start ^ end) & ~(PAGE_SIZE - 1)); | ||
| 84 | |||
| 85 | raw_local_irq_save(flags); | ||
| 86 | __asm__("mcr p15, 1, %0, c15, c11, 4" : : "r" (start)); | ||
| 87 | __asm__("mcr p15, 1, %0, c15, c11, 5" : : "r" (end)); | ||
| 88 | raw_local_irq_restore(flags); | ||
| 89 | } | ||
| 90 | |||
| 91 | static inline void l2_inv_pa_range(unsigned long start, unsigned long end) | ||
| 92 | { | ||
| 93 | l2_inv_mva_range(__phys_to_virt(start), __phys_to_virt(end)); | ||
| 94 | } | ||
| 95 | |||
| 96 | |||
| 97 | /* | ||
| 98 | * Linux primitives. | ||
| 99 | * | ||
| 100 | * Note that the end addresses passed to Linux primitives are | ||
| 101 | * noninclusive, while the hardware cache range operations use | ||
| 102 | * inclusive start and end addresses. | ||
| 103 | */ | ||
| 104 | #define CACHE_LINE_SIZE 32 | ||
| 105 | #define MAX_RANGE_SIZE 1024 | ||
| 106 | |||
| 107 | static int l2_wt_override; | ||
| 108 | |||
| 109 | static unsigned long calc_range_end(unsigned long start, unsigned long end) | ||
| 110 | { | ||
| 111 | unsigned long range_end; | ||
| 112 | |||
| 113 | BUG_ON(start & (CACHE_LINE_SIZE - 1)); | ||
| 114 | BUG_ON(end & (CACHE_LINE_SIZE - 1)); | ||
| 115 | |||
| 116 | /* | ||
| 117 | * Try to process all cache lines between 'start' and 'end'. | ||
| 118 | */ | ||
| 119 | range_end = end; | ||
| 120 | |||
| 121 | /* | ||
| 122 | * Limit the number of cache lines processed at once, | ||
| 123 | * since cache range operations stall the CPU pipeline | ||
| 124 | * until completion. | ||
| 125 | */ | ||
| 126 | if (range_end > start + MAX_RANGE_SIZE) | ||
| 127 | range_end = start + MAX_RANGE_SIZE; | ||
| 128 | |||
| 129 | /* | ||
| 130 | * Cache range operations can't straddle a page boundary. | ||
| 131 | */ | ||
| 132 | if (range_end > (start | (PAGE_SIZE - 1)) + 1) | ||
| 133 | range_end = (start | (PAGE_SIZE - 1)) + 1; | ||
| 134 | |||
| 135 | return range_end; | ||
| 136 | } | ||
| 137 | |||
| 138 | static void feroceon_l2_inv_range(unsigned long start, unsigned long end) | ||
| 139 | { | ||
| 140 | /* | ||
| 141 | * Clean and invalidate partial first cache line. | ||
| 142 | */ | ||
| 143 | if (start & (CACHE_LINE_SIZE - 1)) { | ||
| 144 | l2_clean_inv_pa(start & ~(CACHE_LINE_SIZE - 1)); | ||
| 145 | start = (start | (CACHE_LINE_SIZE - 1)) + 1; | ||
| 146 | } | ||
| 147 | |||
| 148 | /* | ||
| 149 | * Clean and invalidate partial last cache line. | ||
| 150 | */ | ||
| 151 | if (end & (CACHE_LINE_SIZE - 1)) { | ||
| 152 | l2_clean_inv_pa(end & ~(CACHE_LINE_SIZE - 1)); | ||
| 153 | end &= ~(CACHE_LINE_SIZE - 1); | ||
| 154 | } | ||
| 155 | |||
| 156 | /* | ||
| 157 | * Invalidate all full cache lines between 'start' and 'end'. | ||
| 158 | */ | ||
| 159 | while (start != end) { | ||
| 160 | unsigned long range_end = calc_range_end(start, end); | ||
| 161 | l2_inv_pa_range(start, range_end - CACHE_LINE_SIZE); | ||
| 162 | start = range_end; | ||
| 163 | } | ||
| 164 | |||
| 165 | dsb(); | ||
| 166 | } | ||
| 167 | |||
| 168 | static void feroceon_l2_clean_range(unsigned long start, unsigned long end) | ||
| 169 | { | ||
| 170 | /* | ||
| 171 | * If L2 is forced to WT, the L2 will always be clean and we | ||
| 172 | * don't need to do anything here. | ||
| 173 | */ | ||
| 174 | if (!l2_wt_override) { | ||
| 175 | start &= ~(CACHE_LINE_SIZE - 1); | ||
| 176 | end = (end + CACHE_LINE_SIZE - 1) & ~(CACHE_LINE_SIZE - 1); | ||
| 177 | while (start != end) { | ||
| 178 | unsigned long range_end = calc_range_end(start, end); | ||
| 179 | l2_clean_pa_range(start, range_end - CACHE_LINE_SIZE); | ||
| 180 | start = range_end; | ||
| 181 | } | ||
| 182 | } | ||
| 183 | |||
| 184 | dsb(); | ||
| 185 | } | ||
| 186 | |||
| 187 | static void feroceon_l2_flush_range(unsigned long start, unsigned long end) | ||
| 188 | { | ||
| 189 | start &= ~(CACHE_LINE_SIZE - 1); | ||
| 190 | end = (end + CACHE_LINE_SIZE - 1) & ~(CACHE_LINE_SIZE - 1); | ||
| 191 | while (start != end) { | ||
| 192 | unsigned long range_end = calc_range_end(start, end); | ||
| 193 | if (!l2_wt_override) | ||
| 194 | l2_clean_pa_range(start, range_end - CACHE_LINE_SIZE); | ||
| 195 | l2_inv_pa_range(start, range_end - CACHE_LINE_SIZE); | ||
| 196 | start = range_end; | ||
| 197 | } | ||
| 198 | |||
| 199 | dsb(); | ||
| 200 | } | ||
| 201 | |||
| 202 | |||
| 203 | /* | ||
| 204 | * Routines to disable and re-enable the D-cache and I-cache at run | ||
| 205 | * time. These are necessary because the L2 cache can only be enabled | ||
| 206 | * or disabled while the L1 Dcache and Icache are both disabled. | ||
| 207 | */ | ||
| 208 | static void __init invalidate_and_disable_dcache(void) | ||
| 209 | { | ||
| 210 | u32 cr; | ||
| 211 | |||
| 212 | cr = get_cr(); | ||
| 213 | if (cr & CR_C) { | ||
| 214 | unsigned long flags; | ||
| 215 | |||
| 216 | raw_local_irq_save(flags); | ||
| 217 | flush_cache_all(); | ||
| 218 | set_cr(cr & ~CR_C); | ||
| 219 | raw_local_irq_restore(flags); | ||
| 220 | } | ||
| 221 | } | ||
| 222 | |||
| 223 | static void __init enable_dcache(void) | ||
| 224 | { | ||
| 225 | u32 cr; | ||
| 226 | |||
| 227 | cr = get_cr(); | ||
| 228 | if (!(cr & CR_C)) | ||
| 229 | set_cr(cr | CR_C); | ||
| 230 | } | ||
| 231 | |||
| 232 | static void __init __invalidate_icache(void) | ||
| 233 | { | ||
| 234 | int dummy; | ||
| 235 | |||
| 236 | __asm__ __volatile__("mcr p15, 0, %0, c7, c5, 0\n" : "=r" (dummy)); | ||
| 237 | } | ||
| 238 | |||
| 239 | static void __init invalidate_and_disable_icache(void) | ||
| 240 | { | ||
| 241 | u32 cr; | ||
| 242 | |||
| 243 | cr = get_cr(); | ||
| 244 | if (cr & CR_I) { | ||
| 245 | set_cr(cr & ~CR_I); | ||
| 246 | __invalidate_icache(); | ||
| 247 | } | ||
| 248 | } | ||
| 249 | |||
| 250 | static void __init enable_icache(void) | ||
| 251 | { | ||
| 252 | u32 cr; | ||
| 253 | |||
| 254 | cr = get_cr(); | ||
| 255 | if (!(cr & CR_I)) | ||
| 256 | set_cr(cr | CR_I); | ||
| 257 | } | ||
| 258 | |||
| 259 | static inline u32 read_extra_features(void) | ||
| 260 | { | ||
| 261 | u32 u; | ||
| 262 | |||
| 263 | __asm__("mrc p15, 1, %0, c15, c1, 0" : "=r" (u)); | ||
| 264 | |||
| 265 | return u; | ||
| 266 | } | ||
| 267 | |||
| 268 | static inline void write_extra_features(u32 u) | ||
| 269 | { | ||
| 270 | __asm__("mcr p15, 1, %0, c15, c1, 0" : : "r" (u)); | ||
| 271 | } | ||
| 272 | |||
| 273 | static void __init disable_l2_prefetch(void) | ||
| 274 | { | ||
| 275 | u32 u; | ||
| 276 | |||
| 277 | /* | ||
| 278 | * Read the CPU Extra Features register and verify that the | ||
| 279 | * Disable L2 Prefetch bit is set. | ||
| 280 | */ | ||
| 281 | u = read_extra_features(); | ||
| 282 | if (!(u & 0x01000000)) { | ||
| 283 | printk(KERN_INFO "Feroceon L2: Disabling L2 prefetch.\n"); | ||
| 284 | write_extra_features(u | 0x01000000); | ||
| 285 | } | ||
| 286 | } | ||
| 287 | |||
| 288 | static void __init enable_l2(void) | ||
| 289 | { | ||
| 290 | u32 u; | ||
| 291 | |||
| 292 | u = read_extra_features(); | ||
| 293 | if (!(u & 0x00400000)) { | ||
| 294 | printk(KERN_INFO "Feroceon L2: Enabling L2\n"); | ||
| 295 | |||
| 296 | invalidate_and_disable_dcache(); | ||
| 297 | invalidate_and_disable_icache(); | ||
| 298 | write_extra_features(u | 0x00400000); | ||
| 299 | enable_icache(); | ||
| 300 | enable_dcache(); | ||
| 301 | } | ||
| 302 | } | ||
| 303 | |||
| 304 | void __init feroceon_l2_init(int __l2_wt_override) | ||
| 305 | { | ||
| 306 | l2_wt_override = __l2_wt_override; | ||
| 307 | |||
| 308 | disable_l2_prefetch(); | ||
| 309 | |||
| 310 | outer_cache.inv_range = feroceon_l2_inv_range; | ||
| 311 | outer_cache.clean_range = feroceon_l2_clean_range; | ||
| 312 | outer_cache.flush_range = feroceon_l2_flush_range; | ||
| 313 | |||
| 314 | enable_l2(); | ||
| 315 | |||
| 316 | printk(KERN_INFO "Feroceon L2: Cache support initialised%s.\n", | ||
| 317 | l2_wt_override ? ", in WT override mode" : ""); | ||
| 318 | } | ||
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c index 44558d5f9313..fbfa26058442 100644 --- a/arch/arm/mm/fault-armv.c +++ b/arch/arm/mm/fault-armv.c | |||
| @@ -144,13 +144,17 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, pte_t pte) | |||
| 144 | page = pfn_to_page(pfn); | 144 | page = pfn_to_page(pfn); |
| 145 | mapping = page_mapping(page); | 145 | mapping = page_mapping(page); |
| 146 | if (mapping) { | 146 | if (mapping) { |
| 147 | #ifndef CONFIG_SMP | ||
| 147 | int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags); | 148 | int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags); |
| 148 | 149 | ||
| 149 | if (dirty) | 150 | if (dirty) |
| 150 | __flush_dcache_page(mapping, page); | 151 | __flush_dcache_page(mapping, page); |
| 152 | #endif | ||
| 151 | 153 | ||
| 152 | if (cache_is_vivt()) | 154 | if (cache_is_vivt()) |
| 153 | make_coherent(mapping, vma, addr, pfn); | 155 | make_coherent(mapping, vma, addr, pfn); |
| 156 | else if (vma->vm_flags & VM_EXEC) | ||
| 157 | __flush_icache_all(); | ||
| 154 | } | 158 | } |
| 155 | } | 159 | } |
| 156 | 160 | ||
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 9df507d36e0b..029ee65fda2b 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c | |||
| @@ -199,6 +199,8 @@ void flush_dcache_page(struct page *page) | |||
| 199 | __flush_dcache_page(mapping, page); | 199 | __flush_dcache_page(mapping, page); |
| 200 | if (mapping && cache_is_vivt()) | 200 | if (mapping && cache_is_vivt()) |
| 201 | __flush_dcache_aliases(mapping, page); | 201 | __flush_dcache_aliases(mapping, page); |
| 202 | else if (mapping) | ||
| 203 | __flush_icache_all(); | ||
| 202 | } | 204 | } |
| 203 | } | 205 | } |
| 204 | EXPORT_SYMBOL(flush_dcache_page); | 206 | EXPORT_SYMBOL(flush_dcache_page); |
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S index a02c1712b52d..f2e5884c513a 100644 --- a/arch/arm/mm/proc-feroceon.S +++ b/arch/arm/mm/proc-feroceon.S | |||
| @@ -44,11 +44,31 @@ | |||
| 44 | */ | 44 | */ |
| 45 | #define CACHE_DLINESIZE 32 | 45 | #define CACHE_DLINESIZE 32 |
| 46 | 46 | ||
| 47 | .bss | ||
| 48 | .align 3 | ||
| 49 | __cache_params_loc: | ||
| 50 | .space 8 | ||
| 51 | |||
| 47 | .text | 52 | .text |
| 53 | __cache_params: | ||
| 54 | .word __cache_params_loc | ||
| 55 | |||
| 48 | /* | 56 | /* |
| 49 | * cpu_feroceon_proc_init() | 57 | * cpu_feroceon_proc_init() |
| 50 | */ | 58 | */ |
| 51 | ENTRY(cpu_feroceon_proc_init) | 59 | ENTRY(cpu_feroceon_proc_init) |
| 60 | mrc p15, 0, r0, c0, c0, 1 @ read cache type register | ||
| 61 | ldr r1, __cache_params | ||
| 62 | mov r2, #(16 << 5) | ||
| 63 | tst r0, #(1 << 16) @ get way | ||
| 64 | mov r0, r0, lsr #18 @ get cache size order | ||
| 65 | movne r3, #((4 - 1) << 30) @ 4-way | ||
| 66 | and r0, r0, #0xf | ||
| 67 | moveq r3, #0 @ 1-way | ||
| 68 | mov r2, r2, lsl r0 @ actual cache size | ||
| 69 | movne r2, r2, lsr #2 @ turned into # of sets | ||
| 70 | sub r2, r2, #(1 << 5) | ||
| 71 | stmia r1, {r2, r3} | ||
| 52 | mov pc, lr | 72 | mov pc, lr |
| 53 | 73 | ||
| 54 | /* | 74 | /* |
| @@ -59,6 +79,13 @@ ENTRY(cpu_feroceon_proc_fin) | |||
| 59 | mov ip, #PSR_F_BIT | PSR_I_BIT | SVC_MODE | 79 | mov ip, #PSR_F_BIT | PSR_I_BIT | SVC_MODE |
| 60 | msr cpsr_c, ip | 80 | msr cpsr_c, ip |
| 61 | bl feroceon_flush_kern_cache_all | 81 | bl feroceon_flush_kern_cache_all |
| 82 | |||
| 83 | #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH) | ||
| 84 | mov r0, #0 | ||
| 85 | mcr p15, 1, r0, c15, c9, 0 @ clean L2 | ||
| 86 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | ||
| 87 | #endif | ||
| 88 | |||
| 62 | mrc p15, 0, r0, c1, c0, 0 @ ctrl register | 89 | mrc p15, 0, r0, c1, c0, 0 @ ctrl register |
| 63 | bic r0, r0, #0x1000 @ ...i............ | 90 | bic r0, r0, #0x1000 @ ...i............ |
| 64 | bic r0, r0, #0x000e @ ............wca. | 91 | bic r0, r0, #0x000e @ ............wca. |
| @@ -117,11 +144,19 @@ ENTRY(feroceon_flush_user_cache_all) | |||
| 117 | */ | 144 | */ |
| 118 | ENTRY(feroceon_flush_kern_cache_all) | 145 | ENTRY(feroceon_flush_kern_cache_all) |
| 119 | mov r2, #VM_EXEC | 146 | mov r2, #VM_EXEC |
| 120 | mov ip, #0 | 147 | |
| 121 | __flush_whole_cache: | 148 | __flush_whole_cache: |
| 122 | 1: mrc p15, 0, r15, c7, c14, 3 @ test,clean,invalidate | 149 | ldr r1, __cache_params |
| 123 | bne 1b | 150 | ldmia r1, {r1, r3} |
| 151 | 1: orr ip, r1, r3 | ||
| 152 | 2: mcr p15, 0, ip, c7, c14, 2 @ clean + invalidate D set/way | ||
| 153 | subs ip, ip, #(1 << 30) @ next way | ||
| 154 | bcs 2b | ||
| 155 | subs r1, r1, #(1 << 5) @ next set | ||
| 156 | bcs 1b | ||
| 157 | |||
| 124 | tst r2, #VM_EXEC | 158 | tst r2, #VM_EXEC |
| 159 | mov ip, #0 | ||
| 125 | mcrne p15, 0, ip, c7, c5, 0 @ invalidate I cache | 160 | mcrne p15, 0, ip, c7, c5, 0 @ invalidate I cache |
| 126 | mcrne p15, 0, ip, c7, c10, 4 @ drain WB | 161 | mcrne p15, 0, ip, c7, c10, 4 @ drain WB |
| 127 | mov pc, lr | 162 | mov pc, lr |
| @@ -138,7 +173,6 @@ __flush_whole_cache: | |||
| 138 | */ | 173 | */ |
| 139 | .align 5 | 174 | .align 5 |
| 140 | ENTRY(feroceon_flush_user_cache_range) | 175 | ENTRY(feroceon_flush_user_cache_range) |
| 141 | mov ip, #0 | ||
| 142 | sub r3, r1, r0 @ calculate total size | 176 | sub r3, r1, r0 @ calculate total size |
| 143 | cmp r3, #CACHE_DLIMIT | 177 | cmp r3, #CACHE_DLIMIT |
| 144 | bgt __flush_whole_cache | 178 | bgt __flush_whole_cache |
| @@ -152,6 +186,7 @@ ENTRY(feroceon_flush_user_cache_range) | |||
| 152 | cmp r0, r1 | 186 | cmp r0, r1 |
| 153 | blo 1b | 187 | blo 1b |
| 154 | tst r2, #VM_EXEC | 188 | tst r2, #VM_EXEC |
| 189 | mov ip, #0 | ||
| 155 | mcrne p15, 0, ip, c7, c10, 4 @ drain WB | 190 | mcrne p15, 0, ip, c7, c10, 4 @ drain WB |
| 156 | mov pc, lr | 191 | mov pc, lr |
| 157 | 192 | ||
| @@ -209,6 +244,20 @@ ENTRY(feroceon_flush_kern_dcache_page) | |||
| 209 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | 244 | mcr p15, 0, r0, c7, c10, 4 @ drain WB |
| 210 | mov pc, lr | 245 | mov pc, lr |
| 211 | 246 | ||
| 247 | .align 5 | ||
| 248 | ENTRY(feroceon_range_flush_kern_dcache_page) | ||
| 249 | mrs r2, cpsr | ||
| 250 | add r1, r0, #PAGE_SZ - CACHE_DLINESIZE @ top addr is inclusive | ||
| 251 | orr r3, r2, #PSR_I_BIT | ||
| 252 | msr cpsr_c, r3 @ disable interrupts | ||
| 253 | mcr p15, 5, r0, c15, c15, 0 @ D clean/inv range start | ||
| 254 | mcr p15, 5, r1, c15, c15, 1 @ D clean/inv range top | ||
| 255 | msr cpsr_c, r2 @ restore interrupts | ||
| 256 | mov r0, #0 | ||
| 257 | mcr p15, 0, r0, c7, c5, 0 @ invalidate I cache | ||
| 258 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | ||
| 259 | mov pc, lr | ||
| 260 | |||
| 212 | /* | 261 | /* |
| 213 | * dma_inv_range(start, end) | 262 | * dma_inv_range(start, end) |
| 214 | * | 263 | * |
| @@ -225,10 +274,10 @@ ENTRY(feroceon_flush_kern_dcache_page) | |||
| 225 | .align 5 | 274 | .align 5 |
| 226 | ENTRY(feroceon_dma_inv_range) | 275 | ENTRY(feroceon_dma_inv_range) |
| 227 | tst r0, #CACHE_DLINESIZE - 1 | 276 | tst r0, #CACHE_DLINESIZE - 1 |
| 277 | bic r0, r0, #CACHE_DLINESIZE - 1 | ||
| 228 | mcrne p15, 0, r0, c7, c10, 1 @ clean D entry | 278 | mcrne p15, 0, r0, c7, c10, 1 @ clean D entry |
| 229 | tst r1, #CACHE_DLINESIZE - 1 | 279 | tst r1, #CACHE_DLINESIZE - 1 |
| 230 | mcrne p15, 0, r1, c7, c10, 1 @ clean D entry | 280 | mcrne p15, 0, r1, c7, c10, 1 @ clean D entry |
| 231 | bic r0, r0, #CACHE_DLINESIZE - 1 | ||
| 232 | 1: mcr p15, 0, r0, c7, c6, 1 @ invalidate D entry | 281 | 1: mcr p15, 0, r0, c7, c6, 1 @ invalidate D entry |
| 233 | add r0, r0, #CACHE_DLINESIZE | 282 | add r0, r0, #CACHE_DLINESIZE |
| 234 | cmp r0, r1 | 283 | cmp r0, r1 |
| @@ -236,6 +285,22 @@ ENTRY(feroceon_dma_inv_range) | |||
| 236 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | 285 | mcr p15, 0, r0, c7, c10, 4 @ drain WB |
| 237 | mov pc, lr | 286 | mov pc, lr |
| 238 | 287 | ||
| 288 | .align 5 | ||
| 289 | ENTRY(feroceon_range_dma_inv_range) | ||
| 290 | mrs r2, cpsr | ||
| 291 | tst r0, #CACHE_DLINESIZE - 1 | ||
| 292 | mcrne p15, 0, r0, c7, c10, 1 @ clean D entry | ||
| 293 | tst r1, #CACHE_DLINESIZE - 1 | ||
| 294 | mcrne p15, 0, r1, c7, c10, 1 @ clean D entry | ||
| 295 | cmp r1, r0 | ||
| 296 | subne r1, r1, #1 @ top address is inclusive | ||
| 297 | orr r3, r2, #PSR_I_BIT | ||
| 298 | msr cpsr_c, r3 @ disable interrupts | ||
| 299 | mcr p15, 5, r0, c15, c14, 0 @ D inv range start | ||
| 300 | mcr p15, 5, r1, c15, c14, 1 @ D inv range top | ||
| 301 | msr cpsr_c, r2 @ restore interrupts | ||
| 302 | mov pc, lr | ||
| 303 | |||
| 239 | /* | 304 | /* |
| 240 | * dma_clean_range(start, end) | 305 | * dma_clean_range(start, end) |
| 241 | * | 306 | * |
| @@ -256,6 +321,19 @@ ENTRY(feroceon_dma_clean_range) | |||
| 256 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | 321 | mcr p15, 0, r0, c7, c10, 4 @ drain WB |
| 257 | mov pc, lr | 322 | mov pc, lr |
| 258 | 323 | ||
| 324 | .align 5 | ||
| 325 | ENTRY(feroceon_range_dma_clean_range) | ||
| 326 | mrs r2, cpsr | ||
| 327 | cmp r1, r0 | ||
| 328 | subne r1, r1, #1 @ top address is inclusive | ||
| 329 | orr r3, r2, #PSR_I_BIT | ||
| 330 | msr cpsr_c, r3 @ disable interrupts | ||
| 331 | mcr p15, 5, r0, c15, c13, 0 @ D clean range start | ||
| 332 | mcr p15, 5, r1, c15, c13, 1 @ D clean range top | ||
| 333 | msr cpsr_c, r2 @ restore interrupts | ||
| 334 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | ||
| 335 | mov pc, lr | ||
| 336 | |||
| 259 | /* | 337 | /* |
| 260 | * dma_flush_range(start, end) | 338 | * dma_flush_range(start, end) |
| 261 | * | 339 | * |
| @@ -274,6 +352,19 @@ ENTRY(feroceon_dma_flush_range) | |||
| 274 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | 352 | mcr p15, 0, r0, c7, c10, 4 @ drain WB |
| 275 | mov pc, lr | 353 | mov pc, lr |
| 276 | 354 | ||
| 355 | .align 5 | ||
| 356 | ENTRY(feroceon_range_dma_flush_range) | ||
| 357 | mrs r2, cpsr | ||
| 358 | cmp r1, r0 | ||
| 359 | subne r1, r1, #1 @ top address is inclusive | ||
| 360 | orr r3, r2, #PSR_I_BIT | ||
| 361 | msr cpsr_c, r3 @ disable interrupts | ||
| 362 | mcr p15, 5, r0, c15, c15, 0 @ D clean/inv range start | ||
| 363 | mcr p15, 5, r1, c15, c15, 1 @ D clean/inv range top | ||
| 364 | msr cpsr_c, r2 @ restore interrupts | ||
| 365 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | ||
| 366 | mov pc, lr | ||
| 367 | |||
| 277 | ENTRY(feroceon_cache_fns) | 368 | ENTRY(feroceon_cache_fns) |
| 278 | .long feroceon_flush_kern_cache_all | 369 | .long feroceon_flush_kern_cache_all |
| 279 | .long feroceon_flush_user_cache_all | 370 | .long feroceon_flush_user_cache_all |
| @@ -285,12 +376,33 @@ ENTRY(feroceon_cache_fns) | |||
| 285 | .long feroceon_dma_clean_range | 376 | .long feroceon_dma_clean_range |
| 286 | .long feroceon_dma_flush_range | 377 | .long feroceon_dma_flush_range |
| 287 | 378 | ||
| 379 | ENTRY(feroceon_range_cache_fns) | ||
| 380 | .long feroceon_flush_kern_cache_all | ||
| 381 | .long feroceon_flush_user_cache_all | ||
| 382 | .long feroceon_flush_user_cache_range | ||
| 383 | .long feroceon_coherent_kern_range | ||
| 384 | .long feroceon_coherent_user_range | ||
| 385 | .long feroceon_range_flush_kern_dcache_page | ||
| 386 | .long feroceon_range_dma_inv_range | ||
| 387 | .long feroceon_range_dma_clean_range | ||
| 388 | .long feroceon_range_dma_flush_range | ||
| 389 | |||
| 288 | .align 5 | 390 | .align 5 |
| 289 | ENTRY(cpu_feroceon_dcache_clean_area) | 391 | ENTRY(cpu_feroceon_dcache_clean_area) |
| 392 | #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH) | ||
| 393 | mov r2, r0 | ||
| 394 | mov r3, r1 | ||
| 395 | #endif | ||
| 290 | 1: mcr p15, 0, r0, c7, c10, 1 @ clean D entry | 396 | 1: mcr p15, 0, r0, c7, c10, 1 @ clean D entry |
| 291 | add r0, r0, #CACHE_DLINESIZE | 397 | add r0, r0, #CACHE_DLINESIZE |
| 292 | subs r1, r1, #CACHE_DLINESIZE | 398 | subs r1, r1, #CACHE_DLINESIZE |
| 293 | bhi 1b | 399 | bhi 1b |
| 400 | #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH) | ||
| 401 | 1: mcr p15, 1, r2, c15, c9, 1 @ clean L2 entry | ||
| 402 | add r2, r2, #CACHE_DLINESIZE | ||
| 403 | subs r3, r3, #CACHE_DLINESIZE | ||
| 404 | bhi 1b | ||
| 405 | #endif | ||
| 294 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | 406 | mcr p15, 0, r0, c7, c10, 4 @ drain WB |
| 295 | mov pc, lr | 407 | mov pc, lr |
| 296 | 408 | ||
| @@ -306,16 +418,25 @@ ENTRY(cpu_feroceon_dcache_clean_area) | |||
| 306 | .align 5 | 418 | .align 5 |
| 307 | ENTRY(cpu_feroceon_switch_mm) | 419 | ENTRY(cpu_feroceon_switch_mm) |
| 308 | #ifdef CONFIG_MMU | 420 | #ifdef CONFIG_MMU |
| 309 | mov ip, #0 | 421 | /* |
| 310 | @ && 'Clean & Invalidate whole DCache' | 422 | * Note: we wish to call __flush_whole_cache but we need to preserve |
| 311 | 1: mrc p15, 0, r15, c7, c14, 3 @ test,clean,invalidate | 423 | * lr to do so. The only way without touching main memory is to |
| 312 | bne 1b | 424 | * use r2 which is normally used to test the VM_EXEC flag, and |
| 313 | mcr p15, 0, ip, c7, c5, 0 @ invalidate I cache | 425 | * compensate locally for the skipped ops if it is not set. |
| 314 | mcr p15, 0, ip, c7, c10, 4 @ drain WB | 426 | */ |
| 427 | mov r2, lr @ abuse r2 to preserve lr | ||
| 428 | bl __flush_whole_cache | ||
| 429 | @ if r2 contains the VM_EXEC bit then the next 2 ops are done already | ||
| 430 | tst r2, #VM_EXEC | ||
| 431 | mcreq p15, 0, ip, c7, c5, 0 @ invalidate I cache | ||
| 432 | mcreq p15, 0, ip, c7, c10, 4 @ drain WB | ||
| 433 | |||
| 315 | mcr p15, 0, r0, c2, c0, 0 @ load page table pointer | 434 | mcr p15, 0, r0, c2, c0, 0 @ load page table pointer |
| 316 | mcr p15, 0, ip, c8, c7, 0 @ invalidate I & D TLBs | 435 | mcr p15, 0, ip, c8, c7, 0 @ invalidate I & D TLBs |
| 317 | #endif | 436 | mov pc, r2 |
| 437 | #else | ||
| 318 | mov pc, lr | 438 | mov pc, lr |
| 439 | #endif | ||
| 319 | 440 | ||
| 320 | /* | 441 | /* |
| 321 | * cpu_feroceon_set_pte_ext(ptep, pte, ext) | 442 | * cpu_feroceon_set_pte_ext(ptep, pte, ext) |
| @@ -345,6 +466,9 @@ ENTRY(cpu_feroceon_set_pte_ext) | |||
| 345 | str r2, [r0] @ hardware version | 466 | str r2, [r0] @ hardware version |
| 346 | mov r0, r0 | 467 | mov r0, r0 |
| 347 | mcr p15, 0, r0, c7, c10, 1 @ clean D entry | 468 | mcr p15, 0, r0, c7, c10, 1 @ clean D entry |
| 469 | #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH) | ||
| 470 | mcr p15, 1, r0, c15, c9, 1 @ clean L2 entry | ||
| 471 | #endif | ||
| 348 | mcr p15, 0, r0, c7, c10, 4 @ drain WB | 472 | mcr p15, 0, r0, c7, c10, 4 @ drain WB |
| 349 | #endif | 473 | #endif |
| 350 | mov pc, lr | 474 | mov pc, lr |
| @@ -369,14 +493,15 @@ __feroceon_setup: | |||
| 369 | .size __feroceon_setup, . - __feroceon_setup | 493 | .size __feroceon_setup, . - __feroceon_setup |
| 370 | 494 | ||
| 371 | /* | 495 | /* |
| 372 | * R | 496 | * B |
| 373 | * .RVI ZFRS BLDP WCAM | 497 | * R P |
| 374 | * .011 0001 ..11 0101 | 498 | * .RVI UFRS BLDP WCAM |
| 499 | * .011 .001 ..11 0101 | ||
| 375 | * | 500 | * |
| 376 | */ | 501 | */ |
| 377 | .type feroceon_crval, #object | 502 | .type feroceon_crval, #object |
| 378 | feroceon_crval: | 503 | feroceon_crval: |
| 379 | crval clear=0x00007f3f, mmuset=0x00003135, ucset=0x00001134 | 504 | crval clear=0x0000773f, mmuset=0x00003135, ucset=0x00001134 |
| 380 | 505 | ||
| 381 | __INITDATA | 506 | __INITDATA |
| 382 | 507 | ||
| @@ -414,6 +539,21 @@ cpu_feroceon_name: | |||
| 414 | .asciz "Feroceon" | 539 | .asciz "Feroceon" |
| 415 | .size cpu_feroceon_name, . - cpu_feroceon_name | 540 | .size cpu_feroceon_name, . - cpu_feroceon_name |
| 416 | 541 | ||
| 542 | .type cpu_88fr531_name, #object | ||
| 543 | cpu_88fr531_name: | ||
| 544 | .asciz "Feroceon 88FR531-vd" | ||
| 545 | .size cpu_88fr531_name, . - cpu_88fr531_name | ||
| 546 | |||
| 547 | .type cpu_88fr571_name, #object | ||
| 548 | cpu_88fr571_name: | ||
| 549 | .asciz "Feroceon 88FR571-vd" | ||
| 550 | .size cpu_88fr571_name, . - cpu_88fr571_name | ||
| 551 | |||
| 552 | .type cpu_88fr131_name, #object | ||
| 553 | cpu_88fr131_name: | ||
| 554 | .asciz "Feroceon 88FR131" | ||
| 555 | .size cpu_88fr131_name, . - cpu_88fr131_name | ||
| 556 | |||
| 417 | .align | 557 | .align |
| 418 | 558 | ||
| 419 | .section ".proc.info.init", #alloc, #execinstr | 559 | .section ".proc.info.init", #alloc, #execinstr |
| @@ -421,15 +561,15 @@ cpu_feroceon_name: | |||
| 421 | #ifdef CONFIG_CPU_FEROCEON_OLD_ID | 561 | #ifdef CONFIG_CPU_FEROCEON_OLD_ID |
| 422 | .type __feroceon_old_id_proc_info,#object | 562 | .type __feroceon_old_id_proc_info,#object |
| 423 | __feroceon_old_id_proc_info: | 563 | __feroceon_old_id_proc_info: |
| 424 | .long 0x41069260 | 564 | .long 0x41009260 |
| 425 | .long 0xfffffff0 | 565 | .long 0xff00fff0 |
| 426 | .long PMD_TYPE_SECT | \ | 566 | .long PMD_TYPE_SECT | \ |
| 427 | PMD_SECT_BUFFERABLE | \ | 567 | PMD_SECT_BUFFERABLE | \ |
| 428 | PMD_SECT_CACHEABLE | \ | 568 | PMD_SECT_CACHEABLE | \ |
| 429 | PMD_BIT4 | \ | 569 | PMD_BIT4 | \ |
| 430 | PMD_SECT_AP_WRITE | \ | 570 | PMD_SECT_AP_WRITE | \ |
| 431 | PMD_SECT_AP_READ | 571 | PMD_SECT_AP_READ |
| 432 | .long PMD_TYPE_SECT | \ | 572 | .long PMD_TYPE_SECT | \ |
| 433 | PMD_BIT4 | \ | 573 | PMD_BIT4 | \ |
| 434 | PMD_SECT_AP_WRITE | \ | 574 | PMD_SECT_AP_WRITE | \ |
| 435 | PMD_SECT_AP_READ | 575 | PMD_SECT_AP_READ |
| @@ -445,17 +585,17 @@ __feroceon_old_id_proc_info: | |||
| 445 | .size __feroceon_old_id_proc_info, . - __feroceon_old_id_proc_info | 585 | .size __feroceon_old_id_proc_info, . - __feroceon_old_id_proc_info |
| 446 | #endif | 586 | #endif |
| 447 | 587 | ||
| 448 | .type __feroceon_proc_info,#object | 588 | .type __88fr531_proc_info,#object |
| 449 | __feroceon_proc_info: | 589 | __88fr531_proc_info: |
| 450 | .long 0x56055310 | 590 | .long 0x56055310 |
| 451 | .long 0xfffffff0 | 591 | .long 0xfffffff0 |
| 452 | .long PMD_TYPE_SECT | \ | 592 | .long PMD_TYPE_SECT | \ |
| 453 | PMD_SECT_BUFFERABLE | \ | 593 | PMD_SECT_BUFFERABLE | \ |
| 454 | PMD_SECT_CACHEABLE | \ | 594 | PMD_SECT_CACHEABLE | \ |
| 455 | PMD_BIT4 | \ | 595 | PMD_BIT4 | \ |
| 456 | PMD_SECT_AP_WRITE | \ | 596 | PMD_SECT_AP_WRITE | \ |
| 457 | PMD_SECT_AP_READ | 597 | PMD_SECT_AP_READ |
| 458 | .long PMD_TYPE_SECT | \ | 598 | .long PMD_TYPE_SECT | \ |
| 459 | PMD_BIT4 | \ | 599 | PMD_BIT4 | \ |
| 460 | PMD_SECT_AP_WRITE | \ | 600 | PMD_SECT_AP_WRITE | \ |
| 461 | PMD_SECT_AP_READ | 601 | PMD_SECT_AP_READ |
| @@ -463,9 +603,59 @@ __feroceon_proc_info: | |||
| 463 | .long cpu_arch_name | 603 | .long cpu_arch_name |
| 464 | .long cpu_elf_name | 604 | .long cpu_elf_name |
| 465 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP | 605 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP |
| 466 | .long cpu_feroceon_name | 606 | .long cpu_88fr531_name |
| 467 | .long feroceon_processor_functions | 607 | .long feroceon_processor_functions |
| 468 | .long v4wbi_tlb_fns | 608 | .long v4wbi_tlb_fns |
| 469 | .long feroceon_user_fns | 609 | .long feroceon_user_fns |
| 470 | .long feroceon_cache_fns | 610 | .long feroceon_cache_fns |
| 471 | .size __feroceon_proc_info, . - __feroceon_proc_info | 611 | .size __88fr531_proc_info, . - __88fr531_proc_info |
| 612 | |||
| 613 | .type __88fr571_proc_info,#object | ||
| 614 | __88fr571_proc_info: | ||
| 615 | .long 0x56155710 | ||
| 616 | .long 0xfffffff0 | ||
| 617 | .long PMD_TYPE_SECT | \ | ||
| 618 | PMD_SECT_BUFFERABLE | \ | ||
| 619 | PMD_SECT_CACHEABLE | \ | ||
| 620 | PMD_BIT4 | \ | ||
| 621 | PMD_SECT_AP_WRITE | \ | ||
| 622 | PMD_SECT_AP_READ | ||
| 623 | .long PMD_TYPE_SECT | \ | ||
| 624 | PMD_BIT4 | \ | ||
| 625 | PMD_SECT_AP_WRITE | \ | ||
| 626 | PMD_SECT_AP_READ | ||
| 627 | b __feroceon_setup | ||
| 628 | .long cpu_arch_name | ||
| 629 | .long cpu_elf_name | ||
| 630 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP | ||
| 631 | .long cpu_88fr571_name | ||
| 632 | .long feroceon_processor_functions | ||
| 633 | .long v4wbi_tlb_fns | ||
| 634 | .long feroceon_user_fns | ||
| 635 | .long feroceon_range_cache_fns | ||
| 636 | .size __88fr571_proc_info, . - __88fr571_proc_info | ||
| 637 | |||
| 638 | .type __88fr131_proc_info,#object | ||
| 639 | __88fr131_proc_info: | ||
| 640 | .long 0x56251310 | ||
| 641 | .long 0xfffffff0 | ||
| 642 | .long PMD_TYPE_SECT | \ | ||
| 643 | PMD_SECT_BUFFERABLE | \ | ||
| 644 | PMD_SECT_CACHEABLE | \ | ||
| 645 | PMD_BIT4 | \ | ||
| 646 | PMD_SECT_AP_WRITE | \ | ||
| 647 | PMD_SECT_AP_READ | ||
| 648 | .long PMD_TYPE_SECT | \ | ||
| 649 | PMD_BIT4 | \ | ||
| 650 | PMD_SECT_AP_WRITE | \ | ||
| 651 | PMD_SECT_AP_READ | ||
| 652 | b __feroceon_setup | ||
| 653 | .long cpu_arch_name | ||
| 654 | .long cpu_elf_name | ||
| 655 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP | ||
| 656 | .long cpu_88fr131_name | ||
| 657 | .long feroceon_processor_functions | ||
| 658 | .long v4wbi_tlb_fns | ||
| 659 | .long feroceon_user_fns | ||
| 660 | .long feroceon_range_cache_fns | ||
| 661 | .size __88fr131_proc_info, . - __88fr131_proc_info | ||
diff --git a/arch/arm/plat-iop/gpio.c b/arch/arm/plat-iop/gpio.c index eda436083417..640e498c12ef 100644 --- a/arch/arm/plat-iop/gpio.c +++ b/arch/arm/plat-iop/gpio.c | |||
| @@ -11,6 +11,10 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/device.h> | 13 | #include <linux/device.h> |
| 14 | #include <linux/init.h> | ||
| 15 | #include <linux/types.h> | ||
| 16 | #include <linux/errno.h> | ||
| 17 | #include <linux/gpio.h> | ||
| 14 | #include <asm/hardware/iop3xx.h> | 18 | #include <asm/hardware/iop3xx.h> |
| 15 | 19 | ||
| 16 | void gpio_line_config(int line, int direction) | 20 | void gpio_line_config(int line, int direction) |
| @@ -46,3 +50,42 @@ void gpio_line_set(int line, int value) | |||
| 46 | local_irq_restore(flags); | 50 | local_irq_restore(flags); |
| 47 | } | 51 | } |
| 48 | EXPORT_SYMBOL(gpio_line_set); | 52 | EXPORT_SYMBOL(gpio_line_set); |
| 53 | |||
| 54 | static int iop3xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) | ||
| 55 | { | ||
| 56 | gpio_line_config(gpio, GPIO_IN); | ||
| 57 | return 0; | ||
| 58 | } | ||
| 59 | |||
| 60 | static int iop3xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, int level) | ||
| 61 | { | ||
| 62 | gpio_line_set(gpio, level); | ||
| 63 | gpio_line_config(gpio, GPIO_OUT); | ||
| 64 | return 0; | ||
| 65 | } | ||
| 66 | |||
| 67 | static int iop3xx_gpio_get_value(struct gpio_chip *chip, unsigned gpio) | ||
| 68 | { | ||
| 69 | return gpio_line_get(gpio); | ||
| 70 | } | ||
| 71 | |||
| 72 | static void iop3xx_gpio_set_value(struct gpio_chip *chip, unsigned gpio, int value) | ||
| 73 | { | ||
| 74 | gpio_line_set(gpio, value); | ||
| 75 | } | ||
| 76 | |||
| 77 | static struct gpio_chip iop3xx_chip = { | ||
| 78 | .label = "iop3xx", | ||
| 79 | .direction_input = iop3xx_gpio_direction_input, | ||
| 80 | .get = iop3xx_gpio_get_value, | ||
| 81 | .direction_output = iop3xx_gpio_direction_output, | ||
| 82 | .set = iop3xx_gpio_set_value, | ||
| 83 | .base = 0, | ||
| 84 | .ngpio = IOP3XX_N_GPIOS, | ||
| 85 | }; | ||
| 86 | |||
| 87 | static int __init iop3xx_gpio_setup(void) | ||
| 88 | { | ||
| 89 | return gpiochip_add(&iop3xx_chip); | ||
| 90 | } | ||
| 91 | arch_initcall(iop3xx_gpio_setup); | ||
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index bc639a30d6d1..2c4051cc79a1 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # Common support | 5 | # Common support |
| 6 | obj-y := common.o sram.o sram-fn.o clock.o devices.o dma.o mux.o gpio.o \ | 6 | obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \ |
| 7 | usb.o fb.o | 7 | usb.o fb.o |
| 8 | obj-m := | 8 | obj-m := |
| 9 | obj-n := | 9 | obj-n := |
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 2946c193a7d6..c2e741de0203 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/plat-omap/clock.c | 2 | * linux/arch/arm/plat-omap/clock.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2004 - 2005 Nokia corporation | 4 | * Copyright (C) 2004 - 2008 Nokia corporation |
| 5 | * Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com> | 5 | * Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com> |
| 6 | * | 6 | * |
| 7 | * Modified for omap shared clock framework by Tony Lindgren <tony@atomide.com> | 7 | * Modified for omap shared clock framework by Tony Lindgren <tony@atomide.com> |
| @@ -21,6 +21,8 @@ | |||
| 21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/cpufreq.h> | ||
| 25 | #include <linux/debugfs.h> | ||
| 24 | 26 | ||
| 25 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 26 | 28 | ||
| @@ -32,41 +34,6 @@ static DEFINE_SPINLOCK(clockfw_lock); | |||
| 32 | 34 | ||
| 33 | static struct clk_functions *arch_clock; | 35 | static struct clk_functions *arch_clock; |
| 34 | 36 | ||
| 35 | #ifdef CONFIG_PM_DEBUG | ||
| 36 | |||
| 37 | static void print_parents(struct clk *clk) | ||
| 38 | { | ||
| 39 | struct clk *p; | ||
| 40 | int printed = 0; | ||
| 41 | |||
| 42 | list_for_each_entry(p, &clocks, node) { | ||
| 43 | if (p->parent == clk && p->usecount) { | ||
| 44 | if (!clk->usecount && !printed) { | ||
| 45 | printk("MISMATCH: %s\n", clk->name); | ||
| 46 | printed = 1; | ||
| 47 | } | ||
| 48 | printk("\t%-15s\n", p->name); | ||
| 49 | } | ||
| 50 | } | ||
| 51 | } | ||
| 52 | |||
| 53 | void clk_print_usecounts(void) | ||
| 54 | { | ||
| 55 | unsigned long flags; | ||
| 56 | struct clk *p; | ||
| 57 | |||
| 58 | spin_lock_irqsave(&clockfw_lock, flags); | ||
| 59 | list_for_each_entry(p, &clocks, node) { | ||
| 60 | if (p->usecount) | ||
| 61 | printk("%-15s: %d\n", p->name, p->usecount); | ||
| 62 | print_parents(p); | ||
| 63 | |||
| 64 | } | ||
| 65 | spin_unlock_irqrestore(&clockfw_lock, flags); | ||
| 66 | } | ||
| 67 | |||
| 68 | #endif | ||
| 69 | |||
| 70 | /*------------------------------------------------------------------------- | 37 | /*------------------------------------------------------------------------- |
| 71 | * Standard clock functions defined in include/linux/clk.h | 38 | * Standard clock functions defined in include/linux/clk.h |
| 72 | *-------------------------------------------------------------------------*/ | 39 | *-------------------------------------------------------------------------*/ |
| @@ -445,3 +412,93 @@ int __init clk_init(struct clk_functions * custom_clocks) | |||
| 445 | return 0; | 412 | return 0; |
| 446 | } | 413 | } |
| 447 | 414 | ||
| 415 | #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) | ||
| 416 | /* | ||
| 417 | * debugfs support to trace clock tree hierarchy and attributes | ||
| 418 | */ | ||
| 419 | static struct dentry *clk_debugfs_root; | ||
| 420 | |||
| 421 | static int clk_debugfs_register_one(struct clk *c) | ||
| 422 | { | ||
| 423 | int err; | ||
| 424 | struct dentry *d, *child; | ||
| 425 | struct clk *pa = c->parent; | ||
| 426 | char s[255]; | ||
| 427 | char *p = s; | ||
| 428 | |||
| 429 | p += sprintf(p, "%s", c->name); | ||
| 430 | if (c->id != 0) | ||
| 431 | sprintf(p, ":%d", c->id); | ||
| 432 | d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root); | ||
| 433 | if (IS_ERR(d)) | ||
| 434 | return PTR_ERR(d); | ||
| 435 | c->dent = d; | ||
| 436 | |||
| 437 | d = debugfs_create_u8("usecount", S_IRUGO, c->dent, (u8 *)&c->usecount); | ||
| 438 | if (IS_ERR(d)) { | ||
| 439 | err = PTR_ERR(d); | ||
| 440 | goto err_out; | ||
| 441 | } | ||
| 442 | d = debugfs_create_u32("rate", S_IRUGO, c->dent, (u32 *)&c->rate); | ||
| 443 | if (IS_ERR(d)) { | ||
| 444 | err = PTR_ERR(d); | ||
| 445 | goto err_out; | ||
| 446 | } | ||
| 447 | d = debugfs_create_x32("flags", S_IRUGO, c->dent, (u32 *)&c->flags); | ||
| 448 | if (IS_ERR(d)) { | ||
| 449 | err = PTR_ERR(d); | ||
| 450 | goto err_out; | ||
| 451 | } | ||
| 452 | return 0; | ||
| 453 | |||
| 454 | err_out: | ||
| 455 | d = c->dent; | ||
| 456 | list_for_each_entry(child, &d->d_subdirs, d_u.d_child) | ||
| 457 | debugfs_remove(child); | ||
| 458 | debugfs_remove(c->dent); | ||
| 459 | return err; | ||
| 460 | } | ||
| 461 | |||
| 462 | static int clk_debugfs_register(struct clk *c) | ||
| 463 | { | ||
| 464 | int err; | ||
| 465 | struct clk *pa = c->parent; | ||
| 466 | |||
| 467 | if (pa && !pa->dent) { | ||
| 468 | err = clk_debugfs_register(pa); | ||
| 469 | if (err) | ||
| 470 | return err; | ||
| 471 | } | ||
| 472 | |||
| 473 | if (!c->dent) { | ||
| 474 | err = clk_debugfs_register_one(c); | ||
| 475 | if (err) | ||
| 476 | return err; | ||
| 477 | } | ||
| 478 | return 0; | ||
| 479 | } | ||
| 480 | |||
| 481 | static int __init clk_debugfs_init(void) | ||
| 482 | { | ||
| 483 | struct clk *c; | ||
| 484 | struct dentry *d; | ||
| 485 | int err; | ||
| 486 | |||
| 487 | d = debugfs_create_dir("clock", NULL); | ||
| 488 | if (IS_ERR(d)) | ||
| 489 | return PTR_ERR(d); | ||
| 490 | clk_debugfs_root = d; | ||
| 491 | |||
| 492 | list_for_each_entry(c, &clocks, node) { | ||
| 493 | err = clk_debugfs_register(c); | ||
| 494 | if (err) | ||
| 495 | goto err_out; | ||
| 496 | } | ||
| 497 | return 0; | ||
| 498 | err_out: | ||
| 499 | debugfs_remove(clk_debugfs_root); /* REVISIT: Cleanup correctly */ | ||
| 500 | return err; | ||
| 501 | } | ||
| 502 | late_initcall(clk_debugfs_init); | ||
| 503 | |||
| 504 | #endif /* defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) */ | ||
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index bd1cef2c3c14..8d04929a3c75 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 27 | #include <asm/setup.h> | 27 | #include <asm/setup.h> |
| 28 | 28 | ||
| 29 | #include <asm/arch/common.h> | ||
| 29 | #include <asm/arch/board.h> | 30 | #include <asm/arch/board.h> |
| 30 | #include <asm/arch/control.h> | 31 | #include <asm/arch/control.h> |
| 31 | #include <asm/arch/mux.h> | 32 | #include <asm/arch/mux.h> |
| @@ -241,30 +242,70 @@ arch_initcall(omap_init_clocksource_32k); | |||
| 241 | 242 | ||
| 242 | /* Global address base setup code */ | 243 | /* Global address base setup code */ |
| 243 | 244 | ||
| 245 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | ||
| 246 | |||
| 247 | static struct omap_globals *omap2_globals; | ||
| 248 | |||
| 249 | static void __init __omap2_set_globals(void) | ||
| 250 | { | ||
| 251 | omap2_set_globals_memory(omap2_globals); | ||
| 252 | omap2_set_globals_control(omap2_globals); | ||
| 253 | omap2_set_globals_prcm(omap2_globals); | ||
| 254 | } | ||
| 255 | |||
| 256 | #endif | ||
| 257 | |||
| 244 | #if defined(CONFIG_ARCH_OMAP2420) | 258 | #if defined(CONFIG_ARCH_OMAP2420) |
| 259 | |||
| 260 | static struct omap_globals omap242x_globals = { | ||
| 261 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x48014000), | ||
| 262 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE), | ||
| 263 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE), | ||
| 264 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_CTRL_BASE), | ||
| 265 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE), | ||
| 266 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_CM_BASE), | ||
| 267 | }; | ||
| 268 | |||
| 245 | void __init omap2_set_globals_242x(void) | 269 | void __init omap2_set_globals_242x(void) |
| 246 | { | 270 | { |
| 247 | omap2_sdrc_base = OMAP2420_SDRC_BASE; | 271 | omap2_globals = &omap242x_globals; |
| 248 | omap2_sms_base = OMAP2420_SMS_BASE; | 272 | __omap2_set_globals(); |
| 249 | omap_ctrl_base_set(OMAP2420_CTRL_BASE); | ||
| 250 | } | 273 | } |
| 251 | #endif | 274 | #endif |
| 252 | 275 | ||
| 253 | #if defined(CONFIG_ARCH_OMAP2430) | 276 | #if defined(CONFIG_ARCH_OMAP2430) |
| 277 | |||
| 278 | static struct omap_globals omap243x_globals = { | ||
| 279 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x4900a000), | ||
| 280 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE), | ||
| 281 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE), | ||
| 282 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE), | ||
| 283 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE), | ||
| 284 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2430_CM_BASE), | ||
| 285 | }; | ||
| 286 | |||
| 254 | void __init omap2_set_globals_243x(void) | 287 | void __init omap2_set_globals_243x(void) |
| 255 | { | 288 | { |
| 256 | omap2_sdrc_base = OMAP243X_SDRC_BASE; | 289 | omap2_globals = &omap243x_globals; |
| 257 | omap2_sms_base = OMAP243X_SMS_BASE; | 290 | __omap2_set_globals(); |
| 258 | omap_ctrl_base_set(OMAP243X_CTRL_BASE); | ||
| 259 | } | 291 | } |
| 260 | #endif | 292 | #endif |
| 261 | 293 | ||
| 262 | #if defined(CONFIG_ARCH_OMAP3430) | 294 | #if defined(CONFIG_ARCH_OMAP3430) |
| 295 | |||
| 296 | static struct omap_globals omap343x_globals = { | ||
| 297 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x4830A000), | ||
| 298 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), | ||
| 299 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), | ||
| 300 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), | ||
| 301 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), | ||
| 302 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), | ||
| 303 | }; | ||
| 304 | |||
| 263 | void __init omap2_set_globals_343x(void) | 305 | void __init omap2_set_globals_343x(void) |
| 264 | { | 306 | { |
| 265 | omap2_sdrc_base = OMAP343X_SDRC_BASE; | 307 | omap2_globals = &omap343x_globals; |
| 266 | omap2_sms_base = OMAP343X_SMS_BASE; | 308 | __omap2_set_globals(); |
| 267 | omap_ctrl_base_set(OMAP343X_CTRL_BASE); | ||
| 268 | } | 309 | } |
| 269 | #endif | 310 | #endif |
| 270 | 311 | ||
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 4a53f9ba6c43..81002b722da1 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <asm/arch/mux.h> | 24 | #include <asm/arch/mux.h> |
| 25 | #include <asm/arch/gpio.h> | 25 | #include <asm/arch/gpio.h> |
| 26 | #include <asm/arch/menelaus.h> | 26 | #include <asm/arch/menelaus.h> |
| 27 | #include <asm/arch/mcbsp.h> | ||
| 27 | 28 | ||
| 28 | #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) | 29 | #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) |
| 29 | 30 | ||
| @@ -145,6 +146,53 @@ static inline void omap_init_kp(void) {} | |||
| 145 | #endif | 146 | #endif |
| 146 | 147 | ||
| 147 | /*-------------------------------------------------------------------------*/ | 148 | /*-------------------------------------------------------------------------*/ |
| 149 | #if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE) | ||
| 150 | |||
| 151 | static struct platform_device **omap_mcbsp_devices; | ||
| 152 | |||
| 153 | void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, | ||
| 154 | int size) | ||
| 155 | { | ||
| 156 | int i; | ||
| 157 | |||
| 158 | if (size > OMAP_MAX_MCBSP_COUNT) { | ||
| 159 | printk(KERN_WARNING "Registered too many McBSPs platform_data." | ||
| 160 | " Using maximum (%d) available.\n", | ||
| 161 | OMAP_MAX_MCBSP_COUNT); | ||
| 162 | size = OMAP_MAX_MCBSP_COUNT; | ||
| 163 | } | ||
| 164 | |||
| 165 | omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *), | ||
| 166 | GFP_KERNEL); | ||
| 167 | if (!omap_mcbsp_devices) { | ||
| 168 | printk(KERN_ERR "Could not register McBSP devices\n"); | ||
| 169 | return; | ||
| 170 | } | ||
| 171 | |||
| 172 | for (i = 0; i < size; i++) { | ||
| 173 | struct platform_device *new_mcbsp; | ||
| 174 | int ret; | ||
| 175 | |||
| 176 | new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1); | ||
| 177 | if (!new_mcbsp) | ||
| 178 | continue; | ||
| 179 | new_mcbsp->dev.platform_data = &config[i]; | ||
| 180 | ret = platform_device_add(new_mcbsp); | ||
| 181 | if (ret) { | ||
| 182 | platform_device_put(new_mcbsp); | ||
| 183 | continue; | ||
| 184 | } | ||
| 185 | omap_mcbsp_devices[i] = new_mcbsp; | ||
| 186 | } | ||
| 187 | } | ||
| 188 | |||
| 189 | #else | ||
| 190 | void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, | ||
| 191 | int size) | ||
| 192 | { } | ||
| 193 | #endif | ||
| 194 | |||
| 195 | /*-------------------------------------------------------------------------*/ | ||
| 148 | 196 | ||
| 149 | #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) | 197 | #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) |
| 150 | 198 | ||
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c00eda588cd8..fac8e994f588 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/plat-omap/dma.c | 2 | * linux/arch/arm/plat-omap/dma.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2003 Nokia Corporation | 4 | * Copyright (C) 2003 - 2008 Nokia Corporation |
| 5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> | 5 | * Author: Juha Yrjölä <juha.yrjola@nokia.com> |
| 6 | * DMA channel linking for 1610 by Samuel Ortiz <samuel.ortiz@nokia.com> | 6 | * DMA channel linking for 1610 by Samuel Ortiz <samuel.ortiz@nokia.com> |
| 7 | * Graphics DMA and LCD DMA graphics tranformations | 7 | * Graphics DMA and LCD DMA graphics tranformations |
| @@ -25,11 +25,11 @@ | |||
| 25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 27 | #include <linux/irq.h> | 27 | #include <linux/irq.h> |
| 28 | #include <linux/io.h> | ||
| 28 | 29 | ||
| 29 | #include <asm/system.h> | 30 | #include <asm/system.h> |
| 30 | #include <asm/hardware.h> | 31 | #include <asm/hardware.h> |
| 31 | #include <asm/dma.h> | 32 | #include <asm/dma.h> |
| 32 | #include <asm/io.h> | ||
| 33 | 33 | ||
| 34 | #include <asm/arch/tc.h> | 34 | #include <asm/arch/tc.h> |
| 35 | 35 | ||
| @@ -43,13 +43,13 @@ enum { DMA_CH_ALLOC_DONE, DMA_CH_PARAMS_SET_DONE, DMA_CH_STARTED, | |||
| 43 | enum { DMA_CHAIN_STARTED, DMA_CHAIN_NOTSTARTED }; | 43 | enum { DMA_CHAIN_STARTED, DMA_CHAIN_NOTSTARTED }; |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | #define OMAP_DMA_ACTIVE 0x01 | 46 | #define OMAP_DMA_ACTIVE 0x01 |
| 47 | #define OMAP_DMA_CCR_EN (1 << 7) | 47 | #define OMAP_DMA_CCR_EN (1 << 7) |
| 48 | #define OMAP2_DMA_CSR_CLEAR_MASK 0xffe | 48 | #define OMAP2_DMA_CSR_CLEAR_MASK 0xffe |
| 49 | 49 | ||
| 50 | #define OMAP_FUNC_MUX_ARM_BASE (0xfffe1000 + 0xec) | 50 | #define OMAP_FUNC_MUX_ARM_BASE (0xfffe1000 + 0xec) |
| 51 | 51 | ||
| 52 | static int enable_1510_mode = 0; | 52 | static int enable_1510_mode; |
| 53 | 53 | ||
| 54 | struct omap_dma_lch { | 54 | struct omap_dma_lch { |
| 55 | int next_lch; | 55 | int next_lch; |
| @@ -57,7 +57,7 @@ struct omap_dma_lch { | |||
| 57 | u16 saved_csr; | 57 | u16 saved_csr; |
| 58 | u16 enabled_irqs; | 58 | u16 enabled_irqs; |
| 59 | const char *dev_name; | 59 | const char *dev_name; |
| 60 | void (* callback)(int lch, u16 ch_status, void *data); | 60 | void (*callback)(int lch, u16 ch_status, void *data); |
| 61 | void *data; | 61 | void *data; |
| 62 | 62 | ||
| 63 | #ifndef CONFIG_ARCH_OMAP1 | 63 | #ifndef CONFIG_ARCH_OMAP1 |
| @@ -72,7 +72,6 @@ struct omap_dma_lch { | |||
| 72 | long flags; | 72 | long flags; |
| 73 | }; | 73 | }; |
| 74 | 74 | ||
| 75 | #ifndef CONFIG_ARCH_OMAP1 | ||
| 76 | struct dma_link_info { | 75 | struct dma_link_info { |
| 77 | int *linked_dmach_q; | 76 | int *linked_dmach_q; |
| 78 | int no_of_lchs_linked; | 77 | int no_of_lchs_linked; |
| @@ -86,7 +85,9 @@ struct dma_link_info { | |||
| 86 | 85 | ||
| 87 | }; | 86 | }; |
| 88 | 87 | ||
| 89 | static struct dma_link_info dma_linked_lch[OMAP_LOGICAL_DMA_CH_COUNT]; | 88 | static struct dma_link_info *dma_linked_lch; |
| 89 | |||
| 90 | #ifndef CONFIG_ARCH_OMAP1 | ||
| 90 | 91 | ||
| 91 | /* Chain handling macros */ | 92 | /* Chain handling macros */ |
| 92 | #define OMAP_DMA_CHAIN_QINIT(chain_id) \ | 93 | #define OMAP_DMA_CHAIN_QINIT(chain_id) \ |
| @@ -119,12 +120,15 @@ static struct dma_link_info dma_linked_lch[OMAP_LOGICAL_DMA_CH_COUNT]; | |||
| 119 | dma_linked_lch[chain_id].q_count++; \ | 120 | dma_linked_lch[chain_id].q_count++; \ |
| 120 | } while (0) | 121 | } while (0) |
| 121 | #endif | 122 | #endif |
| 123 | |||
| 124 | static int dma_lch_count; | ||
| 122 | static int dma_chan_count; | 125 | static int dma_chan_count; |
| 123 | 126 | ||
| 124 | static spinlock_t dma_chan_lock; | 127 | static spinlock_t dma_chan_lock; |
| 125 | static struct omap_dma_lch dma_chan[OMAP_LOGICAL_DMA_CH_COUNT]; | 128 | static struct omap_dma_lch *dma_chan; |
| 129 | static void __iomem *omap_dma_base; | ||
| 126 | 130 | ||
| 127 | static const u8 omap1_dma_irq[OMAP_LOGICAL_DMA_CH_COUNT] = { | 131 | static const u8 omap1_dma_irq[OMAP1_LOGICAL_DMA_CH_COUNT] = { |
| 128 | INT_DMA_CH0_6, INT_DMA_CH1_7, INT_DMA_CH2_8, INT_DMA_CH3, | 132 | INT_DMA_CH0_6, INT_DMA_CH1_7, INT_DMA_CH2_8, INT_DMA_CH3, |
| 129 | INT_DMA_CH4, INT_DMA_CH5, INT_1610_DMA_CH6, INT_1610_DMA_CH7, | 133 | INT_DMA_CH4, INT_DMA_CH5, INT_1610_DMA_CH6, INT_1610_DMA_CH7, |
| 130 | INT_1610_DMA_CH8, INT_1610_DMA_CH9, INT_1610_DMA_CH10, | 134 | INT_1610_DMA_CH8, INT_1610_DMA_CH9, INT_1610_DMA_CH10, |
| @@ -139,6 +143,24 @@ static inline void omap_enable_channel_irq(int lch); | |||
| 139 | #define REVISIT_24XX() printk(KERN_ERR "FIXME: no %s on 24xx\n", \ | 143 | #define REVISIT_24XX() printk(KERN_ERR "FIXME: no %s on 24xx\n", \ |
| 140 | __func__); | 144 | __func__); |
| 141 | 145 | ||
| 146 | #define dma_read(reg) \ | ||
| 147 | ({ \ | ||
| 148 | u32 __val; \ | ||
| 149 | if (cpu_class_is_omap1()) \ | ||
| 150 | __val = __raw_readw(omap_dma_base + OMAP1_DMA_##reg); \ | ||
| 151 | else \ | ||
| 152 | __val = __raw_readl(omap_dma_base + OMAP_DMA4_##reg); \ | ||
| 153 | __val; \ | ||
| 154 | }) | ||
| 155 | |||
| 156 | #define dma_write(val, reg) \ | ||
| 157 | ({ \ | ||
| 158 | if (cpu_class_is_omap1()) \ | ||
| 159 | __raw_writew((u16)(val), omap_dma_base + OMAP1_DMA_##reg); \ | ||
| 160 | else \ | ||
| 161 | __raw_writel((val), omap_dma_base + OMAP_DMA4_##reg); \ | ||
| 162 | }) | ||
| 163 | |||
| 142 | #ifdef CONFIG_ARCH_OMAP15XX | 164 | #ifdef CONFIG_ARCH_OMAP15XX |
| 143 | /* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */ | 165 | /* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */ |
| 144 | int omap_dma_in_1510_mode(void) | 166 | int omap_dma_in_1510_mode(void) |
| @@ -173,13 +195,14 @@ static inline void set_gdma_dev(int req, int dev) | |||
| 173 | #define set_gdma_dev(req, dev) do {} while (0) | 195 | #define set_gdma_dev(req, dev) do {} while (0) |
| 174 | #endif | 196 | #endif |
| 175 | 197 | ||
| 198 | /* Omap1 only */ | ||
| 176 | static void clear_lch_regs(int lch) | 199 | static void clear_lch_regs(int lch) |
| 177 | { | 200 | { |
| 178 | int i; | 201 | int i; |
| 179 | u32 lch_base = OMAP_DMA_BASE + lch * 0x40; | 202 | void __iomem *lch_base = omap_dma_base + OMAP1_DMA_CH_BASE(lch); |
| 180 | 203 | ||
| 181 | for (i = 0; i < 0x2c; i += 2) | 204 | for (i = 0; i < 0x2c; i += 2) |
| 182 | omap_writew(0, lch_base + i); | 205 | __raw_writew(0, lch_base + i); |
| 183 | } | 206 | } |
| 184 | 207 | ||
| 185 | void omap_set_dma_priority(int lch, int dst_port, int priority) | 208 | void omap_set_dma_priority(int lch, int dst_port, int priority) |
| @@ -212,33 +235,49 @@ void omap_set_dma_priority(int lch, int dst_port, int priority) | |||
| 212 | } | 235 | } |
| 213 | 236 | ||
| 214 | if (cpu_class_is_omap2()) { | 237 | if (cpu_class_is_omap2()) { |
| 238 | u32 ccr; | ||
| 239 | |||
| 240 | ccr = dma_read(CCR(lch)); | ||
| 215 | if (priority) | 241 | if (priority) |
| 216 | OMAP_DMA_CCR_REG(lch) |= (1 << 6); | 242 | ccr |= (1 << 6); |
| 217 | else | 243 | else |
| 218 | OMAP_DMA_CCR_REG(lch) &= ~(1 << 6); | 244 | ccr &= ~(1 << 6); |
| 245 | dma_write(ccr, CCR(lch)); | ||
| 219 | } | 246 | } |
| 220 | } | 247 | } |
| 248 | EXPORT_SYMBOL(omap_set_dma_priority); | ||
| 221 | 249 | ||
| 222 | void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, | 250 | void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, |
| 223 | int frame_count, int sync_mode, | 251 | int frame_count, int sync_mode, |
| 224 | int dma_trigger, int src_or_dst_synch) | 252 | int dma_trigger, int src_or_dst_synch) |
| 225 | { | 253 | { |
| 226 | OMAP_DMA_CSDP_REG(lch) &= ~0x03; | 254 | u32 l; |
| 227 | OMAP_DMA_CSDP_REG(lch) |= data_type; | 255 | |
| 256 | l = dma_read(CSDP(lch)); | ||
| 257 | l &= ~0x03; | ||
| 258 | l |= data_type; | ||
| 259 | dma_write(l, CSDP(lch)); | ||
| 228 | 260 | ||
| 229 | if (cpu_class_is_omap1()) { | 261 | if (cpu_class_is_omap1()) { |
| 230 | OMAP_DMA_CCR_REG(lch) &= ~(1 << 5); | 262 | u16 ccr; |
| 263 | |||
| 264 | ccr = dma_read(CCR(lch)); | ||
| 265 | ccr &= ~(1 << 5); | ||
| 231 | if (sync_mode == OMAP_DMA_SYNC_FRAME) | 266 | if (sync_mode == OMAP_DMA_SYNC_FRAME) |
| 232 | OMAP_DMA_CCR_REG(lch) |= 1 << 5; | 267 | ccr |= 1 << 5; |
| 268 | dma_write(ccr, CCR(lch)); | ||
| 233 | 269 | ||
| 234 | OMAP1_DMA_CCR2_REG(lch) &= ~(1 << 2); | 270 | ccr = dma_read(CCR2(lch)); |
| 271 | ccr &= ~(1 << 2); | ||
| 235 | if (sync_mode == OMAP_DMA_SYNC_BLOCK) | 272 | if (sync_mode == OMAP_DMA_SYNC_BLOCK) |
| 236 | OMAP1_DMA_CCR2_REG(lch) |= 1 << 2; | 273 | ccr |= 1 << 2; |
| 274 | dma_write(ccr, CCR2(lch)); | ||
| 237 | } | 275 | } |
| 238 | 276 | ||
| 239 | if (cpu_class_is_omap2() && dma_trigger) { | 277 | if (cpu_class_is_omap2() && dma_trigger) { |
| 240 | u32 val = OMAP_DMA_CCR_REG(lch); | 278 | u32 val; |
| 241 | 279 | ||
| 280 | val = dma_read(CCR(lch)); | ||
| 242 | val &= ~(3 << 19); | 281 | val &= ~(3 << 19); |
| 243 | if (dma_trigger > 63) | 282 | if (dma_trigger > 63) |
| 244 | val |= 1 << 20; | 283 | val |= 1 << 20; |
| @@ -263,12 +302,13 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, | |||
| 263 | else | 302 | else |
| 264 | val &= ~(1 << 24); /* dest synch */ | 303 | val &= ~(1 << 24); /* dest synch */ |
| 265 | 304 | ||
| 266 | OMAP_DMA_CCR_REG(lch) = val; | 305 | dma_write(val, CCR(lch)); |
| 267 | } | 306 | } |
| 268 | 307 | ||
| 269 | OMAP_DMA_CEN_REG(lch) = elem_count; | 308 | dma_write(elem_count, CEN(lch)); |
| 270 | OMAP_DMA_CFN_REG(lch) = frame_count; | 309 | dma_write(frame_count, CFN(lch)); |
| 271 | } | 310 | } |
| 311 | EXPORT_SYMBOL(omap_set_dma_transfer_params); | ||
| 272 | 312 | ||
| 273 | void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color) | 313 | void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color) |
| 274 | { | 314 | { |
| @@ -281,7 +321,9 @@ void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color) | |||
| 281 | return; | 321 | return; |
| 282 | } | 322 | } |
| 283 | 323 | ||
| 284 | w = OMAP1_DMA_CCR2_REG(lch) & ~0x03; | 324 | w = dma_read(CCR2(lch)); |
| 325 | w &= ~0x03; | ||
| 326 | |||
| 285 | switch (mode) { | 327 | switch (mode) { |
| 286 | case OMAP_DMA_CONSTANT_FILL: | 328 | case OMAP_DMA_CONSTANT_FILL: |
| 287 | w |= 0x01; | 329 | w |= 0x01; |
| @@ -294,52 +336,81 @@ void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color) | |||
| 294 | default: | 336 | default: |
| 295 | BUG(); | 337 | BUG(); |
| 296 | } | 338 | } |
| 297 | OMAP1_DMA_CCR2_REG(lch) = w; | 339 | dma_write(w, CCR2(lch)); |
| 298 | 340 | ||
| 299 | w = OMAP1_DMA_LCH_CTRL_REG(lch) & ~0x0f; | 341 | w = dma_read(LCH_CTRL(lch)); |
| 342 | w &= ~0x0f; | ||
| 300 | /* Default is channel type 2D */ | 343 | /* Default is channel type 2D */ |
| 301 | if (mode) { | 344 | if (mode) { |
| 302 | OMAP1_DMA_COLOR_L_REG(lch) = (u16)color; | 345 | dma_write((u16)color, COLOR_L(lch)); |
| 303 | OMAP1_DMA_COLOR_U_REG(lch) = (u16)(color >> 16); | 346 | dma_write((u16)(color >> 16), COLOR_U(lch)); |
| 304 | w |= 1; /* Channel type G */ | 347 | w |= 1; /* Channel type G */ |
| 305 | } | 348 | } |
| 306 | OMAP1_DMA_LCH_CTRL_REG(lch) = w; | 349 | dma_write(w, LCH_CTRL(lch)); |
| 307 | } | 350 | } |
| 351 | EXPORT_SYMBOL(omap_set_dma_color_mode); | ||
| 308 | 352 | ||
| 309 | void omap_set_dma_write_mode(int lch, enum omap_dma_write_mode mode) | 353 | void omap_set_dma_write_mode(int lch, enum omap_dma_write_mode mode) |
| 310 | { | 354 | { |
| 311 | if (cpu_class_is_omap2()) { | 355 | if (cpu_class_is_omap2()) { |
| 312 | OMAP_DMA_CSDP_REG(lch) &= ~(0x3 << 16); | 356 | u32 csdp; |
| 313 | OMAP_DMA_CSDP_REG(lch) |= (mode << 16); | 357 | |
| 358 | csdp = dma_read(CSDP(lch)); | ||
| 359 | csdp &= ~(0x3 << 16); | ||
| 360 | csdp |= (mode << 16); | ||
| 361 | dma_write(csdp, CSDP(lch)); | ||
| 362 | } | ||
| 363 | } | ||
| 364 | EXPORT_SYMBOL(omap_set_dma_write_mode); | ||
| 365 | |||
| 366 | void omap_set_dma_channel_mode(int lch, enum omap_dma_channel_mode mode) | ||
| 367 | { | ||
| 368 | if (cpu_class_is_omap1() && !cpu_is_omap15xx()) { | ||
| 369 | u32 l; | ||
| 370 | |||
| 371 | l = dma_read(LCH_CTRL(lch)); | ||
| 372 | l &= ~0x7; | ||
| 373 | l |= mode; | ||
| 374 | dma_write(l, LCH_CTRL(lch)); | ||
| 314 | } | 375 | } |
| 315 | } | 376 | } |
| 377 | EXPORT_SYMBOL(omap_set_dma_channel_mode); | ||
| 316 | 378 | ||
| 317 | /* Note that src_port is only for omap1 */ | 379 | /* Note that src_port is only for omap1 */ |
| 318 | void omap_set_dma_src_params(int lch, int src_port, int src_amode, | 380 | void omap_set_dma_src_params(int lch, int src_port, int src_amode, |
| 319 | unsigned long src_start, | 381 | unsigned long src_start, |
| 320 | int src_ei, int src_fi) | 382 | int src_ei, int src_fi) |
| 321 | { | 383 | { |
| 384 | u32 l; | ||
| 385 | |||
| 322 | if (cpu_class_is_omap1()) { | 386 | if (cpu_class_is_omap1()) { |
| 323 | OMAP_DMA_CSDP_REG(lch) &= ~(0x1f << 2); | 387 | u16 w; |
| 324 | OMAP_DMA_CSDP_REG(lch) |= src_port << 2; | 388 | |
| 389 | w = dma_read(CSDP(lch)); | ||
| 390 | w &= ~(0x1f << 2); | ||
| 391 | w |= src_port << 2; | ||
| 392 | dma_write(w, CSDP(lch)); | ||
| 325 | } | 393 | } |
| 326 | 394 | ||
| 327 | OMAP_DMA_CCR_REG(lch) &= ~(0x03 << 12); | 395 | l = dma_read(CCR(lch)); |
| 328 | OMAP_DMA_CCR_REG(lch) |= src_amode << 12; | 396 | l &= ~(0x03 << 12); |
| 397 | l |= src_amode << 12; | ||
| 398 | dma_write(l, CCR(lch)); | ||
| 329 | 399 | ||
| 330 | if (cpu_class_is_omap1()) { | 400 | if (cpu_class_is_omap1()) { |
| 331 | OMAP1_DMA_CSSA_U_REG(lch) = src_start >> 16; | 401 | dma_write(src_start >> 16, CSSA_U(lch)); |
| 332 | OMAP1_DMA_CSSA_L_REG(lch) = src_start; | 402 | dma_write((u16)src_start, CSSA_L(lch)); |
| 333 | } | 403 | } |
| 334 | 404 | ||
| 335 | if (cpu_class_is_omap2()) | 405 | if (cpu_class_is_omap2()) |
| 336 | OMAP2_DMA_CSSA_REG(lch) = src_start; | 406 | dma_write(src_start, CSSA(lch)); |
| 337 | 407 | ||
| 338 | OMAP_DMA_CSEI_REG(lch) = src_ei; | 408 | dma_write(src_ei, CSEI(lch)); |
| 339 | OMAP_DMA_CSFI_REG(lch) = src_fi; | 409 | dma_write(src_fi, CSFI(lch)); |
| 340 | } | 410 | } |
| 411 | EXPORT_SYMBOL(omap_set_dma_src_params); | ||
| 341 | 412 | ||
| 342 | void omap_set_dma_params(int lch, struct omap_dma_channel_params * params) | 413 | void omap_set_dma_params(int lch, struct omap_dma_channel_params *params) |
| 343 | { | 414 | { |
| 344 | omap_set_dma_transfer_params(lch, params->data_type, | 415 | omap_set_dma_transfer_params(lch, params->data_type, |
| 345 | params->elem_count, params->frame_count, | 416 | params->elem_count, params->frame_count, |
| @@ -356,28 +427,37 @@ void omap_set_dma_params(int lch, struct omap_dma_channel_params * params) | |||
| 356 | omap_dma_set_prio_lch(lch, params->read_prio, | 427 | omap_dma_set_prio_lch(lch, params->read_prio, |
| 357 | params->write_prio); | 428 | params->write_prio); |
| 358 | } | 429 | } |
| 430 | EXPORT_SYMBOL(omap_set_dma_params); | ||
| 359 | 431 | ||
| 360 | void omap_set_dma_src_index(int lch, int eidx, int fidx) | 432 | void omap_set_dma_src_index(int lch, int eidx, int fidx) |
| 361 | { | 433 | { |
| 362 | if (cpu_class_is_omap2()) { | 434 | if (cpu_class_is_omap2()) |
| 363 | REVISIT_24XX(); | ||
| 364 | return; | 435 | return; |
| 365 | } | 436 | |
| 366 | OMAP_DMA_CSEI_REG(lch) = eidx; | 437 | dma_write(eidx, CSEI(lch)); |
| 367 | OMAP_DMA_CSFI_REG(lch) = fidx; | 438 | dma_write(fidx, CSFI(lch)); |
| 368 | } | 439 | } |
| 440 | EXPORT_SYMBOL(omap_set_dma_src_index); | ||
| 369 | 441 | ||
| 370 | void omap_set_dma_src_data_pack(int lch, int enable) | 442 | void omap_set_dma_src_data_pack(int lch, int enable) |
| 371 | { | 443 | { |
| 372 | OMAP_DMA_CSDP_REG(lch) &= ~(1 << 6); | 444 | u32 l; |
| 445 | |||
| 446 | l = dma_read(CSDP(lch)); | ||
| 447 | l &= ~(1 << 6); | ||
| 373 | if (enable) | 448 | if (enable) |
| 374 | OMAP_DMA_CSDP_REG(lch) |= (1 << 6); | 449 | l |= (1 << 6); |
| 450 | dma_write(l, CSDP(lch)); | ||
| 375 | } | 451 | } |
| 452 | EXPORT_SYMBOL(omap_set_dma_src_data_pack); | ||
| 376 | 453 | ||
| 377 | void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) | 454 | void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) |
| 378 | { | 455 | { |
| 379 | unsigned int burst = 0; | 456 | unsigned int burst = 0; |
| 380 | OMAP_DMA_CSDP_REG(lch) &= ~(0x03 << 7); | 457 | u32 l; |
| 458 | |||
| 459 | l = dma_read(CSDP(lch)); | ||
| 460 | l &= ~(0x03 << 7); | ||
| 381 | 461 | ||
| 382 | switch (burst_mode) { | 462 | switch (burst_mode) { |
| 383 | case OMAP_DMA_DATA_BURST_DIS: | 463 | case OMAP_DMA_DATA_BURST_DIS: |
| @@ -408,55 +488,73 @@ void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) | |||
| 408 | default: | 488 | default: |
| 409 | BUG(); | 489 | BUG(); |
| 410 | } | 490 | } |
| 411 | OMAP_DMA_CSDP_REG(lch) |= (burst << 7); | 491 | |
| 492 | l |= (burst << 7); | ||
| 493 | dma_write(l, CSDP(lch)); | ||
| 412 | } | 494 | } |
| 495 | EXPORT_SYMBOL(omap_set_dma_src_burst_mode); | ||
| 413 | 496 | ||
| 414 | /* Note that dest_port is only for OMAP1 */ | 497 | /* Note that dest_port is only for OMAP1 */ |
| 415 | void omap_set_dma_dest_params(int lch, int dest_port, int dest_amode, | 498 | void omap_set_dma_dest_params(int lch, int dest_port, int dest_amode, |
| 416 | unsigned long dest_start, | 499 | unsigned long dest_start, |
| 417 | int dst_ei, int dst_fi) | 500 | int dst_ei, int dst_fi) |
| 418 | { | 501 | { |
| 502 | u32 l; | ||
| 503 | |||
| 419 | if (cpu_class_is_omap1()) { | 504 | if (cpu_class_is_omap1()) { |
| 420 | OMAP_DMA_CSDP_REG(lch) &= ~(0x1f << 9); | 505 | l = dma_read(CSDP(lch)); |
| 421 | OMAP_DMA_CSDP_REG(lch) |= dest_port << 9; | 506 | l &= ~(0x1f << 9); |
| 507 | l |= dest_port << 9; | ||
| 508 | dma_write(l, CSDP(lch)); | ||
| 422 | } | 509 | } |
| 423 | 510 | ||
| 424 | OMAP_DMA_CCR_REG(lch) &= ~(0x03 << 14); | 511 | l = dma_read(CCR(lch)); |
| 425 | OMAP_DMA_CCR_REG(lch) |= dest_amode << 14; | 512 | l &= ~(0x03 << 14); |
| 513 | l |= dest_amode << 14; | ||
| 514 | dma_write(l, CCR(lch)); | ||
| 426 | 515 | ||
| 427 | if (cpu_class_is_omap1()) { | 516 | if (cpu_class_is_omap1()) { |
| 428 | OMAP1_DMA_CDSA_U_REG(lch) = dest_start >> 16; | 517 | dma_write(dest_start >> 16, CDSA_U(lch)); |
| 429 | OMAP1_DMA_CDSA_L_REG(lch) = dest_start; | 518 | dma_write(dest_start, CDSA_L(lch)); |
| 430 | } | 519 | } |
| 431 | 520 | ||
| 432 | if (cpu_class_is_omap2()) | 521 | if (cpu_class_is_omap2()) |
| 433 | OMAP2_DMA_CDSA_REG(lch) = dest_start; | 522 | dma_write(dest_start, CDSA(lch)); |
| 434 | 523 | ||
| 435 | OMAP_DMA_CDEI_REG(lch) = dst_ei; | 524 | dma_write(dst_ei, CDEI(lch)); |
| 436 | OMAP_DMA_CDFI_REG(lch) = dst_fi; | 525 | dma_write(dst_fi, CDFI(lch)); |
| 437 | } | 526 | } |
| 527 | EXPORT_SYMBOL(omap_set_dma_dest_params); | ||
| 438 | 528 | ||
| 439 | void omap_set_dma_dest_index(int lch, int eidx, int fidx) | 529 | void omap_set_dma_dest_index(int lch, int eidx, int fidx) |
| 440 | { | 530 | { |
| 441 | if (cpu_class_is_omap2()) { | 531 | if (cpu_class_is_omap2()) |
| 442 | REVISIT_24XX(); | ||
| 443 | return; | 532 | return; |
| 444 | } | 533 | |
| 445 | OMAP_DMA_CDEI_REG(lch) = eidx; | 534 | dma_write(eidx, CDEI(lch)); |
| 446 | OMAP_DMA_CDFI_REG(lch) = fidx; | 535 | dma_write(fidx, CDFI(lch)); |
| 447 | } | 536 | } |
| 537 | EXPORT_SYMBOL(omap_set_dma_dest_index); | ||
| 448 | 538 | ||
| 449 | void omap_set_dma_dest_data_pack(int lch, int enable) | 539 | void omap_set_dma_dest_data_pack(int lch, int enable) |
| 450 | { | 540 | { |
| 451 | OMAP_DMA_CSDP_REG(lch) &= ~(1 << 13); | 541 | u32 l; |
| 542 | |||
| 543 | l = dma_read(CSDP(lch)); | ||
| 544 | l &= ~(1 << 13); | ||
| 452 | if (enable) | 545 | if (enable) |
| 453 | OMAP_DMA_CSDP_REG(lch) |= 1 << 13; | 546 | l |= 1 << 13; |
| 547 | dma_write(l, CSDP(lch)); | ||
| 454 | } | 548 | } |
| 549 | EXPORT_SYMBOL(omap_set_dma_dest_data_pack); | ||
| 455 | 550 | ||
| 456 | void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) | 551 | void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) |
| 457 | { | 552 | { |
| 458 | unsigned int burst = 0; | 553 | unsigned int burst = 0; |
| 459 | OMAP_DMA_CSDP_REG(lch) &= ~(0x03 << 14); | 554 | u32 l; |
| 555 | |||
| 556 | l = dma_read(CSDP(lch)); | ||
| 557 | l &= ~(0x03 << 14); | ||
| 460 | 558 | ||
| 461 | switch (burst_mode) { | 559 | switch (burst_mode) { |
| 462 | case OMAP_DMA_DATA_BURST_DIS: | 560 | case OMAP_DMA_DATA_BURST_DIS: |
| @@ -486,8 +584,10 @@ void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) | |||
| 486 | BUG(); | 584 | BUG(); |
| 487 | return; | 585 | return; |
| 488 | } | 586 | } |
| 489 | OMAP_DMA_CSDP_REG(lch) |= (burst << 14); | 587 | l |= (burst << 14); |
| 588 | dma_write(l, CSDP(lch)); | ||
| 490 | } | 589 | } |
| 590 | EXPORT_SYMBOL(omap_set_dma_dest_burst_mode); | ||
| 491 | 591 | ||
| 492 | static inline void omap_enable_channel_irq(int lch) | 592 | static inline void omap_enable_channel_irq(int lch) |
| 493 | { | 593 | { |
| @@ -495,64 +595,74 @@ static inline void omap_enable_channel_irq(int lch) | |||
| 495 | 595 | ||
| 496 | /* Clear CSR */ | 596 | /* Clear CSR */ |
| 497 | if (cpu_class_is_omap1()) | 597 | if (cpu_class_is_omap1()) |
| 498 | status = OMAP_DMA_CSR_REG(lch); | 598 | status = dma_read(CSR(lch)); |
| 499 | else if (cpu_class_is_omap2()) | 599 | else if (cpu_class_is_omap2()) |
| 500 | OMAP_DMA_CSR_REG(lch) = OMAP2_DMA_CSR_CLEAR_MASK; | 600 | dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(lch)); |
| 501 | 601 | ||
| 502 | /* Enable some nice interrupts. */ | 602 | /* Enable some nice interrupts. */ |
| 503 | OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; | 603 | dma_write(dma_chan[lch].enabled_irqs, CICR(lch)); |
| 504 | |||
| 505 | dma_chan[lch].flags |= OMAP_DMA_ACTIVE; | ||
| 506 | } | 604 | } |
| 507 | 605 | ||
| 508 | static void omap_disable_channel_irq(int lch) | 606 | static void omap_disable_channel_irq(int lch) |
| 509 | { | 607 | { |
| 510 | if (cpu_class_is_omap2()) | 608 | if (cpu_class_is_omap2()) |
| 511 | OMAP_DMA_CICR_REG(lch) = 0; | 609 | dma_write(0, CICR(lch)); |
| 512 | } | 610 | } |
| 513 | 611 | ||
| 514 | void omap_enable_dma_irq(int lch, u16 bits) | 612 | void omap_enable_dma_irq(int lch, u16 bits) |
| 515 | { | 613 | { |
| 516 | dma_chan[lch].enabled_irqs |= bits; | 614 | dma_chan[lch].enabled_irqs |= bits; |
| 517 | } | 615 | } |
| 616 | EXPORT_SYMBOL(omap_enable_dma_irq); | ||
| 518 | 617 | ||
| 519 | void omap_disable_dma_irq(int lch, u16 bits) | 618 | void omap_disable_dma_irq(int lch, u16 bits) |
| 520 | { | 619 | { |
| 521 | dma_chan[lch].enabled_irqs &= ~bits; | 620 | dma_chan[lch].enabled_irqs &= ~bits; |
| 522 | } | 621 | } |
| 622 | EXPORT_SYMBOL(omap_disable_dma_irq); | ||
| 523 | 623 | ||
| 524 | static inline void enable_lnk(int lch) | 624 | static inline void enable_lnk(int lch) |
| 525 | { | 625 | { |
| 626 | u32 l; | ||
| 627 | |||
| 628 | l = dma_read(CLNK_CTRL(lch)); | ||
| 629 | |||
| 526 | if (cpu_class_is_omap1()) | 630 | if (cpu_class_is_omap1()) |
| 527 | OMAP_DMA_CLNK_CTRL_REG(lch) &= ~(1 << 14); | 631 | l &= ~(1 << 14); |
| 528 | 632 | ||
| 529 | /* Set the ENABLE_LNK bits */ | 633 | /* Set the ENABLE_LNK bits */ |
| 530 | if (dma_chan[lch].next_lch != -1) | 634 | if (dma_chan[lch].next_lch != -1) |
| 531 | OMAP_DMA_CLNK_CTRL_REG(lch) = | 635 | l = dma_chan[lch].next_lch | (1 << 15); |
| 532 | dma_chan[lch].next_lch | (1 << 15); | ||
| 533 | 636 | ||
| 534 | #ifndef CONFIG_ARCH_OMAP1 | 637 | #ifndef CONFIG_ARCH_OMAP1 |
| 535 | if (dma_chan[lch].next_linked_ch != -1) | 638 | if (cpu_class_is_omap2()) |
| 536 | OMAP_DMA_CLNK_CTRL_REG(lch) = | 639 | if (dma_chan[lch].next_linked_ch != -1) |
| 537 | dma_chan[lch].next_linked_ch | (1 << 15); | 640 | l = dma_chan[lch].next_linked_ch | (1 << 15); |
| 538 | #endif | 641 | #endif |
| 642 | |||
| 643 | dma_write(l, CLNK_CTRL(lch)); | ||
| 539 | } | 644 | } |
| 540 | 645 | ||
| 541 | static inline void disable_lnk(int lch) | 646 | static inline void disable_lnk(int lch) |
| 542 | { | 647 | { |
| 648 | u32 l; | ||
| 649 | |||
| 650 | l = dma_read(CLNK_CTRL(lch)); | ||
| 651 | |||
| 543 | /* Disable interrupts */ | 652 | /* Disable interrupts */ |
| 544 | if (cpu_class_is_omap1()) { | 653 | if (cpu_class_is_omap1()) { |
| 545 | OMAP_DMA_CICR_REG(lch) = 0; | 654 | dma_write(0, CICR(lch)); |
| 546 | /* Set the STOP_LNK bit */ | 655 | /* Set the STOP_LNK bit */ |
| 547 | OMAP_DMA_CLNK_CTRL_REG(lch) |= 1 << 14; | 656 | l |= 1 << 14; |
| 548 | } | 657 | } |
| 549 | 658 | ||
| 550 | if (cpu_class_is_omap2()) { | 659 | if (cpu_class_is_omap2()) { |
| 551 | omap_disable_channel_irq(lch); | 660 | omap_disable_channel_irq(lch); |
| 552 | /* Clear the ENABLE_LNK bit */ | 661 | /* Clear the ENABLE_LNK bit */ |
| 553 | OMAP_DMA_CLNK_CTRL_REG(lch) &= ~(1 << 15); | 662 | l &= ~(1 << 15); |
| 554 | } | 663 | } |
| 555 | 664 | ||
| 665 | dma_write(l, CLNK_CTRL(lch)); | ||
| 556 | dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE; | 666 | dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE; |
| 557 | } | 667 | } |
| 558 | 668 | ||
| @@ -563,13 +673,13 @@ static inline void omap2_enable_irq_lch(int lch) | |||
| 563 | if (!cpu_class_is_omap2()) | 673 | if (!cpu_class_is_omap2()) |
| 564 | return; | 674 | return; |
| 565 | 675 | ||
| 566 | val = omap_readl(OMAP_DMA4_IRQENABLE_L0); | 676 | val = dma_read(IRQENABLE_L0); |
| 567 | val |= 1 << lch; | 677 | val |= 1 << lch; |
| 568 | omap_writel(val, OMAP_DMA4_IRQENABLE_L0); | 678 | dma_write(val, IRQENABLE_L0); |
| 569 | } | 679 | } |
| 570 | 680 | ||
| 571 | int omap_request_dma(int dev_id, const char *dev_name, | 681 | int omap_request_dma(int dev_id, const char *dev_name, |
| 572 | void (* callback)(int lch, u16 ch_status, void *data), | 682 | void (*callback)(int lch, u16 ch_status, void *data), |
| 573 | void *data, int *dma_ch_out) | 683 | void *data, int *dma_ch_out) |
| 574 | { | 684 | { |
| 575 | int ch, free_ch = -1; | 685 | int ch, free_ch = -1; |
| @@ -602,10 +712,14 @@ int omap_request_dma(int dev_id, const char *dev_name, | |||
| 602 | chan->dev_name = dev_name; | 712 | chan->dev_name = dev_name; |
| 603 | chan->callback = callback; | 713 | chan->callback = callback; |
| 604 | chan->data = data; | 714 | chan->data = data; |
| 715 | |||
| 605 | #ifndef CONFIG_ARCH_OMAP1 | 716 | #ifndef CONFIG_ARCH_OMAP1 |
| 606 | chan->chain_id = -1; | 717 | if (cpu_class_is_omap2()) { |
| 607 | chan->next_linked_ch = -1; | 718 | chan->chain_id = -1; |
| 719 | chan->next_linked_ch = -1; | ||
| 720 | } | ||
| 608 | #endif | 721 | #endif |
| 722 | |||
| 609 | chan->enabled_irqs = OMAP_DMA_DROP_IRQ | OMAP_DMA_BLOCK_IRQ; | 723 | chan->enabled_irqs = OMAP_DMA_DROP_IRQ | OMAP_DMA_BLOCK_IRQ; |
| 610 | 724 | ||
| 611 | if (cpu_class_is_omap1()) | 725 | if (cpu_class_is_omap1()) |
| @@ -620,26 +734,28 @@ int omap_request_dma(int dev_id, const char *dev_name, | |||
| 620 | set_gdma_dev(free_ch + 1, dev_id); | 734 | set_gdma_dev(free_ch + 1, dev_id); |
| 621 | dev_id = free_ch + 1; | 735 | dev_id = free_ch + 1; |
| 622 | } | 736 | } |
| 623 | /* Disable the 1510 compatibility mode and set the sync device | 737 | /* |
| 624 | * id. */ | 738 | * Disable the 1510 compatibility mode and set the sync device |
| 625 | OMAP_DMA_CCR_REG(free_ch) = dev_id | (1 << 10); | 739 | * id. |
| 740 | */ | ||
| 741 | dma_write(dev_id | (1 << 10), CCR(free_ch)); | ||
| 626 | } else if (cpu_is_omap730() || cpu_is_omap15xx()) { | 742 | } else if (cpu_is_omap730() || cpu_is_omap15xx()) { |
| 627 | OMAP_DMA_CCR_REG(free_ch) = dev_id; | 743 | dma_write(dev_id, CCR(free_ch)); |
| 628 | } | 744 | } |
| 629 | 745 | ||
| 630 | if (cpu_class_is_omap2()) { | 746 | if (cpu_class_is_omap2()) { |
| 631 | omap2_enable_irq_lch(free_ch); | 747 | omap2_enable_irq_lch(free_ch); |
| 632 | |||
| 633 | omap_enable_channel_irq(free_ch); | 748 | omap_enable_channel_irq(free_ch); |
| 634 | /* Clear the CSR register and IRQ status register */ | 749 | /* Clear the CSR register and IRQ status register */ |
| 635 | OMAP_DMA_CSR_REG(free_ch) = OMAP2_DMA_CSR_CLEAR_MASK; | 750 | dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(free_ch)); |
| 636 | omap_writel(1 << free_ch, OMAP_DMA4_IRQSTATUS_L0); | 751 | dma_write(1 << free_ch, IRQSTATUS_L0); |
| 637 | } | 752 | } |
| 638 | 753 | ||
| 639 | *dma_ch_out = free_ch; | 754 | *dma_ch_out = free_ch; |
| 640 | 755 | ||
| 641 | return 0; | 756 | return 0; |
| 642 | } | 757 | } |
| 758 | EXPORT_SYMBOL(omap_request_dma); | ||
| 643 | 759 | ||
| 644 | void omap_free_dma(int lch) | 760 | void omap_free_dma(int lch) |
| 645 | { | 761 | { |
| @@ -647,11 +763,12 @@ void omap_free_dma(int lch) | |||
| 647 | 763 | ||
| 648 | spin_lock_irqsave(&dma_chan_lock, flags); | 764 | spin_lock_irqsave(&dma_chan_lock, flags); |
| 649 | if (dma_chan[lch].dev_id == -1) { | 765 | if (dma_chan[lch].dev_id == -1) { |
| 650 | printk("omap_dma: trying to free nonallocated DMA channel %d\n", | 766 | pr_err("omap_dma: trying to free unallocated DMA channel %d\n", |
| 651 | lch); | 767 | lch); |
| 652 | spin_unlock_irqrestore(&dma_chan_lock, flags); | 768 | spin_unlock_irqrestore(&dma_chan_lock, flags); |
| 653 | return; | 769 | return; |
| 654 | } | 770 | } |
| 771 | |||
| 655 | dma_chan[lch].dev_id = -1; | 772 | dma_chan[lch].dev_id = -1; |
| 656 | dma_chan[lch].next_lch = -1; | 773 | dma_chan[lch].next_lch = -1; |
| 657 | dma_chan[lch].callback = NULL; | 774 | dma_chan[lch].callback = NULL; |
| @@ -659,30 +776,31 @@ void omap_free_dma(int lch) | |||
| 659 | 776 | ||
| 660 | if (cpu_class_is_omap1()) { | 777 | if (cpu_class_is_omap1()) { |
| 661 | /* Disable all DMA interrupts for the channel. */ | 778 | /* Disable all DMA interrupts for the channel. */ |
| 662 | OMAP_DMA_CICR_REG(lch) = 0; | 779 | dma_write(0, CICR(lch)); |
| 663 | /* Make sure the DMA transfer is stopped. */ | 780 | /* Make sure the DMA transfer is stopped. */ |
| 664 | OMAP_DMA_CCR_REG(lch) = 0; | 781 | dma_write(0, CCR(lch)); |
| 665 | } | 782 | } |
| 666 | 783 | ||
| 667 | if (cpu_class_is_omap2()) { | 784 | if (cpu_class_is_omap2()) { |
| 668 | u32 val; | 785 | u32 val; |
| 669 | /* Disable interrupts */ | 786 | /* Disable interrupts */ |
| 670 | val = omap_readl(OMAP_DMA4_IRQENABLE_L0); | 787 | val = dma_read(IRQENABLE_L0); |
| 671 | val &= ~(1 << lch); | 788 | val &= ~(1 << lch); |
| 672 | omap_writel(val, OMAP_DMA4_IRQENABLE_L0); | 789 | dma_write(val, IRQENABLE_L0); |
| 673 | 790 | ||
| 674 | /* Clear the CSR register and IRQ status register */ | 791 | /* Clear the CSR register and IRQ status register */ |
| 675 | OMAP_DMA_CSR_REG(lch) = OMAP2_DMA_CSR_CLEAR_MASK; | 792 | dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(lch)); |
| 676 | omap_writel(1 << lch, OMAP_DMA4_IRQSTATUS_L0); | 793 | dma_write(1 << lch, IRQSTATUS_L0); |
| 677 | 794 | ||
| 678 | /* Disable all DMA interrupts for the channel. */ | 795 | /* Disable all DMA interrupts for the channel. */ |
| 679 | OMAP_DMA_CICR_REG(lch) = 0; | 796 | dma_write(0, CICR(lch)); |
| 680 | 797 | ||
| 681 | /* Make sure the DMA transfer is stopped. */ | 798 | /* Make sure the DMA transfer is stopped. */ |
| 682 | OMAP_DMA_CCR_REG(lch) = 0; | 799 | dma_write(0, CCR(lch)); |
| 683 | omap_clear_dma(lch); | 800 | omap_clear_dma(lch); |
| 684 | } | 801 | } |
| 685 | } | 802 | } |
| 803 | EXPORT_SYMBOL(omap_free_dma); | ||
| 686 | 804 | ||
| 687 | /** | 805 | /** |
| 688 | * @brief omap_dma_set_global_params : Set global priority settings for dma | 806 | * @brief omap_dma_set_global_params : Set global priority settings for dma |
| @@ -710,7 +828,7 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams) | |||
| 710 | reg = (arb_rate & 0xff) << 16; | 828 | reg = (arb_rate & 0xff) << 16; |
| 711 | reg |= (0xff & max_fifo_depth); | 829 | reg |= (0xff & max_fifo_depth); |
| 712 | 830 | ||
| 713 | omap_writel(reg, OMAP_DMA4_GCR_REG); | 831 | dma_write(reg, GCR); |
| 714 | } | 832 | } |
| 715 | EXPORT_SYMBOL(omap_dma_set_global_params); | 833 | EXPORT_SYMBOL(omap_dma_set_global_params); |
| 716 | 834 | ||
| @@ -727,20 +845,21 @@ int | |||
| 727 | omap_dma_set_prio_lch(int lch, unsigned char read_prio, | 845 | omap_dma_set_prio_lch(int lch, unsigned char read_prio, |
| 728 | unsigned char write_prio) | 846 | unsigned char write_prio) |
| 729 | { | 847 | { |
| 730 | u32 w; | 848 | u32 l; |
| 731 | 849 | ||
| 732 | if (unlikely((lch < 0 || lch >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 850 | if (unlikely((lch < 0 || lch >= dma_lch_count))) { |
| 733 | printk(KERN_ERR "Invalid channel id\n"); | 851 | printk(KERN_ERR "Invalid channel id\n"); |
| 734 | return -EINVAL; | 852 | return -EINVAL; |
| 735 | } | 853 | } |
| 736 | w = OMAP_DMA_CCR_REG(lch); | 854 | l = dma_read(CCR(lch)); |
| 737 | w &= ~((1 << 6) | (1 << 26)); | 855 | l &= ~((1 << 6) | (1 << 26)); |
| 738 | if (cpu_is_omap2430() || cpu_is_omap34xx()) | 856 | if (cpu_is_omap2430() || cpu_is_omap34xx()) |
| 739 | w |= ((read_prio & 0x1) << 6) | ((write_prio & 0x1) << 26); | 857 | l |= ((read_prio & 0x1) << 6) | ((write_prio & 0x1) << 26); |
| 740 | else | 858 | else |
| 741 | w |= ((read_prio & 0x1) << 6); | 859 | l |= ((read_prio & 0x1) << 6); |
| 860 | |||
| 861 | dma_write(l, CCR(lch)); | ||
| 742 | 862 | ||
| 743 | OMAP_DMA_CCR_REG(lch) = w; | ||
| 744 | return 0; | 863 | return 0; |
| 745 | } | 864 | } |
| 746 | EXPORT_SYMBOL(omap_dma_set_prio_lch); | 865 | EXPORT_SYMBOL(omap_dma_set_prio_lch); |
| @@ -756,28 +875,34 @@ void omap_clear_dma(int lch) | |||
| 756 | local_irq_save(flags); | 875 | local_irq_save(flags); |
| 757 | 876 | ||
| 758 | if (cpu_class_is_omap1()) { | 877 | if (cpu_class_is_omap1()) { |
| 759 | int status; | 878 | u32 l; |
| 760 | OMAP_DMA_CCR_REG(lch) &= ~OMAP_DMA_CCR_EN; | 879 | |
| 880 | l = dma_read(CCR(lch)); | ||
| 881 | l &= ~OMAP_DMA_CCR_EN; | ||
| 882 | dma_write(l, CCR(lch)); | ||
| 761 | 883 | ||
| 762 | /* Clear pending interrupts */ | 884 | /* Clear pending interrupts */ |
| 763 | status = OMAP_DMA_CSR_REG(lch); | 885 | l = dma_read(CSR(lch)); |
| 764 | } | 886 | } |
| 765 | 887 | ||
| 766 | if (cpu_class_is_omap2()) { | 888 | if (cpu_class_is_omap2()) { |
| 767 | int i; | 889 | int i; |
| 768 | u32 lch_base = OMAP_DMA4_BASE + lch * 0x60 + 0x80; | 890 | void __iomem *lch_base = omap_dma_base + OMAP_DMA4_CH_BASE(lch); |
| 769 | for (i = 0; i < 0x44; i += 4) | 891 | for (i = 0; i < 0x44; i += 4) |
| 770 | omap_writel(0, lch_base + i); | 892 | __raw_writel(0, lch_base + i); |
| 771 | } | 893 | } |
| 772 | 894 | ||
| 773 | local_irq_restore(flags); | 895 | local_irq_restore(flags); |
| 774 | } | 896 | } |
| 897 | EXPORT_SYMBOL(omap_clear_dma); | ||
| 775 | 898 | ||
| 776 | void omap_start_dma(int lch) | 899 | void omap_start_dma(int lch) |
| 777 | { | 900 | { |
| 901 | u32 l; | ||
| 902 | |||
| 778 | if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) { | 903 | if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) { |
| 779 | int next_lch, cur_lch; | 904 | int next_lch, cur_lch; |
| 780 | char dma_chan_link_map[OMAP_LOGICAL_DMA_CH_COUNT]; | 905 | char dma_chan_link_map[OMAP_DMA4_LOGICAL_DMA_CH_COUNT]; |
| 781 | 906 | ||
| 782 | dma_chan_link_map[lch] = 1; | 907 | dma_chan_link_map[lch] = 1; |
| 783 | /* Set the link register of the first channel */ | 908 | /* Set the link register of the first channel */ |
| @@ -801,27 +926,34 @@ void omap_start_dma(int lch) | |||
| 801 | } while (next_lch != -1); | 926 | } while (next_lch != -1); |
| 802 | } else if (cpu_class_is_omap2()) { | 927 | } else if (cpu_class_is_omap2()) { |
| 803 | /* Errata: Need to write lch even if not using chaining */ | 928 | /* Errata: Need to write lch even if not using chaining */ |
| 804 | OMAP_DMA_CLNK_CTRL_REG(lch) = lch; | 929 | dma_write(lch, CLNK_CTRL(lch)); |
| 805 | } | 930 | } |
| 806 | 931 | ||
| 807 | omap_enable_channel_irq(lch); | 932 | omap_enable_channel_irq(lch); |
| 808 | 933 | ||
| 809 | /* Errata: On ES2.0 BUFFERING disable must be set. | 934 | l = dma_read(CCR(lch)); |
| 810 | * This will always fail on ES1.0 */ | ||
| 811 | if (cpu_is_omap24xx()) { | ||
| 812 | OMAP_DMA_CCR_REG(lch) |= OMAP_DMA_CCR_EN; | ||
| 813 | } | ||
| 814 | 935 | ||
| 815 | OMAP_DMA_CCR_REG(lch) |= OMAP_DMA_CCR_EN; | 936 | /* |
| 937 | * Errata: On ES2.0 BUFFERING disable must be set. | ||
| 938 | * This will always fail on ES1.0 | ||
| 939 | */ | ||
| 940 | if (cpu_is_omap24xx()) | ||
| 941 | l |= OMAP_DMA_CCR_EN; | ||
| 942 | |||
| 943 | l |= OMAP_DMA_CCR_EN; | ||
| 944 | dma_write(l, CCR(lch)); | ||
| 816 | 945 | ||
| 817 | dma_chan[lch].flags |= OMAP_DMA_ACTIVE; | 946 | dma_chan[lch].flags |= OMAP_DMA_ACTIVE; |
| 818 | } | 947 | } |
| 948 | EXPORT_SYMBOL(omap_start_dma); | ||
| 819 | 949 | ||
| 820 | void omap_stop_dma(int lch) | 950 | void omap_stop_dma(int lch) |
| 821 | { | 951 | { |
| 952 | u32 l; | ||
| 953 | |||
| 822 | if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) { | 954 | if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) { |
| 823 | int next_lch, cur_lch = lch; | 955 | int next_lch, cur_lch = lch; |
| 824 | char dma_chan_link_map[OMAP_LOGICAL_DMA_CH_COUNT]; | 956 | char dma_chan_link_map[OMAP_DMA4_LOGICAL_DMA_CH_COUNT]; |
| 825 | 957 | ||
| 826 | memset(dma_chan_link_map, 0, sizeof(dma_chan_link_map)); | 958 | memset(dma_chan_link_map, 0, sizeof(dma_chan_link_map)); |
| 827 | do { | 959 | do { |
| @@ -842,18 +974,22 @@ void omap_stop_dma(int lch) | |||
| 842 | 974 | ||
| 843 | /* Disable all interrupts on the channel */ | 975 | /* Disable all interrupts on the channel */ |
| 844 | if (cpu_class_is_omap1()) | 976 | if (cpu_class_is_omap1()) |
| 845 | OMAP_DMA_CICR_REG(lch) = 0; | 977 | dma_write(0, CICR(lch)); |
| 978 | |||
| 979 | l = dma_read(CCR(lch)); | ||
| 980 | l &= ~OMAP_DMA_CCR_EN; | ||
| 981 | dma_write(l, CCR(lch)); | ||
| 846 | 982 | ||
| 847 | OMAP_DMA_CCR_REG(lch) &= ~OMAP_DMA_CCR_EN; | ||
| 848 | dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE; | 983 | dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE; |
| 849 | } | 984 | } |
| 985 | EXPORT_SYMBOL(omap_stop_dma); | ||
| 850 | 986 | ||
| 851 | /* | 987 | /* |
| 852 | * Allows changing the DMA callback function or data. This may be needed if | 988 | * Allows changing the DMA callback function or data. This may be needed if |
| 853 | * the driver shares a single DMA channel for multiple dma triggers. | 989 | * the driver shares a single DMA channel for multiple dma triggers. |
| 854 | */ | 990 | */ |
| 855 | int omap_set_dma_callback(int lch, | 991 | int omap_set_dma_callback(int lch, |
| 856 | void (* callback)(int lch, u16 ch_status, void *data), | 992 | void (*callback)(int lch, u16 ch_status, void *data), |
| 857 | void *data) | 993 | void *data) |
| 858 | { | 994 | { |
| 859 | unsigned long flags; | 995 | unsigned long flags; |
| @@ -873,6 +1009,7 @@ int omap_set_dma_callback(int lch, | |||
| 873 | 1009 | ||
| 874 | return 0; | 1010 | return 0; |
| 875 | } | 1011 | } |
| 1012 | EXPORT_SYMBOL(omap_set_dma_callback); | ||
| 876 | 1013 | ||
| 877 | /* | 1014 | /* |
| 878 | * Returns current physical source address for the given DMA channel. | 1015 | * Returns current physical source address for the given DMA channel. |
| @@ -886,15 +1023,24 @@ dma_addr_t omap_get_dma_src_pos(int lch) | |||
| 886 | { | 1023 | { |
| 887 | dma_addr_t offset = 0; | 1024 | dma_addr_t offset = 0; |
| 888 | 1025 | ||
| 889 | if (cpu_class_is_omap1()) | 1026 | if (cpu_is_omap15xx()) |
| 890 | offset = (dma_addr_t) (OMAP1_DMA_CSSA_L_REG(lch) | | 1027 | offset = dma_read(CPC(lch)); |
| 891 | (OMAP1_DMA_CSSA_U_REG(lch) << 16)); | 1028 | else |
| 1029 | offset = dma_read(CSAC(lch)); | ||
| 892 | 1030 | ||
| 893 | if (cpu_class_is_omap2()) | 1031 | /* |
| 894 | offset = OMAP_DMA_CSAC_REG(lch); | 1032 | * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is |
| 1033 | * read before the DMA controller finished disabling the channel. | ||
| 1034 | */ | ||
| 1035 | if (!cpu_is_omap15xx() && offset == 0) | ||
| 1036 | offset = dma_read(CSAC(lch)); | ||
| 1037 | |||
| 1038 | if (cpu_class_is_omap1()) | ||
| 1039 | offset |= (dma_read(CSSA_U(lch)) << 16); | ||
| 895 | 1040 | ||
| 896 | return offset; | 1041 | return offset; |
| 897 | } | 1042 | } |
| 1043 | EXPORT_SYMBOL(omap_get_dma_src_pos); | ||
| 898 | 1044 | ||
| 899 | /* | 1045 | /* |
| 900 | * Returns current physical destination address for the given DMA channel. | 1046 | * Returns current physical destination address for the given DMA channel. |
| @@ -908,25 +1054,30 @@ dma_addr_t omap_get_dma_dst_pos(int lch) | |||
| 908 | { | 1054 | { |
| 909 | dma_addr_t offset = 0; | 1055 | dma_addr_t offset = 0; |
| 910 | 1056 | ||
| 911 | if (cpu_class_is_omap1()) | 1057 | if (cpu_is_omap15xx()) |
| 912 | offset = (dma_addr_t) (OMAP1_DMA_CDSA_L_REG(lch) | | 1058 | offset = dma_read(CPC(lch)); |
| 913 | (OMAP1_DMA_CDSA_U_REG(lch) << 16)); | 1059 | else |
| 1060 | offset = dma_read(CDAC(lch)); | ||
| 914 | 1061 | ||
| 915 | if (cpu_class_is_omap2()) | 1062 | /* |
| 916 | offset = OMAP_DMA_CDAC_REG(lch); | 1063 | * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is |
| 1064 | * read before the DMA controller finished disabling the channel. | ||
| 1065 | */ | ||
| 1066 | if (!cpu_is_omap15xx() && offset == 0) | ||
| 1067 | offset = dma_read(CDAC(lch)); | ||
| 1068 | |||
| 1069 | if (cpu_class_is_omap1()) | ||
| 1070 | offset |= (dma_read(CDSA_U(lch)) << 16); | ||
| 917 | 1071 | ||
| 918 | return offset; | 1072 | return offset; |
| 919 | } | 1073 | } |
| 1074 | EXPORT_SYMBOL(omap_get_dma_dst_pos); | ||
| 920 | 1075 | ||
| 921 | /* | 1076 | int omap_get_dma_active_status(int lch) |
| 922 | * Returns current source transfer counting for the given DMA channel. | ||
| 923 | * Can be used to monitor the progress of a transfer inside a block. | ||
| 924 | * It must be called with disabled interrupts. | ||
| 925 | */ | ||
| 926 | int omap_get_dma_src_addr_counter(int lch) | ||
| 927 | { | 1077 | { |
| 928 | return (dma_addr_t) OMAP_DMA_CSAC_REG(lch); | 1078 | return (dma_read(CCR(lch)) & OMAP_DMA_CCR_EN) != 0; |
| 929 | } | 1079 | } |
| 1080 | EXPORT_SYMBOL(omap_get_dma_active_status); | ||
| 930 | 1081 | ||
| 931 | int omap_dma_running(void) | 1082 | int omap_dma_running(void) |
| 932 | { | 1083 | { |
| @@ -938,7 +1089,7 @@ int omap_dma_running(void) | |||
| 938 | return 1; | 1089 | return 1; |
| 939 | 1090 | ||
| 940 | for (lch = 0; lch < dma_chan_count; lch++) | 1091 | for (lch = 0; lch < dma_chan_count; lch++) |
| 941 | if (OMAP_DMA_CCR_REG(lch) & OMAP_DMA_CCR_EN) | 1092 | if (dma_read(CCR(lch)) & OMAP_DMA_CCR_EN) |
| 942 | return 1; | 1093 | return 1; |
| 943 | 1094 | ||
| 944 | return 0; | 1095 | return 0; |
| @@ -949,7 +1100,7 @@ int omap_dma_running(void) | |||
| 949 | * For this DMA link to start, you still need to start (see omap_start_dma) | 1100 | * For this DMA link to start, you still need to start (see omap_start_dma) |
| 950 | * the first one. That will fire up the entire queue. | 1101 | * the first one. That will fire up the entire queue. |
| 951 | */ | 1102 | */ |
| 952 | void omap_dma_link_lch (int lch_head, int lch_queue) | 1103 | void omap_dma_link_lch(int lch_head, int lch_queue) |
| 953 | { | 1104 | { |
| 954 | if (omap_dma_in_1510_mode()) { | 1105 | if (omap_dma_in_1510_mode()) { |
| 955 | printk(KERN_ERR "DMA linking is not supported in 1510 mode\n"); | 1106 | printk(KERN_ERR "DMA linking is not supported in 1510 mode\n"); |
| @@ -966,11 +1117,12 @@ void omap_dma_link_lch (int lch_head, int lch_queue) | |||
| 966 | 1117 | ||
| 967 | dma_chan[lch_head].next_lch = lch_queue; | 1118 | dma_chan[lch_head].next_lch = lch_queue; |
| 968 | } | 1119 | } |
| 1120 | EXPORT_SYMBOL(omap_dma_link_lch); | ||
| 969 | 1121 | ||
| 970 | /* | 1122 | /* |
| 971 | * Once the DMA queue is stopped, we can destroy it. | 1123 | * Once the DMA queue is stopped, we can destroy it. |
| 972 | */ | 1124 | */ |
| 973 | void omap_dma_unlink_lch (int lch_head, int lch_queue) | 1125 | void omap_dma_unlink_lch(int lch_head, int lch_queue) |
| 974 | { | 1126 | { |
| 975 | if (omap_dma_in_1510_mode()) { | 1127 | if (omap_dma_in_1510_mode()) { |
| 976 | printk(KERN_ERR "DMA linking is not supported in 1510 mode\n"); | 1128 | printk(KERN_ERR "DMA linking is not supported in 1510 mode\n"); |
| @@ -985,7 +1137,6 @@ void omap_dma_unlink_lch (int lch_head, int lch_queue) | |||
| 985 | dump_stack(); | 1137 | dump_stack(); |
| 986 | } | 1138 | } |
| 987 | 1139 | ||
| 988 | |||
| 989 | if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) || | 1140 | if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) || |
| 990 | (dma_chan[lch_head].flags & OMAP_DMA_ACTIVE)) { | 1141 | (dma_chan[lch_head].flags & OMAP_DMA_ACTIVE)) { |
| 991 | printk(KERN_ERR "omap_dma: You need to stop the DMA channels " | 1142 | printk(KERN_ERR "omap_dma: You need to stop the DMA channels " |
| @@ -995,12 +1146,15 @@ void omap_dma_unlink_lch (int lch_head, int lch_queue) | |||
| 995 | 1146 | ||
| 996 | dma_chan[lch_head].next_lch = -1; | 1147 | dma_chan[lch_head].next_lch = -1; |
| 997 | } | 1148 | } |
| 1149 | EXPORT_SYMBOL(omap_dma_unlink_lch); | ||
| 1150 | |||
| 1151 | /*----------------------------------------------------------------------------*/ | ||
| 998 | 1152 | ||
| 999 | #ifndef CONFIG_ARCH_OMAP1 | 1153 | #ifndef CONFIG_ARCH_OMAP1 |
| 1000 | /* Create chain of DMA channesls */ | 1154 | /* Create chain of DMA channesls */ |
| 1001 | static void create_dma_lch_chain(int lch_head, int lch_queue) | 1155 | static void create_dma_lch_chain(int lch_head, int lch_queue) |
| 1002 | { | 1156 | { |
| 1003 | u32 w; | 1157 | u32 l; |
| 1004 | 1158 | ||
| 1005 | /* Check if this is the first link in chain */ | 1159 | /* Check if this is the first link in chain */ |
| 1006 | if (dma_chan[lch_head].next_linked_ch == -1) { | 1160 | if (dma_chan[lch_head].next_linked_ch == -1) { |
| @@ -1020,15 +1174,15 @@ static void create_dma_lch_chain(int lch_head, int lch_queue) | |||
| 1020 | lch_queue; | 1174 | lch_queue; |
| 1021 | } | 1175 | } |
| 1022 | 1176 | ||
| 1023 | w = OMAP_DMA_CLNK_CTRL_REG(lch_head); | 1177 | l = dma_read(CLNK_CTRL(lch_head)); |
| 1024 | w &= ~(0x1f); | 1178 | l &= ~(0x1f); |
| 1025 | w |= lch_queue; | 1179 | l |= lch_queue; |
| 1026 | OMAP_DMA_CLNK_CTRL_REG(lch_head) = w; | 1180 | dma_write(l, CLNK_CTRL(lch_head)); |
| 1027 | 1181 | ||
| 1028 | w = OMAP_DMA_CLNK_CTRL_REG(lch_queue); | 1182 | l = dma_read(CLNK_CTRL(lch_queue)); |
| 1029 | w &= ~(0x1f); | 1183 | l &= ~(0x1f); |
| 1030 | w |= (dma_chan[lch_queue].next_linked_ch); | 1184 | l |= (dma_chan[lch_queue].next_linked_ch); |
| 1031 | OMAP_DMA_CLNK_CTRL_REG(lch_queue) = w; | 1185 | dma_write(l, CLNK_CTRL(lch_queue)); |
| 1032 | } | 1186 | } |
| 1033 | 1187 | ||
| 1034 | /** | 1188 | /** |
| @@ -1063,7 +1217,7 @@ int omap_request_dma_chain(int dev_id, const char *dev_name, | |||
| 1063 | } | 1217 | } |
| 1064 | 1218 | ||
| 1065 | if (unlikely((no_of_chans < 1 | 1219 | if (unlikely((no_of_chans < 1 |
| 1066 | || no_of_chans > OMAP_LOGICAL_DMA_CH_COUNT))) { | 1220 | || no_of_chans > dma_lch_count))) { |
| 1067 | printk(KERN_ERR "Invalid Number of channels requested\n"); | 1221 | printk(KERN_ERR "Invalid Number of channels requested\n"); |
| 1068 | return -EINVAL; | 1222 | return -EINVAL; |
| 1069 | } | 1223 | } |
| @@ -1118,6 +1272,7 @@ int omap_request_dma_chain(int dev_id, const char *dev_name, | |||
| 1118 | for (i = 0; i < (no_of_chans - 1); i++) | 1272 | for (i = 0; i < (no_of_chans - 1); i++) |
| 1119 | create_dma_lch_chain(channels[i], channels[i + 1]); | 1273 | create_dma_lch_chain(channels[i], channels[i + 1]); |
| 1120 | } | 1274 | } |
| 1275 | |||
| 1121 | return 0; | 1276 | return 0; |
| 1122 | } | 1277 | } |
| 1123 | EXPORT_SYMBOL(omap_request_dma_chain); | 1278 | EXPORT_SYMBOL(omap_request_dma_chain); |
| @@ -1140,7 +1295,7 @@ int omap_modify_dma_chain_params(int chain_id, | |||
| 1140 | 1295 | ||
| 1141 | /* Check for input params */ | 1296 | /* Check for input params */ |
| 1142 | if (unlikely((chain_id < 0 | 1297 | if (unlikely((chain_id < 0 |
| 1143 | || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1298 | || chain_id >= dma_lch_count))) { |
| 1144 | printk(KERN_ERR "Invalid chain id\n"); | 1299 | printk(KERN_ERR "Invalid chain id\n"); |
| 1145 | return -EINVAL; | 1300 | return -EINVAL; |
| 1146 | } | 1301 | } |
| @@ -1160,6 +1315,7 @@ int omap_modify_dma_chain_params(int chain_id, | |||
| 1160 | */ | 1315 | */ |
| 1161 | omap_set_dma_params(channels[i], ¶ms); | 1316 | omap_set_dma_params(channels[i], ¶ms); |
| 1162 | } | 1317 | } |
| 1318 | |||
| 1163 | return 0; | 1319 | return 0; |
| 1164 | } | 1320 | } |
| 1165 | EXPORT_SYMBOL(omap_modify_dma_chain_params); | 1321 | EXPORT_SYMBOL(omap_modify_dma_chain_params); |
| @@ -1178,7 +1334,7 @@ int omap_free_dma_chain(int chain_id) | |||
| 1178 | u32 i; | 1334 | u32 i; |
| 1179 | 1335 | ||
| 1180 | /* Check for input params */ | 1336 | /* Check for input params */ |
| 1181 | if (unlikely((chain_id < 0 || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1337 | if (unlikely((chain_id < 0 || chain_id >= dma_lch_count))) { |
| 1182 | printk(KERN_ERR "Invalid chain id\n"); | 1338 | printk(KERN_ERR "Invalid chain id\n"); |
| 1183 | return -EINVAL; | 1339 | return -EINVAL; |
| 1184 | } | 1340 | } |
| @@ -1203,6 +1359,7 @@ int omap_free_dma_chain(int chain_id) | |||
| 1203 | dma_linked_lch[chain_id].linked_dmach_q = NULL; | 1359 | dma_linked_lch[chain_id].linked_dmach_q = NULL; |
| 1204 | dma_linked_lch[chain_id].chain_mode = -1; | 1360 | dma_linked_lch[chain_id].chain_mode = -1; |
| 1205 | dma_linked_lch[chain_id].chain_state = -1; | 1361 | dma_linked_lch[chain_id].chain_state = -1; |
| 1362 | |||
| 1206 | return (0); | 1363 | return (0); |
| 1207 | } | 1364 | } |
| 1208 | EXPORT_SYMBOL(omap_free_dma_chain); | 1365 | EXPORT_SYMBOL(omap_free_dma_chain); |
| @@ -1218,7 +1375,7 @@ EXPORT_SYMBOL(omap_free_dma_chain); | |||
| 1218 | int omap_dma_chain_status(int chain_id) | 1375 | int omap_dma_chain_status(int chain_id) |
| 1219 | { | 1376 | { |
| 1220 | /* Check for input params */ | 1377 | /* Check for input params */ |
| 1221 | if (unlikely((chain_id < 0 || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1378 | if (unlikely((chain_id < 0 || chain_id >= dma_lch_count))) { |
| 1222 | printk(KERN_ERR "Invalid chain id\n"); | 1379 | printk(KERN_ERR "Invalid chain id\n"); |
| 1223 | return -EINVAL; | 1380 | return -EINVAL; |
| 1224 | } | 1381 | } |
| @@ -1233,6 +1390,7 @@ int omap_dma_chain_status(int chain_id) | |||
| 1233 | 1390 | ||
| 1234 | if (OMAP_DMA_CHAIN_QEMPTY(chain_id)) | 1391 | if (OMAP_DMA_CHAIN_QEMPTY(chain_id)) |
| 1235 | return OMAP_DMA_CHAIN_INACTIVE; | 1392 | return OMAP_DMA_CHAIN_INACTIVE; |
| 1393 | |||
| 1236 | return OMAP_DMA_CHAIN_ACTIVE; | 1394 | return OMAP_DMA_CHAIN_ACTIVE; |
| 1237 | } | 1395 | } |
| 1238 | EXPORT_SYMBOL(omap_dma_chain_status); | 1396 | EXPORT_SYMBOL(omap_dma_chain_status); |
| @@ -1255,11 +1413,13 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, | |||
| 1255 | int elem_count, int frame_count, void *callbk_data) | 1413 | int elem_count, int frame_count, void *callbk_data) |
| 1256 | { | 1414 | { |
| 1257 | int *channels; | 1415 | int *channels; |
| 1258 | u32 w, lch; | 1416 | u32 l, lch; |
| 1259 | int start_dma = 0; | 1417 | int start_dma = 0; |
| 1260 | 1418 | ||
| 1261 | /* if buffer size is less than 1 then there is | 1419 | /* |
| 1262 | * no use of starting the chain */ | 1420 | * if buffer size is less than 1 then there is |
| 1421 | * no use of starting the chain | ||
| 1422 | */ | ||
| 1263 | if (elem_count < 1) { | 1423 | if (elem_count < 1) { |
| 1264 | printk(KERN_ERR "Invalid buffer size\n"); | 1424 | printk(KERN_ERR "Invalid buffer size\n"); |
| 1265 | return -EINVAL; | 1425 | return -EINVAL; |
| @@ -1267,7 +1427,7 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, | |||
| 1267 | 1427 | ||
| 1268 | /* Check for input params */ | 1428 | /* Check for input params */ |
| 1269 | if (unlikely((chain_id < 0 | 1429 | if (unlikely((chain_id < 0 |
| 1270 | || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1430 | || chain_id >= dma_lch_count))) { |
| 1271 | printk(KERN_ERR "Invalid chain id\n"); | 1431 | printk(KERN_ERR "Invalid chain id\n"); |
| 1272 | return -EINVAL; | 1432 | return -EINVAL; |
| 1273 | } | 1433 | } |
| @@ -1296,20 +1456,24 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, | |||
| 1296 | 1456 | ||
| 1297 | /* Set the params to the free channel */ | 1457 | /* Set the params to the free channel */ |
| 1298 | if (src_start != 0) | 1458 | if (src_start != 0) |
| 1299 | OMAP2_DMA_CSSA_REG(lch) = src_start; | 1459 | dma_write(src_start, CSSA(lch)); |
| 1300 | if (dest_start != 0) | 1460 | if (dest_start != 0) |
| 1301 | OMAP2_DMA_CDSA_REG(lch) = dest_start; | 1461 | dma_write(dest_start, CDSA(lch)); |
| 1302 | 1462 | ||
| 1303 | /* Write the buffer size */ | 1463 | /* Write the buffer size */ |
| 1304 | OMAP_DMA_CEN_REG(lch) = elem_count; | 1464 | dma_write(elem_count, CEN(lch)); |
| 1305 | OMAP_DMA_CFN_REG(lch) = frame_count; | 1465 | dma_write(frame_count, CFN(lch)); |
| 1306 | 1466 | ||
| 1307 | /* If the chain is dynamically linked, | 1467 | /* |
| 1308 | * then we may have to start the chain if its not active */ | 1468 | * If the chain is dynamically linked, |
| 1469 | * then we may have to start the chain if its not active | ||
| 1470 | */ | ||
| 1309 | if (dma_linked_lch[chain_id].chain_mode == OMAP_DMA_DYNAMIC_CHAIN) { | 1471 | if (dma_linked_lch[chain_id].chain_mode == OMAP_DMA_DYNAMIC_CHAIN) { |
| 1310 | 1472 | ||
| 1311 | /* In Dynamic chain, if the chain is not started, | 1473 | /* |
| 1312 | * queue the channel */ | 1474 | * In Dynamic chain, if the chain is not started, |
| 1475 | * queue the channel | ||
| 1476 | */ | ||
| 1313 | if (dma_linked_lch[chain_id].chain_state == | 1477 | if (dma_linked_lch[chain_id].chain_state == |
| 1314 | DMA_CHAIN_NOTSTARTED) { | 1478 | DMA_CHAIN_NOTSTARTED) { |
| 1315 | /* Enable the link in previous channel */ | 1479 | /* Enable the link in previous channel */ |
| @@ -1319,8 +1483,10 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, | |||
| 1319 | dma_chan[lch].state = DMA_CH_QUEUED; | 1483 | dma_chan[lch].state = DMA_CH_QUEUED; |
| 1320 | } | 1484 | } |
| 1321 | 1485 | ||
| 1322 | /* Chain is already started, make sure its active, | 1486 | /* |
| 1323 | * if not then start the chain */ | 1487 | * Chain is already started, make sure its active, |
| 1488 | * if not then start the chain | ||
| 1489 | */ | ||
| 1324 | else { | 1490 | else { |
| 1325 | start_dma = 1; | 1491 | start_dma = 1; |
| 1326 | 1492 | ||
| @@ -1329,8 +1495,8 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, | |||
| 1329 | enable_lnk(dma_chan[lch].prev_linked_ch); | 1495 | enable_lnk(dma_chan[lch].prev_linked_ch); |
| 1330 | dma_chan[lch].state = DMA_CH_QUEUED; | 1496 | dma_chan[lch].state = DMA_CH_QUEUED; |
| 1331 | start_dma = 0; | 1497 | start_dma = 0; |
| 1332 | if (0 == ((1 << 7) & (OMAP_DMA_CCR_REG | 1498 | if (0 == ((1 << 7) & dma_read( |
| 1333 | (dma_chan[lch].prev_linked_ch)))) { | 1499 | CCR(dma_chan[lch].prev_linked_ch)))) { |
| 1334 | disable_lnk(dma_chan[lch]. | 1500 | disable_lnk(dma_chan[lch]. |
| 1335 | prev_linked_ch); | 1501 | prev_linked_ch); |
| 1336 | pr_debug("\n prev ch is stopped\n"); | 1502 | pr_debug("\n prev ch is stopped\n"); |
| @@ -1346,27 +1512,28 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, | |||
| 1346 | } | 1512 | } |
| 1347 | omap_enable_channel_irq(lch); | 1513 | omap_enable_channel_irq(lch); |
| 1348 | 1514 | ||
| 1349 | w = OMAP_DMA_CCR_REG(lch); | 1515 | l = dma_read(CCR(lch)); |
| 1350 | 1516 | ||
| 1351 | if ((0 == (w & (1 << 24)))) | 1517 | if ((0 == (l & (1 << 24)))) |
| 1352 | w &= ~(1 << 25); | 1518 | l &= ~(1 << 25); |
| 1353 | else | 1519 | else |
| 1354 | w |= (1 << 25); | 1520 | l |= (1 << 25); |
| 1355 | if (start_dma == 1) { | 1521 | if (start_dma == 1) { |
| 1356 | if (0 == (w & (1 << 7))) { | 1522 | if (0 == (l & (1 << 7))) { |
| 1357 | w |= (1 << 7); | 1523 | l |= (1 << 7); |
| 1358 | dma_chan[lch].state = DMA_CH_STARTED; | 1524 | dma_chan[lch].state = DMA_CH_STARTED; |
| 1359 | pr_debug("starting %d\n", lch); | 1525 | pr_debug("starting %d\n", lch); |
| 1360 | OMAP_DMA_CCR_REG(lch) = w; | 1526 | dma_write(l, CCR(lch)); |
| 1361 | } else | 1527 | } else |
| 1362 | start_dma = 0; | 1528 | start_dma = 0; |
| 1363 | } else { | 1529 | } else { |
| 1364 | if (0 == (w & (1 << 7))) | 1530 | if (0 == (l & (1 << 7))) |
| 1365 | OMAP_DMA_CCR_REG(lch) = w; | 1531 | dma_write(l, CCR(lch)); |
| 1366 | } | 1532 | } |
| 1367 | dma_chan[lch].flags |= OMAP_DMA_ACTIVE; | 1533 | dma_chan[lch].flags |= OMAP_DMA_ACTIVE; |
| 1368 | } | 1534 | } |
| 1369 | } | 1535 | } |
| 1536 | |||
| 1370 | return 0; | 1537 | return 0; |
| 1371 | } | 1538 | } |
| 1372 | EXPORT_SYMBOL(omap_dma_chain_a_transfer); | 1539 | EXPORT_SYMBOL(omap_dma_chain_a_transfer); |
| @@ -1382,9 +1549,9 @@ EXPORT_SYMBOL(omap_dma_chain_a_transfer); | |||
| 1382 | int omap_start_dma_chain_transfers(int chain_id) | 1549 | int omap_start_dma_chain_transfers(int chain_id) |
| 1383 | { | 1550 | { |
| 1384 | int *channels; | 1551 | int *channels; |
| 1385 | u32 w, i; | 1552 | u32 l, i; |
| 1386 | 1553 | ||
| 1387 | if (unlikely((chain_id < 0 || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1554 | if (unlikely((chain_id < 0 || chain_id >= dma_lch_count))) { |
| 1388 | printk(KERN_ERR "Invalid chain id\n"); | 1555 | printk(KERN_ERR "Invalid chain id\n"); |
| 1389 | return -EINVAL; | 1556 | return -EINVAL; |
| 1390 | } | 1557 | } |
| @@ -1406,18 +1573,19 @@ int omap_start_dma_chain_transfers(int chain_id) | |||
| 1406 | omap_enable_channel_irq(channels[0]); | 1573 | omap_enable_channel_irq(channels[0]); |
| 1407 | } | 1574 | } |
| 1408 | 1575 | ||
| 1409 | w = OMAP_DMA_CCR_REG(channels[0]); | 1576 | l = dma_read(CCR(channels[0])); |
| 1410 | w |= (1 << 7); | 1577 | l |= (1 << 7); |
| 1411 | dma_linked_lch[chain_id].chain_state = DMA_CHAIN_STARTED; | 1578 | dma_linked_lch[chain_id].chain_state = DMA_CHAIN_STARTED; |
| 1412 | dma_chan[channels[0]].state = DMA_CH_STARTED; | 1579 | dma_chan[channels[0]].state = DMA_CH_STARTED; |
| 1413 | 1580 | ||
| 1414 | if ((0 == (w & (1 << 24)))) | 1581 | if ((0 == (l & (1 << 24)))) |
| 1415 | w &= ~(1 << 25); | 1582 | l &= ~(1 << 25); |
| 1416 | else | 1583 | else |
| 1417 | w |= (1 << 25); | 1584 | l |= (1 << 25); |
| 1418 | OMAP_DMA_CCR_REG(channels[0]) = w; | 1585 | dma_write(l, CCR(channels[0])); |
| 1419 | 1586 | ||
| 1420 | dma_chan[channels[0]].flags |= OMAP_DMA_ACTIVE; | 1587 | dma_chan[channels[0]].flags |= OMAP_DMA_ACTIVE; |
| 1588 | |||
| 1421 | return 0; | 1589 | return 0; |
| 1422 | } | 1590 | } |
| 1423 | EXPORT_SYMBOL(omap_start_dma_chain_transfers); | 1591 | EXPORT_SYMBOL(omap_start_dma_chain_transfers); |
| @@ -1433,11 +1601,11 @@ EXPORT_SYMBOL(omap_start_dma_chain_transfers); | |||
| 1433 | int omap_stop_dma_chain_transfers(int chain_id) | 1601 | int omap_stop_dma_chain_transfers(int chain_id) |
| 1434 | { | 1602 | { |
| 1435 | int *channels; | 1603 | int *channels; |
| 1436 | u32 w, i; | 1604 | u32 l, i; |
| 1437 | u32 sys_cf; | 1605 | u32 sys_cf; |
| 1438 | 1606 | ||
| 1439 | /* Check for input params */ | 1607 | /* Check for input params */ |
| 1440 | if (unlikely((chain_id < 0 || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1608 | if (unlikely((chain_id < 0 || chain_id >= dma_lch_count))) { |
| 1441 | printk(KERN_ERR "Invalid chain id\n"); | 1609 | printk(KERN_ERR "Invalid chain id\n"); |
| 1442 | return -EINVAL; | 1610 | return -EINVAL; |
| 1443 | } | 1611 | } |
| @@ -1449,21 +1617,22 @@ int omap_stop_dma_chain_transfers(int chain_id) | |||
| 1449 | } | 1617 | } |
| 1450 | channels = dma_linked_lch[chain_id].linked_dmach_q; | 1618 | channels = dma_linked_lch[chain_id].linked_dmach_q; |
| 1451 | 1619 | ||
| 1452 | /* DMA Errata: | 1620 | /* |
| 1621 | * DMA Errata: | ||
| 1453 | * Special programming model needed to disable DMA before end of block | 1622 | * Special programming model needed to disable DMA before end of block |
| 1454 | */ | 1623 | */ |
| 1455 | sys_cf = omap_readl(OMAP_DMA4_OCP_SYSCONFIG); | 1624 | sys_cf = dma_read(OCP_SYSCONFIG); |
| 1456 | w = sys_cf; | 1625 | l = sys_cf; |
| 1457 | /* Middle mode reg set no Standby */ | 1626 | /* Middle mode reg set no Standby */ |
| 1458 | w &= ~((1 << 12)|(1 << 13)); | 1627 | l &= ~((1 << 12)|(1 << 13)); |
| 1459 | omap_writel(w, OMAP_DMA4_OCP_SYSCONFIG); | 1628 | dma_write(l, OCP_SYSCONFIG); |
| 1460 | 1629 | ||
| 1461 | for (i = 0; i < dma_linked_lch[chain_id].no_of_lchs_linked; i++) { | 1630 | for (i = 0; i < dma_linked_lch[chain_id].no_of_lchs_linked; i++) { |
| 1462 | 1631 | ||
| 1463 | /* Stop the Channel transmission */ | 1632 | /* Stop the Channel transmission */ |
| 1464 | w = OMAP_DMA_CCR_REG(channels[i]); | 1633 | l = dma_read(CCR(channels[i])); |
| 1465 | w &= ~(1 << 7); | 1634 | l &= ~(1 << 7); |
| 1466 | OMAP_DMA_CCR_REG(channels[i]) = w; | 1635 | dma_write(l, CCR(channels[i])); |
| 1467 | 1636 | ||
| 1468 | /* Disable the link in all the channels */ | 1637 | /* Disable the link in all the channels */ |
| 1469 | disable_lnk(channels[i]); | 1638 | disable_lnk(channels[i]); |
| @@ -1476,7 +1645,8 @@ int omap_stop_dma_chain_transfers(int chain_id) | |||
| 1476 | OMAP_DMA_CHAIN_QINIT(chain_id); | 1645 | OMAP_DMA_CHAIN_QINIT(chain_id); |
| 1477 | 1646 | ||
| 1478 | /* Errata - put in the old value */ | 1647 | /* Errata - put in the old value */ |
| 1479 | omap_writel(sys_cf, OMAP_DMA4_OCP_SYSCONFIG); | 1648 | dma_write(sys_cf, OCP_SYSCONFIG); |
| 1649 | |||
| 1480 | return 0; | 1650 | return 0; |
| 1481 | } | 1651 | } |
| 1482 | EXPORT_SYMBOL(omap_stop_dma_chain_transfers); | 1652 | EXPORT_SYMBOL(omap_stop_dma_chain_transfers); |
| @@ -1499,7 +1669,7 @@ int omap_get_dma_chain_index(int chain_id, int *ei, int *fi) | |||
| 1499 | int *channels; | 1669 | int *channels; |
| 1500 | 1670 | ||
| 1501 | /* Check for input params */ | 1671 | /* Check for input params */ |
| 1502 | if (unlikely((chain_id < 0 || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1672 | if (unlikely((chain_id < 0 || chain_id >= dma_lch_count))) { |
| 1503 | printk(KERN_ERR "Invalid chain id\n"); | 1673 | printk(KERN_ERR "Invalid chain id\n"); |
| 1504 | return -EINVAL; | 1674 | return -EINVAL; |
| 1505 | } | 1675 | } |
| @@ -1517,8 +1687,8 @@ int omap_get_dma_chain_index(int chain_id, int *ei, int *fi) | |||
| 1517 | /* Get the current channel */ | 1687 | /* Get the current channel */ |
| 1518 | lch = channels[dma_linked_lch[chain_id].q_head]; | 1688 | lch = channels[dma_linked_lch[chain_id].q_head]; |
| 1519 | 1689 | ||
| 1520 | *ei = OMAP2_DMA_CCEN_REG(lch); | 1690 | *ei = dma_read(CCEN(lch)); |
| 1521 | *fi = OMAP2_DMA_CCFN_REG(lch); | 1691 | *fi = dma_read(CCFN(lch)); |
| 1522 | 1692 | ||
| 1523 | return 0; | 1693 | return 0; |
| 1524 | } | 1694 | } |
| @@ -1539,7 +1709,7 @@ int omap_get_dma_chain_dst_pos(int chain_id) | |||
| 1539 | int *channels; | 1709 | int *channels; |
| 1540 | 1710 | ||
| 1541 | /* Check for input params */ | 1711 | /* Check for input params */ |
| 1542 | if (unlikely((chain_id < 0 || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1712 | if (unlikely((chain_id < 0 || chain_id >= dma_lch_count))) { |
| 1543 | printk(KERN_ERR "Invalid chain id\n"); | 1713 | printk(KERN_ERR "Invalid chain id\n"); |
| 1544 | return -EINVAL; | 1714 | return -EINVAL; |
| 1545 | } | 1715 | } |
| @@ -1555,7 +1725,7 @@ int omap_get_dma_chain_dst_pos(int chain_id) | |||
| 1555 | /* Get the current channel */ | 1725 | /* Get the current channel */ |
| 1556 | lch = channels[dma_linked_lch[chain_id].q_head]; | 1726 | lch = channels[dma_linked_lch[chain_id].q_head]; |
| 1557 | 1727 | ||
| 1558 | return (OMAP_DMA_CDAC_REG(lch)); | 1728 | return dma_read(CDAC(lch)); |
| 1559 | } | 1729 | } |
| 1560 | EXPORT_SYMBOL(omap_get_dma_chain_dst_pos); | 1730 | EXPORT_SYMBOL(omap_get_dma_chain_dst_pos); |
| 1561 | 1731 | ||
| @@ -1573,7 +1743,7 @@ int omap_get_dma_chain_src_pos(int chain_id) | |||
| 1573 | int *channels; | 1743 | int *channels; |
| 1574 | 1744 | ||
| 1575 | /* Check for input params */ | 1745 | /* Check for input params */ |
| 1576 | if (unlikely((chain_id < 0 || chain_id >= OMAP_LOGICAL_DMA_CH_COUNT))) { | 1746 | if (unlikely((chain_id < 0 || chain_id >= dma_lch_count))) { |
| 1577 | printk(KERN_ERR "Invalid chain id\n"); | 1747 | printk(KERN_ERR "Invalid chain id\n"); |
| 1578 | return -EINVAL; | 1748 | return -EINVAL; |
| 1579 | } | 1749 | } |
| @@ -1589,10 +1759,10 @@ int omap_get_dma_chain_src_pos(int chain_id) | |||
| 1589 | /* Get the current channel */ | 1759 | /* Get the current channel */ |
| 1590 | lch = channels[dma_linked_lch[chain_id].q_head]; | 1760 | lch = channels[dma_linked_lch[chain_id].q_head]; |
| 1591 | 1761 | ||
| 1592 | return (OMAP_DMA_CSAC_REG(lch)); | 1762 | return dma_read(CSAC(lch)); |
| 1593 | } | 1763 | } |
| 1594 | EXPORT_SYMBOL(omap_get_dma_chain_src_pos); | 1764 | EXPORT_SYMBOL(omap_get_dma_chain_src_pos); |
| 1595 | #endif | 1765 | #endif /* ifndef CONFIG_ARCH_OMAP1 */ |
| 1596 | 1766 | ||
| 1597 | /*----------------------------------------------------------------------------*/ | 1767 | /*----------------------------------------------------------------------------*/ |
| 1598 | 1768 | ||
| @@ -1600,13 +1770,13 @@ EXPORT_SYMBOL(omap_get_dma_chain_src_pos); | |||
| 1600 | 1770 | ||
| 1601 | static int omap1_dma_handle_ch(int ch) | 1771 | static int omap1_dma_handle_ch(int ch) |
| 1602 | { | 1772 | { |
| 1603 | u16 csr; | 1773 | u32 csr; |
| 1604 | 1774 | ||
| 1605 | if (enable_1510_mode && ch >= 6) { | 1775 | if (enable_1510_mode && ch >= 6) { |
| 1606 | csr = dma_chan[ch].saved_csr; | 1776 | csr = dma_chan[ch].saved_csr; |
| 1607 | dma_chan[ch].saved_csr = 0; | 1777 | dma_chan[ch].saved_csr = 0; |
| 1608 | } else | 1778 | } else |
| 1609 | csr = OMAP_DMA_CSR_REG(ch); | 1779 | csr = dma_read(CSR(ch)); |
| 1610 | if (enable_1510_mode && ch <= 2 && (csr >> 7) != 0) { | 1780 | if (enable_1510_mode && ch <= 2 && (csr >> 7) != 0) { |
| 1611 | dma_chan[ch + 6].saved_csr = csr >> 7; | 1781 | dma_chan[ch + 6].saved_csr = csr >> 7; |
| 1612 | csr &= 0x7f; | 1782 | csr &= 0x7f; |
| @@ -1628,6 +1798,7 @@ static int omap1_dma_handle_ch(int ch) | |||
| 1628 | dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE; | 1798 | dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE; |
| 1629 | if (likely(dma_chan[ch].callback != NULL)) | 1799 | if (likely(dma_chan[ch].callback != NULL)) |
| 1630 | dma_chan[ch].callback(ch, csr, dma_chan[ch].data); | 1800 | dma_chan[ch].callback(ch, csr, dma_chan[ch].data); |
| 1801 | |||
| 1631 | return 1; | 1802 | return 1; |
| 1632 | } | 1803 | } |
| 1633 | 1804 | ||
| @@ -1658,12 +1829,13 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id) | |||
| 1658 | 1829 | ||
| 1659 | static int omap2_dma_handle_ch(int ch) | 1830 | static int omap2_dma_handle_ch(int ch) |
| 1660 | { | 1831 | { |
| 1661 | u32 status = OMAP_DMA_CSR_REG(ch); | 1832 | u32 status = dma_read(CSR(ch)); |
| 1662 | 1833 | ||
| 1663 | if (!status) { | 1834 | if (!status) { |
| 1664 | if (printk_ratelimit()) | 1835 | if (printk_ratelimit()) |
| 1665 | printk(KERN_WARNING "Spurious DMA IRQ for lch %d\n", ch); | 1836 | printk(KERN_WARNING "Spurious DMA IRQ for lch %d\n", |
| 1666 | omap_writel(1 << ch, OMAP_DMA4_IRQSTATUS_L0); | 1837 | ch); |
| 1838 | dma_write(1 << ch, IRQSTATUS_L0); | ||
| 1667 | return 0; | 1839 | return 0; |
| 1668 | } | 1840 | } |
| 1669 | if (unlikely(dma_chan[ch].dev_id == -1)) { | 1841 | if (unlikely(dma_chan[ch].dev_id == -1)) { |
| @@ -1686,14 +1858,14 @@ static int omap2_dma_handle_ch(int ch) | |||
| 1686 | printk(KERN_INFO "DMA misaligned error with device %d\n", | 1858 | printk(KERN_INFO "DMA misaligned error with device %d\n", |
| 1687 | dma_chan[ch].dev_id); | 1859 | dma_chan[ch].dev_id); |
| 1688 | 1860 | ||
| 1689 | OMAP_DMA_CSR_REG(ch) = OMAP2_DMA_CSR_CLEAR_MASK; | 1861 | dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(ch)); |
| 1690 | omap_writel(1 << ch, OMAP_DMA4_IRQSTATUS_L0); | 1862 | dma_write(1 << ch, IRQSTATUS_L0); |
| 1691 | 1863 | ||
| 1692 | /* If the ch is not chained then chain_id will be -1 */ | 1864 | /* If the ch is not chained then chain_id will be -1 */ |
| 1693 | if (dma_chan[ch].chain_id != -1) { | 1865 | if (dma_chan[ch].chain_id != -1) { |
| 1694 | int chain_id = dma_chan[ch].chain_id; | 1866 | int chain_id = dma_chan[ch].chain_id; |
| 1695 | dma_chan[ch].state = DMA_CH_NOTSTARTED; | 1867 | dma_chan[ch].state = DMA_CH_NOTSTARTED; |
| 1696 | if (OMAP_DMA_CLNK_CTRL_REG(ch) & (1 << 15)) | 1868 | if (dma_read(CLNK_CTRL(ch)) & (1 << 15)) |
| 1697 | dma_chan[dma_chan[ch].next_linked_ch].state = | 1869 | dma_chan[dma_chan[ch].next_linked_ch].state = |
| 1698 | DMA_CH_STARTED; | 1870 | DMA_CH_STARTED; |
| 1699 | if (dma_linked_lch[chain_id].chain_mode == | 1871 | if (dma_linked_lch[chain_id].chain_mode == |
| @@ -1703,13 +1875,13 @@ static int omap2_dma_handle_ch(int ch) | |||
| 1703 | if (!OMAP_DMA_CHAIN_QEMPTY(chain_id)) | 1875 | if (!OMAP_DMA_CHAIN_QEMPTY(chain_id)) |
| 1704 | OMAP_DMA_CHAIN_INCQHEAD(chain_id); | 1876 | OMAP_DMA_CHAIN_INCQHEAD(chain_id); |
| 1705 | 1877 | ||
| 1706 | status = OMAP_DMA_CSR_REG(ch); | 1878 | status = dma_read(CSR(ch)); |
| 1707 | } | 1879 | } |
| 1708 | 1880 | ||
| 1709 | if (likely(dma_chan[ch].callback != NULL)) | 1881 | if (likely(dma_chan[ch].callback != NULL)) |
| 1710 | dma_chan[ch].callback(ch, status, dma_chan[ch].data); | 1882 | dma_chan[ch].callback(ch, status, dma_chan[ch].data); |
| 1711 | 1883 | ||
| 1712 | OMAP_DMA_CSR_REG(ch) = status; | 1884 | dma_write(status, CSR(ch)); |
| 1713 | 1885 | ||
| 1714 | return 0; | 1886 | return 0; |
| 1715 | } | 1887 | } |
| @@ -1720,13 +1892,13 @@ static irqreturn_t omap2_dma_irq_handler(int irq, void *dev_id) | |||
| 1720 | u32 val; | 1892 | u32 val; |
| 1721 | int i; | 1893 | int i; |
| 1722 | 1894 | ||
| 1723 | val = omap_readl(OMAP_DMA4_IRQSTATUS_L0); | 1895 | val = dma_read(IRQSTATUS_L0); |
| 1724 | if (val == 0) { | 1896 | if (val == 0) { |
| 1725 | if (printk_ratelimit()) | 1897 | if (printk_ratelimit()) |
| 1726 | printk(KERN_WARNING "Spurious DMA IRQ\n"); | 1898 | printk(KERN_WARNING "Spurious DMA IRQ\n"); |
| 1727 | return IRQ_HANDLED; | 1899 | return IRQ_HANDLED; |
| 1728 | } | 1900 | } |
| 1729 | for (i = 0; i < OMAP_LOGICAL_DMA_CH_COUNT && val != 0; i++) { | 1901 | for (i = 0; i < dma_lch_count && val != 0; i++) { |
| 1730 | if (val & 1) | 1902 | if (val & 1) |
| 1731 | omap2_dma_handle_ch(i); | 1903 | omap2_dma_handle_ch(i); |
| 1732 | val >>= 1; | 1904 | val >>= 1; |
| @@ -1750,7 +1922,7 @@ static struct irqaction omap24xx_dma_irq; | |||
| 1750 | static struct lcd_dma_info { | 1922 | static struct lcd_dma_info { |
| 1751 | spinlock_t lock; | 1923 | spinlock_t lock; |
| 1752 | int reserved; | 1924 | int reserved; |
| 1753 | void (* callback)(u16 status, void *data); | 1925 | void (*callback)(u16 status, void *data); |
| 1754 | void *cb_data; | 1926 | void *cb_data; |
| 1755 | 1927 | ||
| 1756 | int active; | 1928 | int active; |
| @@ -1772,6 +1944,7 @@ void omap_set_lcd_dma_b1(unsigned long addr, u16 fb_xres, u16 fb_yres, | |||
| 1772 | lcd_dma.xres = fb_xres; | 1944 | lcd_dma.xres = fb_xres; |
| 1773 | lcd_dma.yres = fb_yres; | 1945 | lcd_dma.yres = fb_yres; |
| 1774 | } | 1946 | } |
| 1947 | EXPORT_SYMBOL(omap_set_lcd_dma_b1); | ||
| 1775 | 1948 | ||
| 1776 | void omap_set_lcd_dma_src_port(int port) | 1949 | void omap_set_lcd_dma_src_port(int port) |
| 1777 | { | 1950 | { |
| @@ -1782,12 +1955,13 @@ void omap_set_lcd_dma_ext_controller(int external) | |||
| 1782 | { | 1955 | { |
| 1783 | lcd_dma.ext_ctrl = external; | 1956 | lcd_dma.ext_ctrl = external; |
| 1784 | } | 1957 | } |
| 1958 | EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller); | ||
| 1785 | 1959 | ||
| 1786 | void omap_set_lcd_dma_single_transfer(int single) | 1960 | void omap_set_lcd_dma_single_transfer(int single) |
| 1787 | { | 1961 | { |
| 1788 | lcd_dma.single_transfer = single; | 1962 | lcd_dma.single_transfer = single; |
| 1789 | } | 1963 | } |
| 1790 | 1964 | EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); | |
| 1791 | 1965 | ||
| 1792 | void omap_set_lcd_dma_b1_rotation(int rotate) | 1966 | void omap_set_lcd_dma_b1_rotation(int rotate) |
| 1793 | { | 1967 | { |
| @@ -1798,6 +1972,7 @@ void omap_set_lcd_dma_b1_rotation(int rotate) | |||
| 1798 | } | 1972 | } |
| 1799 | lcd_dma.rotate = rotate; | 1973 | lcd_dma.rotate = rotate; |
| 1800 | } | 1974 | } |
| 1975 | EXPORT_SYMBOL(omap_set_lcd_dma_b1_rotation); | ||
| 1801 | 1976 | ||
| 1802 | void omap_set_lcd_dma_b1_mirror(int mirror) | 1977 | void omap_set_lcd_dma_b1_mirror(int mirror) |
| 1803 | { | 1978 | { |
| @@ -1807,6 +1982,7 @@ void omap_set_lcd_dma_b1_mirror(int mirror) | |||
| 1807 | } | 1982 | } |
| 1808 | lcd_dma.mirror = mirror; | 1983 | lcd_dma.mirror = mirror; |
| 1809 | } | 1984 | } |
| 1985 | EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror); | ||
| 1810 | 1986 | ||
| 1811 | void omap_set_lcd_dma_b1_vxres(unsigned long vxres) | 1987 | void omap_set_lcd_dma_b1_vxres(unsigned long vxres) |
| 1812 | { | 1988 | { |
| @@ -1817,6 +1993,7 @@ void omap_set_lcd_dma_b1_vxres(unsigned long vxres) | |||
| 1817 | } | 1993 | } |
| 1818 | lcd_dma.vxres = vxres; | 1994 | lcd_dma.vxres = vxres; |
| 1819 | } | 1995 | } |
| 1996 | EXPORT_SYMBOL(omap_set_lcd_dma_b1_vxres); | ||
| 1820 | 1997 | ||
| 1821 | void omap_set_lcd_dma_b1_scale(unsigned int xscale, unsigned int yscale) | 1998 | void omap_set_lcd_dma_b1_scale(unsigned int xscale, unsigned int yscale) |
| 1822 | { | 1999 | { |
| @@ -1827,6 +2004,7 @@ void omap_set_lcd_dma_b1_scale(unsigned int xscale, unsigned int yscale) | |||
| 1827 | lcd_dma.xscale = xscale; | 2004 | lcd_dma.xscale = xscale; |
| 1828 | lcd_dma.yscale = yscale; | 2005 | lcd_dma.yscale = yscale; |
| 1829 | } | 2006 | } |
| 2007 | EXPORT_SYMBOL(omap_set_lcd_dma_b1_scale); | ||
| 1830 | 2008 | ||
| 1831 | static void set_b1_regs(void) | 2009 | static void set_b1_regs(void) |
| 1832 | { | 2010 | { |
| @@ -1857,8 +2035,11 @@ static void set_b1_regs(void) | |||
| 1857 | xscale = lcd_dma.xscale ? lcd_dma.xscale : 1; | 2035 | xscale = lcd_dma.xscale ? lcd_dma.xscale : 1; |
| 1858 | yscale = lcd_dma.yscale ? lcd_dma.yscale : 1; | 2036 | yscale = lcd_dma.yscale ? lcd_dma.yscale : 1; |
| 1859 | BUG_ON(vxres < lcd_dma.xres); | 2037 | BUG_ON(vxres < lcd_dma.xres); |
| 1860 | #define PIXADDR(x,y) (lcd_dma.addr + ((y) * vxres * yscale + (x) * xscale) * es) | 2038 | |
| 2039 | #define PIXADDR(x, y) (lcd_dma.addr + \ | ||
| 2040 | ((y) * vxres * yscale + (x) * xscale) * es) | ||
| 1861 | #define PIXSTEP(sx, sy, dx, dy) (PIXADDR(dx, dy) - PIXADDR(sx, sy) - es + 1) | 2041 | #define PIXSTEP(sx, sy, dx, dy) (PIXADDR(dx, dy) - PIXADDR(sx, sy) - es + 1) |
| 2042 | |||
| 1862 | switch (lcd_dma.rotate) { | 2043 | switch (lcd_dma.rotate) { |
| 1863 | case 0: | 2044 | case 0: |
| 1864 | if (!lcd_dma.mirror) { | 2045 | if (!lcd_dma.mirror) { |
| @@ -1867,8 +2048,8 @@ static void set_b1_regs(void) | |||
| 1867 | /* 1510 DMA requires the bottom address to be 2 more | 2048 | /* 1510 DMA requires the bottom address to be 2 more |
| 1868 | * than the actual last memory access location. */ | 2049 | * than the actual last memory access location. */ |
| 1869 | if (omap_dma_in_1510_mode() && | 2050 | if (omap_dma_in_1510_mode() && |
| 1870 | lcd_dma.data_type == OMAP_DMA_DATA_TYPE_S32) | 2051 | lcd_dma.data_type == OMAP_DMA_DATA_TYPE_S32) |
| 1871 | bottom += 2; | 2052 | bottom += 2; |
| 1872 | ei = PIXSTEP(0, 0, 1, 0); | 2053 | ei = PIXSTEP(0, 0, 1, 0); |
| 1873 | fi = PIXSTEP(lcd_dma.xres - 1, 0, 0, 1); | 2054 | fi = PIXSTEP(lcd_dma.xres - 1, 0, 0, 1); |
| 1874 | } else { | 2055 | } else { |
| @@ -1995,7 +2176,7 @@ static irqreturn_t lcd_dma_irq_handler(int irq, void *dev_id) | |||
| 1995 | return IRQ_HANDLED; | 2176 | return IRQ_HANDLED; |
| 1996 | } | 2177 | } |
| 1997 | 2178 | ||
| 1998 | int omap_request_lcd_dma(void (* callback)(u16 status, void *data), | 2179 | int omap_request_lcd_dma(void (*callback)(u16 status, void *data), |
| 1999 | void *data) | 2180 | void *data) |
| 2000 | { | 2181 | { |
| 2001 | spin_lock_irq(&lcd_dma.lock); | 2182 | spin_lock_irq(&lcd_dma.lock); |
| @@ -2021,6 +2202,7 @@ int omap_request_lcd_dma(void (* callback)(u16 status, void *data), | |||
| 2021 | 2202 | ||
| 2022 | return 0; | 2203 | return 0; |
| 2023 | } | 2204 | } |
| 2205 | EXPORT_SYMBOL(omap_request_lcd_dma); | ||
| 2024 | 2206 | ||
| 2025 | void omap_free_lcd_dma(void) | 2207 | void omap_free_lcd_dma(void) |
| 2026 | { | 2208 | { |
| @@ -2037,12 +2219,14 @@ void omap_free_lcd_dma(void) | |||
| 2037 | lcd_dma.reserved = 0; | 2219 | lcd_dma.reserved = 0; |
| 2038 | spin_unlock(&lcd_dma.lock); | 2220 | spin_unlock(&lcd_dma.lock); |
| 2039 | } | 2221 | } |
| 2222 | EXPORT_SYMBOL(omap_free_lcd_dma); | ||
| 2040 | 2223 | ||
| 2041 | void omap_enable_lcd_dma(void) | 2224 | void omap_enable_lcd_dma(void) |
| 2042 | { | 2225 | { |
| 2043 | u16 w; | 2226 | u16 w; |
| 2044 | 2227 | ||
| 2045 | /* Set the Enable bit only if an external controller is | 2228 | /* |
| 2229 | * Set the Enable bit only if an external controller is | ||
| 2046 | * connected. Otherwise the OMAP internal controller will | 2230 | * connected. Otherwise the OMAP internal controller will |
| 2047 | * start the transfer when it gets enabled. | 2231 | * start the transfer when it gets enabled. |
| 2048 | */ | 2232 | */ |
| @@ -2059,6 +2243,7 @@ void omap_enable_lcd_dma(void) | |||
| 2059 | w |= 1 << 7; | 2243 | w |= 1 << 7; |
| 2060 | omap_writew(w, OMAP1610_DMA_LCD_CCR); | 2244 | omap_writew(w, OMAP1610_DMA_LCD_CCR); |
| 2061 | } | 2245 | } |
| 2246 | EXPORT_SYMBOL(omap_enable_lcd_dma); | ||
| 2062 | 2247 | ||
| 2063 | void omap_setup_lcd_dma(void) | 2248 | void omap_setup_lcd_dma(void) |
| 2064 | { | 2249 | { |
| @@ -2074,16 +2259,18 @@ void omap_setup_lcd_dma(void) | |||
| 2074 | u16 w; | 2259 | u16 w; |
| 2075 | 2260 | ||
| 2076 | w = omap_readw(OMAP1610_DMA_LCD_CCR); | 2261 | w = omap_readw(OMAP1610_DMA_LCD_CCR); |
| 2077 | /* If DMA was already active set the end_prog bit to have | 2262 | /* |
| 2263 | * If DMA was already active set the end_prog bit to have | ||
| 2078 | * the programmed register set loaded into the active | 2264 | * the programmed register set loaded into the active |
| 2079 | * register set. | 2265 | * register set. |
| 2080 | */ | 2266 | */ |
| 2081 | w |= 1 << 11; /* End_prog */ | 2267 | w |= 1 << 11; /* End_prog */ |
| 2082 | if (!lcd_dma.single_transfer) | 2268 | if (!lcd_dma.single_transfer) |
| 2083 | w |= (3 << 8); /* Auto_init, repeat */ | 2269 | w |= (3 << 8); /* Auto_init, repeat */ |
| 2084 | omap_writew(w, OMAP1610_DMA_LCD_CCR); | 2270 | omap_writew(w, OMAP1610_DMA_LCD_CCR); |
| 2085 | } | 2271 | } |
| 2086 | } | 2272 | } |
| 2273 | EXPORT_SYMBOL(omap_setup_lcd_dma); | ||
| 2087 | 2274 | ||
| 2088 | void omap_stop_lcd_dma(void) | 2275 | void omap_stop_lcd_dma(void) |
| 2089 | { | 2276 | { |
| @@ -2101,6 +2288,7 @@ void omap_stop_lcd_dma(void) | |||
| 2101 | w &= ~(1 << 8); | 2288 | w &= ~(1 << 8); |
| 2102 | omap_writew(w, OMAP1610_DMA_LCD_CTRL); | 2289 | omap_writew(w, OMAP1610_DMA_LCD_CTRL); |
| 2103 | } | 2290 | } |
| 2291 | EXPORT_SYMBOL(omap_stop_lcd_dma); | ||
| 2104 | 2292 | ||
| 2105 | /*----------------------------------------------------------------------------*/ | 2293 | /*----------------------------------------------------------------------------*/ |
| 2106 | 2294 | ||
| @@ -2108,27 +2296,55 @@ static int __init omap_init_dma(void) | |||
| 2108 | { | 2296 | { |
| 2109 | int ch, r; | 2297 | int ch, r; |
| 2110 | 2298 | ||
| 2299 | if (cpu_class_is_omap1()) { | ||
| 2300 | omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP1_DMA_BASE); | ||
| 2301 | dma_lch_count = OMAP1_LOGICAL_DMA_CH_COUNT; | ||
| 2302 | } else if (cpu_is_omap24xx()) { | ||
| 2303 | omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP24XX_DMA4_BASE); | ||
| 2304 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; | ||
| 2305 | } else if (cpu_is_omap34xx()) { | ||
| 2306 | omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP34XX_DMA4_BASE); | ||
| 2307 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; | ||
| 2308 | } else { | ||
| 2309 | pr_err("DMA init failed for unsupported omap\n"); | ||
| 2310 | return -ENODEV; | ||
| 2311 | } | ||
| 2312 | |||
| 2313 | dma_chan = kzalloc(sizeof(struct omap_dma_lch) * dma_lch_count, | ||
| 2314 | GFP_KERNEL); | ||
| 2315 | if (!dma_chan) | ||
| 2316 | return -ENOMEM; | ||
| 2317 | |||
| 2318 | if (cpu_class_is_omap2()) { | ||
| 2319 | dma_linked_lch = kzalloc(sizeof(struct dma_link_info) * | ||
| 2320 | dma_lch_count, GFP_KERNEL); | ||
| 2321 | if (!dma_linked_lch) { | ||
| 2322 | kfree(dma_chan); | ||
| 2323 | return -ENOMEM; | ||
| 2324 | } | ||
| 2325 | } | ||
| 2326 | |||
| 2111 | if (cpu_is_omap15xx()) { | 2327 | if (cpu_is_omap15xx()) { |
| 2112 | printk(KERN_INFO "DMA support for OMAP15xx initialized\n"); | 2328 | printk(KERN_INFO "DMA support for OMAP15xx initialized\n"); |
| 2113 | dma_chan_count = 9; | 2329 | dma_chan_count = 9; |
| 2114 | enable_1510_mode = 1; | 2330 | enable_1510_mode = 1; |
| 2115 | } else if (cpu_is_omap16xx() || cpu_is_omap730()) { | 2331 | } else if (cpu_is_omap16xx() || cpu_is_omap730()) { |
| 2116 | printk(KERN_INFO "OMAP DMA hardware version %d\n", | 2332 | printk(KERN_INFO "OMAP DMA hardware version %d\n", |
| 2117 | omap_readw(OMAP_DMA_HW_ID)); | 2333 | dma_read(HW_ID)); |
| 2118 | printk(KERN_INFO "DMA capabilities: %08x:%08x:%04x:%04x:%04x\n", | 2334 | printk(KERN_INFO "DMA capabilities: %08x:%08x:%04x:%04x:%04x\n", |
| 2119 | (omap_readw(OMAP_DMA_CAPS_0_U) << 16) | | 2335 | (dma_read(CAPS_0_U) << 16) | |
| 2120 | omap_readw(OMAP_DMA_CAPS_0_L), | 2336 | dma_read(CAPS_0_L), |
| 2121 | (omap_readw(OMAP_DMA_CAPS_1_U) << 16) | | 2337 | (dma_read(CAPS_1_U) << 16) | |
| 2122 | omap_readw(OMAP_DMA_CAPS_1_L), | 2338 | dma_read(CAPS_1_L), |
| 2123 | omap_readw(OMAP_DMA_CAPS_2), omap_readw(OMAP_DMA_CAPS_3), | 2339 | dma_read(CAPS_2), dma_read(CAPS_3), |
| 2124 | omap_readw(OMAP_DMA_CAPS_4)); | 2340 | dma_read(CAPS_4)); |
| 2125 | if (!enable_1510_mode) { | 2341 | if (!enable_1510_mode) { |
| 2126 | u16 w; | 2342 | u16 w; |
| 2127 | 2343 | ||
| 2128 | /* Disable OMAP 3.0/3.1 compatibility mode. */ | 2344 | /* Disable OMAP 3.0/3.1 compatibility mode. */ |
| 2129 | w = omap_readw(OMAP_DMA_GSCR); | 2345 | w = dma_read(GSCR); |
| 2130 | w |= 1 << 3; | 2346 | w |= 1 << 3; |
| 2131 | omap_writew(w, OMAP_DMA_GSCR); | 2347 | dma_write(w, GSCR); |
| 2132 | dma_chan_count = 16; | 2348 | dma_chan_count = 16; |
| 2133 | } else | 2349 | } else |
| 2134 | dma_chan_count = 9; | 2350 | dma_chan_count = 9; |
| @@ -2141,19 +2357,17 @@ static int __init omap_init_dma(void) | |||
| 2141 | omap_writew(w, OMAP1610_DMA_LCD_CTRL); | 2357 | omap_writew(w, OMAP1610_DMA_LCD_CTRL); |
| 2142 | } | 2358 | } |
| 2143 | } else if (cpu_class_is_omap2()) { | 2359 | } else if (cpu_class_is_omap2()) { |
| 2144 | u8 revision = omap_readb(OMAP_DMA4_REVISION); | 2360 | u8 revision = dma_read(REVISION) & 0xff; |
| 2145 | printk(KERN_INFO "OMAP DMA hardware revision %d.%d\n", | 2361 | printk(KERN_INFO "OMAP DMA hardware revision %d.%d\n", |
| 2146 | revision >> 4, revision & 0xf); | 2362 | revision >> 4, revision & 0xf); |
| 2147 | dma_chan_count = OMAP_LOGICAL_DMA_CH_COUNT; | 2363 | dma_chan_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; |
| 2148 | } else { | 2364 | } else { |
| 2149 | dma_chan_count = 0; | 2365 | dma_chan_count = 0; |
| 2150 | return 0; | 2366 | return 0; |
| 2151 | } | 2367 | } |
| 2152 | 2368 | ||
| 2153 | memset(&lcd_dma, 0, sizeof(lcd_dma)); | ||
| 2154 | spin_lock_init(&lcd_dma.lock); | 2369 | spin_lock_init(&lcd_dma.lock); |
| 2155 | spin_lock_init(&dma_chan_lock); | 2370 | spin_lock_init(&dma_chan_lock); |
| 2156 | memset(&dma_chan, 0, sizeof(dma_chan)); | ||
| 2157 | 2371 | ||
| 2158 | for (ch = 0; ch < dma_chan_count; ch++) { | 2372 | for (ch = 0; ch < dma_chan_count; ch++) { |
| 2159 | omap_clear_dma(ch); | 2373 | omap_clear_dma(ch); |
| @@ -2164,8 +2378,10 @@ static int __init omap_init_dma(void) | |||
| 2164 | continue; | 2378 | continue; |
| 2165 | 2379 | ||
| 2166 | if (cpu_class_is_omap1()) { | 2380 | if (cpu_class_is_omap1()) { |
| 2167 | /* request_irq() doesn't like dev_id (ie. ch) being | 2381 | /* |
| 2168 | * zero, so we have to kludge around this. */ | 2382 | * request_irq() doesn't like dev_id (ie. ch) being |
| 2383 | * zero, so we have to kludge around this. | ||
| 2384 | */ | ||
| 2169 | r = request_irq(omap1_dma_irq[ch], | 2385 | r = request_irq(omap1_dma_irq[ch], |
| 2170 | omap1_dma_irq_handler, 0, "DMA", | 2386 | omap1_dma_irq_handler, 0, "DMA", |
| 2171 | (void *) (ch + 1)); | 2387 | (void *) (ch + 1)); |
| @@ -2210,48 +2426,4 @@ static int __init omap_init_dma(void) | |||
| 2210 | 2426 | ||
| 2211 | arch_initcall(omap_init_dma); | 2427 | arch_initcall(omap_init_dma); |
| 2212 | 2428 | ||
| 2213 | EXPORT_SYMBOL(omap_get_dma_src_pos); | ||
| 2214 | EXPORT_SYMBOL(omap_get_dma_dst_pos); | ||
| 2215 | EXPORT_SYMBOL(omap_get_dma_src_addr_counter); | ||
| 2216 | EXPORT_SYMBOL(omap_clear_dma); | ||
| 2217 | EXPORT_SYMBOL(omap_set_dma_priority); | ||
| 2218 | EXPORT_SYMBOL(omap_request_dma); | ||
| 2219 | EXPORT_SYMBOL(omap_free_dma); | ||
| 2220 | EXPORT_SYMBOL(omap_start_dma); | ||
| 2221 | EXPORT_SYMBOL(omap_stop_dma); | ||
| 2222 | EXPORT_SYMBOL(omap_set_dma_callback); | ||
| 2223 | EXPORT_SYMBOL(omap_enable_dma_irq); | ||
| 2224 | EXPORT_SYMBOL(omap_disable_dma_irq); | ||
| 2225 | |||
| 2226 | EXPORT_SYMBOL(omap_set_dma_transfer_params); | ||
| 2227 | EXPORT_SYMBOL(omap_set_dma_color_mode); | ||
| 2228 | EXPORT_SYMBOL(omap_set_dma_write_mode); | ||
| 2229 | |||
| 2230 | EXPORT_SYMBOL(omap_set_dma_src_params); | ||
| 2231 | EXPORT_SYMBOL(omap_set_dma_src_index); | ||
| 2232 | EXPORT_SYMBOL(omap_set_dma_src_data_pack); | ||
| 2233 | EXPORT_SYMBOL(omap_set_dma_src_burst_mode); | ||
| 2234 | |||
| 2235 | EXPORT_SYMBOL(omap_set_dma_dest_params); | ||
| 2236 | EXPORT_SYMBOL(omap_set_dma_dest_index); | ||
| 2237 | EXPORT_SYMBOL(omap_set_dma_dest_data_pack); | ||
| 2238 | EXPORT_SYMBOL(omap_set_dma_dest_burst_mode); | ||
| 2239 | |||
| 2240 | EXPORT_SYMBOL(omap_set_dma_params); | ||
| 2241 | |||
| 2242 | EXPORT_SYMBOL(omap_dma_link_lch); | ||
| 2243 | EXPORT_SYMBOL(omap_dma_unlink_lch); | ||
| 2244 | |||
| 2245 | EXPORT_SYMBOL(omap_request_lcd_dma); | ||
| 2246 | EXPORT_SYMBOL(omap_free_lcd_dma); | ||
| 2247 | EXPORT_SYMBOL(omap_enable_lcd_dma); | ||
| 2248 | EXPORT_SYMBOL(omap_setup_lcd_dma); | ||
| 2249 | EXPORT_SYMBOL(omap_stop_lcd_dma); | ||
| 2250 | EXPORT_SYMBOL(omap_set_lcd_dma_b1); | ||
| 2251 | EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); | ||
| 2252 | EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller); | ||
| 2253 | EXPORT_SYMBOL(omap_set_lcd_dma_b1_rotation); | ||
| 2254 | EXPORT_SYMBOL(omap_set_lcd_dma_b1_vxres); | ||
| 2255 | EXPORT_SYMBOL(omap_set_lcd_dma_b1_scale); | ||
| 2256 | EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror); | ||
| 2257 | 2429 | ||
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 302ad8dff2cb..f22506af0e67 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
| @@ -38,34 +38,113 @@ | |||
| 38 | #include <asm/arch/irqs.h> | 38 | #include <asm/arch/irqs.h> |
| 39 | 39 | ||
| 40 | /* register offsets */ | 40 | /* register offsets */ |
| 41 | #define OMAP_TIMER_ID_REG 0x00 | 41 | #define _OMAP_TIMER_ID_OFFSET 0x00 |
| 42 | #define OMAP_TIMER_OCP_CFG_REG 0x10 | 42 | #define _OMAP_TIMER_OCP_CFG_OFFSET 0x10 |
| 43 | #define OMAP_TIMER_SYS_STAT_REG 0x14 | 43 | #define _OMAP_TIMER_SYS_STAT_OFFSET 0x14 |
| 44 | #define OMAP_TIMER_STAT_REG 0x18 | 44 | #define _OMAP_TIMER_STAT_OFFSET 0x18 |
| 45 | #define OMAP_TIMER_INT_EN_REG 0x1c | 45 | #define _OMAP_TIMER_INT_EN_OFFSET 0x1c |
| 46 | #define OMAP_TIMER_WAKEUP_EN_REG 0x20 | 46 | #define _OMAP_TIMER_WAKEUP_EN_OFFSET 0x20 |
| 47 | #define OMAP_TIMER_CTRL_REG 0x24 | 47 | #define _OMAP_TIMER_CTRL_OFFSET 0x24 |
| 48 | #define OMAP_TIMER_COUNTER_REG 0x28 | 48 | #define OMAP_TIMER_CTRL_GPOCFG (1 << 14) |
| 49 | #define OMAP_TIMER_LOAD_REG 0x2c | 49 | #define OMAP_TIMER_CTRL_CAPTMODE (1 << 13) |
| 50 | #define OMAP_TIMER_TRIGGER_REG 0x30 | 50 | #define OMAP_TIMER_CTRL_PT (1 << 12) |
| 51 | #define OMAP_TIMER_WRITE_PEND_REG 0x34 | 51 | #define OMAP_TIMER_CTRL_TCM_LOWTOHIGH (0x1 << 8) |
| 52 | #define OMAP_TIMER_MATCH_REG 0x38 | 52 | #define OMAP_TIMER_CTRL_TCM_HIGHTOLOW (0x2 << 8) |
| 53 | #define OMAP_TIMER_CAPTURE_REG 0x3c | 53 | #define OMAP_TIMER_CTRL_TCM_BOTHEDGES (0x3 << 8) |
| 54 | #define OMAP_TIMER_IF_CTRL_REG 0x40 | 54 | #define OMAP_TIMER_CTRL_SCPWM (1 << 7) |
| 55 | 55 | #define OMAP_TIMER_CTRL_CE (1 << 6) /* compare enable */ | |
| 56 | /* timer control reg bits */ | 56 | #define OMAP_TIMER_CTRL_PRE (1 << 5) /* prescaler enable */ |
| 57 | #define OMAP_TIMER_CTRL_GPOCFG (1 << 14) | 57 | #define OMAP_TIMER_CTRL_PTV_SHIFT 2 /* prescaler value shift */ |
| 58 | #define OMAP_TIMER_CTRL_CAPTMODE (1 << 13) | 58 | #define OMAP_TIMER_CTRL_POSTED (1 << 2) |
| 59 | #define OMAP_TIMER_CTRL_PT (1 << 12) | 59 | #define OMAP_TIMER_CTRL_AR (1 << 1) /* auto-reload enable */ |
| 60 | #define OMAP_TIMER_CTRL_TCM_LOWTOHIGH (0x1 << 8) | 60 | #define OMAP_TIMER_CTRL_ST (1 << 0) /* start timer */ |
| 61 | #define OMAP_TIMER_CTRL_TCM_HIGHTOLOW (0x2 << 8) | 61 | #define _OMAP_TIMER_COUNTER_OFFSET 0x28 |
| 62 | #define OMAP_TIMER_CTRL_TCM_BOTHEDGES (0x3 << 8) | 62 | #define _OMAP_TIMER_LOAD_OFFSET 0x2c |
| 63 | #define OMAP_TIMER_CTRL_SCPWM (1 << 7) | 63 | #define _OMAP_TIMER_TRIGGER_OFFSET 0x30 |
| 64 | #define OMAP_TIMER_CTRL_CE (1 << 6) /* compare enable */ | 64 | #define _OMAP_TIMER_WRITE_PEND_OFFSET 0x34 |
| 65 | #define OMAP_TIMER_CTRL_PRE (1 << 5) /* prescaler enable */ | 65 | #define WP_NONE 0 /* no write pending bit */ |
| 66 | #define OMAP_TIMER_CTRL_PTV_SHIFT 2 /* how much to shift the prescaler value */ | 66 | #define WP_TCLR (1 << 0) |
| 67 | #define OMAP_TIMER_CTRL_AR (1 << 1) /* auto-reload enable */ | 67 | #define WP_TCRR (1 << 1) |
| 68 | #define OMAP_TIMER_CTRL_ST (1 << 0) /* start timer */ | 68 | #define WP_TLDR (1 << 2) |
| 69 | #define WP_TTGR (1 << 3) | ||
| 70 | #define WP_TMAR (1 << 4) | ||
| 71 | #define WP_TPIR (1 << 5) | ||
| 72 | #define WP_TNIR (1 << 6) | ||
| 73 | #define WP_TCVR (1 << 7) | ||
| 74 | #define WP_TOCR (1 << 8) | ||
| 75 | #define WP_TOWR (1 << 9) | ||
| 76 | #define _OMAP_TIMER_MATCH_OFFSET 0x38 | ||
| 77 | #define _OMAP_TIMER_CAPTURE_OFFSET 0x3c | ||
| 78 | #define _OMAP_TIMER_IF_CTRL_OFFSET 0x40 | ||
| 79 | #define _OMAP_TIMER_CAPTURE2_OFFSET 0x44 /* TCAR2, 34xx only */ | ||
| 80 | #define _OMAP_TIMER_TICK_POS_OFFSET 0x48 /* TPIR, 34xx only */ | ||
| 81 | #define _OMAP_TIMER_TICK_NEG_OFFSET 0x4c /* TNIR, 34xx only */ | ||
| 82 | #define _OMAP_TIMER_TICK_COUNT_OFFSET 0x50 /* TCVR, 34xx only */ | ||
| 83 | #define _OMAP_TIMER_TICK_INT_MASK_SET_OFFSET 0x54 /* TOCR, 34xx only */ | ||
| 84 | #define _OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET 0x58 /* TOWR, 34xx only */ | ||
| 85 | |||
| 86 | /* register offsets with the write pending bit encoded */ | ||
| 87 | #define WPSHIFT 16 | ||
| 88 | |||
| 89 | #define OMAP_TIMER_ID_REG (_OMAP_TIMER_ID_OFFSET \ | ||
| 90 | | (WP_NONE << WPSHIFT)) | ||
| 91 | |||
| 92 | #define OMAP_TIMER_OCP_CFG_REG (_OMAP_TIMER_OCP_CFG_OFFSET \ | ||
| 93 | | (WP_NONE << WPSHIFT)) | ||
| 94 | |||
| 95 | #define OMAP_TIMER_SYS_STAT_REG (_OMAP_TIMER_SYS_STAT_OFFSET \ | ||
| 96 | | (WP_NONE << WPSHIFT)) | ||
| 97 | |||
| 98 | #define OMAP_TIMER_STAT_REG (_OMAP_TIMER_STAT_OFFSET \ | ||
| 99 | | (WP_NONE << WPSHIFT)) | ||
| 100 | |||
| 101 | #define OMAP_TIMER_INT_EN_REG (_OMAP_TIMER_INT_EN_OFFSET \ | ||
| 102 | | (WP_NONE << WPSHIFT)) | ||
| 103 | |||
| 104 | #define OMAP_TIMER_WAKEUP_EN_REG (_OMAP_TIMER_WAKEUP_EN_OFFSET \ | ||
| 105 | | (WP_NONE << WPSHIFT)) | ||
| 106 | |||
| 107 | #define OMAP_TIMER_CTRL_REG (_OMAP_TIMER_CTRL_OFFSET \ | ||
| 108 | | (WP_TCLR << WPSHIFT)) | ||
| 109 | |||
| 110 | #define OMAP_TIMER_COUNTER_REG (_OMAP_TIMER_COUNTER_OFFSET \ | ||
| 111 | | (WP_TCRR << WPSHIFT)) | ||
| 112 | |||
| 113 | #define OMAP_TIMER_LOAD_REG (_OMAP_TIMER_LOAD_OFFSET \ | ||
| 114 | | (WP_TLDR << WPSHIFT)) | ||
| 115 | |||
| 116 | #define OMAP_TIMER_TRIGGER_REG (_OMAP_TIMER_TRIGGER_OFFSET \ | ||
| 117 | | (WP_TTGR << WPSHIFT)) | ||
| 118 | |||
| 119 | #define OMAP_TIMER_WRITE_PEND_REG (_OMAP_TIMER_WRITE_PEND_OFFSET \ | ||
| 120 | | (WP_NONE << WPSHIFT)) | ||
| 121 | |||
| 122 | #define OMAP_TIMER_MATCH_REG (_OMAP_TIMER_MATCH_OFFSET \ | ||
| 123 | | (WP_TMAR << WPSHIFT)) | ||
| 124 | |||
| 125 | #define OMAP_TIMER_CAPTURE_REG (_OMAP_TIMER_CAPTURE_OFFSET \ | ||
| 126 | | (WP_NONE << WPSHIFT)) | ||
| 127 | |||
| 128 | #define OMAP_TIMER_IF_CTRL_REG (_OMAP_TIMER_IF_CTRL_OFFSET \ | ||
| 129 | | (WP_NONE << WPSHIFT)) | ||
| 130 | |||
| 131 | #define OMAP_TIMER_CAPTURE2_REG (_OMAP_TIMER_CAPTURE2_OFFSET \ | ||
| 132 | | (WP_NONE << WPSHIFT)) | ||
| 133 | |||
| 134 | #define OMAP_TIMER_TICK_POS_REG (_OMAP_TIMER_TICK_POS_OFFSET \ | ||
| 135 | | (WP_TPIR << WPSHIFT)) | ||
| 136 | |||
| 137 | #define OMAP_TIMER_TICK_NEG_REG (_OMAP_TIMER_TICK_NEG_OFFSET \ | ||
| 138 | | (WP_TNIR << WPSHIFT)) | ||
| 139 | |||
| 140 | #define OMAP_TIMER_TICK_COUNT_REG (_OMAP_TIMER_TICK_COUNT_OFFSET \ | ||
| 141 | | (WP_TCVR << WPSHIFT)) | ||
| 142 | |||
| 143 | #define OMAP_TIMER_TICK_INT_MASK_SET_REG \ | ||
| 144 | (_OMAP_TIMER_TICK_INT_MASK_SET_OFFSET | (WP_TOCR << WPSHIFT)) | ||
| 145 | |||
| 146 | #define OMAP_TIMER_TICK_INT_MASK_COUNT_REG \ | ||
| 147 | (_OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET | (WP_TOWR << WPSHIFT)) | ||
| 69 | 148 | ||
| 70 | struct omap_dm_timer { | 149 | struct omap_dm_timer { |
| 71 | unsigned long phys_base; | 150 | unsigned long phys_base; |
| @@ -76,6 +155,7 @@ struct omap_dm_timer { | |||
| 76 | void __iomem *io_base; | 155 | void __iomem *io_base; |
| 77 | unsigned reserved:1; | 156 | unsigned reserved:1; |
| 78 | unsigned enabled:1; | 157 | unsigned enabled:1; |
| 158 | unsigned posted:1; | ||
| 79 | }; | 159 | }; |
| 80 | 160 | ||
| 81 | #ifdef CONFIG_ARCH_OMAP1 | 161 | #ifdef CONFIG_ARCH_OMAP1 |
| @@ -181,16 +261,34 @@ static struct clk **dm_source_clocks; | |||
| 181 | 261 | ||
| 182 | static spinlock_t dm_timer_lock; | 262 | static spinlock_t dm_timer_lock; |
| 183 | 263 | ||
| 184 | static inline u32 omap_dm_timer_read_reg(struct omap_dm_timer *timer, int reg) | 264 | /* |
| 265 | * Reads timer registers in posted and non-posted mode. The posted mode bit | ||
| 266 | * is encoded in reg. Note that in posted mode write pending bit must be | ||
| 267 | * checked. Otherwise a read of a non completed write will produce an error. | ||
| 268 | */ | ||
| 269 | static inline u32 omap_dm_timer_read_reg(struct omap_dm_timer *timer, u32 reg) | ||
| 185 | { | 270 | { |
| 186 | return readl(timer->io_base + reg); | 271 | if (timer->posted) |
| 272 | while (readl(timer->io_base + (OMAP_TIMER_WRITE_PEND_REG & 0xff)) | ||
| 273 | & (reg >> WPSHIFT)) | ||
| 274 | cpu_relax(); | ||
| 275 | return readl(timer->io_base + (reg & 0xff)); | ||
| 187 | } | 276 | } |
| 188 | 277 | ||
| 189 | static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, int reg, u32 value) | 278 | /* |
| 279 | * Writes timer registers in posted and non-posted mode. The posted mode bit | ||
| 280 | * is encoded in reg. Note that in posted mode the write pending bit must be | ||
| 281 | * checked. Otherwise a write on a register which has a pending write will be | ||
| 282 | * lost. | ||
| 283 | */ | ||
| 284 | static void omap_dm_timer_write_reg(struct omap_dm_timer *timer, u32 reg, | ||
| 285 | u32 value) | ||
| 190 | { | 286 | { |
| 191 | writel(value, timer->io_base + reg); | 287 | if (timer->posted) |
| 192 | while (omap_dm_timer_read_reg(timer, OMAP_TIMER_WRITE_PEND_REG)) | 288 | while (readl(timer->io_base + (OMAP_TIMER_WRITE_PEND_REG & 0xff)) |
| 193 | ; | 289 | & (reg >> WPSHIFT)) |
| 290 | cpu_relax(); | ||
| 291 | writel(value, timer->io_base + (reg & 0xff)); | ||
| 194 | } | 292 | } |
| 195 | 293 | ||
| 196 | static void omap_dm_timer_wait_for_reset(struct omap_dm_timer *timer) | 294 | static void omap_dm_timer_wait_for_reset(struct omap_dm_timer *timer) |
| @@ -217,17 +315,23 @@ static void omap_dm_timer_reset(struct omap_dm_timer *timer) | |||
| 217 | } | 315 | } |
| 218 | omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ); | 316 | omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ); |
| 219 | 317 | ||
| 220 | /* Set to smart-idle mode */ | ||
| 221 | l = omap_dm_timer_read_reg(timer, OMAP_TIMER_OCP_CFG_REG); | 318 | l = omap_dm_timer_read_reg(timer, OMAP_TIMER_OCP_CFG_REG); |
| 222 | l |= 0x02 << 3; | 319 | l |= 0x02 << 3; /* Set to smart-idle mode */ |
| 223 | 320 | l |= 0x2 << 8; /* Set clock activity to perserve f-clock on idle */ | |
| 224 | if (cpu_class_is_omap2() && timer == &dm_timers[0]) { | 321 | |
| 225 | /* Enable wake-up only for GPT1 on OMAP2 CPUs*/ | 322 | /* |
| 323 | * Enable wake-up only for GPT1 on OMAP2 CPUs. | ||
| 324 | * FIXME: All timers should have wake-up enabled and clear | ||
| 325 | * PRCM status. | ||
| 326 | */ | ||
| 327 | if (cpu_class_is_omap2() && (timer == &dm_timers[0])) | ||
| 226 | l |= 1 << 2; | 328 | l |= 1 << 2; |
| 227 | /* Non-posted mode */ | ||
| 228 | omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG, 0); | ||
| 229 | } | ||
| 230 | omap_dm_timer_write_reg(timer, OMAP_TIMER_OCP_CFG_REG, l); | 329 | omap_dm_timer_write_reg(timer, OMAP_TIMER_OCP_CFG_REG, l); |
| 330 | |||
| 331 | /* Match hardware reset default of posted mode */ | ||
| 332 | omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG, | ||
| 333 | OMAP_TIMER_CTRL_POSTED); | ||
| 334 | timer->posted = 1; | ||
| 231 | } | 335 | } |
| 232 | 336 | ||
| 233 | static void omap_dm_timer_prepare(struct omap_dm_timer *timer) | 337 | static void omap_dm_timer_prepare(struct omap_dm_timer *timer) |
| @@ -434,9 +538,32 @@ void omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload, | |||
| 434 | l &= ~OMAP_TIMER_CTRL_AR; | 538 | l &= ~OMAP_TIMER_CTRL_AR; |
| 435 | omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l); | 539 | omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l); |
| 436 | omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load); | 540 | omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load); |
| 541 | |||
| 542 | /* REVISIT: hw feature, ttgr overtaking tldr? */ | ||
| 543 | while (readl(timer->io_base + (OMAP_TIMER_WRITE_PEND_REG & 0xff))) | ||
| 544 | cpu_relax(); | ||
| 545 | |||
| 437 | omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0); | 546 | omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0); |
| 438 | } | 547 | } |
| 439 | 548 | ||
| 549 | /* Optimized set_load which removes costly spin wait in timer_start */ | ||
| 550 | void omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload, | ||
| 551 | unsigned int load) | ||
| 552 | { | ||
| 553 | u32 l; | ||
| 554 | |||
| 555 | l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG); | ||
| 556 | if (autoreload) | ||
| 557 | l |= OMAP_TIMER_CTRL_AR; | ||
| 558 | else | ||
| 559 | l &= ~OMAP_TIMER_CTRL_AR; | ||
| 560 | l |= OMAP_TIMER_CTRL_ST; | ||
| 561 | |||
| 562 | omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, load); | ||
| 563 | omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load); | ||
| 564 | omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l); | ||
| 565 | } | ||
| 566 | |||
| 440 | void omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, | 567 | void omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, |
| 441 | unsigned int match) | 568 | unsigned int match) |
| 442 | { | 569 | { |
| @@ -451,7 +578,6 @@ void omap_dm_timer_set_match(struct omap_dm_timer *timer, int enable, | |||
| 451 | omap_dm_timer_write_reg(timer, OMAP_TIMER_MATCH_REG, match); | 578 | omap_dm_timer_write_reg(timer, OMAP_TIMER_MATCH_REG, match); |
| 452 | } | 579 | } |
| 453 | 580 | ||
| 454 | |||
| 455 | void omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on, | 581 | void omap_dm_timer_set_pwm(struct omap_dm_timer *timer, int def_on, |
| 456 | int toggle, int trigger) | 582 | int toggle, int trigger) |
| 457 | { | 583 | { |
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 9cf83c4da9fa..c7f74064696c 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
| @@ -15,95 +15,66 @@ | |||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
| 18 | #include <linux/platform_device.h> | ||
| 18 | #include <linux/wait.h> | 19 | #include <linux/wait.h> |
| 19 | #include <linux/completion.h> | 20 | #include <linux/completion.h> |
| 20 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 21 | #include <linux/err.h> | 22 | #include <linux/err.h> |
| 22 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 24 | 25 | #include <linux/io.h> | |
| 25 | #include <asm/io.h> | ||
| 26 | #include <asm/irq.h> | ||
| 27 | 26 | ||
| 28 | #include <asm/arch/dma.h> | 27 | #include <asm/arch/dma.h> |
| 29 | #include <asm/arch/mux.h> | ||
| 30 | #include <asm/arch/irqs.h> | ||
| 31 | #include <asm/arch/dsp_common.h> | ||
| 32 | #include <asm/arch/mcbsp.h> | 28 | #include <asm/arch/mcbsp.h> |
| 33 | 29 | ||
| 34 | #ifdef CONFIG_MCBSP_DEBUG | ||
| 35 | #define DBG(x...) printk(x) | ||
| 36 | #else | ||
| 37 | #define DBG(x...) do { } while (0) | ||
| 38 | #endif | ||
| 39 | |||
| 40 | struct omap_mcbsp { | ||
| 41 | u32 io_base; | ||
| 42 | u8 id; | ||
| 43 | u8 free; | ||
| 44 | omap_mcbsp_word_length rx_word_length; | ||
| 45 | omap_mcbsp_word_length tx_word_length; | ||
| 46 | |||
| 47 | omap_mcbsp_io_type_t io_type; /* IRQ or poll */ | ||
| 48 | /* IRQ based TX/RX */ | ||
| 49 | int rx_irq; | ||
| 50 | int tx_irq; | ||
| 51 | |||
| 52 | /* DMA stuff */ | ||
| 53 | u8 dma_rx_sync; | ||
| 54 | short dma_rx_lch; | ||
| 55 | u8 dma_tx_sync; | ||
| 56 | short dma_tx_lch; | ||
| 57 | |||
| 58 | /* Completion queues */ | ||
| 59 | struct completion tx_irq_completion; | ||
| 60 | struct completion rx_irq_completion; | ||
| 61 | struct completion tx_dma_completion; | ||
| 62 | struct completion rx_dma_completion; | ||
| 63 | |||
| 64 | spinlock_t lock; | ||
| 65 | }; | ||
| 66 | |||
| 67 | static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT]; | 30 | static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT]; |
| 68 | #ifdef CONFIG_ARCH_OMAP1 | 31 | |
| 69 | static struct clk *mcbsp_dsp_ck = 0; | 32 | #define omap_mcbsp_check_valid_id(id) (mcbsp[id].pdata && \ |
| 70 | static struct clk *mcbsp_api_ck = 0; | 33 | mcbsp[id].pdata->ops && \ |
| 71 | static struct clk *mcbsp_dspxor_ck = 0; | 34 | mcbsp[id].pdata->ops->check && \ |
| 72 | #endif | 35 | (mcbsp[id].pdata->ops->check(id) == 0)) |
| 73 | #ifdef CONFIG_ARCH_OMAP2 | ||
| 74 | static struct clk *mcbsp1_ick = 0; | ||
| 75 | static struct clk *mcbsp1_fck = 0; | ||
| 76 | static struct clk *mcbsp2_ick = 0; | ||
| 77 | static struct clk *mcbsp2_fck = 0; | ||
| 78 | #endif | ||
| 79 | 36 | ||
| 80 | static void omap_mcbsp_dump_reg(u8 id) | 37 | static void omap_mcbsp_dump_reg(u8 id) |
| 81 | { | 38 | { |
| 82 | DBG("**** MCBSP%d regs ****\n", mcbsp[id].id); | 39 | dev_dbg(mcbsp[id].dev, "**** McBSP%d regs ****\n", mcbsp[id].id); |
| 83 | DBG("DRR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); | 40 | dev_dbg(mcbsp[id].dev, "DRR2: 0x%04x\n", |
| 84 | DBG("DRR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); | 41 | OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); |
| 85 | DBG("DXR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); | 42 | dev_dbg(mcbsp[id].dev, "DRR1: 0x%04x\n", |
| 86 | DBG("DXR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); | 43 | OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); |
| 87 | DBG("SPCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); | 44 | dev_dbg(mcbsp[id].dev, "DXR2: 0x%04x\n", |
| 88 | DBG("SPCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); | 45 | OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); |
| 89 | DBG("RCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); | 46 | dev_dbg(mcbsp[id].dev, "DXR1: 0x%04x\n", |
| 90 | DBG("RCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); | 47 | OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); |
| 91 | DBG("XCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); | 48 | dev_dbg(mcbsp[id].dev, "SPCR2: 0x%04x\n", |
| 92 | DBG("XCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); | 49 | OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); |
| 93 | DBG("SRGR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); | 50 | dev_dbg(mcbsp[id].dev, "SPCR1: 0x%04x\n", |
| 94 | DBG("SRGR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); | 51 | OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); |
| 95 | DBG("PCR0: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); | 52 | dev_dbg(mcbsp[id].dev, "RCR2: 0x%04x\n", |
| 96 | DBG("***********************\n"); | 53 | OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); |
| 54 | dev_dbg(mcbsp[id].dev, "RCR1: 0x%04x\n", | ||
| 55 | OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); | ||
| 56 | dev_dbg(mcbsp[id].dev, "XCR2: 0x%04x\n", | ||
| 57 | OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); | ||
| 58 | dev_dbg(mcbsp[id].dev, "XCR1: 0x%04x\n", | ||
| 59 | OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); | ||
| 60 | dev_dbg(mcbsp[id].dev, "SRGR2: 0x%04x\n", | ||
| 61 | OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); | ||
| 62 | dev_dbg(mcbsp[id].dev, "SRGR1: 0x%04x\n", | ||
| 63 | OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); | ||
| 64 | dev_dbg(mcbsp[id].dev, "PCR0: 0x%04x\n", | ||
| 65 | OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); | ||
| 66 | dev_dbg(mcbsp[id].dev, "***********************\n"); | ||
| 97 | } | 67 | } |
| 98 | 68 | ||
| 99 | static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) | 69 | static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) |
| 100 | { | 70 | { |
| 101 | struct omap_mcbsp *mcbsp_tx = dev_id; | 71 | struct omap_mcbsp *mcbsp_tx = dev_id; |
| 102 | 72 | ||
| 103 | DBG("TX IRQ callback : 0x%x\n", | 73 | dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n", |
| 104 | OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); | 74 | OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); |
| 105 | 75 | ||
| 106 | complete(&mcbsp_tx->tx_irq_completion); | 76 | complete(&mcbsp_tx->tx_irq_completion); |
| 77 | |||
| 107 | return IRQ_HANDLED; | 78 | return IRQ_HANDLED; |
| 108 | } | 79 | } |
| 109 | 80 | ||
| @@ -111,10 +82,11 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) | |||
| 111 | { | 82 | { |
| 112 | struct omap_mcbsp *mcbsp_rx = dev_id; | 83 | struct omap_mcbsp *mcbsp_rx = dev_id; |
| 113 | 84 | ||
| 114 | DBG("RX IRQ callback : 0x%x\n", | 85 | dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n", |
| 115 | OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); | 86 | OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); |
| 116 | 87 | ||
| 117 | complete(&mcbsp_rx->rx_irq_completion); | 88 | complete(&mcbsp_rx->rx_irq_completion); |
| 89 | |||
| 118 | return IRQ_HANDLED; | 90 | return IRQ_HANDLED; |
| 119 | } | 91 | } |
| 120 | 92 | ||
| @@ -122,8 +94,8 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data) | |||
| 122 | { | 94 | { |
| 123 | struct omap_mcbsp *mcbsp_dma_tx = data; | 95 | struct omap_mcbsp *mcbsp_dma_tx = data; |
| 124 | 96 | ||
| 125 | DBG("TX DMA callback : 0x%x\n", | 97 | dev_dbg(mcbsp_dma_tx->dev, "TX DMA callback : 0x%x\n", |
| 126 | OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); | 98 | OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); |
| 127 | 99 | ||
| 128 | /* We can free the channels */ | 100 | /* We can free the channels */ |
| 129 | omap_free_dma(mcbsp_dma_tx->dma_tx_lch); | 101 | omap_free_dma(mcbsp_dma_tx->dma_tx_lch); |
| @@ -136,8 +108,8 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) | |||
| 136 | { | 108 | { |
| 137 | struct omap_mcbsp *mcbsp_dma_rx = data; | 109 | struct omap_mcbsp *mcbsp_dma_rx = data; |
| 138 | 110 | ||
| 139 | DBG("RX DMA callback : 0x%x\n", | 111 | dev_dbg(mcbsp_dma_rx->dev, "RX DMA callback : 0x%x\n", |
| 140 | OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); | 112 | OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); |
| 141 | 113 | ||
| 142 | /* We can free the channels */ | 114 | /* We can free the channels */ |
| 143 | omap_free_dma(mcbsp_dma_rx->dma_rx_lch); | 115 | omap_free_dma(mcbsp_dma_rx->dma_rx_lch); |
| @@ -146,19 +118,24 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) | |||
| 146 | complete(&mcbsp_dma_rx->rx_dma_completion); | 118 | complete(&mcbsp_dma_rx->rx_dma_completion); |
| 147 | } | 119 | } |
| 148 | 120 | ||
| 149 | |||
| 150 | /* | 121 | /* |
| 151 | * omap_mcbsp_config simply write a config to the | 122 | * omap_mcbsp_config simply write a config to the |
| 152 | * appropriate McBSP. | 123 | * appropriate McBSP. |
| 153 | * You either call this function or set the McBSP registers | 124 | * You either call this function or set the McBSP registers |
| 154 | * by yourself before calling omap_mcbsp_start(). | 125 | * by yourself before calling omap_mcbsp_start(). |
| 155 | */ | 126 | */ |
| 156 | 127 | void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) | |
| 157 | void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config) | ||
| 158 | { | 128 | { |
| 159 | u32 io_base = mcbsp[id].io_base; | 129 | u32 io_base; |
| 130 | |||
| 131 | if (!omap_mcbsp_check_valid_id(id)) { | ||
| 132 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 133 | return; | ||
| 134 | } | ||
| 160 | 135 | ||
| 161 | DBG("OMAP-McBSP: McBSP%d io_base: 0x%8x\n", id+1, io_base); | 136 | io_base = mcbsp[id].io_base; |
| 137 | dev_dbg(mcbsp[id].dev, "Configuring McBSP%d io_base: 0x%8x\n", | ||
| 138 | mcbsp[id].id, io_base); | ||
| 162 | 139 | ||
| 163 | /* We write the given config */ | 140 | /* We write the given config */ |
| 164 | OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); | 141 | OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); |
| @@ -173,83 +150,7 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config | |||
| 173 | OMAP_MCBSP_WRITE(io_base, MCR1, config->mcr1); | 150 | OMAP_MCBSP_WRITE(io_base, MCR1, config->mcr1); |
| 174 | OMAP_MCBSP_WRITE(io_base, PCR0, config->pcr0); | 151 | OMAP_MCBSP_WRITE(io_base, PCR0, config->pcr0); |
| 175 | } | 152 | } |
| 176 | 153 | EXPORT_SYMBOL(omap_mcbsp_config); | |
| 177 | |||
| 178 | |||
| 179 | static int omap_mcbsp_check(unsigned int id) | ||
| 180 | { | ||
| 181 | if (cpu_is_omap730()) { | ||
| 182 | if (id > OMAP_MAX_MCBSP_COUNT - 1) { | ||
| 183 | printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1); | ||
| 184 | return -1; | ||
| 185 | } | ||
| 186 | return 0; | ||
| 187 | } | ||
| 188 | |||
| 189 | if (cpu_is_omap15xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) { | ||
| 190 | if (id > OMAP_MAX_MCBSP_COUNT) { | ||
| 191 | printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", id + 1); | ||
| 192 | return -1; | ||
| 193 | } | ||
| 194 | return 0; | ||
| 195 | } | ||
| 196 | |||
| 197 | return -1; | ||
| 198 | } | ||
| 199 | |||
| 200 | #ifdef CONFIG_ARCH_OMAP1 | ||
| 201 | static void omap_mcbsp_dsp_request(void) | ||
| 202 | { | ||
| 203 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { | ||
| 204 | int ret; | ||
| 205 | |||
| 206 | ret = omap_dsp_request_mem(); | ||
| 207 | if (ret < 0) { | ||
| 208 | printk(KERN_ERR "Could not get dsp memory: %i\n", ret); | ||
| 209 | return; | ||
| 210 | } | ||
| 211 | |||
| 212 | clk_enable(mcbsp_dsp_ck); | ||
| 213 | clk_enable(mcbsp_api_ck); | ||
| 214 | |||
| 215 | /* enable 12MHz clock to mcbsp 1 & 3 */ | ||
| 216 | clk_enable(mcbsp_dspxor_ck); | ||
| 217 | |||
| 218 | /* | ||
| 219 | * DSP external peripheral reset | ||
| 220 | * FIXME: This should be moved to dsp code | ||
| 221 | */ | ||
| 222 | __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1, | ||
| 223 | DSP_RSTCT2); | ||
| 224 | } | ||
| 225 | } | ||
| 226 | |||
| 227 | static void omap_mcbsp_dsp_free(void) | ||
| 228 | { | ||
| 229 | if (cpu_is_omap15xx() || cpu_is_omap16xx()) { | ||
| 230 | omap_dsp_release_mem(); | ||
| 231 | clk_disable(mcbsp_dspxor_ck); | ||
| 232 | clk_disable(mcbsp_dsp_ck); | ||
| 233 | clk_disable(mcbsp_api_ck); | ||
| 234 | } | ||
| 235 | } | ||
| 236 | #endif | ||
| 237 | |||
| 238 | #ifdef CONFIG_ARCH_OMAP2 | ||
| 239 | static void omap2_mcbsp2_mux_setup(void) | ||
| 240 | { | ||
| 241 | if (cpu_is_omap2420()) { | ||
| 242 | omap_cfg_reg(Y15_24XX_MCBSP2_CLKX); | ||
| 243 | omap_cfg_reg(R14_24XX_MCBSP2_FSX); | ||
| 244 | omap_cfg_reg(W15_24XX_MCBSP2_DR); | ||
| 245 | omap_cfg_reg(V15_24XX_MCBSP2_DX); | ||
| 246 | omap_cfg_reg(V14_24XX_GPIO117); | ||
| 247 | } | ||
| 248 | /* | ||
| 249 | * Need to add MUX settings for OMAP 2430 SDP | ||
| 250 | */ | ||
| 251 | } | ||
| 252 | #endif | ||
| 253 | 154 | ||
| 254 | /* | 155 | /* |
| 255 | * We can choose between IRQ based or polled IO. | 156 | * We can choose between IRQ based or polled IO. |
| @@ -257,13 +158,16 @@ static void omap2_mcbsp2_mux_setup(void) | |||
| 257 | */ | 158 | */ |
| 258 | int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type) | 159 | int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type) |
| 259 | { | 160 | { |
| 260 | if (omap_mcbsp_check(id) < 0) | 161 | if (!omap_mcbsp_check_valid_id(id)) { |
| 261 | return -EINVAL; | 162 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
| 163 | return -ENODEV; | ||
| 164 | } | ||
| 262 | 165 | ||
| 263 | spin_lock(&mcbsp[id].lock); | 166 | spin_lock(&mcbsp[id].lock); |
| 264 | 167 | ||
| 265 | if (!mcbsp[id].free) { | 168 | if (!mcbsp[id].free) { |
| 266 | printk (KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", id + 1); | 169 | dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", |
| 170 | mcbsp[id].id); | ||
| 267 | spin_unlock(&mcbsp[id].lock); | 171 | spin_unlock(&mcbsp[id].lock); |
| 268 | return -EINVAL; | 172 | return -EINVAL; |
| 269 | } | 173 | } |
| @@ -274,38 +178,26 @@ int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type) | |||
| 274 | 178 | ||
| 275 | return 0; | 179 | return 0; |
| 276 | } | 180 | } |
| 181 | EXPORT_SYMBOL(omap_mcbsp_set_io_type); | ||
| 277 | 182 | ||
| 278 | int omap_mcbsp_request(unsigned int id) | 183 | int omap_mcbsp_request(unsigned int id) |
| 279 | { | 184 | { |
| 280 | int err; | 185 | int err; |
| 281 | 186 | ||
| 282 | if (omap_mcbsp_check(id) < 0) | 187 | if (!omap_mcbsp_check_valid_id(id)) { |
| 283 | return -EINVAL; | 188 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
| 284 | 189 | return -ENODEV; | |
| 285 | #ifdef CONFIG_ARCH_OMAP1 | ||
| 286 | /* | ||
| 287 | * On 1510, 1610 and 1710, McBSP1 and McBSP3 | ||
| 288 | * are DSP public peripherals. | ||
| 289 | */ | ||
| 290 | if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) | ||
| 291 | omap_mcbsp_dsp_request(); | ||
| 292 | #endif | ||
| 293 | |||
| 294 | #ifdef CONFIG_ARCH_OMAP2 | ||
| 295 | if (cpu_is_omap24xx()) { | ||
| 296 | if (id == OMAP_MCBSP1) { | ||
| 297 | clk_enable(mcbsp1_ick); | ||
| 298 | clk_enable(mcbsp1_fck); | ||
| 299 | } else { | ||
| 300 | clk_enable(mcbsp2_ick); | ||
| 301 | clk_enable(mcbsp2_fck); | ||
| 302 | } | ||
| 303 | } | 190 | } |
| 304 | #endif | 191 | |
| 192 | if (mcbsp[id].pdata->ops->request) | ||
| 193 | mcbsp[id].pdata->ops->request(id); | ||
| 194 | |||
| 195 | clk_enable(mcbsp[id].clk); | ||
| 305 | 196 | ||
| 306 | spin_lock(&mcbsp[id].lock); | 197 | spin_lock(&mcbsp[id].lock); |
| 307 | if (!mcbsp[id].free) { | 198 | if (!mcbsp[id].free) { |
| 308 | printk (KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", id + 1); | 199 | dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", |
| 200 | mcbsp[id].id); | ||
| 309 | spin_unlock(&mcbsp[id].lock); | 201 | spin_unlock(&mcbsp[id].lock); |
| 310 | return -1; | 202 | return -1; |
| 311 | } | 203 | } |
| @@ -315,24 +207,23 @@ int omap_mcbsp_request(unsigned int id) | |||
| 315 | 207 | ||
| 316 | if (mcbsp[id].io_type == OMAP_MCBSP_IRQ_IO) { | 208 | if (mcbsp[id].io_type == OMAP_MCBSP_IRQ_IO) { |
| 317 | /* We need to get IRQs here */ | 209 | /* We need to get IRQs here */ |
| 318 | err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler, 0, | 210 | err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler, |
| 319 | "McBSP", | 211 | 0, "McBSP", (void *) (&mcbsp[id])); |
| 320 | (void *) (&mcbsp[id])); | ||
| 321 | if (err != 0) { | 212 | if (err != 0) { |
| 322 | printk(KERN_ERR "OMAP-McBSP: Unable to request TX IRQ %d for McBSP%d\n", | 213 | dev_err(mcbsp[id].dev, "Unable to request TX IRQ %d " |
| 323 | mcbsp[id].tx_irq, mcbsp[id].id); | 214 | "for McBSP%d\n", mcbsp[id].tx_irq, |
| 215 | mcbsp[id].id); | ||
| 324 | return err; | 216 | return err; |
| 325 | } | 217 | } |
| 326 | 218 | ||
| 327 | init_completion(&(mcbsp[id].tx_irq_completion)); | 219 | init_completion(&(mcbsp[id].tx_irq_completion)); |
| 328 | 220 | ||
| 329 | 221 | err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, | |
| 330 | err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, 0, | 222 | 0, "McBSP", (void *) (&mcbsp[id])); |
| 331 | "McBSP", | ||
| 332 | (void *) (&mcbsp[id])); | ||
| 333 | if (err != 0) { | 223 | if (err != 0) { |
| 334 | printk(KERN_ERR "OMAP-McBSP: Unable to request RX IRQ %d for McBSP%d\n", | 224 | dev_err(mcbsp[id].dev, "Unable to request RX IRQ %d " |
| 335 | mcbsp[id].rx_irq, mcbsp[id].id); | 225 | "for McBSP%d\n", mcbsp[id].rx_irq, |
| 226 | mcbsp[id].id); | ||
| 336 | free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); | 227 | free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); |
| 337 | return err; | 228 | return err; |
| 338 | } | 229 | } |
| @@ -341,36 +232,25 @@ int omap_mcbsp_request(unsigned int id) | |||
| 341 | } | 232 | } |
| 342 | 233 | ||
| 343 | return 0; | 234 | return 0; |
| 344 | |||
| 345 | } | 235 | } |
| 236 | EXPORT_SYMBOL(omap_mcbsp_request); | ||
| 346 | 237 | ||
| 347 | void omap_mcbsp_free(unsigned int id) | 238 | void omap_mcbsp_free(unsigned int id) |
| 348 | { | 239 | { |
| 349 | if (omap_mcbsp_check(id) < 0) | 240 | if (!omap_mcbsp_check_valid_id(id)) { |
| 241 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 350 | return; | 242 | return; |
| 351 | |||
| 352 | #ifdef CONFIG_ARCH_OMAP1 | ||
| 353 | if (cpu_class_is_omap1()) { | ||
| 354 | if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) | ||
| 355 | omap_mcbsp_dsp_free(); | ||
| 356 | } | 243 | } |
| 357 | #endif | 244 | |
| 358 | 245 | if (mcbsp[id].pdata->ops->free) | |
| 359 | #ifdef CONFIG_ARCH_OMAP2 | 246 | mcbsp[id].pdata->ops->free(id); |
| 360 | if (cpu_is_omap24xx()) { | 247 | |
| 361 | if (id == OMAP_MCBSP1) { | 248 | clk_disable(mcbsp[id].clk); |
| 362 | clk_disable(mcbsp1_ick); | ||
| 363 | clk_disable(mcbsp1_fck); | ||
| 364 | } else { | ||
| 365 | clk_disable(mcbsp2_ick); | ||
| 366 | clk_disable(mcbsp2_fck); | ||
| 367 | } | ||
| 368 | } | ||
| 369 | #endif | ||
| 370 | 249 | ||
| 371 | spin_lock(&mcbsp[id].lock); | 250 | spin_lock(&mcbsp[id].lock); |
| 372 | if (mcbsp[id].free) { | 251 | if (mcbsp[id].free) { |
| 373 | printk (KERN_ERR "OMAP-McBSP: McBSP%d was not reserved\n", id + 1); | 252 | dev_err(mcbsp[id].dev, "McBSP%d was not reserved\n", |
| 253 | mcbsp[id].id); | ||
| 374 | spin_unlock(&mcbsp[id].lock); | 254 | spin_unlock(&mcbsp[id].lock); |
| 375 | return; | 255 | return; |
| 376 | } | 256 | } |
| @@ -384,6 +264,7 @@ void omap_mcbsp_free(unsigned int id) | |||
| 384 | free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); | 264 | free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); |
| 385 | } | 265 | } |
| 386 | } | 266 | } |
| 267 | EXPORT_SYMBOL(omap_mcbsp_free); | ||
| 387 | 268 | ||
| 388 | /* | 269 | /* |
| 389 | * Here we start the McBSP, by enabling the sample | 270 | * Here we start the McBSP, by enabling the sample |
| @@ -395,13 +276,15 @@ void omap_mcbsp_start(unsigned int id) | |||
| 395 | u32 io_base; | 276 | u32 io_base; |
| 396 | u16 w; | 277 | u16 w; |
| 397 | 278 | ||
| 398 | if (omap_mcbsp_check(id) < 0) | 279 | if (!omap_mcbsp_check_valid_id(id)) { |
| 280 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 399 | return; | 281 | return; |
| 282 | } | ||
| 400 | 283 | ||
| 401 | io_base = mcbsp[id].io_base; | 284 | io_base = mcbsp[id].io_base; |
| 402 | 285 | ||
| 403 | mcbsp[id].rx_word_length = ((OMAP_MCBSP_READ(io_base, RCR1) >> 5) & 0x7); | 286 | mcbsp[id].rx_word_length = (OMAP_MCBSP_READ(io_base, RCR1) >> 5) & 0x7; |
| 404 | mcbsp[id].tx_word_length = ((OMAP_MCBSP_READ(io_base, XCR1) >> 5) & 0x7); | 287 | mcbsp[id].tx_word_length = (OMAP_MCBSP_READ(io_base, XCR1) >> 5) & 0x7; |
| 405 | 288 | ||
| 406 | /* Start the sample generator */ | 289 | /* Start the sample generator */ |
| 407 | w = OMAP_MCBSP_READ(io_base, SPCR2); | 290 | w = OMAP_MCBSP_READ(io_base, SPCR2); |
| @@ -422,20 +305,22 @@ void omap_mcbsp_start(unsigned int id) | |||
| 422 | 305 | ||
| 423 | /* Dump McBSP Regs */ | 306 | /* Dump McBSP Regs */ |
| 424 | omap_mcbsp_dump_reg(id); | 307 | omap_mcbsp_dump_reg(id); |
| 425 | |||
| 426 | } | 308 | } |
| 309 | EXPORT_SYMBOL(omap_mcbsp_start); | ||
| 427 | 310 | ||
| 428 | void omap_mcbsp_stop(unsigned int id) | 311 | void omap_mcbsp_stop(unsigned int id) |
| 429 | { | 312 | { |
| 430 | u32 io_base; | 313 | u32 io_base; |
| 431 | u16 w; | 314 | u16 w; |
| 432 | 315 | ||
| 433 | if (omap_mcbsp_check(id) < 0) | 316 | if (!omap_mcbsp_check_valid_id(id)) { |
| 317 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 434 | return; | 318 | return; |
| 319 | } | ||
| 435 | 320 | ||
| 436 | io_base = mcbsp[id].io_base; | 321 | io_base = mcbsp[id].io_base; |
| 437 | 322 | ||
| 438 | /* Reset transmitter */ | 323 | /* Reset transmitter */ |
| 439 | w = OMAP_MCBSP_READ(io_base, SPCR2); | 324 | w = OMAP_MCBSP_READ(io_base, SPCR2); |
| 440 | OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(1)); | 325 | OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(1)); |
| 441 | 326 | ||
| @@ -447,12 +332,19 @@ void omap_mcbsp_stop(unsigned int id) | |||
| 447 | w = OMAP_MCBSP_READ(io_base, SPCR2); | 332 | w = OMAP_MCBSP_READ(io_base, SPCR2); |
| 448 | OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(1 << 6)); | 333 | OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(1 << 6)); |
| 449 | } | 334 | } |
| 450 | 335 | EXPORT_SYMBOL(omap_mcbsp_stop); | |
| 451 | 336 | ||
| 452 | /* polled mcbsp i/o operations */ | 337 | /* polled mcbsp i/o operations */ |
| 453 | int omap_mcbsp_pollwrite(unsigned int id, u16 buf) | 338 | int omap_mcbsp_pollwrite(unsigned int id, u16 buf) |
| 454 | { | 339 | { |
| 455 | u32 base = mcbsp[id].io_base; | 340 | u32 base; |
| 341 | |||
| 342 | if (!omap_mcbsp_check_valid_id(id)) { | ||
| 343 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 344 | return -ENODEV; | ||
| 345 | } | ||
| 346 | |||
| 347 | base = mcbsp[id].io_base; | ||
| 456 | writew(buf, base + OMAP_MCBSP_REG_DXR1); | 348 | writew(buf, base + OMAP_MCBSP_REG_DXR1); |
| 457 | /* if frame sync error - clear the error */ | 349 | /* if frame sync error - clear the error */ |
| 458 | if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) { | 350 | if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) { |
| @@ -474,18 +366,27 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf) | |||
| 474 | (XRST), | 366 | (XRST), |
| 475 | base + OMAP_MCBSP_REG_SPCR2); | 367 | base + OMAP_MCBSP_REG_SPCR2); |
| 476 | udelay(10); | 368 | udelay(10); |
| 477 | printk(KERN_ERR | 369 | dev_err(mcbsp[id].dev, "Could not write to" |
| 478 | " Could not write to McBSP Register\n"); | 370 | " McBSP%d Register\n", mcbsp[id].id); |
| 479 | return -2; | 371 | return -2; |
| 480 | } | 372 | } |
| 481 | } | 373 | } |
| 482 | } | 374 | } |
| 375 | |||
| 483 | return 0; | 376 | return 0; |
| 484 | } | 377 | } |
| 378 | EXPORT_SYMBOL(omap_mcbsp_pollwrite); | ||
| 485 | 379 | ||
| 486 | int omap_mcbsp_pollread(unsigned int id, u16 * buf) | 380 | int omap_mcbsp_pollread(unsigned int id, u16 *buf) |
| 487 | { | 381 | { |
| 488 | u32 base = mcbsp[id].io_base; | 382 | u32 base; |
| 383 | |||
| 384 | if (!omap_mcbsp_check_valid_id(id)) { | ||
| 385 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 386 | return -ENODEV; | ||
| 387 | } | ||
| 388 | |||
| 389 | base = mcbsp[id].io_base; | ||
| 489 | /* if frame sync error - clear the error */ | 390 | /* if frame sync error - clear the error */ |
| 490 | if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) { | 391 | if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) { |
| 491 | /* clear error */ | 392 | /* clear error */ |
| @@ -506,15 +407,17 @@ int omap_mcbsp_pollread(unsigned int id, u16 * buf) | |||
| 506 | (RRST), | 407 | (RRST), |
| 507 | base + OMAP_MCBSP_REG_SPCR1); | 408 | base + OMAP_MCBSP_REG_SPCR1); |
| 508 | udelay(10); | 409 | udelay(10); |
| 509 | printk(KERN_ERR | 410 | dev_err(mcbsp[id].dev, "Could not read from" |
| 510 | " Could not read from McBSP Register\n"); | 411 | " McBSP%d Register\n", mcbsp[id].id); |
| 511 | return -2; | 412 | return -2; |
| 512 | } | 413 | } |
| 513 | } | 414 | } |
| 514 | } | 415 | } |
| 515 | *buf = readw(base + OMAP_MCBSP_REG_DRR1); | 416 | *buf = readw(base + OMAP_MCBSP_REG_DRR1); |
| 417 | |||
| 516 | return 0; | 418 | return 0; |
| 517 | } | 419 | } |
| 420 | EXPORT_SYMBOL(omap_mcbsp_pollread); | ||
| 518 | 421 | ||
| 519 | /* | 422 | /* |
| 520 | * IRQ based word transmission. | 423 | * IRQ based word transmission. |
| @@ -522,12 +425,15 @@ int omap_mcbsp_pollread(unsigned int id, u16 * buf) | |||
| 522 | void omap_mcbsp_xmit_word(unsigned int id, u32 word) | 425 | void omap_mcbsp_xmit_word(unsigned int id, u32 word) |
| 523 | { | 426 | { |
| 524 | u32 io_base; | 427 | u32 io_base; |
| 525 | omap_mcbsp_word_length word_length = mcbsp[id].tx_word_length; | 428 | omap_mcbsp_word_length word_length; |
| 526 | 429 | ||
| 527 | if (omap_mcbsp_check(id) < 0) | 430 | if (!omap_mcbsp_check_valid_id(id)) { |
| 431 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 528 | return; | 432 | return; |
| 433 | } | ||
| 529 | 434 | ||
| 530 | io_base = mcbsp[id].io_base; | 435 | io_base = mcbsp[id].io_base; |
| 436 | word_length = mcbsp[id].tx_word_length; | ||
| 531 | 437 | ||
| 532 | wait_for_completion(&(mcbsp[id].tx_irq_completion)); | 438 | wait_for_completion(&(mcbsp[id].tx_irq_completion)); |
| 533 | 439 | ||
| @@ -535,16 +441,20 @@ void omap_mcbsp_xmit_word(unsigned int id, u32 word) | |||
| 535 | OMAP_MCBSP_WRITE(io_base, DXR2, word >> 16); | 441 | OMAP_MCBSP_WRITE(io_base, DXR2, word >> 16); |
| 536 | OMAP_MCBSP_WRITE(io_base, DXR1, word & 0xffff); | 442 | OMAP_MCBSP_WRITE(io_base, DXR1, word & 0xffff); |
| 537 | } | 443 | } |
| 444 | EXPORT_SYMBOL(omap_mcbsp_xmit_word); | ||
| 538 | 445 | ||
| 539 | u32 omap_mcbsp_recv_word(unsigned int id) | 446 | u32 omap_mcbsp_recv_word(unsigned int id) |
| 540 | { | 447 | { |
| 541 | u32 io_base; | 448 | u32 io_base; |
| 542 | u16 word_lsb, word_msb = 0; | 449 | u16 word_lsb, word_msb = 0; |
| 543 | omap_mcbsp_word_length word_length = mcbsp[id].rx_word_length; | 450 | omap_mcbsp_word_length word_length; |
| 544 | 451 | ||
| 545 | if (omap_mcbsp_check(id) < 0) | 452 | if (!omap_mcbsp_check_valid_id(id)) { |
| 546 | return -EINVAL; | 453 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
| 454 | return -ENODEV; | ||
| 455 | } | ||
| 547 | 456 | ||
| 457 | word_length = mcbsp[id].rx_word_length; | ||
| 548 | io_base = mcbsp[id].io_base; | 458 | io_base = mcbsp[id].io_base; |
| 549 | 459 | ||
| 550 | wait_for_completion(&(mcbsp[id].rx_irq_completion)); | 460 | wait_for_completion(&(mcbsp[id].rx_irq_completion)); |
| @@ -555,15 +465,24 @@ u32 omap_mcbsp_recv_word(unsigned int id) | |||
| 555 | 465 | ||
| 556 | return (word_lsb | (word_msb << 16)); | 466 | return (word_lsb | (word_msb << 16)); |
| 557 | } | 467 | } |
| 558 | 468 | EXPORT_SYMBOL(omap_mcbsp_recv_word); | |
| 559 | 469 | ||
| 560 | int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) | 470 | int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) |
| 561 | { | 471 | { |
| 562 | u32 io_base = mcbsp[id].io_base; | 472 | u32 io_base; |
| 563 | omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; | 473 | omap_mcbsp_word_length tx_word_length; |
| 564 | omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; | 474 | omap_mcbsp_word_length rx_word_length; |
| 565 | u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; | 475 | u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; |
| 566 | 476 | ||
| 477 | if (!omap_mcbsp_check_valid_id(id)) { | ||
| 478 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 479 | return -ENODEV; | ||
| 480 | } | ||
| 481 | |||
| 482 | io_base = mcbsp[id].io_base; | ||
| 483 | tx_word_length = mcbsp[id].tx_word_length; | ||
| 484 | rx_word_length = mcbsp[id].rx_word_length; | ||
| 485 | |||
| 567 | if (tx_word_length != rx_word_length) | 486 | if (tx_word_length != rx_word_length) |
| 568 | return -EINVAL; | 487 | return -EINVAL; |
| 569 | 488 | ||
| @@ -577,7 +496,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) | |||
| 577 | udelay(10); | 496 | udelay(10); |
| 578 | OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); | 497 | OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); |
| 579 | udelay(10); | 498 | udelay(10); |
| 580 | printk("McBSP transmitter not ready\n"); | 499 | dev_err(mcbsp[id].dev, "McBSP%d transmitter not " |
| 500 | "ready\n", mcbsp[id].id); | ||
| 581 | return -EAGAIN; | 501 | return -EAGAIN; |
| 582 | } | 502 | } |
| 583 | } | 503 | } |
| @@ -597,7 +517,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) | |||
| 597 | udelay(10); | 517 | udelay(10); |
| 598 | OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); | 518 | OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); |
| 599 | udelay(10); | 519 | udelay(10); |
| 600 | printk("McBSP receiver not ready\n"); | 520 | dev_err(mcbsp[id].dev, "McBSP%d receiver not " |
| 521 | "ready\n", mcbsp[id].id); | ||
| 601 | return -EAGAIN; | 522 | return -EAGAIN; |
| 602 | } | 523 | } |
| 603 | } | 524 | } |
| @@ -609,14 +530,24 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) | |||
| 609 | 530 | ||
| 610 | return 0; | 531 | return 0; |
| 611 | } | 532 | } |
| 533 | EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll); | ||
| 612 | 534 | ||
| 613 | int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 * word) | 535 | int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) |
| 614 | { | 536 | { |
| 615 | u32 io_base = mcbsp[id].io_base, clock_word = 0; | 537 | u32 io_base, clock_word = 0; |
| 616 | omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; | 538 | omap_mcbsp_word_length tx_word_length; |
| 617 | omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; | 539 | omap_mcbsp_word_length rx_word_length; |
| 618 | u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; | 540 | u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; |
| 619 | 541 | ||
| 542 | if (!omap_mcbsp_check_valid_id(id)) { | ||
| 543 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 544 | return -ENODEV; | ||
| 545 | } | ||
| 546 | |||
| 547 | io_base = mcbsp[id].io_base; | ||
| 548 | tx_word_length = mcbsp[id].tx_word_length; | ||
| 549 | rx_word_length = mcbsp[id].rx_word_length; | ||
| 550 | |||
| 620 | if (tx_word_length != rx_word_length) | 551 | if (tx_word_length != rx_word_length) |
| 621 | return -EINVAL; | 552 | return -EINVAL; |
| 622 | 553 | ||
| @@ -630,7 +561,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 * word) | |||
| 630 | udelay(10); | 561 | udelay(10); |
| 631 | OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); | 562 | OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); |
| 632 | udelay(10); | 563 | udelay(10); |
| 633 | printk("McBSP transmitter not ready\n"); | 564 | dev_err(mcbsp[id].dev, "McBSP%d transmitter not " |
| 565 | "ready\n", mcbsp[id].id); | ||
| 634 | return -EAGAIN; | 566 | return -EAGAIN; |
| 635 | } | 567 | } |
| 636 | } | 568 | } |
| @@ -650,7 +582,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 * word) | |||
| 650 | udelay(10); | 582 | udelay(10); |
| 651 | OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); | 583 | OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); |
| 652 | udelay(10); | 584 | udelay(10); |
| 653 | printk("McBSP receiver not ready\n"); | 585 | dev_err(mcbsp[id].dev, "McBSP%d receiver not " |
| 586 | "ready\n", mcbsp[id].id); | ||
| 654 | return -EAGAIN; | 587 | return -EAGAIN; |
| 655 | } | 588 | } |
| 656 | } | 589 | } |
| @@ -664,7 +597,7 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 * word) | |||
| 664 | 597 | ||
| 665 | return 0; | 598 | return 0; |
| 666 | } | 599 | } |
| 667 | 600 | EXPORT_SYMBOL(omap_mcbsp_spi_master_recv_word_poll); | |
| 668 | 601 | ||
| 669 | /* | 602 | /* |
| 670 | * Simple DMA based buffer rx/tx routines. | 603 | * Simple DMA based buffer rx/tx routines. |
| @@ -673,25 +606,32 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 * word) | |||
| 673 | * For anything fancier, you should use your own customized DMA | 606 | * For anything fancier, you should use your own customized DMA |
| 674 | * routines and callbacks. | 607 | * routines and callbacks. |
| 675 | */ | 608 | */ |
| 676 | int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, unsigned int length) | 609 | int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, |
| 610 | unsigned int length) | ||
| 677 | { | 611 | { |
| 678 | int dma_tx_ch; | 612 | int dma_tx_ch; |
| 679 | int src_port = 0; | 613 | int src_port = 0; |
| 680 | int dest_port = 0; | 614 | int dest_port = 0; |
| 681 | int sync_dev = 0; | 615 | int sync_dev = 0; |
| 682 | 616 | ||
| 683 | if (omap_mcbsp_check(id) < 0) | 617 | if (!omap_mcbsp_check_valid_id(id)) { |
| 684 | return -EINVAL; | 618 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
| 619 | return -ENODEV; | ||
| 620 | } | ||
| 685 | 621 | ||
| 686 | if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX", omap_mcbsp_tx_dma_callback, | 622 | if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX", |
| 687 | &mcbsp[id], | 623 | omap_mcbsp_tx_dma_callback, |
| 688 | &dma_tx_ch)) { | 624 | &mcbsp[id], |
| 689 | printk("OMAP-McBSP: Unable to request DMA channel for McBSP%d TX. Trying IRQ based TX\n", id+1); | 625 | &dma_tx_ch)) { |
| 626 | dev_err(mcbsp[id].dev, " Unable to request DMA channel for " | ||
| 627 | "McBSP%d TX. Trying IRQ based TX\n", | ||
| 628 | mcbsp[id].id); | ||
| 690 | return -EAGAIN; | 629 | return -EAGAIN; |
| 691 | } | 630 | } |
| 692 | mcbsp[id].dma_tx_lch = dma_tx_ch; | 631 | mcbsp[id].dma_tx_lch = dma_tx_ch; |
| 693 | 632 | ||
| 694 | DBG("TX DMA on channel %d\n", dma_tx_ch); | 633 | dev_err(mcbsp[id].dev, "McBSP%d TX DMA on channel %d\n", mcbsp[id].id, |
| 634 | dma_tx_ch); | ||
| 695 | 635 | ||
| 696 | init_completion(&(mcbsp[id].tx_dma_completion)); | 636 | init_completion(&(mcbsp[id].tx_dma_completion)); |
| 697 | 637 | ||
| @@ -699,7 +639,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, unsigned int leng | |||
| 699 | src_port = OMAP_DMA_PORT_TIPB; | 639 | src_port = OMAP_DMA_PORT_TIPB; |
| 700 | dest_port = OMAP_DMA_PORT_EMIFF; | 640 | dest_port = OMAP_DMA_PORT_EMIFF; |
| 701 | } | 641 | } |
| 702 | if (cpu_is_omap24xx()) | 642 | if (cpu_class_is_omap2()) |
| 703 | sync_dev = mcbsp[id].dma_tx_sync; | 643 | sync_dev = mcbsp[id].dma_tx_sync; |
| 704 | 644 | ||
| 705 | omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch, | 645 | omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch, |
| @@ -722,29 +662,37 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, unsigned int leng | |||
| 722 | 662 | ||
| 723 | omap_start_dma(mcbsp[id].dma_tx_lch); | 663 | omap_start_dma(mcbsp[id].dma_tx_lch); |
| 724 | wait_for_completion(&(mcbsp[id].tx_dma_completion)); | 664 | wait_for_completion(&(mcbsp[id].tx_dma_completion)); |
| 665 | |||
| 725 | return 0; | 666 | return 0; |
| 726 | } | 667 | } |
| 668 | EXPORT_SYMBOL(omap_mcbsp_xmit_buffer); | ||
| 727 | 669 | ||
| 728 | 670 | int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, | |
| 729 | int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, unsigned int length) | 671 | unsigned int length) |
| 730 | { | 672 | { |
| 731 | int dma_rx_ch; | 673 | int dma_rx_ch; |
| 732 | int src_port = 0; | 674 | int src_port = 0; |
| 733 | int dest_port = 0; | 675 | int dest_port = 0; |
| 734 | int sync_dev = 0; | 676 | int sync_dev = 0; |
| 735 | 677 | ||
| 736 | if (omap_mcbsp_check(id) < 0) | 678 | if (!omap_mcbsp_check_valid_id(id)) { |
| 737 | return -EINVAL; | 679 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
| 680 | return -ENODEV; | ||
| 681 | } | ||
| 738 | 682 | ||
| 739 | if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX", omap_mcbsp_rx_dma_callback, | 683 | if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX", |
| 740 | &mcbsp[id], | 684 | omap_mcbsp_rx_dma_callback, |
| 741 | &dma_rx_ch)) { | 685 | &mcbsp[id], |
| 742 | printk("Unable to request DMA channel for McBSP%d RX. Trying IRQ based RX\n", id+1); | 686 | &dma_rx_ch)) { |
| 687 | dev_err(mcbsp[id].dev, "Unable to request DMA channel for " | ||
| 688 | "McBSP%d RX. Trying IRQ based RX\n", | ||
| 689 | mcbsp[id].id); | ||
| 743 | return -EAGAIN; | 690 | return -EAGAIN; |
| 744 | } | 691 | } |
| 745 | mcbsp[id].dma_rx_lch = dma_rx_ch; | 692 | mcbsp[id].dma_rx_lch = dma_rx_ch; |
| 746 | 693 | ||
| 747 | DBG("RX DMA on channel %d\n", dma_rx_ch); | 694 | dev_err(mcbsp[id].dev, "McBSP%d RX DMA on channel %d\n", mcbsp[id].id, |
| 695 | dma_rx_ch); | ||
| 748 | 696 | ||
| 749 | init_completion(&(mcbsp[id].rx_dma_completion)); | 697 | init_completion(&(mcbsp[id].rx_dma_completion)); |
| 750 | 698 | ||
| @@ -752,14 +700,14 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, unsigned int leng | |||
| 752 | src_port = OMAP_DMA_PORT_TIPB; | 700 | src_port = OMAP_DMA_PORT_TIPB; |
| 753 | dest_port = OMAP_DMA_PORT_EMIFF; | 701 | dest_port = OMAP_DMA_PORT_EMIFF; |
| 754 | } | 702 | } |
| 755 | if (cpu_is_omap24xx()) | 703 | if (cpu_class_is_omap2()) |
| 756 | sync_dev = mcbsp[id].dma_rx_sync; | 704 | sync_dev = mcbsp[id].dma_rx_sync; |
| 757 | 705 | ||
| 758 | omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch, | 706 | omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch, |
| 759 | OMAP_DMA_DATA_TYPE_S16, | 707 | OMAP_DMA_DATA_TYPE_S16, |
| 760 | length >> 1, 1, | 708 | length >> 1, 1, |
| 761 | OMAP_DMA_SYNC_ELEMENT, | 709 | OMAP_DMA_SYNC_ELEMENT, |
| 762 | sync_dev, 0); | 710 | sync_dev, 0); |
| 763 | 711 | ||
| 764 | omap_set_dma_src_params(mcbsp[id].dma_rx_lch, | 712 | omap_set_dma_src_params(mcbsp[id].dma_rx_lch, |
| 765 | src_port, | 713 | src_port, |
| @@ -768,16 +716,17 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, unsigned int leng | |||
| 768 | 0, 0); | 716 | 0, 0); |
| 769 | 717 | ||
| 770 | omap_set_dma_dest_params(mcbsp[id].dma_rx_lch, | 718 | omap_set_dma_dest_params(mcbsp[id].dma_rx_lch, |
| 771 | dest_port, | 719 | dest_port, |
| 772 | OMAP_DMA_AMODE_POST_INC, | 720 | OMAP_DMA_AMODE_POST_INC, |
| 773 | buffer, | 721 | buffer, |
| 774 | 0, 0); | 722 | 0, 0); |
| 775 | 723 | ||
| 776 | omap_start_dma(mcbsp[id].dma_rx_lch); | 724 | omap_start_dma(mcbsp[id].dma_rx_lch); |
| 777 | wait_for_completion(&(mcbsp[id].rx_dma_completion)); | 725 | wait_for_completion(&(mcbsp[id].rx_dma_completion)); |
| 726 | |||
| 778 | return 0; | 727 | return 0; |
| 779 | } | 728 | } |
| 780 | 729 | EXPORT_SYMBOL(omap_mcbsp_recv_buffer); | |
| 781 | 730 | ||
| 782 | /* | 731 | /* |
| 783 | * SPI wrapper. | 732 | * SPI wrapper. |
| @@ -785,12 +734,15 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, unsigned int leng | |||
| 785 | * this wrapper just need an omap_mcbsp_spi_cfg structure as an input. | 734 | * this wrapper just need an omap_mcbsp_spi_cfg structure as an input. |
| 786 | * Once this is done, you can call omap_mcbsp_start(). | 735 | * Once this is done, you can call omap_mcbsp_start(). |
| 787 | */ | 736 | */ |
| 788 | void omap_mcbsp_set_spi_mode(unsigned int id, const struct omap_mcbsp_spi_cfg * spi_cfg) | 737 | void omap_mcbsp_set_spi_mode(unsigned int id, |
| 738 | const struct omap_mcbsp_spi_cfg *spi_cfg) | ||
| 789 | { | 739 | { |
| 790 | struct omap_mcbsp_reg_cfg mcbsp_cfg; | 740 | struct omap_mcbsp_reg_cfg mcbsp_cfg; |
| 791 | 741 | ||
| 792 | if (omap_mcbsp_check(id) < 0) | 742 | if (!omap_mcbsp_check_valid_id(id)) { |
| 743 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | ||
| 793 | return; | 744 | return; |
| 745 | } | ||
| 794 | 746 | ||
| 795 | memset(&mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg)); | 747 | memset(&mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg)); |
| 796 | 748 | ||
| @@ -798,7 +750,7 @@ void omap_mcbsp_set_spi_mode(unsigned int id, const struct omap_mcbsp_spi_cfg * | |||
| 798 | mcbsp_cfg.rcr1 |= (RWDLEN1(spi_cfg->word_length) | RFRLEN1(0)); | 750 | mcbsp_cfg.rcr1 |= (RWDLEN1(spi_cfg->word_length) | RFRLEN1(0)); |
| 799 | mcbsp_cfg.xcr1 |= (XWDLEN1(spi_cfg->word_length) | XFRLEN1(0)); | 751 | mcbsp_cfg.xcr1 |= (XWDLEN1(spi_cfg->word_length) | XFRLEN1(0)); |
| 800 | 752 | ||
| 801 | /* Clock stop mode */ | 753 | /* Clock stop mode */ |
| 802 | if (spi_cfg->clk_stp_mode == OMAP_MCBSP_CLK_STP_MODE_NO_DELAY) | 754 | if (spi_cfg->clk_stp_mode == OMAP_MCBSP_CLK_STP_MODE_NO_DELAY) |
| 803 | mcbsp_cfg.spcr1 |= (1 << 12); | 755 | mcbsp_cfg.spcr1 |= (1 << 12); |
| 804 | else | 756 | else |
| @@ -827,13 +779,12 @@ void omap_mcbsp_set_spi_mode(unsigned int id, const struct omap_mcbsp_spi_cfg * | |||
| 827 | 779 | ||
| 828 | if (spi_cfg->spi_mode == OMAP_MCBSP_SPI_MASTER) { | 780 | if (spi_cfg->spi_mode == OMAP_MCBSP_SPI_MASTER) { |
| 829 | mcbsp_cfg.pcr0 |= CLKXM; | 781 | mcbsp_cfg.pcr0 |= CLKXM; |
| 830 | mcbsp_cfg.srgr1 |= CLKGDV(spi_cfg->clk_div -1); | 782 | mcbsp_cfg.srgr1 |= CLKGDV(spi_cfg->clk_div - 1); |
| 831 | mcbsp_cfg.pcr0 |= FSXM; | 783 | mcbsp_cfg.pcr0 |= FSXM; |
| 832 | mcbsp_cfg.srgr2 &= ~FSGM; | 784 | mcbsp_cfg.srgr2 &= ~FSGM; |
| 833 | mcbsp_cfg.xcr2 |= XDATDLY(1); | 785 | mcbsp_cfg.xcr2 |= XDATDLY(1); |
| 834 | mcbsp_cfg.rcr2 |= RDATDLY(1); | 786 | mcbsp_cfg.rcr2 |= RDATDLY(1); |
| 835 | } | 787 | } else { |
| 836 | else { | ||
| 837 | mcbsp_cfg.pcr0 &= ~CLKXM; | 788 | mcbsp_cfg.pcr0 &= ~CLKXM; |
| 838 | mcbsp_cfg.srgr1 |= CLKGDV(1); | 789 | mcbsp_cfg.srgr1 |= CLKGDV(1); |
| 839 | mcbsp_cfg.pcr0 &= ~FSXM; | 790 | mcbsp_cfg.pcr0 &= ~FSXM; |
| @@ -846,199 +797,99 @@ void omap_mcbsp_set_spi_mode(unsigned int id, const struct omap_mcbsp_spi_cfg * | |||
| 846 | 797 | ||
| 847 | omap_mcbsp_config(id, &mcbsp_cfg); | 798 | omap_mcbsp_config(id, &mcbsp_cfg); |
| 848 | } | 799 | } |
| 849 | 800 | EXPORT_SYMBOL(omap_mcbsp_set_spi_mode); | |
| 850 | 801 | ||
| 851 | /* | 802 | /* |
| 852 | * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. | 803 | * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. |
| 853 | * 730 has only 2 McBSP, and both of them are MPU peripherals. | 804 | * 730 has only 2 McBSP, and both of them are MPU peripherals. |
| 854 | */ | 805 | */ |
| 855 | struct omap_mcbsp_info { | 806 | static int __init omap_mcbsp_probe(struct platform_device *pdev) |
| 856 | u32 virt_base; | 807 | { |
| 857 | u8 dma_rx_sync, dma_tx_sync; | 808 | struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data; |
| 858 | u16 rx_irq, tx_irq; | 809 | int id = pdev->id - 1; |
| 859 | }; | 810 | int ret = 0; |
| 860 | 811 | ||
| 861 | #ifdef CONFIG_ARCH_OMAP730 | 812 | if (!pdata) { |
| 862 | static const struct omap_mcbsp_info mcbsp_730[] = { | 813 | dev_err(&pdev->dev, "McBSP device initialized without" |
| 863 | [0] = { .virt_base = io_p2v(OMAP730_MCBSP1_BASE), | 814 | "platform data\n"); |
| 864 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | 815 | ret = -EINVAL; |
| 865 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | 816 | goto exit; |
| 866 | .rx_irq = INT_730_McBSP1RX, | 817 | } |
| 867 | .tx_irq = INT_730_McBSP1TX }, | 818 | |
| 868 | [1] = { .virt_base = io_p2v(OMAP730_MCBSP2_BASE), | 819 | dev_dbg(&pdev->dev, "Initializing OMAP McBSP (%d).\n", pdev->id); |
| 869 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | 820 | |
| 870 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | 821 | if (id >= OMAP_MAX_MCBSP_COUNT) { |
| 871 | .rx_irq = INT_730_McBSP2RX, | 822 | dev_err(&pdev->dev, "Invalid McBSP device id (%d)\n", id); |
| 872 | .tx_irq = INT_730_McBSP2TX }, | 823 | ret = -EINVAL; |
| 873 | }; | 824 | goto exit; |
| 874 | #endif | 825 | } |
| 875 | 826 | ||
| 876 | #ifdef CONFIG_ARCH_OMAP15XX | 827 | spin_lock_init(&mcbsp[id].lock); |
| 877 | static const struct omap_mcbsp_info mcbsp_1510[] = { | 828 | mcbsp[id].id = id + 1; |
| 878 | [0] = { .virt_base = OMAP1510_MCBSP1_BASE, | 829 | mcbsp[id].free = 1; |
| 879 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | 830 | mcbsp[id].dma_tx_lch = -1; |
| 880 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | 831 | mcbsp[id].dma_rx_lch = -1; |
| 881 | .rx_irq = INT_McBSP1RX, | 832 | |
| 882 | .tx_irq = INT_McBSP1TX }, | 833 | mcbsp[id].io_base = pdata->virt_base; |
| 883 | [1] = { .virt_base = io_p2v(OMAP1510_MCBSP2_BASE), | 834 | /* Default I/O is IRQ based */ |
| 884 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, | 835 | mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO; |
| 885 | .dma_tx_sync = OMAP_DMA_MCBSP2_TX, | 836 | mcbsp[id].tx_irq = pdata->tx_irq; |
| 886 | .rx_irq = INT_1510_SPI_RX, | 837 | mcbsp[id].rx_irq = pdata->rx_irq; |
| 887 | .tx_irq = INT_1510_SPI_TX }, | 838 | mcbsp[id].dma_rx_sync = pdata->dma_rx_sync; |
| 888 | [2] = { .virt_base = OMAP1510_MCBSP3_BASE, | 839 | mcbsp[id].dma_tx_sync = pdata->dma_tx_sync; |
| 889 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | 840 | |
| 890 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | 841 | if (pdata->clk_name) |
| 891 | .rx_irq = INT_McBSP3RX, | 842 | mcbsp[id].clk = clk_get(&pdev->dev, pdata->clk_name); |
| 892 | .tx_irq = INT_McBSP3TX }, | 843 | if (IS_ERR(mcbsp[id].clk)) { |
| 893 | }; | 844 | mcbsp[id].free = 0; |
| 894 | #endif | 845 | dev_err(&pdev->dev, |
| 895 | 846 | "Invalid clock configuration for McBSP%d.\n", | |
| 896 | #if defined(CONFIG_ARCH_OMAP16XX) | 847 | mcbsp[id].id); |
| 897 | static const struct omap_mcbsp_info mcbsp_1610[] = { | 848 | ret = -EINVAL; |
| 898 | [0] = { .virt_base = OMAP1610_MCBSP1_BASE, | 849 | goto exit; |
| 899 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | 850 | } |
| 900 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | 851 | |
| 901 | .rx_irq = INT_McBSP1RX, | 852 | mcbsp[id].pdata = pdata; |
| 902 | .tx_irq = INT_McBSP1TX }, | 853 | mcbsp[id].dev = &pdev->dev; |
| 903 | [1] = { .virt_base = io_p2v(OMAP1610_MCBSP2_BASE), | 854 | platform_set_drvdata(pdev, &mcbsp[id]); |
| 904 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, | 855 | |
| 905 | .dma_tx_sync = OMAP_DMA_MCBSP2_TX, | 856 | exit: |
| 906 | .rx_irq = INT_1610_McBSP2_RX, | 857 | return ret; |
| 907 | .tx_irq = INT_1610_McBSP2_TX }, | 858 | } |
| 908 | [2] = { .virt_base = OMAP1610_MCBSP3_BASE, | ||
| 909 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | ||
| 910 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | ||
| 911 | .rx_irq = INT_McBSP3RX, | ||
| 912 | .tx_irq = INT_McBSP3TX }, | ||
| 913 | }; | ||
| 914 | #endif | ||
| 915 | |||
| 916 | #if defined(CONFIG_ARCH_OMAP24XX) | ||
| 917 | static const struct omap_mcbsp_info mcbsp_24xx[] = { | ||
| 918 | [0] = { .virt_base = IO_ADDRESS(OMAP24XX_MCBSP1_BASE), | ||
| 919 | .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX, | ||
| 920 | .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX, | ||
| 921 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, | ||
| 922 | .tx_irq = INT_24XX_MCBSP1_IRQ_TX, | ||
| 923 | }, | ||
| 924 | [1] = { .virt_base = IO_ADDRESS(OMAP24XX_MCBSP2_BASE), | ||
| 925 | .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX, | ||
| 926 | .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX, | ||
| 927 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, | ||
| 928 | .tx_irq = INT_24XX_MCBSP2_IRQ_TX, | ||
| 929 | }, | ||
| 930 | }; | ||
| 931 | #endif | ||
| 932 | 859 | ||
| 933 | static int __init omap_mcbsp_init(void) | 860 | static int omap_mcbsp_remove(struct platform_device *pdev) |
| 934 | { | 861 | { |
| 935 | int mcbsp_count = 0, i; | 862 | struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); |
| 936 | static const struct omap_mcbsp_info *mcbsp_info; | ||
| 937 | 863 | ||
| 938 | printk("Initializing OMAP McBSP system\n"); | 864 | platform_set_drvdata(pdev, NULL); |
| 865 | if (mcbsp) { | ||
| 939 | 866 | ||
| 940 | #ifdef CONFIG_ARCH_OMAP1 | 867 | if (mcbsp->pdata && mcbsp->pdata->ops && |
| 941 | mcbsp_dsp_ck = clk_get(0, "dsp_ck"); | 868 | mcbsp->pdata->ops->free) |
| 942 | if (IS_ERR(mcbsp_dsp_ck)) { | 869 | mcbsp->pdata->ops->free(mcbsp->id); |
| 943 | printk(KERN_ERR "mcbsp: could not acquire dsp_ck handle.\n"); | ||
| 944 | return PTR_ERR(mcbsp_dsp_ck); | ||
| 945 | } | ||
| 946 | mcbsp_api_ck = clk_get(0, "api_ck"); | ||
| 947 | if (IS_ERR(mcbsp_api_ck)) { | ||
| 948 | printk(KERN_ERR "mcbsp: could not acquire api_ck handle.\n"); | ||
| 949 | return PTR_ERR(mcbsp_api_ck); | ||
| 950 | } | ||
| 951 | mcbsp_dspxor_ck = clk_get(0, "dspxor_ck"); | ||
| 952 | if (IS_ERR(mcbsp_dspxor_ck)) { | ||
| 953 | printk(KERN_ERR "mcbsp: could not acquire dspxor_ck handle.\n"); | ||
| 954 | return PTR_ERR(mcbsp_dspxor_ck); | ||
| 955 | } | ||
| 956 | #endif | ||
| 957 | #ifdef CONFIG_ARCH_OMAP2 | ||
| 958 | mcbsp1_ick = clk_get(0, "mcbsp1_ick"); | ||
| 959 | if (IS_ERR(mcbsp1_ick)) { | ||
| 960 | printk(KERN_ERR "mcbsp: could not acquire mcbsp1_ick handle.\n"); | ||
| 961 | return PTR_ERR(mcbsp1_ick); | ||
| 962 | } | ||
| 963 | mcbsp1_fck = clk_get(0, "mcbsp1_fck"); | ||
| 964 | if (IS_ERR(mcbsp1_fck)) { | ||
| 965 | printk(KERN_ERR "mcbsp: could not acquire mcbsp1_fck handle.\n"); | ||
| 966 | return PTR_ERR(mcbsp1_fck); | ||
| 967 | } | ||
| 968 | mcbsp2_ick = clk_get(0, "mcbsp2_ick"); | ||
| 969 | if (IS_ERR(mcbsp2_ick)) { | ||
| 970 | printk(KERN_ERR "mcbsp: could not acquire mcbsp2_ick handle.\n"); | ||
| 971 | return PTR_ERR(mcbsp2_ick); | ||
| 972 | } | ||
| 973 | mcbsp2_fck = clk_get(0, "mcbsp2_fck"); | ||
| 974 | if (IS_ERR(mcbsp2_fck)) { | ||
| 975 | printk(KERN_ERR "mcbsp: could not acquire mcbsp2_fck handle.\n"); | ||
| 976 | return PTR_ERR(mcbsp2_fck); | ||
| 977 | } | ||
| 978 | #endif | ||
| 979 | 870 | ||
| 980 | #ifdef CONFIG_ARCH_OMAP730 | 871 | clk_disable(mcbsp->clk); |
| 981 | if (cpu_is_omap730()) { | 872 | clk_put(mcbsp->clk); |
| 982 | mcbsp_info = mcbsp_730; | 873 | |
| 983 | mcbsp_count = ARRAY_SIZE(mcbsp_730); | 874 | mcbsp->clk = NULL; |
| 984 | } | 875 | mcbsp->free = 0; |
| 985 | #endif | 876 | mcbsp->dev = NULL; |
| 986 | #ifdef CONFIG_ARCH_OMAP15XX | ||
| 987 | if (cpu_is_omap15xx()) { | ||
| 988 | mcbsp_info = mcbsp_1510; | ||
| 989 | mcbsp_count = ARRAY_SIZE(mcbsp_1510); | ||
| 990 | } | ||
| 991 | #endif | ||
| 992 | #if defined(CONFIG_ARCH_OMAP16XX) | ||
| 993 | if (cpu_is_omap16xx()) { | ||
| 994 | mcbsp_info = mcbsp_1610; | ||
| 995 | mcbsp_count = ARRAY_SIZE(mcbsp_1610); | ||
| 996 | } | ||
| 997 | #endif | ||
| 998 | #if defined(CONFIG_ARCH_OMAP24XX) | ||
| 999 | if (cpu_is_omap24xx()) { | ||
| 1000 | mcbsp_info = mcbsp_24xx; | ||
| 1001 | mcbsp_count = ARRAY_SIZE(mcbsp_24xx); | ||
| 1002 | omap2_mcbsp2_mux_setup(); | ||
| 1003 | } | ||
| 1004 | #endif | ||
| 1005 | for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) { | ||
| 1006 | if (i >= mcbsp_count) { | ||
| 1007 | mcbsp[i].io_base = 0; | ||
| 1008 | mcbsp[i].free = 0; | ||
| 1009 | continue; | ||
| 1010 | } | ||
| 1011 | mcbsp[i].id = i + 1; | ||
| 1012 | mcbsp[i].free = 1; | ||
| 1013 | mcbsp[i].dma_tx_lch = -1; | ||
| 1014 | mcbsp[i].dma_rx_lch = -1; | ||
| 1015 | |||
| 1016 | mcbsp[i].io_base = mcbsp_info[i].virt_base; | ||
| 1017 | mcbsp[i].io_type = OMAP_MCBSP_IRQ_IO; /* Default I/O is IRQ based */ | ||
| 1018 | mcbsp[i].tx_irq = mcbsp_info[i].tx_irq; | ||
| 1019 | mcbsp[i].rx_irq = mcbsp_info[i].rx_irq; | ||
| 1020 | mcbsp[i].dma_rx_sync = mcbsp_info[i].dma_rx_sync; | ||
| 1021 | mcbsp[i].dma_tx_sync = mcbsp_info[i].dma_tx_sync; | ||
| 1022 | spin_lock_init(&mcbsp[i].lock); | ||
| 1023 | } | 877 | } |
| 1024 | 878 | ||
| 1025 | return 0; | 879 | return 0; |
| 1026 | } | 880 | } |
| 1027 | 881 | ||
| 1028 | arch_initcall(omap_mcbsp_init); | 882 | static struct platform_driver omap_mcbsp_driver = { |
| 883 | .probe = omap_mcbsp_probe, | ||
| 884 | .remove = omap_mcbsp_remove, | ||
| 885 | .driver = { | ||
| 886 | .name = "omap-mcbsp", | ||
| 887 | }, | ||
| 888 | }; | ||
| 889 | |||
| 890 | int __init omap_mcbsp_init(void) | ||
| 891 | { | ||
| 892 | /* Register the McBSP driver */ | ||
| 893 | return platform_driver_register(&omap_mcbsp_driver); | ||
| 894 | } | ||
| 1029 | 895 | ||
| 1030 | EXPORT_SYMBOL(omap_mcbsp_config); | ||
| 1031 | EXPORT_SYMBOL(omap_mcbsp_request); | ||
| 1032 | EXPORT_SYMBOL(omap_mcbsp_set_io_type); | ||
| 1033 | EXPORT_SYMBOL(omap_mcbsp_free); | ||
| 1034 | EXPORT_SYMBOL(omap_mcbsp_start); | ||
| 1035 | EXPORT_SYMBOL(omap_mcbsp_stop); | ||
| 1036 | EXPORT_SYMBOL(omap_mcbsp_pollread); | ||
| 1037 | EXPORT_SYMBOL(omap_mcbsp_pollwrite); | ||
| 1038 | EXPORT_SYMBOL(omap_mcbsp_xmit_word); | ||
| 1039 | EXPORT_SYMBOL(omap_mcbsp_recv_word); | ||
| 1040 | EXPORT_SYMBOL(omap_mcbsp_xmit_buffer); | ||
| 1041 | EXPORT_SYMBOL(omap_mcbsp_recv_buffer); | ||
| 1042 | EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll); | ||
| 1043 | EXPORT_SYMBOL(omap_mcbsp_spi_master_recv_word_poll); | ||
| 1044 | EXPORT_SYMBOL(omap_mcbsp_set_spi_mode); | ||
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 1f23f0459e5f..554ee58e1294 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
| 11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
| 12 | */ | 12 | */ |
| 13 | #undef DEBUG | ||
| 13 | 14 | ||
| 14 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| @@ -24,25 +25,43 @@ | |||
| 24 | #include <asm/arch/sram.h> | 25 | #include <asm/arch/sram.h> |
| 25 | #include <asm/arch/board.h> | 26 | #include <asm/arch/board.h> |
| 26 | 27 | ||
| 28 | #include <asm/arch/control.h> | ||
| 29 | |||
| 30 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | ||
| 31 | # include "../mach-omap2/prm.h" | ||
| 32 | # include "../mach-omap2/cm.h" | ||
| 33 | # include "../mach-omap2/sdrc.h" | ||
| 34 | #endif | ||
| 35 | |||
| 27 | #define OMAP1_SRAM_PA 0x20000000 | 36 | #define OMAP1_SRAM_PA 0x20000000 |
| 28 | #define OMAP1_SRAM_VA 0xd0000000 | 37 | #define OMAP1_SRAM_VA VMALLOC_END |
| 29 | #define OMAP2_SRAM_PA 0x40200000 | 38 | #define OMAP2_SRAM_PA 0x40200000 |
| 30 | #define OMAP2_SRAM_PUB_PA 0x4020f800 | 39 | #define OMAP2_SRAM_PUB_PA 0x4020f800 |
| 31 | #define OMAP2_SRAM_VA 0xd0000000 | 40 | #define OMAP2_SRAM_VA VMALLOC_END |
| 32 | #define OMAP2_SRAM_PUB_VA 0xd0000800 | 41 | #define OMAP2_SRAM_PUB_VA (VMALLOC_END + 0x800) |
| 33 | 42 | #define OMAP3_SRAM_PA 0x40200000 | |
| 34 | #if defined(CONFIG_ARCH_OMAP24XX) | 43 | #define OMAP3_SRAM_VA 0xd7000000 |
| 44 | #define OMAP3_SRAM_PUB_PA 0x40208000 | ||
| 45 | #define OMAP3_SRAM_PUB_VA 0xd7008000 | ||
| 46 | |||
| 47 | #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) | ||
| 35 | #define SRAM_BOOTLOADER_SZ 0x00 | 48 | #define SRAM_BOOTLOADER_SZ 0x00 |
| 36 | #else | 49 | #else |
| 37 | #define SRAM_BOOTLOADER_SZ 0x80 | 50 | #define SRAM_BOOTLOADER_SZ 0x80 |
| 38 | #endif | 51 | #endif |
| 39 | 52 | ||
| 40 | #define VA_REQINFOPERM0 IO_ADDRESS(0x68005048) | 53 | #define OMAP24XX_VA_REQINFOPERM0 IO_ADDRESS(0x68005048) |
| 41 | #define VA_READPERM0 IO_ADDRESS(0x68005050) | 54 | #define OMAP24XX_VA_READPERM0 IO_ADDRESS(0x68005050) |
| 42 | #define VA_WRITEPERM0 IO_ADDRESS(0x68005058) | 55 | #define OMAP24XX_VA_WRITEPERM0 IO_ADDRESS(0x68005058) |
| 43 | #define VA_CONTROL_STAT IO_ADDRESS(0x480002F8) | 56 | |
| 57 | #define OMAP34XX_VA_REQINFOPERM0 IO_ADDRESS(0x68012848) | ||
| 58 | #define OMAP34XX_VA_READPERM0 IO_ADDRESS(0x68012850) | ||
| 59 | #define OMAP34XX_VA_WRITEPERM0 IO_ADDRESS(0x68012858) | ||
| 60 | #define OMAP34XX_VA_ADDR_MATCH2 IO_ADDRESS(0x68012880) | ||
| 61 | #define OMAP34XX_VA_SMS_RG_ATT0 IO_ADDRESS(0x6C000048) | ||
| 62 | #define OMAP34XX_VA_CONTROL_STAT IO_ADDRESS(0x480022F0) | ||
| 63 | |||
| 44 | #define GP_DEVICE 0x300 | 64 | #define GP_DEVICE 0x300 |
| 45 | #define TYPE_MASK 0x700 | ||
| 46 | 65 | ||
| 47 | #define ROUND_DOWN(value,boundary) ((value) & (~((boundary)-1))) | 66 | #define ROUND_DOWN(value,boundary) ((value) & (~((boundary)-1))) |
| 48 | 67 | ||
| @@ -68,14 +87,21 @@ static int is_sram_locked(void) | |||
| 68 | int type = 0; | 87 | int type = 0; |
| 69 | 88 | ||
| 70 | if (cpu_is_omap242x()) | 89 | if (cpu_is_omap242x()) |
| 71 | type = __raw_readl(VA_CONTROL_STAT) & TYPE_MASK; | 90 | type = system_rev & OMAP2_DEVICETYPE_MASK; |
| 72 | 91 | ||
| 73 | if (type == GP_DEVICE) { | 92 | if (type == GP_DEVICE) { |
| 74 | /* RAMFW: R/W access to all initiators for all qualifier sets */ | 93 | /* RAMFW: R/W access to all initiators for all qualifier sets */ |
| 75 | if (cpu_is_omap242x()) { | 94 | if (cpu_is_omap242x()) { |
| 76 | __raw_writel(0xFF, VA_REQINFOPERM0); /* all q-vects */ | 95 | __raw_writel(0xFF, OMAP24XX_VA_REQINFOPERM0); /* all q-vects */ |
| 77 | __raw_writel(0xCFDE, VA_READPERM0); /* all i-read */ | 96 | __raw_writel(0xCFDE, OMAP24XX_VA_READPERM0); /* all i-read */ |
| 78 | __raw_writel(0xCFDE, VA_WRITEPERM0); /* all i-write */ | 97 | __raw_writel(0xCFDE, OMAP24XX_VA_WRITEPERM0); /* all i-write */ |
| 98 | } | ||
| 99 | if (cpu_is_omap34xx()) { | ||
| 100 | __raw_writel(0xFFFF, OMAP34XX_VA_REQINFOPERM0); /* all q-vects */ | ||
| 101 | __raw_writel(0xFFFF, OMAP34XX_VA_READPERM0); /* all i-read */ | ||
| 102 | __raw_writel(0xFFFF, OMAP34XX_VA_WRITEPERM0); /* all i-write */ | ||
| 103 | __raw_writel(0x0, OMAP34XX_VA_ADDR_MATCH2); | ||
| 104 | __raw_writel(0xFFFFFFFF, OMAP34XX_VA_SMS_RG_ATT0); | ||
| 79 | } | 105 | } |
| 80 | return 0; | 106 | return 0; |
| 81 | } else | 107 | } else |
| @@ -92,18 +118,30 @@ void __init omap_detect_sram(void) | |||
| 92 | { | 118 | { |
| 93 | unsigned long reserved; | 119 | unsigned long reserved; |
| 94 | 120 | ||
| 95 | if (cpu_is_omap24xx()) { | 121 | if (cpu_class_is_omap2()) { |
| 96 | if (is_sram_locked()) { | 122 | if (is_sram_locked()) { |
| 97 | omap_sram_base = OMAP2_SRAM_PUB_VA; | 123 | if (cpu_is_omap34xx()) { |
| 98 | omap_sram_start = OMAP2_SRAM_PUB_PA; | 124 | omap_sram_base = OMAP3_SRAM_PUB_VA; |
| 99 | omap_sram_size = 0x800; /* 2K */ | 125 | omap_sram_start = OMAP3_SRAM_PUB_PA; |
| 126 | omap_sram_size = 0x8000; /* 32K */ | ||
| 127 | } else { | ||
| 128 | omap_sram_base = OMAP2_SRAM_PUB_VA; | ||
| 129 | omap_sram_start = OMAP2_SRAM_PUB_PA; | ||
| 130 | omap_sram_size = 0x800; /* 2K */ | ||
| 131 | } | ||
| 100 | } else { | 132 | } else { |
| 101 | omap_sram_base = OMAP2_SRAM_VA; | 133 | if (cpu_is_omap34xx()) { |
| 102 | omap_sram_start = OMAP2_SRAM_PA; | 134 | omap_sram_base = OMAP3_SRAM_VA; |
| 103 | if (cpu_is_omap242x()) | 135 | omap_sram_start = OMAP3_SRAM_PA; |
| 104 | omap_sram_size = 0xa0000; /* 640K */ | ||
| 105 | else if (cpu_is_omap243x()) | ||
| 106 | omap_sram_size = 0x10000; /* 64K */ | 136 | omap_sram_size = 0x10000; /* 64K */ |
| 137 | } else { | ||
| 138 | omap_sram_base = OMAP2_SRAM_VA; | ||
| 139 | omap_sram_start = OMAP2_SRAM_PA; | ||
| 140 | if (cpu_is_omap242x()) | ||
| 141 | omap_sram_size = 0xa0000; /* 640K */ | ||
| 142 | else if (cpu_is_omap243x()) | ||
| 143 | omap_sram_size = 0x10000; /* 64K */ | ||
| 144 | } | ||
| 107 | } | 145 | } |
| 108 | } else { | 146 | } else { |
| 109 | omap_sram_base = OMAP1_SRAM_VA; | 147 | omap_sram_base = OMAP1_SRAM_VA; |
| @@ -157,6 +195,13 @@ void __init omap_map_sram(void) | |||
| 157 | omap_sram_io_desc[0].pfn = __phys_to_pfn(base); | 195 | omap_sram_io_desc[0].pfn = __phys_to_pfn(base); |
| 158 | } | 196 | } |
| 159 | 197 | ||
| 198 | if (cpu_is_omap34xx()) { | ||
| 199 | omap_sram_io_desc[0].virtual = OMAP3_SRAM_VA; | ||
| 200 | base = OMAP3_SRAM_PA; | ||
| 201 | base = ROUND_DOWN(base, PAGE_SIZE); | ||
| 202 | omap_sram_io_desc[0].pfn = __phys_to_pfn(base); | ||
| 203 | } | ||
| 204 | |||
| 160 | omap_sram_io_desc[0].length = 1024 * 1024; /* Use section desc */ | 205 | omap_sram_io_desc[0].length = 1024 * 1024; /* Use section desc */ |
| 161 | iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc)); | 206 | iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc)); |
| 162 | 207 | ||
| @@ -191,6 +236,7 @@ void * omap_sram_push(void * start, unsigned long size) | |||
| 191 | omap_sram_ceil -= size; | 236 | omap_sram_ceil -= size; |
| 192 | omap_sram_ceil = ROUND_DOWN(omap_sram_ceil, sizeof(void *)); | 237 | omap_sram_ceil = ROUND_DOWN(omap_sram_ceil, sizeof(void *)); |
| 193 | memcpy((void *)omap_sram_ceil, start, size); | 238 | memcpy((void *)omap_sram_ceil, start, size); |
| 239 | flush_icache_range((unsigned long)start, (unsigned long)(start + size)); | ||
| 194 | 240 | ||
| 195 | return (void *)omap_sram_ceil; | 241 | return (void *)omap_sram_ceil; |
| 196 | } | 242 | } |
| @@ -214,8 +260,9 @@ void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl) | |||
| 214 | 260 | ||
| 215 | int __init omap1_sram_init(void) | 261 | int __init omap1_sram_init(void) |
| 216 | { | 262 | { |
| 217 | _omap_sram_reprogram_clock = omap_sram_push(sram_reprogram_clock, | 263 | _omap_sram_reprogram_clock = |
| 218 | sram_reprogram_clock_sz); | 264 | omap_sram_push(omap1_sram_reprogram_clock, |
| 265 | omap1_sram_reprogram_clock_sz); | ||
| 219 | 266 | ||
| 220 | return 0; | 267 | return 0; |
| 221 | } | 268 | } |
| @@ -224,7 +271,7 @@ int __init omap1_sram_init(void) | |||
| 224 | #define omap1_sram_init() do {} while (0) | 271 | #define omap1_sram_init() do {} while (0) |
| 225 | #endif | 272 | #endif |
| 226 | 273 | ||
| 227 | #ifdef CONFIG_ARCH_OMAP2 | 274 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
| 228 | 275 | ||
| 229 | static void (*_omap2_sram_ddr_init)(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, | 276 | static void (*_omap2_sram_ddr_init)(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, |
| 230 | u32 base_cs, u32 force_unlock); | 277 | u32 base_cs, u32 force_unlock); |
| @@ -259,19 +306,109 @@ u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass) | |||
| 259 | 306 | ||
| 260 | return _omap2_set_prcm(dpll_ctrl_val, sdrc_rfr_val, bypass); | 307 | return _omap2_set_prcm(dpll_ctrl_val, sdrc_rfr_val, bypass); |
| 261 | } | 308 | } |
| 309 | #endif | ||
| 310 | |||
| 311 | #ifdef CONFIG_ARCH_OMAP2420 | ||
| 312 | int __init omap242x_sram_init(void) | ||
| 313 | { | ||
| 314 | _omap2_sram_ddr_init = omap_sram_push(omap242x_sram_ddr_init, | ||
| 315 | omap242x_sram_ddr_init_sz); | ||
| 316 | |||
| 317 | _omap2_sram_reprogram_sdrc = omap_sram_push(omap242x_sram_reprogram_sdrc, | ||
| 318 | omap242x_sram_reprogram_sdrc_sz); | ||
| 319 | |||
| 320 | _omap2_set_prcm = omap_sram_push(omap242x_sram_set_prcm, | ||
| 321 | omap242x_sram_set_prcm_sz); | ||
| 322 | |||
| 323 | return 0; | ||
| 324 | } | ||
| 325 | #else | ||
| 326 | static inline int omap242x_sram_init(void) | ||
| 327 | { | ||
| 328 | return 0; | ||
| 329 | } | ||
| 330 | #endif | ||
| 331 | |||
| 332 | #ifdef CONFIG_ARCH_OMAP2430 | ||
| 333 | int __init omap243x_sram_init(void) | ||
| 334 | { | ||
| 335 | _omap2_sram_ddr_init = omap_sram_push(omap243x_sram_ddr_init, | ||
| 336 | omap243x_sram_ddr_init_sz); | ||
| 337 | |||
| 338 | _omap2_sram_reprogram_sdrc = omap_sram_push(omap243x_sram_reprogram_sdrc, | ||
| 339 | omap243x_sram_reprogram_sdrc_sz); | ||
| 340 | |||
| 341 | _omap2_set_prcm = omap_sram_push(omap243x_sram_set_prcm, | ||
| 342 | omap243x_sram_set_prcm_sz); | ||
| 343 | |||
| 344 | return 0; | ||
| 345 | } | ||
| 346 | #else | ||
| 347 | static inline int omap243x_sram_init(void) | ||
| 348 | { | ||
| 349 | return 0; | ||
| 350 | } | ||
| 351 | #endif | ||
| 352 | |||
| 353 | #ifdef CONFIG_ARCH_OMAP3 | ||
| 354 | |||
| 355 | static u32 (*_omap2_sram_reprogram_gpmc)(u32 perf_level); | ||
| 356 | u32 omap2_sram_reprogram_gpmc(u32 perf_level) | ||
| 357 | { | ||
| 358 | if (!_omap2_sram_reprogram_gpmc) | ||
| 359 | omap_sram_error(); | ||
| 360 | |||
| 361 | return _omap2_sram_reprogram_gpmc(perf_level); | ||
| 362 | } | ||
| 363 | |||
| 364 | static u32 (*_omap2_sram_configure_core_dpll)(u32 m, u32 n, | ||
| 365 | u32 freqsel, u32 m2); | ||
| 366 | u32 omap2_sram_configure_core_dpll(u32 m, u32 n, u32 freqsel, u32 m2) | ||
| 367 | { | ||
| 368 | if (!_omap2_sram_configure_core_dpll) | ||
| 369 | omap_sram_error(); | ||
| 370 | |||
| 371 | return _omap2_sram_configure_core_dpll(m, n, freqsel, m2); | ||
| 372 | } | ||
| 262 | 373 | ||
| 263 | int __init omap2_sram_init(void) | 374 | /* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */ |
| 375 | void restore_sram_functions(void) | ||
| 264 | { | 376 | { |
| 265 | _omap2_sram_ddr_init = omap_sram_push(sram_ddr_init, sram_ddr_init_sz); | 377 | omap_sram_ceil = omap_sram_base + omap_sram_size; |
| 266 | 378 | ||
| 267 | _omap2_sram_reprogram_sdrc = omap_sram_push(sram_reprogram_sdrc, | 379 | _omap2_sram_reprogram_gpmc = omap_sram_push(omap34xx_sram_reprogram_gpmc, |
| 268 | sram_reprogram_sdrc_sz); | 380 | omap34xx_sram_reprogram_gpmc_sz); |
| 269 | _omap2_set_prcm = omap_sram_push(sram_set_prcm, sram_set_prcm_sz); | 381 | |
| 382 | _omap2_sram_configure_core_dpll = | ||
| 383 | omap_sram_push(omap34xx_sram_configure_core_dpll, | ||
| 384 | omap34xx_sram_configure_core_dpll_sz); | ||
| 385 | } | ||
| 386 | |||
| 387 | int __init omap34xx_sram_init(void) | ||
| 388 | { | ||
| 389 | _omap2_sram_ddr_init = omap_sram_push(omap34xx_sram_ddr_init, | ||
| 390 | omap34xx_sram_ddr_init_sz); | ||
| 391 | |||
| 392 | _omap2_sram_reprogram_sdrc = omap_sram_push(omap34xx_sram_reprogram_sdrc, | ||
| 393 | omap34xx_sram_reprogram_sdrc_sz); | ||
| 394 | |||
| 395 | _omap2_set_prcm = omap_sram_push(omap34xx_sram_set_prcm, | ||
| 396 | omap34xx_sram_set_prcm_sz); | ||
| 397 | |||
| 398 | _omap2_sram_reprogram_gpmc = omap_sram_push(omap34xx_sram_reprogram_gpmc, | ||
| 399 | omap34xx_sram_reprogram_gpmc_sz); | ||
| 400 | |||
| 401 | _omap2_sram_configure_core_dpll = | ||
| 402 | omap_sram_push(omap34xx_sram_configure_core_dpll, | ||
| 403 | omap34xx_sram_configure_core_dpll_sz); | ||
| 270 | 404 | ||
| 271 | return 0; | 405 | return 0; |
| 272 | } | 406 | } |
| 273 | #else | 407 | #else |
| 274 | #define omap2_sram_init() do {} while (0) | 408 | static inline int omap34xx_sram_init(void) |
| 409 | { | ||
| 410 | return 0; | ||
| 411 | } | ||
| 275 | #endif | 412 | #endif |
| 276 | 413 | ||
| 277 | int __init omap_sram_init(void) | 414 | int __init omap_sram_init(void) |
| @@ -279,10 +416,14 @@ int __init omap_sram_init(void) | |||
| 279 | omap_detect_sram(); | 416 | omap_detect_sram(); |
| 280 | omap_map_sram(); | 417 | omap_map_sram(); |
| 281 | 418 | ||
| 282 | if (!cpu_is_omap24xx()) | 419 | if (!(cpu_class_is_omap2())) |
| 283 | omap1_sram_init(); | 420 | omap1_sram_init(); |
| 284 | else | 421 | else if (cpu_is_omap242x()) |
| 285 | omap2_sram_init(); | 422 | omap242x_sram_init(); |
| 423 | else if (cpu_is_omap2430()) | ||
| 424 | omap243x_sram_init(); | ||
| 425 | else if (cpu_is_omap34xx()) | ||
| 426 | omap34xx_sram_init(); | ||
| 286 | 427 | ||
| 287 | return 0; | 428 | return 0; |
| 288 | } | 429 | } |
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index a619475c4b76..2699c16d4da0 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/plat-omap/usb.c -- platform level USB initialization | 2 | * arch/arm/plat-omap/usb.c -- platform level USB initialization |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2004 Texas Instruments, Inc. | 4 | * Copyright (C) 2004 Texas Instruments, Inc. |
| @@ -156,8 +156,12 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) | |||
| 156 | 156 | ||
| 157 | if (nwires == 0) { | 157 | if (nwires == 0) { |
| 158 | if (cpu_class_is_omap1() && !cpu_is_omap15xx()) { | 158 | if (cpu_class_is_omap1() && !cpu_is_omap15xx()) { |
| 159 | u32 l; | ||
| 160 | |||
| 159 | /* pulldown D+/D- */ | 161 | /* pulldown D+/D- */ |
| 160 | USB_TRANSCEIVER_CTRL_REG &= ~(3 << 1); | 162 | l = omap_readl(USB_TRANSCEIVER_CTRL); |
| 163 | l &= ~(3 << 1); | ||
| 164 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 161 | } | 165 | } |
| 162 | return 0; | 166 | return 0; |
| 163 | } | 167 | } |
| @@ -171,6 +175,8 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) | |||
| 171 | 175 | ||
| 172 | /* internal transceiver (unavailable on 17xx, 24xx) */ | 176 | /* internal transceiver (unavailable on 17xx, 24xx) */ |
| 173 | if (!cpu_class_is_omap2() && nwires == 2) { | 177 | if (!cpu_class_is_omap2() && nwires == 2) { |
| 178 | u32 l; | ||
| 179 | |||
| 174 | // omap_cfg_reg(P9_USB_DP); | 180 | // omap_cfg_reg(P9_USB_DP); |
| 175 | // omap_cfg_reg(R8_USB_DM); | 181 | // omap_cfg_reg(R8_USB_DM); |
| 176 | 182 | ||
| @@ -185,9 +191,11 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) | |||
| 185 | * - OTG support on this port not yet written | 191 | * - OTG support on this port not yet written |
| 186 | */ | 192 | */ |
| 187 | 193 | ||
| 188 | USB_TRANSCEIVER_CTRL_REG &= ~(7 << 4); | 194 | l = omap_readl(USB_TRANSCEIVER_CTRL); |
| 195 | l &= ~(7 << 4); | ||
| 189 | if (!is_device) | 196 | if (!is_device) |
| 190 | USB_TRANSCEIVER_CTRL_REG |= (3 << 1); | 197 | l |= (3 << 1); |
| 198 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 191 | 199 | ||
| 192 | return 3 << 16; | 200 | return 3 << 16; |
| 193 | } | 201 | } |
| @@ -217,8 +225,13 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) | |||
| 217 | * with VBUS switching and overcurrent detection. | 225 | * with VBUS switching and overcurrent detection. |
| 218 | */ | 226 | */ |
| 219 | 227 | ||
| 220 | if (cpu_class_is_omap1() && nwires != 6) | 228 | if (cpu_class_is_omap1() && nwires != 6) { |
| 221 | USB_TRANSCEIVER_CTRL_REG &= ~CONF_USB2_UNI_R; | 229 | u32 l; |
| 230 | |||
| 231 | l = omap_readl(USB_TRANSCEIVER_CTRL); | ||
| 232 | l &= ~CONF_USB2_UNI_R; | ||
| 233 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 234 | } | ||
| 222 | 235 | ||
| 223 | switch (nwires) { | 236 | switch (nwires) { |
| 224 | case 3: | 237 | case 3: |
| @@ -238,9 +251,13 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device) | |||
| 238 | omap_cfg_reg(K20_24XX_USB0_VM); | 251 | omap_cfg_reg(K20_24XX_USB0_VM); |
| 239 | omap2_usb_devconf_set(0, USB_UNIDIR); | 252 | omap2_usb_devconf_set(0, USB_UNIDIR); |
| 240 | } else { | 253 | } else { |
| 254 | u32 l; | ||
| 255 | |||
| 241 | omap_cfg_reg(AA9_USB0_VP); | 256 | omap_cfg_reg(AA9_USB0_VP); |
| 242 | omap_cfg_reg(R9_USB0_VM); | 257 | omap_cfg_reg(R9_USB0_VM); |
| 243 | USB_TRANSCEIVER_CTRL_REG |= CONF_USB2_UNI_R; | 258 | l = omap_readl(USB_TRANSCEIVER_CTRL); |
| 259 | l |= CONF_USB2_UNI_R; | ||
| 260 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 244 | } | 261 | } |
| 245 | break; | 262 | break; |
| 246 | default: | 263 | default: |
| @@ -254,8 +271,13 @@ static u32 __init omap_usb1_init(unsigned nwires) | |||
| 254 | { | 271 | { |
| 255 | u32 syscon1 = 0; | 272 | u32 syscon1 = 0; |
| 256 | 273 | ||
| 257 | if (cpu_class_is_omap1() && !cpu_is_omap15xx() && nwires != 6) | 274 | if (cpu_class_is_omap1() && !cpu_is_omap15xx() && nwires != 6) { |
| 258 | USB_TRANSCEIVER_CTRL_REG &= ~CONF_USB1_UNI_R; | 275 | u32 l; |
| 276 | |||
| 277 | l = omap_readl(USB_TRANSCEIVER_CTRL); | ||
| 278 | l &= ~CONF_USB1_UNI_R; | ||
| 279 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 280 | } | ||
| 259 | if (cpu_is_omap24xx()) | 281 | if (cpu_is_omap24xx()) |
| 260 | omap2_usb_devconf_clear(1, USB_BIDIR_TLL); | 282 | omap2_usb_devconf_clear(1, USB_BIDIR_TLL); |
| 261 | 283 | ||
| @@ -316,8 +338,13 @@ static u32 __init omap_usb1_init(unsigned nwires) | |||
| 316 | syscon1 = 3; | 338 | syscon1 = 3; |
| 317 | omap_cfg_reg(USB1_VP); | 339 | omap_cfg_reg(USB1_VP); |
| 318 | omap_cfg_reg(USB1_VM); | 340 | omap_cfg_reg(USB1_VM); |
| 319 | if (!cpu_is_omap15xx()) | 341 | if (!cpu_is_omap15xx()) { |
| 320 | USB_TRANSCEIVER_CTRL_REG |= CONF_USB1_UNI_R; | 342 | u32 l; |
| 343 | |||
| 344 | l = omap_readl(USB_TRANSCEIVER_CTRL); | ||
| 345 | l |= CONF_USB1_UNI_R; | ||
| 346 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 347 | } | ||
| 321 | break; | 348 | break; |
| 322 | default: | 349 | default: |
| 323 | bad: | 350 | bad: |
| @@ -340,8 +367,13 @@ static u32 __init omap_usb2_init(unsigned nwires, unsigned alt_pingroup) | |||
| 340 | if (alt_pingroup || nwires == 0) | 367 | if (alt_pingroup || nwires == 0) |
| 341 | return 0; | 368 | return 0; |
| 342 | 369 | ||
| 343 | if (cpu_class_is_omap1() && !cpu_is_omap15xx() && nwires != 6) | 370 | if (cpu_class_is_omap1() && !cpu_is_omap15xx() && nwires != 6) { |
| 344 | USB_TRANSCEIVER_CTRL_REG &= ~CONF_USB2_UNI_R; | 371 | u32 l; |
| 372 | |||
| 373 | l = omap_readl(USB_TRANSCEIVER_CTRL); | ||
| 374 | l &= ~CONF_USB2_UNI_R; | ||
| 375 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 376 | } | ||
| 345 | 377 | ||
| 346 | /* external transceiver */ | 378 | /* external transceiver */ |
| 347 | if (cpu_is_omap15xx()) { | 379 | if (cpu_is_omap15xx()) { |
| @@ -410,9 +442,13 @@ static u32 __init omap_usb2_init(unsigned nwires, unsigned alt_pingroup) | |||
| 410 | omap_cfg_reg(USB2_VP); | 442 | omap_cfg_reg(USB2_VP); |
| 411 | omap_cfg_reg(USB2_VM); | 443 | omap_cfg_reg(USB2_VM); |
| 412 | } else { | 444 | } else { |
| 445 | u32 l; | ||
| 446 | |||
| 413 | omap_cfg_reg(AA9_USB2_VP); | 447 | omap_cfg_reg(AA9_USB2_VP); |
| 414 | omap_cfg_reg(R9_USB2_VM); | 448 | omap_cfg_reg(R9_USB2_VM); |
| 415 | USB_TRANSCEIVER_CTRL_REG |= CONF_USB2_UNI_R; | 449 | l = omap_readl(USB_TRANSCEIVER_CTRL); |
| 450 | l |= CONF_USB2_UNI_R; | ||
| 451 | omap_writel(l, USB_TRANSCEIVER_CTRL); | ||
| 416 | } | 452 | } |
| 417 | break; | 453 | break; |
| 418 | default: | 454 | default: |
| @@ -531,10 +567,6 @@ static struct platform_device otg_device = { | |||
| 531 | 567 | ||
| 532 | /*-------------------------------------------------------------------------*/ | 568 | /*-------------------------------------------------------------------------*/ |
| 533 | 569 | ||
| 534 | #define ULPD_CLOCK_CTRL_REG __REG16(ULPD_CLOCK_CTRL) | ||
| 535 | #define ULPD_SOFT_REQ_REG __REG16(ULPD_SOFT_REQ) | ||
| 536 | |||
| 537 | |||
| 538 | // FIXME correct answer depends on hmc_mode, | 570 | // FIXME correct answer depends on hmc_mode, |
| 539 | // as does (on omap1) any nonzero value for config->otg port number | 571 | // as does (on omap1) any nonzero value for config->otg port number |
| 540 | #ifdef CONFIG_USB_GADGET_OMAP | 572 | #ifdef CONFIG_USB_GADGET_OMAP |
| @@ -550,17 +582,17 @@ static struct platform_device otg_device = { | |||
| 550 | void __init | 582 | void __init |
| 551 | omap_otg_init(struct omap_usb_config *config) | 583 | omap_otg_init(struct omap_usb_config *config) |
| 552 | { | 584 | { |
| 553 | u32 syscon = OTG_SYSCON_1_REG & 0xffff; | 585 | u32 syscon; |
| 554 | int status; | 586 | int status; |
| 555 | int alt_pingroup = 0; | 587 | int alt_pingroup = 0; |
| 556 | 588 | ||
| 557 | /* NOTE: no bus or clock setup (yet?) */ | 589 | /* NOTE: no bus or clock setup (yet?) */ |
| 558 | 590 | ||
| 559 | syscon = OTG_SYSCON_1_REG & 0xffff; | 591 | syscon = omap_readl(OTG_SYSCON_1) & 0xffff; |
| 560 | if (!(syscon & OTG_RESET_DONE)) | 592 | if (!(syscon & OTG_RESET_DONE)) |
| 561 | pr_debug("USB resets not complete?\n"); | 593 | pr_debug("USB resets not complete?\n"); |
| 562 | 594 | ||
| 563 | // OTG_IRQ_EN_REG = 0; | 595 | //omap_writew(0, OTG_IRQ_EN); |
| 564 | 596 | ||
| 565 | /* pin muxing and transceiver pinouts */ | 597 | /* pin muxing and transceiver pinouts */ |
| 566 | if (config->pins[0] > 2) /* alt pingroup 2 */ | 598 | if (config->pins[0] > 2) /* alt pingroup 2 */ |
| @@ -568,8 +600,8 @@ omap_otg_init(struct omap_usb_config *config) | |||
| 568 | syscon |= omap_usb0_init(config->pins[0], is_usb0_device(config)); | 600 | syscon |= omap_usb0_init(config->pins[0], is_usb0_device(config)); |
| 569 | syscon |= omap_usb1_init(config->pins[1]); | 601 | syscon |= omap_usb1_init(config->pins[1]); |
| 570 | syscon |= omap_usb2_init(config->pins[2], alt_pingroup); | 602 | syscon |= omap_usb2_init(config->pins[2], alt_pingroup); |
| 571 | pr_debug("OTG_SYSCON_1_REG = %08x\n", syscon); | 603 | pr_debug("OTG_SYSCON_1 = %08x\n", omap_readl(OTG_SYSCON_1)); |
| 572 | OTG_SYSCON_1_REG = syscon; | 604 | omap_writel(syscon, OTG_SYSCON_1); |
| 573 | 605 | ||
| 574 | syscon = config->hmc_mode; | 606 | syscon = config->hmc_mode; |
| 575 | syscon |= USBX_SYNCHRO | (4 << 16) /* B_ASE0_BRST */; | 607 | syscon |= USBX_SYNCHRO | (4 << 16) /* B_ASE0_BRST */; |
| @@ -578,9 +610,10 @@ omap_otg_init(struct omap_usb_config *config) | |||
| 578 | syscon |= OTG_EN; | 610 | syscon |= OTG_EN; |
| 579 | #endif | 611 | #endif |
| 580 | if (cpu_class_is_omap1()) | 612 | if (cpu_class_is_omap1()) |
| 581 | pr_debug("USB_TRANSCEIVER_CTRL_REG = %03x\n", USB_TRANSCEIVER_CTRL_REG); | 613 | pr_debug("USB_TRANSCEIVER_CTRL = %03x\n", |
| 582 | pr_debug("OTG_SYSCON_2_REG = %08x\n", syscon); | 614 | omap_readl(USB_TRANSCEIVER_CTRL)); |
| 583 | OTG_SYSCON_2_REG = syscon; | 615 | pr_debug("OTG_SYSCON_2 = %08x\n", omap_readl(OTG_SYSCON_2)); |
| 616 | omap_writel(syscon, OTG_SYSCON_2); | ||
| 584 | 617 | ||
| 585 | printk("USB: hmc %d", config->hmc_mode); | 618 | printk("USB: hmc %d", config->hmc_mode); |
| 586 | if (!alt_pingroup) | 619 | if (!alt_pingroup) |
| @@ -597,12 +630,19 @@ omap_otg_init(struct omap_usb_config *config) | |||
| 597 | printk("\n"); | 630 | printk("\n"); |
| 598 | 631 | ||
| 599 | if (cpu_class_is_omap1()) { | 632 | if (cpu_class_is_omap1()) { |
| 633 | u16 w; | ||
| 634 | |||
| 600 | /* leave USB clocks/controllers off until needed */ | 635 | /* leave USB clocks/controllers off until needed */ |
| 601 | ULPD_SOFT_REQ_REG &= ~SOFT_USB_CLK_REQ; | 636 | w = omap_readw(ULPD_SOFT_REQ); |
| 602 | ULPD_CLOCK_CTRL_REG &= ~USB_MCLK_EN; | 637 | w &= ~SOFT_USB_CLK_REQ; |
| 603 | ULPD_CLOCK_CTRL_REG |= DIS_USB_PVCI_CLK; | 638 | omap_writew(w, ULPD_SOFT_REQ); |
| 639 | |||
| 640 | w = omap_readw(ULPD_CLOCK_CTRL); | ||
| 641 | w &= ~USB_MCLK_EN; | ||
| 642 | w |= DIS_USB_PVCI_CLK; | ||
| 643 | omap_writew(w, ULPD_CLOCK_CTRL); | ||
| 604 | } | 644 | } |
| 605 | syscon = OTG_SYSCON_1_REG; | 645 | syscon = omap_readl(OTG_SYSCON_1); |
| 606 | syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN; | 646 | syscon |= HST_IDLE_EN|DEV_IDLE_EN|OTG_IDLE_EN; |
| 607 | 647 | ||
| 608 | #ifdef CONFIG_USB_GADGET_OMAP | 648 | #ifdef CONFIG_USB_GADGET_OMAP |
| @@ -639,8 +679,8 @@ omap_otg_init(struct omap_usb_config *config) | |||
| 639 | pr_debug("can't register OTG device, %d\n", status); | 679 | pr_debug("can't register OTG device, %d\n", status); |
| 640 | } | 680 | } |
| 641 | #endif | 681 | #endif |
| 642 | pr_debug("OTG_SYSCON_1_REG = %08x\n", syscon); | 682 | pr_debug("OTG_SYSCON_1 = %08x\n", omap_readl(OTG_SYSCON_1)); |
| 643 | OTG_SYSCON_1_REG = syscon; | 683 | omap_writel(syscon, OTG_SYSCON_1); |
| 644 | 684 | ||
| 645 | status = 0; | 685 | status = 0; |
| 646 | } | 686 | } |
| @@ -653,18 +693,19 @@ static inline void omap_otg_init(struct omap_usb_config *config) {} | |||
| 653 | 693 | ||
| 654 | #ifdef CONFIG_ARCH_OMAP15XX | 694 | #ifdef CONFIG_ARCH_OMAP15XX |
| 655 | 695 | ||
| 656 | #define ULPD_DPLL_CTRL_REG __REG16(ULPD_DPLL_CTRL) | 696 | /* ULPD_DPLL_CTRL */ |
| 657 | #define DPLL_IOB (1 << 13) | 697 | #define DPLL_IOB (1 << 13) |
| 658 | #define DPLL_PLL_ENABLE (1 << 4) | 698 | #define DPLL_PLL_ENABLE (1 << 4) |
| 659 | #define DPLL_LOCK (1 << 0) | 699 | #define DPLL_LOCK (1 << 0) |
| 660 | 700 | ||
| 661 | #define ULPD_APLL_CTRL_REG __REG16(ULPD_APLL_CTRL) | 701 | /* ULPD_APLL_CTRL */ |
| 662 | #define APLL_NDPLL_SWITCH (1 << 0) | 702 | #define APLL_NDPLL_SWITCH (1 << 0) |
| 663 | 703 | ||
| 664 | 704 | ||
| 665 | static void __init omap_1510_usb_init(struct omap_usb_config *config) | 705 | static void __init omap_1510_usb_init(struct omap_usb_config *config) |
| 666 | { | 706 | { |
| 667 | unsigned int val; | 707 | unsigned int val; |
| 708 | u16 w; | ||
| 668 | 709 | ||
| 669 | omap_usb0_init(config->pins[0], is_usb0_device(config)); | 710 | omap_usb0_init(config->pins[0], is_usb0_device(config)); |
| 670 | omap_usb1_init(config->pins[1]); | 711 | omap_usb1_init(config->pins[1]); |
| @@ -685,12 +726,22 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config) | |||
| 685 | printk("\n"); | 726 | printk("\n"); |
| 686 | 727 | ||
| 687 | /* use DPLL for 48 MHz function clock */ | 728 | /* use DPLL for 48 MHz function clock */ |
| 688 | pr_debug("APLL %04x DPLL %04x REQ %04x\n", ULPD_APLL_CTRL_REG, | 729 | pr_debug("APLL %04x DPLL %04x REQ %04x\n", omap_readw(ULPD_APLL_CTRL), |
| 689 | ULPD_DPLL_CTRL_REG, ULPD_SOFT_REQ_REG); | 730 | omap_readw(ULPD_DPLL_CTRL), omap_readw(ULPD_SOFT_REQ)); |
| 690 | ULPD_APLL_CTRL_REG &= ~APLL_NDPLL_SWITCH; | 731 | |
| 691 | ULPD_DPLL_CTRL_REG |= DPLL_IOB | DPLL_PLL_ENABLE; | 732 | w = omap_readw(ULPD_APLL_CTRL); |
| 692 | ULPD_SOFT_REQ_REG |= SOFT_UDC_REQ | SOFT_DPLL_REQ; | 733 | w &= ~APLL_NDPLL_SWITCH; |
| 693 | while (!(ULPD_DPLL_CTRL_REG & DPLL_LOCK)) | 734 | omap_writew(w, ULPD_APLL_CTRL); |
| 735 | |||
| 736 | w = omap_readw(ULPD_DPLL_CTRL); | ||
| 737 | w |= DPLL_IOB | DPLL_PLL_ENABLE; | ||
| 738 | omap_writew(w, ULPD_DPLL_CTRL); | ||
| 739 | |||
| 740 | w = omap_readw(ULPD_SOFT_REQ); | ||
| 741 | w |= SOFT_UDC_REQ | SOFT_DPLL_REQ; | ||
| 742 | omap_writew(w, ULPD_SOFT_REQ); | ||
| 743 | |||
| 744 | while (!(omap_readw(ULPD_DPLL_CTRL) & DPLL_LOCK)) | ||
| 694 | cpu_relax(); | 745 | cpu_relax(); |
| 695 | 746 | ||
| 696 | #ifdef CONFIG_USB_GADGET_OMAP | 747 | #ifdef CONFIG_USB_GADGET_OMAP |
diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c index c5b669d234bc..fe66a1835169 100644 --- a/arch/arm/plat-orion/irq.c +++ b/arch/arm/plat-orion/irq.c | |||
| @@ -36,8 +36,8 @@ static void orion_irq_unmask(u32 irq) | |||
| 36 | 36 | ||
| 37 | static struct irq_chip orion_irq_chip = { | 37 | static struct irq_chip orion_irq_chip = { |
| 38 | .name = "orion_irq", | 38 | .name = "orion_irq", |
| 39 | .ack = orion_irq_mask, | ||
| 40 | .mask = orion_irq_mask, | 39 | .mask = orion_irq_mask, |
| 40 | .mask_ack = orion_irq_mask, | ||
| 41 | .unmask = orion_irq_unmask, | 41 | .unmask = orion_irq_unmask, |
| 42 | }; | 42 | }; |
| 43 | 43 | ||
| @@ -59,6 +59,7 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr) | |||
| 59 | set_irq_chip(irq, &orion_irq_chip); | 59 | set_irq_chip(irq, &orion_irq_chip); |
| 60 | set_irq_chip_data(irq, maskaddr); | 60 | set_irq_chip_data(irq, maskaddr); |
| 61 | set_irq_handler(irq, handle_level_irq); | 61 | set_irq_handler(irq, handle_level_irq); |
| 62 | irq_desc[irq].status |= IRQ_LEVEL; | ||
| 62 | set_irq_flags(irq, IRQF_VALID); | 63 | set_irq_flags(irq, IRQF_VALID); |
| 63 | } | 64 | } |
| 64 | } | 65 | } |
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c index abfda53f1800..ca32c60e14d7 100644 --- a/arch/arm/plat-orion/pcie.c +++ b/arch/arm/plat-orion/pcie.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #define PCIE_CONF_DATA_OFF 0x18fc | 39 | #define PCIE_CONF_DATA_OFF 0x18fc |
| 40 | #define PCIE_MASK_OFF 0x1910 | 40 | #define PCIE_MASK_OFF 0x1910 |
| 41 | #define PCIE_CTRL_OFF 0x1a00 | 41 | #define PCIE_CTRL_OFF 0x1a00 |
| 42 | #define PCIE_CTRL_X1_MODE 0x0001 | ||
| 42 | #define PCIE_STAT_OFF 0x1a04 | 43 | #define PCIE_STAT_OFF 0x1a04 |
| 43 | #define PCIE_STAT_DEV_OFFS 20 | 44 | #define PCIE_STAT_DEV_OFFS 20 |
| 44 | #define PCIE_STAT_DEV_MASK 0x1f | 45 | #define PCIE_STAT_DEV_MASK 0x1f |
| @@ -62,6 +63,11 @@ int orion_pcie_link_up(void __iomem *base) | |||
| 62 | return !(readl(base + PCIE_STAT_OFF) & PCIE_STAT_LINK_DOWN); | 63 | return !(readl(base + PCIE_STAT_OFF) & PCIE_STAT_LINK_DOWN); |
| 63 | } | 64 | } |
| 64 | 65 | ||
| 66 | int __init orion_pcie_x4_mode(void __iomem *base) | ||
| 67 | { | ||
| 68 | return !(readl(base + PCIE_CTRL_OFF) & PCIE_CTRL_X1_MODE); | ||
| 69 | } | ||
| 70 | |||
| 65 | int orion_pcie_get_local_bus_nr(void __iomem *base) | 71 | int orion_pcie_get_local_bus_nr(void __iomem *base) |
| 66 | { | 72 | { |
| 67 | u32 stat = readl(base + PCIE_STAT_OFF); | 73 | u32 stat = readl(base + PCIE_STAT_OFF); |
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index 28b5285446e8..93c4ef9f0067 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c | |||
| @@ -74,7 +74,7 @@ orion_clkevt_next_event(unsigned long delta, struct clock_event_device *dev) | |||
| 74 | /* | 74 | /* |
| 75 | * Clear and enable clockevent timer interrupt. | 75 | * Clear and enable clockevent timer interrupt. |
| 76 | */ | 76 | */ |
| 77 | writel(~BRIDGE_INT_TIMER1, BRIDGE_CAUSE); | 77 | writel(BRIDGE_INT_TIMER1_CLR, BRIDGE_CAUSE); |
| 78 | 78 | ||
| 79 | u = readl(BRIDGE_MASK); | 79 | u = readl(BRIDGE_MASK); |
| 80 | u |= BRIDGE_INT_TIMER1; | 80 | u |= BRIDGE_INT_TIMER1; |
| @@ -138,7 +138,7 @@ orion_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev) | |||
| 138 | /* | 138 | /* |
| 139 | * ACK pending timer interrupt. | 139 | * ACK pending timer interrupt. |
| 140 | */ | 140 | */ |
| 141 | writel(~BRIDGE_INT_TIMER1, BRIDGE_CAUSE); | 141 | writel(BRIDGE_INT_TIMER1_CLR, BRIDGE_CAUSE); |
| 142 | 142 | ||
| 143 | } | 143 | } |
| 144 | local_irq_restore(flags); | 144 | local_irq_restore(flags); |
| @@ -159,7 +159,7 @@ static irqreturn_t orion_timer_interrupt(int irq, void *dev_id) | |||
| 159 | /* | 159 | /* |
| 160 | * ACK timer interrupt and call event handler. | 160 | * ACK timer interrupt and call event handler. |
| 161 | */ | 161 | */ |
| 162 | writel(~BRIDGE_INT_TIMER1, BRIDGE_CAUSE); | 162 | writel(BRIDGE_INT_TIMER1_CLR, BRIDGE_CAUSE); |
| 163 | orion_clkevt.event_handler(&orion_clkevt); | 163 | orion_clkevt.event_handler(&orion_clkevt); |
| 164 | 164 | ||
| 165 | return IRQ_HANDLED; | 165 | return IRQ_HANDLED; |
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig index b66fb3c4e228..5e28c217b8c2 100644 --- a/arch/arm/plat-s3c24xx/Kconfig +++ b/arch/arm/plat-s3c24xx/Kconfig | |||
| @@ -9,6 +9,7 @@ config PLAT_S3C24XX | |||
| 9 | depends on ARCH_S3C2410 | 9 | depends on ARCH_S3C2410 |
| 10 | default y if ARCH_S3C2410 | 10 | default y if ARCH_S3C2410 |
| 11 | select NO_IOPORT | 11 | select NO_IOPORT |
| 12 | select HAVE_GPIO_LIB | ||
| 12 | help | 13 | help |
| 13 | Base platform code for any Samsung S3C24XX device | 14 | Base platform code for any Samsung S3C24XX device |
| 14 | 15 | ||
| @@ -20,6 +21,13 @@ config CPU_S3C244X | |||
| 20 | help | 21 | help |
| 21 | Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. | 22 | Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. |
| 22 | 23 | ||
| 24 | config S3C24XX_PWM | ||
| 25 | bool "PWM device support" | ||
| 26 | select HAVE_PWM | ||
| 27 | help | ||
| 28 | Support for exporting the PWM timer blocks via the pwm device | ||
| 29 | system. | ||
| 30 | |||
| 23 | config PM_SIMTEC | 31 | config PM_SIMTEC |
| 24 | bool | 32 | bool |
| 25 | help | 33 | help |
diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile index 131d20237dd7..d82767b2b833 100644 --- a/arch/arm/plat-s3c24xx/Makefile +++ b/arch/arm/plat-s3c24xx/Makefile | |||
| @@ -16,8 +16,10 @@ obj-y += cpu.o | |||
| 16 | obj-y += irq.o | 16 | obj-y += irq.o |
| 17 | obj-y += devs.o | 17 | obj-y += devs.o |
| 18 | obj-y += gpio.o | 18 | obj-y += gpio.o |
| 19 | obj-y += gpiolib.o | ||
| 19 | obj-y += time.o | 20 | obj-y += time.o |
| 20 | obj-y += clock.o | 21 | obj-y += clock.o |
| 22 | obj-y += pwm-clock.o | ||
| 21 | 23 | ||
| 22 | # Architecture dependant builds | 24 | # Architecture dependant builds |
| 23 | 25 | ||
| @@ -27,5 +29,6 @@ obj-$(CONFIG_CPU_S3C244X) += s3c244x-clock.o | |||
| 27 | obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o | 29 | obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o |
| 28 | obj-$(CONFIG_PM) += pm.o | 30 | obj-$(CONFIG_PM) += pm.o |
| 29 | obj-$(CONFIG_PM) += sleep.o | 31 | obj-$(CONFIG_PM) += sleep.o |
| 32 | obj-$(CONFIG_HAVE_PWM) += pwm.o | ||
| 30 | obj-$(CONFIG_S3C2410_DMA) += dma.o | 33 | obj-$(CONFIG_S3C2410_DMA) += dma.o |
| 31 | obj-$(CONFIG_MACH_SMDK) += common-smdk.o | 34 | obj-$(CONFIG_MACH_SMDK) += common-smdk.o |
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index e546e933b3f7..eea3b32ff798 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
| @@ -495,106 +495,6 @@ struct platform_device s3c_device_spi1 = { | |||
| 495 | 495 | ||
| 496 | EXPORT_SYMBOL(s3c_device_spi1); | 496 | EXPORT_SYMBOL(s3c_device_spi1); |
| 497 | 497 | ||
| 498 | /* pwm timer blocks */ | ||
| 499 | |||
| 500 | static struct resource s3c_timer0_resource[] = { | ||
| 501 | [0] = { | ||
| 502 | .start = S3C24XX_PA_TIMER + 0x0C, | ||
| 503 | .end = S3C24XX_PA_TIMER + 0x0C + 0xB, | ||
| 504 | .flags = IORESOURCE_MEM, | ||
| 505 | }, | ||
| 506 | [1] = { | ||
| 507 | .start = IRQ_TIMER0, | ||
| 508 | .end = IRQ_TIMER0, | ||
| 509 | .flags = IORESOURCE_IRQ, | ||
| 510 | } | ||
| 511 | |||
| 512 | }; | ||
| 513 | |||
| 514 | struct platform_device s3c_device_timer0 = { | ||
| 515 | .name = "s3c2410-timer", | ||
| 516 | .id = 0, | ||
| 517 | .num_resources = ARRAY_SIZE(s3c_timer0_resource), | ||
| 518 | .resource = s3c_timer0_resource, | ||
| 519 | }; | ||
| 520 | |||
| 521 | EXPORT_SYMBOL(s3c_device_timer0); | ||
| 522 | |||
| 523 | /* timer 1 */ | ||
| 524 | |||
| 525 | static struct resource s3c_timer1_resource[] = { | ||
| 526 | [0] = { | ||
| 527 | .start = S3C24XX_PA_TIMER + 0x18, | ||
| 528 | .end = S3C24XX_PA_TIMER + 0x23, | ||
| 529 | .flags = IORESOURCE_MEM, | ||
| 530 | }, | ||
| 531 | [1] = { | ||
| 532 | .start = IRQ_TIMER1, | ||
| 533 | .end = IRQ_TIMER1, | ||
| 534 | .flags = IORESOURCE_IRQ, | ||
| 535 | } | ||
| 536 | |||
| 537 | }; | ||
| 538 | |||
| 539 | struct platform_device s3c_device_timer1 = { | ||
| 540 | .name = "s3c2410-timer", | ||
| 541 | .id = 1, | ||
| 542 | .num_resources = ARRAY_SIZE(s3c_timer1_resource), | ||
| 543 | .resource = s3c_timer1_resource, | ||
| 544 | }; | ||
| 545 | |||
| 546 | EXPORT_SYMBOL(s3c_device_timer1); | ||
| 547 | |||
| 548 | /* timer 2 */ | ||
| 549 | |||
| 550 | static struct resource s3c_timer2_resource[] = { | ||
| 551 | [0] = { | ||
| 552 | .start = S3C24XX_PA_TIMER + 0x24, | ||
| 553 | .end = S3C24XX_PA_TIMER + 0x2F, | ||
| 554 | .flags = IORESOURCE_MEM, | ||
| 555 | }, | ||
| 556 | [1] = { | ||
| 557 | .start = IRQ_TIMER2, | ||
| 558 | .end = IRQ_TIMER2, | ||
| 559 | .flags = IORESOURCE_IRQ, | ||
| 560 | } | ||
| 561 | |||
| 562 | }; | ||
| 563 | |||
| 564 | struct platform_device s3c_device_timer2 = { | ||
| 565 | .name = "s3c2410-timer", | ||
| 566 | .id = 2, | ||
| 567 | .num_resources = ARRAY_SIZE(s3c_timer2_resource), | ||
| 568 | .resource = s3c_timer2_resource, | ||
| 569 | }; | ||
| 570 | |||
| 571 | EXPORT_SYMBOL(s3c_device_timer2); | ||
| 572 | |||
| 573 | /* timer 3 */ | ||
| 574 | |||
| 575 | static struct resource s3c_timer3_resource[] = { | ||
| 576 | [0] = { | ||
| 577 | .start = S3C24XX_PA_TIMER + 0x30, | ||
| 578 | .end = S3C24XX_PA_TIMER + 0x3B, | ||
| 579 | .flags = IORESOURCE_MEM, | ||
| 580 | }, | ||
| 581 | [1] = { | ||
| 582 | .start = IRQ_TIMER3, | ||
| 583 | .end = IRQ_TIMER3, | ||
| 584 | .flags = IORESOURCE_IRQ, | ||
| 585 | } | ||
| 586 | |||
| 587 | }; | ||
| 588 | |||
| 589 | struct platform_device s3c_device_timer3 = { | ||
| 590 | .name = "s3c2410-timer", | ||
| 591 | .id = 3, | ||
| 592 | .num_resources = ARRAY_SIZE(s3c_timer3_resource), | ||
| 593 | .resource = s3c_timer3_resource, | ||
| 594 | }; | ||
| 595 | |||
| 596 | EXPORT_SYMBOL(s3c_device_timer3); | ||
| 597 | |||
| 598 | #ifdef CONFIG_CPU_S3C2440 | 498 | #ifdef CONFIG_CPU_S3C2440 |
| 599 | 499 | ||
| 600 | /* Camif Controller */ | 500 | /* Camif Controller */ |
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c new file mode 100644 index 000000000000..825d8d0c5ca2 --- /dev/null +++ b/arch/arm/plat-s3c24xx/gpiolib.c | |||
| @@ -0,0 +1,259 @@ | |||
| 1 | /* linux/arch/arm/plat-s3c24xx/gpiolib.c | ||
| 2 | * | ||
| 3 | * Copyright (c) 2008 Simtec Electronics | ||
| 4 | * http://armlinux.simtec.co.uk/ | ||
| 5 | * Ben Dooks <ben@simtec.co.uk> | ||
| 6 | * | ||
| 7 | * S3C24XX GPIOlib support | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/init.h> | ||
| 16 | #include <linux/module.h> | ||
| 17 | #include <linux/interrupt.h> | ||
| 18 | #include <linux/ioport.h> | ||
| 19 | #include <linux/io.h> | ||
| 20 | #include <linux/gpio.h> | ||
| 21 | |||
| 22 | #include <asm/hardware.h> | ||
| 23 | #include <asm/irq.h> | ||
| 24 | |||
| 25 | #include <asm/arch/regs-gpio.h> | ||
| 26 | |||
| 27 | struct s3c24xx_gpio_chip { | ||
| 28 | struct gpio_chip chip; | ||
| 29 | void __iomem *base; | ||
| 30 | }; | ||
| 31 | |||
| 32 | static inline struct s3c24xx_gpio_chip *to_s3c_chip(struct gpio_chip *gpc) | ||
| 33 | { | ||
| 34 | return container_of(gpc, struct s3c24xx_gpio_chip, chip); | ||
| 35 | } | ||
| 36 | |||
| 37 | /* these routines are exported for use by other parts of the platform | ||
| 38 | * and system support, but are not intended to be used directly by the | ||
| 39 | * drivers themsevles. | ||
| 40 | */ | ||
| 41 | |||
| 42 | int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) | ||
| 43 | { | ||
| 44 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | ||
| 45 | void __iomem *base = ourchip->base; | ||
| 46 | unsigned long flags; | ||
| 47 | unsigned long con; | ||
| 48 | |||
| 49 | local_irq_save(flags); | ||
| 50 | |||
| 51 | con = __raw_readl(base + 0x00); | ||
| 52 | con &= ~(3 << (offset * 2)); | ||
| 53 | con |= (S3C2410_GPIO_OUTPUT & 0xf) << (offset * 2); | ||
| 54 | |||
| 55 | __raw_writel(con, base + 0x00); | ||
| 56 | |||
| 57 | local_irq_restore(flags); | ||
| 58 | return 0; | ||
| 59 | } | ||
| 60 | |||
| 61 | int s3c24xx_gpiolib_output(struct gpio_chip *chip, | ||
| 62 | unsigned offset, int value) | ||
| 63 | { | ||
| 64 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | ||
| 65 | void __iomem *base = ourchip->base; | ||
| 66 | unsigned long flags; | ||
| 67 | unsigned long dat; | ||
| 68 | unsigned long con; | ||
| 69 | |||
| 70 | local_irq_save(flags); | ||
| 71 | |||
| 72 | dat = __raw_readl(base + 0x04); | ||
| 73 | dat &= ~(1 << offset); | ||
| 74 | if (value) | ||
| 75 | dat |= 1 << offset; | ||
| 76 | __raw_writel(dat, base + 0x04); | ||
| 77 | |||
| 78 | con = __raw_readl(base + 0x00); | ||
| 79 | con &= ~(3 << (offset * 2)); | ||
| 80 | con |= (S3C2410_GPIO_OUTPUT & 0xf) << (offset * 2); | ||
| 81 | |||
| 82 | __raw_writel(con, base + 0x00); | ||
| 83 | __raw_writel(dat, base + 0x04); | ||
| 84 | |||
| 85 | local_irq_restore(flags); | ||
| 86 | return 0; | ||
| 87 | } | ||
| 88 | |||
| 89 | void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value) | ||
| 90 | { | ||
| 91 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | ||
| 92 | void __iomem *base = ourchip->base; | ||
| 93 | unsigned long flags; | ||
| 94 | unsigned long dat; | ||
| 95 | |||
| 96 | local_irq_save(flags); | ||
| 97 | |||
| 98 | dat = __raw_readl(base + 0x04); | ||
| 99 | dat &= ~(1 << offset); | ||
| 100 | if (value) | ||
| 101 | dat |= 1 << offset; | ||
| 102 | __raw_writel(dat, base + 0x04); | ||
| 103 | |||
| 104 | local_irq_restore(flags); | ||
| 105 | } | ||
| 106 | |||
| 107 | int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset) | ||
| 108 | { | ||
| 109 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | ||
| 110 | unsigned long val; | ||
| 111 | |||
| 112 | val = __raw_readl(ourchip->base + 0x04); | ||
| 113 | val >>= offset; | ||
| 114 | val &= 1; | ||
| 115 | |||
| 116 | return val; | ||
| 117 | } | ||
| 118 | |||
| 119 | static int s3c24xx_gpiolib_banka_input(struct gpio_chip *chip, unsigned offset) | ||
| 120 | { | ||
| 121 | return -EINVAL; | ||
| 122 | } | ||
| 123 | |||
| 124 | static int s3c24xx_gpiolib_banka_output(struct gpio_chip *chip, | ||
| 125 | unsigned offset, int value) | ||
| 126 | { | ||
| 127 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | ||
| 128 | void __iomem *base = ourchip->base; | ||
| 129 | unsigned long flags; | ||
| 130 | unsigned long dat; | ||
| 131 | unsigned long con; | ||
| 132 | |||
| 133 | local_irq_save(flags); | ||
| 134 | |||
| 135 | con = __raw_readl(base + 0x00); | ||
| 136 | dat = __raw_readl(base + 0x04); | ||
| 137 | |||
| 138 | dat &= ~(1 << offset); | ||
| 139 | if (value) | ||
| 140 | dat |= 1 << offset; | ||
| 141 | |||
| 142 | __raw_writel(dat, base + 0x04); | ||
| 143 | |||
| 144 | con &= ~(1 << offset); | ||
| 145 | |||
| 146 | __raw_writel(con, base + 0x00); | ||
| 147 | __raw_writel(dat, base + 0x04); | ||
| 148 | |||
| 149 | local_irq_restore(flags); | ||
| 150 | return 0; | ||
| 151 | } | ||
| 152 | |||
| 153 | |||
| 154 | struct s3c24xx_gpio_chip gpios[] = { | ||
| 155 | [0] = { | ||
| 156 | .base = S3C24XX_GPIO_BASE(S3C2410_GPA0), | ||
| 157 | .chip = { | ||
| 158 | .base = S3C2410_GPA0, | ||
| 159 | .owner = THIS_MODULE, | ||
| 160 | .label = "GPIOA", | ||
| 161 | .ngpio = 24, | ||
| 162 | .direction_input = s3c24xx_gpiolib_banka_input, | ||
| 163 | .direction_output = s3c24xx_gpiolib_banka_output, | ||
| 164 | .set = s3c24xx_gpiolib_set, | ||
| 165 | .get = s3c24xx_gpiolib_get, | ||
| 166 | }, | ||
| 167 | }, | ||
| 168 | [1] = { | ||
| 169 | .base = S3C24XX_GPIO_BASE(S3C2410_GPB0), | ||
| 170 | .chip = { | ||
| 171 | .base = S3C2410_GPB0, | ||
| 172 | .owner = THIS_MODULE, | ||
| 173 | .label = "GPIOB", | ||
| 174 | .ngpio = 16, | ||
| 175 | .direction_input = s3c24xx_gpiolib_input, | ||
| 176 | .direction_output = s3c24xx_gpiolib_output, | ||
| 177 | .set = s3c24xx_gpiolib_set, | ||
| 178 | .get = s3c24xx_gpiolib_get, | ||
| 179 | }, | ||
| 180 | }, | ||
| 181 | [2] = { | ||
| 182 | .base = S3C24XX_GPIO_BASE(S3C2410_GPC0), | ||
| 183 | .chip = { | ||
| 184 | .base = S3C2410_GPC0, | ||
| 185 | .owner = THIS_MODULE, | ||
| 186 | .label = "GPIOC", | ||
| 187 | .ngpio = 16, | ||
| 188 | .direction_input = s3c24xx_gpiolib_input, | ||
| 189 | .direction_output = s3c24xx_gpiolib_output, | ||
| 190 | .set = s3c24xx_gpiolib_set, | ||
| 191 | .get = s3c24xx_gpiolib_get, | ||
| 192 | }, | ||
| 193 | }, | ||
| 194 | [3] = { | ||
| 195 | .base = S3C24XX_GPIO_BASE(S3C2410_GPD0), | ||
| 196 | .chip = { | ||
| 197 | .base = S3C2410_GPD0, | ||
| 198 | .owner = THIS_MODULE, | ||
| 199 | .label = "GPIOD", | ||
| 200 | .ngpio = 16, | ||
| 201 | .direction_input = s3c24xx_gpiolib_input, | ||
| 202 | .direction_output = s3c24xx_gpiolib_output, | ||
| 203 | .set = s3c24xx_gpiolib_set, | ||
| 204 | .get = s3c24xx_gpiolib_get, | ||
| 205 | }, | ||
| 206 | }, | ||
| 207 | [4] = { | ||
| 208 | .base = S3C24XX_GPIO_BASE(S3C2410_GPE0), | ||
| 209 | .chip = { | ||
| 210 | .base = S3C2410_GPE0, | ||
| 211 | .label = "GPIOE", | ||
| 212 | .owner = THIS_MODULE, | ||
| 213 | .ngpio = 16, | ||
| 214 | .direction_input = s3c24xx_gpiolib_input, | ||
| 215 | .direction_output = s3c24xx_gpiolib_output, | ||
| 216 | .set = s3c24xx_gpiolib_set, | ||
| 217 | .get = s3c24xx_gpiolib_get, | ||
| 218 | }, | ||
| 219 | }, | ||
| 220 | [5] = { | ||
| 221 | .base = S3C24XX_GPIO_BASE(S3C2410_GPF0), | ||
| 222 | .chip = { | ||
| 223 | .base = S3C2410_GPF0, | ||
| 224 | .owner = THIS_MODULE, | ||
| 225 | .label = "GPIOF", | ||
| 226 | .ngpio = 8, | ||
| 227 | .direction_input = s3c24xx_gpiolib_input, | ||
| 228 | .direction_output = s3c24xx_gpiolib_output, | ||
| 229 | .set = s3c24xx_gpiolib_set, | ||
| 230 | .get = s3c24xx_gpiolib_get, | ||
| 231 | }, | ||
| 232 | }, | ||
| 233 | [6] = { | ||
| 234 | .base = S3C24XX_GPIO_BASE(S3C2410_GPG0), | ||
| 235 | .chip = { | ||
| 236 | .base = S3C2410_GPG0, | ||
| 237 | .owner = THIS_MODULE, | ||
| 238 | .label = "GPIOG", | ||
| 239 | .ngpio = 10, | ||
| 240 | .direction_input = s3c24xx_gpiolib_input, | ||
| 241 | .direction_output = s3c24xx_gpiolib_output, | ||
| 242 | .set = s3c24xx_gpiolib_set, | ||
| 243 | .get = s3c24xx_gpiolib_get, | ||
| 244 | }, | ||
| 245 | }, | ||
| 246 | }; | ||
| 247 | |||
| 248 | static __init int s3c24xx_gpiolib_init(void) | ||
| 249 | { | ||
| 250 | struct s3c24xx_gpio_chip *chip = gpios; | ||
| 251 | int gpn; | ||
| 252 | |||
| 253 | for (gpn = 0; gpn < ARRAY_SIZE(gpios); gpn++, chip++) | ||
| 254 | gpiochip_add(&chip->chip); | ||
| 255 | |||
| 256 | return 0; | ||
| 257 | } | ||
| 258 | |||
| 259 | arch_initcall(s3c24xx_gpiolib_init); | ||
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c new file mode 100644 index 000000000000..2cda3e3c6786 --- /dev/null +++ b/arch/arm/plat-s3c24xx/pwm-clock.c | |||
| @@ -0,0 +1,437 @@ | |||
| 1 | /* linux/arch/arm/plat-s3c24xx/pwm-clock.c | ||
| 2 | * | ||
| 3 | * Copyright (c) 2007 Simtec Electronics | ||
| 4 | * Copyright (c) 2007, 2008 Ben Dooks | ||
| 5 | * Ben Dooks <ben-linux@fluff.org> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/init.h> | ||
| 13 | #include <linux/module.h> | ||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/list.h> | ||
| 16 | #include <linux/errno.h> | ||
| 17 | #include <linux/clk.h> | ||
| 18 | #include <linux/err.h> | ||
| 19 | #include <linux/io.h> | ||
| 20 | |||
| 21 | #include <asm/hardware.h> | ||
| 22 | #include <asm/irq.h> | ||
| 23 | |||
| 24 | #include <asm/arch/regs-clock.h> | ||
| 25 | #include <asm/arch/regs-gpio.h> | ||
| 26 | |||
| 27 | #include <asm/plat-s3c24xx/clock.h> | ||
| 28 | #include <asm/plat-s3c24xx/cpu.h> | ||
| 29 | |||
| 30 | #include <asm/plat-s3c/regs-timer.h> | ||
| 31 | |||
| 32 | /* Each of the timers 0 through 5 go through the following | ||
| 33 | * clock tree, with the inputs depending on the timers. | ||
| 34 | * | ||
| 35 | * pclk ---- [ prescaler 0 ] -+---> timer 0 | ||
| 36 | * +---> timer 1 | ||
| 37 | * | ||
| 38 | * pclk ---- [ prescaler 1 ] -+---> timer 2 | ||
| 39 | * +---> timer 3 | ||
| 40 | * \---> timer 4 | ||
| 41 | * | ||
| 42 | * Which are fed into the timers as so: | ||
| 43 | * | ||
| 44 | * prescaled 0 ---- [ div 2,4,8,16 ] ---\ | ||
| 45 | * [mux] -> timer 0 | ||
| 46 | * tclk 0 ------------------------------/ | ||
| 47 | * | ||
| 48 | * prescaled 0 ---- [ div 2,4,8,16 ] ---\ | ||
| 49 | * [mux] -> timer 1 | ||
| 50 | * tclk 0 ------------------------------/ | ||
| 51 | * | ||
| 52 | * | ||
| 53 | * prescaled 1 ---- [ div 2,4,8,16 ] ---\ | ||
| 54 | * [mux] -> timer 2 | ||
| 55 | * tclk 1 ------------------------------/ | ||
| 56 | * | ||
| 57 | * prescaled 1 ---- [ div 2,4,8,16 ] ---\ | ||
| 58 | * [mux] -> timer 3 | ||
| 59 | * tclk 1 ------------------------------/ | ||
| 60 | * | ||
| 61 | * prescaled 1 ---- [ div 2,4,8, 16 ] --\ | ||
| 62 | * [mux] -> timer 4 | ||
| 63 | * tclk 1 ------------------------------/ | ||
| 64 | * | ||
| 65 | * Since the mux and the divider are tied together in the | ||
| 66 | * same register space, it is impossible to set the parent | ||
| 67 | * and the rate at the same time. To avoid this, we add an | ||
| 68 | * intermediate 'prescaled-and-divided' clock to select | ||
| 69 | * as the parent for the timer input clock called tdiv. | ||
| 70 | * | ||
| 71 | * prescaled clk --> pwm-tdiv ---\ | ||
| 72 | * [ mux ] --> timer X | ||
| 73 | * tclk -------------------------/ | ||
| 74 | */ | ||
| 75 | |||
| 76 | static unsigned long clk_pwm_scaler_getrate(struct clk *clk) | ||
| 77 | { | ||
| 78 | unsigned long tcfg0 = __raw_readl(S3C2410_TCFG0); | ||
| 79 | |||
| 80 | if (clk->id == 1) { | ||
| 81 | tcfg0 &= S3C2410_TCFG_PRESCALER1_MASK; | ||
| 82 | tcfg0 >>= S3C2410_TCFG_PRESCALER1_SHIFT; | ||
| 83 | } else { | ||
| 84 | tcfg0 &= S3C2410_TCFG_PRESCALER0_MASK; | ||
| 85 | } | ||
| 86 | |||
| 87 | return clk_get_rate(clk->parent) / (tcfg0 + 1); | ||
| 88 | } | ||
| 89 | |||
| 90 | /* TODO - add set rate calls. */ | ||
| 91 | |||
| 92 | struct clk clk_timer_scaler[] = { | ||
| 93 | [0] = { | ||
| 94 | .name = "pwm-scaler0", | ||
| 95 | .id = -1, | ||
| 96 | .get_rate = clk_pwm_scaler_getrate, | ||
| 97 | }, | ||
| 98 | [1] = { | ||
| 99 | .name = "pwm-scaler1", | ||
| 100 | .id = -1, | ||
| 101 | .get_rate = clk_pwm_scaler_getrate, | ||
| 102 | }, | ||
| 103 | }; | ||
| 104 | |||
| 105 | struct clk clk_timer_tclk[] = { | ||
| 106 | [0] = { | ||
| 107 | .name = "pwm-tclk0", | ||
| 108 | .id = -1, | ||
| 109 | }, | ||
| 110 | [1] = { | ||
| 111 | .name = "pwm-tclk1", | ||
| 112 | .id = -1, | ||
| 113 | }, | ||
| 114 | }; | ||
| 115 | |||
| 116 | struct pwm_tdiv_clk { | ||
| 117 | struct clk clk; | ||
| 118 | unsigned int divisor; | ||
| 119 | }; | ||
| 120 | |||
| 121 | static inline struct pwm_tdiv_clk *to_tdiv(struct clk *clk) | ||
| 122 | { | ||
| 123 | return container_of(clk, struct pwm_tdiv_clk, clk); | ||
| 124 | } | ||
| 125 | |||
| 126 | static inline unsigned long tcfg_to_divisor(unsigned long tcfg1) | ||
| 127 | { | ||
| 128 | return 1 << (1 + tcfg1); | ||
| 129 | } | ||
| 130 | |||
| 131 | static unsigned long clk_pwm_tdiv_get_rate(struct clk *clk) | ||
| 132 | { | ||
| 133 | unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1); | ||
| 134 | unsigned int divisor; | ||
| 135 | |||
| 136 | tcfg1 >>= S3C2410_TCFG1_SHIFT(clk->id); | ||
| 137 | tcfg1 &= S3C2410_TCFG1_MUX_MASK; | ||
| 138 | |||
| 139 | if (tcfg1 == S3C2410_TCFG1_MUX_TCLK) | ||
| 140 | divisor = to_tdiv(clk)->divisor; | ||
| 141 | else | ||
| 142 | divisor = tcfg_to_divisor(tcfg1); | ||
| 143 | |||
| 144 | return clk_get_rate(clk->parent) / divisor; | ||
| 145 | } | ||
| 146 | |||
| 147 | static unsigned long clk_pwm_tdiv_round_rate(struct clk *clk, | ||
| 148 | unsigned long rate) | ||
| 149 | { | ||
| 150 | unsigned long parent_rate; | ||
| 151 | unsigned long divisor; | ||
| 152 | |||
| 153 | parent_rate = clk_get_rate(clk->parent); | ||
| 154 | divisor = parent_rate / rate; | ||
| 155 | |||
| 156 | if (divisor <= 2) | ||
| 157 | divisor = 2; | ||
| 158 | else if (divisor <= 4) | ||
| 159 | divisor = 4; | ||
| 160 | else if (divisor <= 8) | ||
| 161 | divisor = 8; | ||
| 162 | else | ||
| 163 | divisor = 16; | ||
| 164 | |||
| 165 | return parent_rate / divisor; | ||
| 166 | } | ||
| 167 | |||
| 168 | static unsigned long clk_pwm_tdiv_bits(struct pwm_tdiv_clk *divclk) | ||
| 169 | { | ||
| 170 | unsigned long bits; | ||
| 171 | |||
| 172 | switch (divclk->divisor) { | ||
| 173 | case 2: | ||
| 174 | bits = S3C2410_TCFG1_MUX_DIV2; | ||
| 175 | break; | ||
| 176 | case 4: | ||
| 177 | bits = S3C2410_TCFG1_MUX_DIV4; | ||
| 178 | break; | ||
| 179 | case 8: | ||
| 180 | bits = S3C2410_TCFG1_MUX_DIV8; | ||
| 181 | break; | ||
| 182 | case 16: | ||
| 183 | default: | ||
| 184 | bits = S3C2410_TCFG1_MUX_DIV16; | ||
| 185 | break; | ||
| 186 | } | ||
| 187 | |||
| 188 | return bits; | ||
| 189 | } | ||
| 190 | |||
| 191 | static void clk_pwm_tdiv_update(struct pwm_tdiv_clk *divclk) | ||
| 192 | { | ||
| 193 | unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1); | ||
| 194 | unsigned long bits = clk_pwm_tdiv_bits(divclk); | ||
| 195 | unsigned long flags; | ||
| 196 | unsigned long shift = S3C2410_TCFG1_SHIFT(divclk->clk.id); | ||
| 197 | |||
| 198 | local_irq_save(flags); | ||
| 199 | |||
| 200 | tcfg1 = __raw_readl(S3C2410_TCFG1); | ||
| 201 | tcfg1 &= ~(S3C2410_TCFG1_MUX_MASK << shift); | ||
| 202 | tcfg1 |= bits << shift; | ||
| 203 | __raw_writel(tcfg1, S3C2410_TCFG1); | ||
| 204 | |||
| 205 | local_irq_restore(flags); | ||
| 206 | } | ||
| 207 | |||
| 208 | static int clk_pwm_tdiv_set_rate(struct clk *clk, unsigned long rate) | ||
| 209 | { | ||
| 210 | struct pwm_tdiv_clk *divclk = to_tdiv(clk); | ||
| 211 | unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1); | ||
| 212 | unsigned long parent_rate = clk_get_rate(clk->parent); | ||
| 213 | unsigned long divisor; | ||
| 214 | |||
| 215 | tcfg1 >>= S3C2410_TCFG1_SHIFT(clk->id); | ||
| 216 | tcfg1 &= S3C2410_TCFG1_MUX_MASK; | ||
| 217 | |||
| 218 | rate = clk_round_rate(clk, rate); | ||
| 219 | divisor = parent_rate / rate; | ||
| 220 | |||
| 221 | if (divisor > 16) | ||
| 222 | return -EINVAL; | ||
| 223 | |||
| 224 | divclk->divisor = divisor; | ||
| 225 | |||
| 226 | /* Update the current MUX settings if we are currently | ||
| 227 | * selected as the clock source for this clock. */ | ||
| 228 | |||
| 229 | if (tcfg1 != S3C2410_TCFG1_MUX_TCLK) | ||
| 230 | clk_pwm_tdiv_update(divclk); | ||
| 231 | |||
| 232 | return 0; | ||
| 233 | } | ||
| 234 | |||
| 235 | struct pwm_tdiv_clk clk_timer_tdiv[] = { | ||
| 236 | [0] = { | ||
| 237 | .clk = { | ||
| 238 | .name = "pwm-tdiv", | ||
| 239 | .parent = &clk_timer_scaler[0], | ||
| 240 | .get_rate = clk_pwm_tdiv_get_rate, | ||
| 241 | .set_rate = clk_pwm_tdiv_set_rate, | ||
| 242 | .round_rate = clk_pwm_tdiv_round_rate, | ||
| 243 | }, | ||
| 244 | }, | ||
| 245 | [1] = { | ||
| 246 | .clk = { | ||
| 247 | .name = "pwm-tdiv", | ||
| 248 | .parent = &clk_timer_scaler[0], | ||
| 249 | .get_rate = clk_pwm_tdiv_get_rate, | ||
| 250 | .set_rate = clk_pwm_tdiv_set_rate, | ||
| 251 | .round_rate = clk_pwm_tdiv_round_rate, | ||
| 252 | } | ||
| 253 | }, | ||
| 254 | [2] = { | ||
| 255 | .clk = { | ||
| 256 | .name = "pwm-tdiv", | ||
| 257 | .parent = &clk_timer_scaler[1], | ||
| 258 | .get_rate = clk_pwm_tdiv_get_rate, | ||
| 259 | .set_rate = clk_pwm_tdiv_set_rate, | ||
| 260 | .round_rate = clk_pwm_tdiv_round_rate, | ||
| 261 | }, | ||
| 262 | }, | ||
| 263 | [3] = { | ||
| 264 | .clk = { | ||
| 265 | .name = "pwm-tdiv", | ||
| 266 | .parent = &clk_timer_scaler[1], | ||
| 267 | .get_rate = clk_pwm_tdiv_get_rate, | ||
| 268 | .set_rate = clk_pwm_tdiv_set_rate, | ||
| 269 | .round_rate = clk_pwm_tdiv_round_rate, | ||
| 270 | }, | ||
| 271 | }, | ||
| 272 | [4] = { | ||
| 273 | .clk = { | ||
| 274 | .name = "pwm-tdiv", | ||
| 275 | .parent = &clk_timer_scaler[1], | ||
| 276 | .get_rate = clk_pwm_tdiv_get_rate, | ||
| 277 | .set_rate = clk_pwm_tdiv_set_rate, | ||
| 278 | .round_rate = clk_pwm_tdiv_round_rate, | ||
| 279 | }, | ||
| 280 | }, | ||
| 281 | }; | ||
| 282 | |||
| 283 | static int __init clk_pwm_tdiv_register(unsigned int id) | ||
| 284 | { | ||
| 285 | struct pwm_tdiv_clk *divclk = &clk_timer_tdiv[id]; | ||
| 286 | unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1); | ||
| 287 | |||
| 288 | tcfg1 >>= S3C2410_TCFG1_SHIFT(id); | ||
| 289 | tcfg1 &= S3C2410_TCFG1_MUX_MASK; | ||
| 290 | |||
| 291 | divclk->clk.id = id; | ||
| 292 | divclk->divisor = tcfg_to_divisor(tcfg1); | ||
| 293 | |||
| 294 | return s3c24xx_register_clock(&divclk->clk); | ||
| 295 | } | ||
| 296 | |||
| 297 | static inline struct clk *s3c24xx_pwmclk_tclk(unsigned int id) | ||
| 298 | { | ||
| 299 | return (id >= 2) ? &clk_timer_tclk[1] : &clk_timer_tclk[0]; | ||
| 300 | } | ||
| 301 | |||
| 302 | static inline struct clk *s3c24xx_pwmclk_tdiv(unsigned int id) | ||
| 303 | { | ||
| 304 | return &clk_timer_tdiv[id].clk; | ||
| 305 | } | ||
| 306 | |||
| 307 | static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent) | ||
| 308 | { | ||
| 309 | unsigned int id = clk->id; | ||
| 310 | unsigned long tcfg1; | ||
| 311 | unsigned long flags; | ||
| 312 | unsigned long bits; | ||
| 313 | unsigned long shift = S3C2410_TCFG1_SHIFT(id); | ||
| 314 | |||
| 315 | if (parent == s3c24xx_pwmclk_tclk(id)) | ||
| 316 | bits = S3C2410_TCFG1_MUX_TCLK << shift; | ||
| 317 | else if (parent == s3c24xx_pwmclk_tdiv(id)) | ||
| 318 | bits = clk_pwm_tdiv_bits(to_tdiv(clk)) << shift; | ||
| 319 | else | ||
| 320 | return -EINVAL; | ||
| 321 | |||
| 322 | clk->parent = parent; | ||
| 323 | |||
| 324 | local_irq_save(flags); | ||
| 325 | |||
| 326 | tcfg1 = __raw_readl(S3C2410_TCFG1); | ||
| 327 | tcfg1 &= ~(S3C2410_TCFG1_MUX_MASK << shift); | ||
| 328 | __raw_writel(tcfg1 | bits, S3C2410_TCFG1); | ||
| 329 | |||
| 330 | local_irq_restore(flags); | ||
| 331 | |||
| 332 | return 0; | ||
| 333 | } | ||
| 334 | |||
| 335 | static struct clk clk_tin[] = { | ||
| 336 | [0] = { | ||
| 337 | .name = "pwm-tin", | ||
| 338 | .id = 0, | ||
| 339 | .set_parent = clk_pwm_tin_set_parent, | ||
| 340 | }, | ||
| 341 | [1] = { | ||
| 342 | .name = "pwm-tin", | ||
| 343 | .id = 1, | ||
| 344 | .set_parent = clk_pwm_tin_set_parent, | ||
| 345 | }, | ||
| 346 | [2] = { | ||
| 347 | .name = "pwm-tin", | ||
| 348 | .id = 2, | ||
| 349 | .set_parent = clk_pwm_tin_set_parent, | ||
| 350 | }, | ||
| 351 | [3] = { | ||
| 352 | .name = "pwm-tin", | ||
| 353 | .id = 3, | ||
| 354 | .set_parent = clk_pwm_tin_set_parent, | ||
| 355 | }, | ||
| 356 | [4] = { | ||
| 357 | .name = "pwm-tin", | ||
| 358 | .id = 4, | ||
| 359 | .set_parent = clk_pwm_tin_set_parent, | ||
| 360 | }, | ||
| 361 | }; | ||
| 362 | |||
| 363 | static __init int clk_pwm_tin_register(struct clk *pwm) | ||
| 364 | { | ||
| 365 | unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1); | ||
| 366 | unsigned int id = pwm->id; | ||
| 367 | |||
| 368 | struct clk *parent; | ||
| 369 | int ret; | ||
| 370 | |||
| 371 | ret = s3c24xx_register_clock(pwm); | ||
| 372 | if (ret < 0) | ||
| 373 | return ret; | ||
| 374 | |||
| 375 | tcfg1 >>= S3C2410_TCFG1_SHIFT(id); | ||
| 376 | tcfg1 &= S3C2410_TCFG1_MUX_MASK; | ||
| 377 | |||
| 378 | if (tcfg1 == S3C2410_TCFG1_MUX_TCLK) | ||
| 379 | parent = s3c24xx_pwmclk_tclk(id); | ||
| 380 | else | ||
| 381 | parent = s3c24xx_pwmclk_tdiv(id); | ||
| 382 | |||
| 383 | return clk_set_parent(pwm, parent); | ||
| 384 | } | ||
| 385 | |||
| 386 | static __init int s3c24xx_pwmclk_init(void) | ||
| 387 | { | ||
| 388 | struct clk *clk_timers; | ||
| 389 | unsigned int clk; | ||
| 390 | int ret; | ||
| 391 | |||
| 392 | clk_timers = clk_get(NULL, "timers"); | ||
| 393 | if (IS_ERR(clk_timers)) { | ||
| 394 | printk(KERN_ERR "%s: no parent clock\n", __func__); | ||
| 395 | return -EINVAL; | ||
| 396 | } | ||
| 397 | |||
| 398 | for (clk = 0; clk < ARRAY_SIZE(clk_timer_scaler); clk++) { | ||
| 399 | clk_timer_scaler[clk].parent = clk_timers; | ||
| 400 | ret = s3c24xx_register_clock(&clk_timer_scaler[clk]); | ||
| 401 | if (ret < 0) { | ||
| 402 | printk(KERN_ERR "error adding pwm scaler%d clock\n", clk); | ||
| 403 | goto err; | ||
| 404 | } | ||
| 405 | } | ||
| 406 | |||
| 407 | for (clk = 0; clk < ARRAY_SIZE(clk_timer_tclk); clk++) { | ||
| 408 | ret = s3c24xx_register_clock(&clk_timer_tclk[clk]); | ||
| 409 | if (ret < 0) { | ||
| 410 | printk(KERN_ERR "error adding pww tclk%d\n", clk); | ||
| 411 | goto err; | ||
| 412 | } | ||
| 413 | } | ||
| 414 | |||
| 415 | for (clk = 0; clk < ARRAY_SIZE(clk_timer_tdiv); clk++) { | ||
| 416 | ret = clk_pwm_tdiv_register(clk); | ||
| 417 | if (ret < 0) { | ||
| 418 | printk(KERN_ERR "error adding pwm%d tdiv clock\n", clk); | ||
| 419 | goto err; | ||
| 420 | } | ||
| 421 | } | ||
| 422 | |||
| 423 | for (clk = 0; clk < ARRAY_SIZE(clk_tin); clk++) { | ||
| 424 | ret = clk_pwm_tin_register(&clk_tin[clk]); | ||
| 425 | if (ret < 0) { | ||
| 426 | printk(KERN_ERR "error adding pwm%d tin clock\n", clk); | ||
| 427 | goto err; | ||
| 428 | } | ||
| 429 | } | ||
| 430 | |||
| 431 | return 0; | ||
| 432 | |||
| 433 | err: | ||
| 434 | return ret; | ||
| 435 | } | ||
| 436 | |||
| 437 | arch_initcall(s3c24xx_pwmclk_init); | ||
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c new file mode 100644 index 000000000000..18c4bdc49a05 --- /dev/null +++ b/arch/arm/plat-s3c24xx/pwm.c | |||
| @@ -0,0 +1,402 @@ | |||
| 1 | /* arch/arm/plat-s3c24xx/pwm.c | ||
| 2 | * | ||
| 3 | * Copyright (c) 2007 Ben Dooks | ||
| 4 | * Copyright (c) 2008 Simtec Electronics | ||
| 5 | * Ben Dooks <ben@simtec.co.uk>, <ben-linux@fluff.org> | ||
| 6 | * | ||
| 7 | * S3C24XX PWM device core | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License. | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/module.h> | ||
| 15 | #include <linux/kernel.h> | ||
| 16 | #include <linux/platform_device.h> | ||
| 17 | #include <linux/err.h> | ||
| 18 | #include <linux/clk.h> | ||
| 19 | #include <linux/io.h> | ||
| 20 | #include <linux/pwm.h> | ||
| 21 | |||
| 22 | #include <asm/plat-s3c/regs-timer.h> | ||
| 23 | |||
| 24 | struct pwm_device { | ||
| 25 | struct list_head list; | ||
| 26 | struct platform_device *pdev; | ||
| 27 | |||
| 28 | struct clk *clk_div; | ||
| 29 | struct clk *clk; | ||
| 30 | const char *label; | ||
| 31 | |||
| 32 | unsigned int period_ns; | ||
| 33 | unsigned int duty_ns; | ||
| 34 | |||
| 35 | unsigned char tcon_base; | ||
| 36 | unsigned char running; | ||
| 37 | unsigned char use_count; | ||
| 38 | unsigned char pwm_id; | ||
| 39 | }; | ||
| 40 | |||
| 41 | #define pwm_dbg(_pwm, msg...) dev_info(&(_pwm)->pdev->dev, msg) | ||
| 42 | |||
| 43 | static struct clk *clk_scaler[2]; | ||
| 44 | |||
| 45 | /* Standard setup for a timer block. */ | ||
| 46 | |||
| 47 | #define TIMER_RESOURCE_SIZE (1) | ||
| 48 | |||
| 49 | #define TIMER_RESOURCE(_tmr, _irq) \ | ||
| 50 | (struct resource [TIMER_RESOURCE_SIZE]) { \ | ||
| 51 | [0] = { \ | ||
| 52 | .start = _irq, \ | ||
| 53 | .end = _irq, \ | ||
| 54 | .flags = IORESOURCE_IRQ \ | ||
| 55 | } \ | ||
| 56 | } | ||
| 57 | |||
| 58 | #define DEFINE_TIMER(_tmr_no, _irq) \ | ||
| 59 | .name = "s3c24xx-pwm", \ | ||
| 60 | .id = _tmr_no, \ | ||
| 61 | .num_resources = TIMER_RESOURCE_SIZE, \ | ||
| 62 | .resource = TIMER_RESOURCE(_tmr_no, _irq), \ | ||
| 63 | |||
| 64 | /* since we already have an static mapping for the timer, we do not | ||
| 65 | * bother setting any IO resource for the base. | ||
| 66 | */ | ||
| 67 | |||
| 68 | struct platform_device s3c_device_timer[] = { | ||
| 69 | [0] = { DEFINE_TIMER(0, IRQ_TIMER0) }, | ||
| 70 | [1] = { DEFINE_TIMER(1, IRQ_TIMER1) }, | ||
| 71 | [2] = { DEFINE_TIMER(2, IRQ_TIMER2) }, | ||
| 72 | [3] = { DEFINE_TIMER(3, IRQ_TIMER3) }, | ||
| 73 | [4] = { DEFINE_TIMER(4, IRQ_TIMER4) }, | ||
| 74 | }; | ||
| 75 | |||
| 76 | static inline int pwm_is_tdiv(struct pwm_device *pwm) | ||
| 77 | { | ||
| 78 | return clk_get_parent(pwm->clk) == pwm->clk_div; | ||
| 79 | } | ||
| 80 | |||
| 81 | static DEFINE_MUTEX(pwm_lock); | ||
| 82 | static LIST_HEAD(pwm_list); | ||
| 83 | |||
| 84 | struct pwm_device *pwm_request(int pwm_id, const char *label) | ||
| 85 | { | ||
| 86 | struct pwm_device *pwm; | ||
| 87 | int found = 0; | ||
| 88 | |||
| 89 | mutex_lock(&pwm_lock); | ||
| 90 | |||
| 91 | list_for_each_entry(pwm, &pwm_list, list) { | ||
| 92 | if (pwm->pwm_id == pwm_id) { | ||
| 93 | found = 1; | ||
| 94 | break; | ||
| 95 | } | ||
| 96 | } | ||
| 97 | |||
| 98 | if (found) { | ||
| 99 | if (pwm->use_count == 0) { | ||
| 100 | pwm->use_count = 1; | ||
| 101 | pwm->label = label; | ||
| 102 | } else | ||
| 103 | pwm = ERR_PTR(-EBUSY); | ||
| 104 | } else | ||
| 105 | pwm = ERR_PTR(-ENOENT); | ||
| 106 | |||
| 107 | mutex_unlock(&pwm_lock); | ||
| 108 | return pwm; | ||
| 109 | } | ||
| 110 | |||
| 111 | EXPORT_SYMBOL(pwm_request); | ||
| 112 | |||
| 113 | |||
| 114 | void pwm_free(struct pwm_device *pwm) | ||
| 115 | { | ||
| 116 | mutex_lock(&pwm_lock); | ||
| 117 | |||
| 118 | if (pwm->use_count) { | ||
| 119 | pwm->use_count--; | ||
| 120 | pwm->label = NULL; | ||
| 121 | } else | ||
| 122 | printk(KERN_ERR "PWM%d device already freed\n", pwm->pwm_id); | ||
| 123 | |||
| 124 | mutex_unlock(&pwm_lock); | ||
| 125 | } | ||
| 126 | |||
| 127 | EXPORT_SYMBOL(pwm_free); | ||
| 128 | |||
| 129 | #define pwm_tcon_start(pwm) (1 << (pwm->tcon_base + 0)) | ||
| 130 | #define pwm_tcon_invert(pwm) (1 << (pwm->tcon_base + 2)) | ||
| 131 | #define pwm_tcon_autoreload(pwm) (1 << (pwm->tcon_base + 3)) | ||
| 132 | #define pwm_tcon_manulupdate(pwm) (1 << (pwm->tcon_base + 1)) | ||
| 133 | |||
| 134 | int pwm_enable(struct pwm_device *pwm) | ||
| 135 | { | ||
| 136 | unsigned long flags; | ||
| 137 | unsigned long tcon; | ||
| 138 | |||
| 139 | local_irq_save(flags); | ||
| 140 | |||
| 141 | tcon = __raw_readl(S3C2410_TCON); | ||
| 142 | tcon |= pwm_tcon_start(pwm); | ||
| 143 | __raw_writel(tcon, S3C2410_TCON); | ||
| 144 | |||
| 145 | local_irq_restore(flags); | ||
| 146 | |||
| 147 | pwm->running = 1; | ||
| 148 | return 0; | ||
| 149 | } | ||
| 150 | |||
| 151 | EXPORT_SYMBOL(pwm_enable); | ||
| 152 | |||
| 153 | void pwm_disable(struct pwm_device *pwm) | ||
| 154 | { | ||
| 155 | unsigned long flags; | ||
| 156 | unsigned long tcon; | ||
| 157 | |||
| 158 | local_irq_save(flags); | ||
| 159 | |||
| 160 | tcon = __raw_readl(S3C2410_TCON); | ||
| 161 | tcon &= ~pwm_tcon_start(pwm); | ||
| 162 | __raw_writel(tcon, S3C2410_TCON); | ||
| 163 | |||
| 164 | local_irq_restore(flags); | ||
| 165 | |||
| 166 | pwm->running = 0; | ||
| 167 | } | ||
| 168 | |||
| 169 | EXPORT_SYMBOL(pwm_disable); | ||
| 170 | |||
| 171 | unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq) | ||
| 172 | { | ||
| 173 | unsigned long tin_parent_rate; | ||
| 174 | unsigned int div; | ||
| 175 | |||
| 176 | tin_parent_rate = clk_get_rate(clk_get_parent(pwm->clk_div)); | ||
| 177 | pwm_dbg(pwm, "tin parent at %lu\n", tin_parent_rate); | ||
| 178 | |||
| 179 | for (div = 2; div <= 16; div *= 2) { | ||
| 180 | if ((tin_parent_rate / (div << 16)) < freq) | ||
| 181 | return tin_parent_rate / div; | ||
| 182 | } | ||
| 183 | |||
| 184 | return tin_parent_rate / 16; | ||
| 185 | } | ||
| 186 | |||
| 187 | #define NS_IN_HZ (1000000000UL) | ||
| 188 | |||
| 189 | int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) | ||
| 190 | { | ||
| 191 | unsigned long tin_rate; | ||
| 192 | unsigned long tin_ns; | ||
| 193 | unsigned long period; | ||
| 194 | unsigned long flags; | ||
| 195 | unsigned long tcon; | ||
| 196 | unsigned long tcnt; | ||
| 197 | long tcmp; | ||
| 198 | |||
| 199 | /* We currently avoid using 64bit arithmetic by using the | ||
| 200 | * fact that anything faster than 1Hz is easily representable | ||
| 201 | * by 32bits. */ | ||
| 202 | |||
| 203 | if (period_ns > NS_IN_HZ || duty_ns > NS_IN_HZ) | ||
| 204 | return -ERANGE; | ||
| 205 | |||
| 206 | if (duty_ns > period_ns) | ||
| 207 | return -EINVAL; | ||
| 208 | |||
| 209 | if (period_ns == pwm->period_ns && | ||
| 210 | duty_ns == pwm->duty_ns) | ||
| 211 | return 0; | ||
| 212 | |||
| 213 | /* The TCMP and TCNT can be read without a lock, they're not | ||
| 214 | * shared between the timers. */ | ||
| 215 | |||
| 216 | tcmp = __raw_readl(S3C2410_TCMPB(pwm->pwm_id)); | ||
| 217 | tcnt = __raw_readl(S3C2410_TCNTB(pwm->pwm_id)); | ||
| 218 | |||
| 219 | period = NS_IN_HZ / period_ns; | ||
| 220 | |||
| 221 | pwm_dbg(pwm, "duty_ns=%d, period_ns=%d (%lu)\n", | ||
| 222 | duty_ns, period_ns, period); | ||
| 223 | |||
| 224 | /* Check to see if we are changing the clock rate of the PWM */ | ||
| 225 | |||
| 226 | if (pwm->period_ns != period_ns) { | ||
| 227 | if (pwm_is_tdiv(pwm)) { | ||
| 228 | tin_rate = pwm_calc_tin(pwm, period); | ||
| 229 | clk_set_rate(pwm->clk_div, tin_rate); | ||
| 230 | } else | ||
| 231 | tin_rate = clk_get_rate(pwm->clk); | ||
| 232 | |||
| 233 | pwm->period_ns = period_ns; | ||
| 234 | |||
| 235 | pwm_dbg(pwm, "tin_rate=%lu\n", tin_rate); | ||
| 236 | |||
| 237 | tin_ns = NS_IN_HZ / tin_rate; | ||
| 238 | tcnt = period_ns / tin_ns; | ||
| 239 | } else | ||
| 240 | tin_ns = NS_IN_HZ / clk_get_rate(pwm->clk); | ||
| 241 | |||
| 242 | /* Note, counters count down */ | ||
| 243 | |||
| 244 | tcmp = duty_ns / tin_ns; | ||
| 245 | tcmp = tcnt - tcmp; | ||
| 246 | |||
| 247 | pwm_dbg(pwm, "tin_ns=%lu, tcmp=%ld/%lu\n", tin_ns, tcmp, tcnt); | ||
| 248 | |||
| 249 | if (tcmp < 0) | ||
| 250 | tcmp = 0; | ||
| 251 | |||
| 252 | /* Update the PWM register block. */ | ||
| 253 | |||
| 254 | local_irq_save(flags); | ||
| 255 | |||
| 256 | __raw_writel(tcmp, S3C2410_TCMPB(pwm->pwm_id)); | ||
| 257 | __raw_writel(tcnt, S3C2410_TCNTB(pwm->pwm_id)); | ||
| 258 | |||
| 259 | tcon = __raw_readl(S3C2410_TCON); | ||
| 260 | tcon |= pwm_tcon_manulupdate(pwm); | ||
| 261 | tcon |= pwm_tcon_autoreload(pwm); | ||
| 262 | __raw_writel(tcon, S3C2410_TCON); | ||
| 263 | |||
| 264 | tcon &= ~pwm_tcon_manulupdate(pwm); | ||
| 265 | __raw_writel(tcon, S3C2410_TCON); | ||
| 266 | |||
| 267 | local_irq_restore(flags); | ||
| 268 | |||
| 269 | return 0; | ||
| 270 | } | ||
| 271 | |||
| 272 | EXPORT_SYMBOL(pwm_config); | ||
| 273 | |||
| 274 | static int pwm_register(struct pwm_device *pwm) | ||
| 275 | { | ||
| 276 | pwm->duty_ns = -1; | ||
| 277 | pwm->period_ns = -1; | ||
| 278 | |||
| 279 | mutex_lock(&pwm_lock); | ||
| 280 | list_add_tail(&pwm->list, &pwm_list); | ||
| 281 | mutex_unlock(&pwm_lock); | ||
| 282 | |||
| 283 | return 0; | ||
| 284 | } | ||
| 285 | |||
| 286 | static int s3c_pwm_probe(struct platform_device *pdev) | ||
| 287 | { | ||
| 288 | struct device *dev = &pdev->dev; | ||
| 289 | struct pwm_device *pwm; | ||
| 290 | unsigned long flags; | ||
| 291 | unsigned long tcon; | ||
| 292 | unsigned int id = pdev->id; | ||
| 293 | int ret; | ||
| 294 | |||
| 295 | if (id == 4) { | ||
| 296 | dev_err(dev, "TIMER4 is currently not supported\n"); | ||
| 297 | return -ENXIO; | ||
| 298 | } | ||
| 299 | |||
| 300 | pwm = kzalloc(sizeof(struct pwm_device), GFP_KERNEL); | ||
| 301 | if (pwm == NULL) { | ||
| 302 | dev_err(dev, "failed to allocate pwm_device\n"); | ||
| 303 | return -ENOMEM; | ||
| 304 | } | ||
| 305 | |||
| 306 | pwm->pdev = pdev; | ||
| 307 | pwm->pwm_id = id; | ||
| 308 | |||
| 309 | /* calculate base of control bits in TCON */ | ||
| 310 | pwm->tcon_base = id == 0 ? 0 : (id * 4) + 4; | ||
| 311 | |||
| 312 | pwm->clk = clk_get(dev, "pwm-tin"); | ||
| 313 | if (IS_ERR(pwm->clk)) { | ||
| 314 | dev_err(dev, "failed to get pwm tin clk\n"); | ||
| 315 | ret = PTR_ERR(pwm->clk); | ||
| 316 | goto err_alloc; | ||
| 317 | } | ||
| 318 | |||
| 319 | pwm->clk_div = clk_get(dev, "pwm-tdiv"); | ||
| 320 | if (IS_ERR(pwm->clk_div)) { | ||
| 321 | dev_err(dev, "failed to get pwm tdiv clk\n"); | ||
| 322 | ret = PTR_ERR(pwm->clk_div); | ||
| 323 | goto err_clk_tin; | ||
| 324 | } | ||
| 325 | |||
| 326 | local_irq_save(flags); | ||
| 327 | |||
| 328 | tcon = __raw_readl(S3C2410_TCON); | ||
| 329 | tcon |= pwm_tcon_invert(pwm); | ||
| 330 | __raw_writel(tcon, S3C2410_TCON); | ||
| 331 | |||
| 332 | local_irq_restore(flags); | ||
| 333 | |||
| 334 | |||
| 335 | ret = pwm_register(pwm); | ||
| 336 | if (ret) { | ||
| 337 | dev_err(dev, "failed to register pwm\n"); | ||
| 338 | goto err_clk_tdiv; | ||
| 339 | } | ||
| 340 | |||
| 341 | pwm_dbg(pwm, "config bits %02x\n", | ||
| 342 | (__raw_readl(S3C2410_TCON) >> pwm->tcon_base) & 0x0f); | ||
| 343 | |||
| 344 | dev_info(dev, "tin at %lu, tdiv at %lu, tin=%sclk, base %d\n", | ||
| 345 | clk_get_rate(pwm->clk), | ||
| 346 | clk_get_rate(pwm->clk_div), | ||
| 347 | pwm_is_tdiv(pwm) ? "div" : "ext", pwm->tcon_base); | ||
| 348 | |||
| 349 | platform_set_drvdata(pdev, pwm); | ||
| 350 | return 0; | ||
| 351 | |||
| 352 | err_clk_tdiv: | ||
| 353 | clk_put(pwm->clk_div); | ||
| 354 | |||
| 355 | err_clk_tin: | ||
| 356 | clk_put(pwm->clk); | ||
| 357 | |||
| 358 | err_alloc: | ||
| 359 | kfree(pwm); | ||
| 360 | return ret; | ||
| 361 | } | ||
| 362 | |||
| 363 | static int s3c_pwm_remove(struct platform_device *pdev) | ||
| 364 | { | ||
| 365 | struct pwm_device *pwm = platform_get_drvdata(pdev); | ||
| 366 | |||
| 367 | clk_put(pwm->clk_div); | ||
| 368 | clk_put(pwm->clk); | ||
| 369 | kfree(pwm); | ||
| 370 | |||
| 371 | return 0; | ||
| 372 | } | ||
| 373 | |||
| 374 | static struct platform_driver s3c_pwm_driver = { | ||
| 375 | .driver = { | ||
| 376 | .name = "s3c24xx-pwm", | ||
| 377 | .owner = THIS_MODULE, | ||
| 378 | }, | ||
| 379 | .probe = s3c_pwm_probe, | ||
| 380 | .remove = __devexit_p(s3c_pwm_remove), | ||
| 381 | }; | ||
| 382 | |||
| 383 | static int __init pwm_init(void) | ||
| 384 | { | ||
| 385 | int ret; | ||
| 386 | |||
| 387 | clk_scaler[0] = clk_get(NULL, "pwm-scaler0"); | ||
| 388 | clk_scaler[1] = clk_get(NULL, "pwm-scaler1"); | ||
| 389 | |||
| 390 | if (IS_ERR(clk_scaler[0]) || IS_ERR(clk_scaler[1])) { | ||
| 391 | printk(KERN_ERR "%s: failed to get scaler clocks\n", __func__); | ||
| 392 | return -EINVAL; | ||
| 393 | } | ||
| 394 | |||
| 395 | ret = platform_driver_register(&s3c_pwm_driver); | ||
| 396 | if (ret) | ||
| 397 | printk(KERN_ERR "%s: failed to add pwm driver\n", __func__); | ||
| 398 | |||
| 399 | return ret; | ||
| 400 | } | ||
| 401 | |||
| 402 | arch_initcall(pwm_init); | ||
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index f197bb3a2366..2f01af5f64c4 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c | |||
| @@ -65,6 +65,7 @@ void __init s3c244x_map_io(struct map_desc *mach_desc, int size) | |||
| 65 | 65 | ||
| 66 | /* rename any peripherals used differing from the s3c2410 */ | 66 | /* rename any peripherals used differing from the s3c2410 */ |
| 67 | 67 | ||
| 68 | s3c_device_sdi.name = "s3c2440-sdi"; | ||
| 68 | s3c_device_i2c.name = "s3c2440-i2c"; | 69 | s3c_device_i2c.name = "s3c2440-i2c"; |
| 69 | s3c_device_nand.name = "s3c2440-nand"; | 70 | s3c_device_nand.name = "s3c2440-nand"; |
| 70 | s3c_device_usbgadget.name = "s3c2440-usbgadget"; | 71 | s3c_device_usbgadget.name = "s3c2440-usbgadget"; |
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 207a8b5a0c4a..0be5630ff568 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | # | 12 | # |
| 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new | 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new |
| 14 | # | 14 | # |
| 15 | # Last update: Sat Apr 19 11:23:38 2008 | 15 | # Last update: Mon Jul 7 16:25:39 2008 |
| 16 | # | 16 | # |
| 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number | 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number |
| 18 | # | 18 | # |
| @@ -560,7 +560,6 @@ husky MACH_HUSKY HUSKY 543 | |||
| 560 | boxer MACH_BOXER BOXER 544 | 560 | boxer MACH_BOXER BOXER 544 |
| 561 | shepherd MACH_SHEPHERD SHEPHERD 545 | 561 | shepherd MACH_SHEPHERD SHEPHERD 545 |
| 562 | aml42800aa MACH_AML42800AA AML42800AA 546 | 562 | aml42800aa MACH_AML42800AA AML42800AA 546 |
| 563 | ml674001 MACH_MACH_TYPE_ML674001 MACH_TYPE_ML674001 547 | ||
| 564 | lpc2294 MACH_LPC2294 LPC2294 548 | 563 | lpc2294 MACH_LPC2294 LPC2294 548 |
| 565 | switchgrass MACH_SWITCHGRASS SWITCHGRASS 549 | 564 | switchgrass MACH_SWITCHGRASS SWITCHGRASS 549 |
| 566 | ens_cmu MACH_ENS_CMU ENS_CMU 550 | 565 | ens_cmu MACH_ENS_CMU ENS_CMU 550 |
| @@ -748,7 +747,6 @@ anubis MACH_ANUBIS ANUBIS 734 | |||
| 748 | ite8152 MACH_ITE8152 ITE8152 735 | 747 | ite8152 MACH_ITE8152 ITE8152 735 |
| 749 | lpc3xxx MACH_LPC3XXX LPC3XXX 736 | 748 | lpc3xxx MACH_LPC3XXX LPC3XXX 736 |
| 750 | puppeteer MACH_PUPPETEER PUPPETEER 737 | 749 | puppeteer MACH_PUPPETEER PUPPETEER 737 |
| 751 | vt001 MACH_MACH_VADATECH MACH_VADATECH 738 | ||
| 752 | e570 MACH_E570 E570 739 | 750 | e570 MACH_E570 E570 739 |
| 753 | x50 MACH_X50 X50 740 | 751 | x50 MACH_X50 X50 740 |
| 754 | recon MACH_RECON RECON 741 | 752 | recon MACH_RECON RECON 741 |
| @@ -839,7 +837,7 @@ ccxp270 MACH_CCXP CCXP 825 | |||
| 839 | omap_gsample MACH_OMAP_GSAMPLE OMAP_GSAMPLE 826 | 837 | omap_gsample MACH_OMAP_GSAMPLE OMAP_GSAMPLE 826 |
| 840 | realview_eb MACH_REALVIEW_EB REALVIEW_EB 827 | 838 | realview_eb MACH_REALVIEW_EB REALVIEW_EB 827 |
| 841 | samoa MACH_SAMOA SAMOA 828 | 839 | samoa MACH_SAMOA SAMOA 828 |
| 842 | t3xscale MACH_T3XSCALE T3XSCALE 829 | 840 | palmt3 MACH_PALMT3 PALMT3 829 |
| 843 | i878 MACH_I878 I878 830 | 841 | i878 MACH_I878 I878 830 |
| 844 | borzoi MACH_BORZOI BORZOI 831 | 842 | borzoi MACH_BORZOI BORZOI 831 |
| 845 | gecko MACH_GECKO GECKO 832 | 843 | gecko MACH_GECKO GECKO 832 |
| @@ -895,7 +893,7 @@ mio8390 MACH_MIO8390 MIO8390 881 | |||
| 895 | omi_board MACH_OMI_BOARD OMI_BOARD 882 | 893 | omi_board MACH_OMI_BOARD OMI_BOARD 882 |
| 896 | mx21civ MACH_MX21CIV MX21CIV 883 | 894 | mx21civ MACH_MX21CIV MX21CIV 883 |
| 897 | mahi_cdac MACH_MAHI_CDAC MAHI_CDAC 884 | 895 | mahi_cdac MACH_MAHI_CDAC MAHI_CDAC 884 |
| 898 | xscale_palmtx MACH_XSCALE_PALMTX XSCALE_PALMTX 885 | 896 | palmtx MACH_PALMTX PALMTX 885 |
| 899 | s3c2413 MACH_S3C2413 S3C2413 887 | 897 | s3c2413 MACH_S3C2413 S3C2413 887 |
| 900 | samsys_ep0 MACH_SAMSYS_EP0 SAMSYS_EP0 888 | 898 | samsys_ep0 MACH_SAMSYS_EP0 SAMSYS_EP0 888 |
| 901 | wg302v1 MACH_WG302V1 WG302V1 889 | 899 | wg302v1 MACH_WG302V1 WG302V1 889 |
| @@ -918,7 +916,7 @@ nxdb500 MACH_NXDB500 NXDB500 905 | |||
| 918 | apf9328 MACH_APF9328 APF9328 906 | 916 | apf9328 MACH_APF9328 APF9328 906 |
| 919 | omap_wipoq MACH_OMAP_WIPOQ OMAP_WIPOQ 907 | 917 | omap_wipoq MACH_OMAP_WIPOQ OMAP_WIPOQ 907 |
| 920 | omap_twip MACH_OMAP_TWIP OMAP_TWIP 908 | 918 | omap_twip MACH_OMAP_TWIP OMAP_TWIP 908 |
| 921 | xscale_treo650 MACH_XSCALE_PALMTREO650 XSCALE_PALMTREO650 909 | 919 | palmtreo650 MACH_PALMTREO650 PALMTREO650 909 |
| 922 | acumen MACH_ACUMEN ACUMEN 910 | 920 | acumen MACH_ACUMEN ACUMEN 910 |
| 923 | xp100 MACH_XP100 XP100 911 | 921 | xp100 MACH_XP100 XP100 911 |
| 924 | fs2410 MACH_FS2410 FS2410 912 | 922 | fs2410 MACH_FS2410 FS2410 912 |
| @@ -926,8 +924,8 @@ pxa270_cerf MACH_PXA270_CERF PXA270_CERF 913 | |||
| 926 | sq2ftlpalm MACH_SQ2FTLPALM SQ2FTLPALM 914 | 924 | sq2ftlpalm MACH_SQ2FTLPALM SQ2FTLPALM 914 |
| 927 | bsemserver MACH_BSEMSERVER BSEMSERVER 915 | 925 | bsemserver MACH_BSEMSERVER BSEMSERVER 915 |
| 928 | netclient MACH_NETCLIENT NETCLIENT 916 | 926 | netclient MACH_NETCLIENT NETCLIENT 916 |
| 929 | xscale_palmtt5 MACH_XSCALE_PALMTT5 XSCALE_PALMTT5 917 | 927 | palmt5 MACH_PALMT5 PALMT5 917 |
| 930 | xscale_palmtc MACH_OMAP_PALMTC OMAP_PALMTC 918 | 928 | palmtc MACH_PALMTC PALMTC 918 |
| 931 | omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919 | 929 | omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919 |
| 932 | mxc30030evb MACH_MXC30030EVB MXC30030EVB 920 | 930 | mxc30030evb MACH_MXC30030EVB MXC30030EVB 920 |
| 933 | rea_2d MACH_REA_2D REA_2D 921 | 931 | rea_2d MACH_REA_2D REA_2D 921 |
| @@ -1220,7 +1218,6 @@ empca400 MACH_EMPCA400 EMPCA400 1211 | |||
| 1220 | em7210 MACH_EM7210 EM7210 1212 | 1218 | em7210 MACH_EM7210 EM7210 1212 |
| 1221 | htchermes MACH_HTCHERMES HTCHERMES 1213 | 1219 | htchermes MACH_HTCHERMES HTCHERMES 1213 |
| 1222 | eti_c1 MACH_ETI_C1 ETI_C1 1214 | 1220 | eti_c1 MACH_ETI_C1 ETI_C1 1214 |
| 1223 | mach_dep2410 MACH_MACH_DEP2410 MACH_DEP2410 1215 | ||
| 1224 | ac100 MACH_AC100 AC100 1216 | 1221 | ac100 MACH_AC100 AC100 1216 |
| 1225 | sneetch MACH_SNEETCH SNEETCH 1217 | 1222 | sneetch MACH_SNEETCH SNEETCH 1217 |
| 1226 | studentmate MACH_STUDENTMATE STUDENTMATE 1218 | 1223 | studentmate MACH_STUDENTMATE STUDENTMATE 1218 |
| @@ -1421,10 +1418,10 @@ looxc550 MACH_LOOXC550 LOOXC550 1417 | |||
| 1421 | cnty_titan MACH_CNTY_TITAN CNTY_TITAN 1418 | 1418 | cnty_titan MACH_CNTY_TITAN CNTY_TITAN 1418 |
| 1422 | app3xx MACH_APP3XX APP3XX 1419 | 1419 | app3xx MACH_APP3XX APP3XX 1419 |
| 1423 | sideoatsgrama MACH_SIDEOATSGRAMA SIDEOATSGRAMA 1420 | 1420 | sideoatsgrama MACH_SIDEOATSGRAMA SIDEOATSGRAMA 1420 |
| 1424 | xscale_palmt700p MACH_XSCALE_PALMT700P XSCALE_PALMT700P 1421 | 1421 | palmtreo700p MACH_PALMTREO700P PALMTREO700P 1421 |
| 1425 | xscale_palmt700w MACH_XSCALE_PALMT700W XSCALE_PALMT700W 1422 | 1422 | palmtreo700w MACH_PALMTREO700W PALMTREO700W 1422 |
| 1426 | xscale_palmt750 MACH_XSCALE_PALMT750 XSCALE_PALMT750 1423 | 1423 | palmtreo750 MACH_PALMTREO750 PALMTREO750 1423 |
| 1427 | xscale_palmt755p MACH_XSCALE_PALMT755P XSCALE_PALMT755P 1424 | 1424 | palmtreo755p MACH_PALMTREO755P PALMTREO755P 1424 |
| 1428 | ezreganut9200 MACH_EZREGANUT9200 EZREGANUT9200 1425 | 1425 | ezreganut9200 MACH_EZREGANUT9200 EZREGANUT9200 1425 |
| 1429 | sarge MACH_SARGE SARGE 1426 | 1426 | sarge MACH_SARGE SARGE 1426 |
| 1430 | a696 MACH_A696 A696 1427 | 1427 | a696 MACH_A696 A696 1427 |
| @@ -1463,7 +1460,7 @@ artemis MACH_ARTEMIS ARTEMIS 1462 | |||
| 1463 | htctitan MACH_HTCTITAN HTCTITAN 1463 | 1460 | htctitan MACH_HTCTITAN HTCTITAN 1463 |
| 1464 | qranium MACH_QRANIUM QRANIUM 1464 | 1461 | qranium MACH_QRANIUM QRANIUM 1464 |
| 1465 | adx_wsc2 MACH_ADX_WSC2 ADX_WSC2 1465 | 1462 | adx_wsc2 MACH_ADX_WSC2 ADX_WSC2 1465 |
| 1466 | adx_medcom MACH_ADX_MEDINET ADX_MEDINET 1466 | 1463 | adx_medcom MACH_ADX_MEDCOM ADX_MEDCOM 1466 |
| 1467 | bboard MACH_BBOARD BBOARD 1467 | 1464 | bboard MACH_BBOARD BBOARD 1467 |
| 1468 | cambria MACH_CAMBRIA CAMBRIA 1468 | 1465 | cambria MACH_CAMBRIA CAMBRIA 1468 |
| 1469 | mt7xxx MACH_MT7XXX MT7XXX 1469 | 1466 | mt7xxx MACH_MT7XXX MT7XXX 1469 |
| @@ -1519,7 +1516,7 @@ wp188 MACH_WP188 WP188 1518 | |||
| 1519 | corsica MACH_CORSICA CORSICA 1519 | 1516 | corsica MACH_CORSICA CORSICA 1519 |
| 1520 | bigeye MACH_BIGEYE BIGEYE 1520 | 1517 | bigeye MACH_BIGEYE BIGEYE 1520 |
| 1521 | tll5000 MACH_TLL5000 TLL5000 1522 | 1518 | tll5000 MACH_TLL5000 TLL5000 1522 |
| 1522 | hni270 MACH_HNI_X270 HNI_X270 1523 | 1519 | bebot MACH_BEBOT BEBOT 1523 |
| 1523 | qong MACH_QONG QONG 1524 | 1520 | qong MACH_QONG QONG 1524 |
| 1524 | tcompact MACH_TCOMPACT TCOMPACT 1525 | 1521 | tcompact MACH_TCOMPACT TCOMPACT 1525 |
| 1525 | puma5 MACH_PUMA5 PUMA5 1526 | 1522 | puma5 MACH_PUMA5 PUMA5 1526 |
| @@ -1636,7 +1633,6 @@ awlug4lcu MACH_AWLUG4LCU AWLUG4LCU 1637 | |||
| 1636 | palermoc MACH_PALERMOC PALERMOC 1638 | 1633 | palermoc MACH_PALERMOC PALERMOC 1638 |
| 1637 | omap_ldp MACH_OMAP_LDP OMAP_LDP 1639 | 1634 | omap_ldp MACH_OMAP_LDP OMAP_LDP 1639 |
| 1638 | ip500 MACH_IP500 IP500 1640 | 1635 | ip500 MACH_IP500 IP500 1640 |
| 1639 | mx35ads MACH_MACH_MX35ADS MACH_MX35ADS 1641 | ||
| 1640 | ase2 MACH_ASE2 ASE2 1642 | 1636 | ase2 MACH_ASE2 ASE2 1642 |
| 1641 | mx35evb MACH_MX35EVB MX35EVB 1643 | 1637 | mx35evb MACH_MX35EVB MX35EVB 1643 |
| 1642 | aml_m8050 MACH_AML_M8050 AML_M8050 1644 | 1638 | aml_m8050 MACH_AML_M8050 AML_M8050 1644 |
| @@ -1647,7 +1643,7 @@ badger MACH_BADGER BADGER 1648 | |||
| 1647 | trizeps4wl MACH_TRIZEPS4WL TRIZEPS4WL 1649 | 1643 | trizeps4wl MACH_TRIZEPS4WL TRIZEPS4WL 1649 |
| 1648 | trizeps5 MACH_TRIZEPS5 TRIZEPS5 1650 | 1644 | trizeps5 MACH_TRIZEPS5 TRIZEPS5 1650 |
| 1649 | marlin MACH_MARLIN MARLIN 1651 | 1645 | marlin MACH_MARLIN MARLIN 1651 |
| 1650 | ts7800 MACH_TS7800 TS7800 1652 | 1646 | ts78xx MACH_TS78XX TS78XX 1652 |
| 1651 | hpipaq214 MACH_HPIPAQ214 HPIPAQ214 1653 | 1647 | hpipaq214 MACH_HPIPAQ214 HPIPAQ214 1653 |
| 1652 | at572d940dcm MACH_AT572D940DCM AT572D940DCM 1654 | 1648 | at572d940dcm MACH_AT572D940DCM AT572D940DCM 1654 |
| 1653 | ne1board MACH_NE1BOARD NE1BOARD 1655 | 1649 | ne1board MACH_NE1BOARD NE1BOARD 1655 |
| @@ -1720,3 +1716,99 @@ htc_kaiser MACH_HTC_KAISER HTC_KAISER 1724 | |||
| 1720 | lg_ks20 MACH_LG_KS20 LG_KS20 1725 | 1716 | lg_ks20 MACH_LG_KS20 LG_KS20 1725 |
| 1721 | hhgps MACH_HHGPS HHGPS 1726 | 1717 | hhgps MACH_HHGPS HHGPS 1726 |
| 1722 | nokia_n810_wimax MACH_NOKIA_N810_WIMAX NOKIA_N810_WIMAX 1727 | 1718 | nokia_n810_wimax MACH_NOKIA_N810_WIMAX NOKIA_N810_WIMAX 1727 |
| 1719 | insight MACH_INSIGHT INSIGHT 1728 | ||
| 1720 | sapphire MACH_SAPPHIRE SAPPHIRE 1729 | ||
| 1721 | csb637xo MACH_CSB637XO CSB637XO 1730 | ||
| 1722 | evisiong MACH_EVISIONG EVISIONG 1731 | ||
| 1723 | stmp37xx MACH_STMP37XX STMP37XX 1732 | ||
| 1724 | stmp378x MACH_STMP38XX STMP38XX 1733 | ||
| 1725 | tnt MACH_TNT TNT 1734 | ||
| 1726 | tbxt MACH_TBXT TBXT 1735 | ||
| 1727 | playmate MACH_PLAYMATE PLAYMATE 1736 | ||
| 1728 | pns10 MACH_PNS10 PNS10 1737 | ||
| 1729 | eznavi MACH_EZNAVI EZNAVI 1738 | ||
| 1730 | ps4000 MACH_PS4000 PS4000 1739 | ||
| 1731 | ezx_a780 MACH_EZX_A780 EZX_A780 1740 | ||
| 1732 | ezx_e680 MACH_EZX_E680 EZX_E680 1741 | ||
| 1733 | ezx_a1200 MACH_EZX_A1200 EZX_A1200 1742 | ||
| 1734 | ezx_e6 MACH_EZX_E6 EZX_E6 1743 | ||
| 1735 | ezx_e2 MACH_EZX_E2 EZX_E2 1744 | ||
| 1736 | ezx_a910 MACH_EZX_A910 EZX_A910 1745 | ||
| 1737 | cwmx31 MACH_CWMX31 CWMX31 1746 | ||
| 1738 | sl2312 MACH_SL2312 SL2312 1747 | ||
| 1739 | blenny MACH_BLENNY BLENNY 1748 | ||
| 1740 | ds107 MACH_DS107 DS107 1749 | ||
| 1741 | dsx07 MACH_DSX07 DSX07 1750 | ||
| 1742 | picocom1 MACH_PICOCOM1 PICOCOM1 1751 | ||
| 1743 | lynx_wolverine MACH_LYNX_WOLVERINE LYNX_WOLVERINE 1752 | ||
| 1744 | ubisys_p9_sc19 MACH_UBISYS_P9_SC19 UBISYS_P9_SC19 1753 | ||
| 1745 | kratos_low MACH_KRATOS_LOW KRATOS_LOW 1754 | ||
| 1746 | m700 MACH_M700 M700 1755 | ||
| 1747 | edmini_v2 MACH_EDMINI_V2 EDMINI_V2 1756 | ||
| 1748 | zipit2 MACH_ZIPIT2 ZIPIT2 1757 | ||
| 1749 | hslfemtocell MACH_HSLFEMTOCELL HSLFEMTOCELL 1758 | ||
| 1750 | daintree_at91 MACH_DAINTREE_AT91 DAINTREE_AT91 1759 | ||
| 1751 | sg560usb MACH_SG560USB SG560USB 1760 | ||
| 1752 | omap3_pandora MACH_OMAP3_PANDORA OMAP3_PANDORA 1761 | ||
| 1753 | usr8200 MACH_USR8200 USR8200 1762 | ||
| 1754 | s1s65k MACH_S1S65K S1S65K 1763 | ||
| 1755 | s2s65a MACH_S2S65A S2S65A 1764 | ||
| 1756 | icore MACH_ICORE ICORE 1765 | ||
| 1757 | mss2 MACH_MSS2 MSS2 1766 | ||
| 1758 | belmont MACH_BELMONT BELMONT 1767 | ||
| 1759 | asusp525 MACH_ASUSP525 ASUSP525 1768 | ||
| 1760 | lb88rc8480 MACH_LB88RC8480 LB88RC8480 1769 | ||
| 1761 | hipxa MACH_HIPXA HIPXA 1770 | ||
| 1762 | mx25_3ds MACH_MX25_3DS MX25_3DS 1771 | ||
| 1763 | m800 MACH_M800 M800 1772 | ||
| 1764 | omap3530_lv_som MACH_OMAP3530_LV_SOM OMAP3530_LV_SOM 1773 | ||
| 1765 | prima_evb MACH_PRIMA_EVB PRIMA_EVB 1774 | ||
| 1766 | mx31bt1 MACH_MX31BT1 MX31BT1 1775 | ||
| 1767 | atlas4_evb MACH_ATLAS4_EVB ATLAS4_EVB 1776 | ||
| 1768 | mx31cicada MACH_MX31CICADA MX31CICADA 1777 | ||
| 1769 | mi424wr MACH_MI424WR MI424WR 1778 | ||
| 1770 | axs_ultrax MACH_AXS_ULTRAX AXS_ULTRAX 1779 | ||
| 1771 | at572d940deb MACH_AT572D940DEB AT572D940DEB 1780 | ||
| 1772 | davinci_da8xx_evm MACH_DAVINCI_DA8XX_EVM DAVINCI_DA8XX_EVM 1781 | ||
| 1773 | ep9302 MACH_EP9302 EP9302 1782 | ||
| 1774 | at572d940hfeb MACH_AT572D940HFEB AT572D940HFEB 1783 | ||
| 1775 | cybook3 MACH_CYBOOK3 CYBOOK3 1784 | ||
| 1776 | wdg002 MACH_WDG002 WDG002 1785 | ||
| 1777 | sg560adsl MACH_SG560ADSL SG560ADSL 1786 | ||
| 1778 | nextio_n2800_ica MACH_NEXTIO_N2800_ICA NEXTIO_N2800_ICA 1787 | ||
| 1779 | marvell_newdb MACH_MARVELL_NEWDB MARVELL_NEWDB 1789 | ||
| 1780 | vandihud MACH_VANDIHUD VANDIHUD 1790 | ||
| 1781 | magx_e8 MACH_MAGX_E8 MAGX_E8 1791 | ||
| 1782 | magx_z6 MACH_MAGX_Z6 MAGX_Z6 1792 | ||
| 1783 | magx_v8 MACH_MAGX_V8 MAGX_V8 1793 | ||
| 1784 | magx_u9 MACH_MAGX_U9 MAGX_U9 1794 | ||
| 1785 | toughcf08 MACH_TOUGHCF08 TOUGHCF08 1795 | ||
| 1786 | zw4400 MACH_ZW4400 ZW4400 1796 | ||
| 1787 | marat91 MACH_MARAT91 MARAT91 1797 | ||
| 1788 | overo MACH_OVERO OVERO 1798 | ||
| 1789 | at2440evb MACH_AT2440EVB AT2440EVB 1799 | ||
| 1790 | neocore926 MACH_NEOCORE926 NEOCORE926 1800 | ||
| 1791 | wnr854t MACH_WNR854T WNR854T 1801 | ||
| 1792 | imx27 MACH_IMX27 IMX27 1802 | ||
| 1793 | moose_db MACH_MOOSE_DB MOOSE_DB 1803 | ||
| 1794 | fab4 MACH_FAB4 FAB4 1804 | ||
| 1795 | htcdiamond MACH_HTCDIAMOND HTCDIAMOND 1805 | ||
| 1796 | fiona MACH_FIONA FIONA 1806 | ||
| 1797 | mxc30030_x MACH_MXC30030_X MXC30030_X 1807 | ||
| 1798 | bmp1000 MACH_BMP1000 BMP1000 1808 | ||
| 1799 | logi9200 MACH_LOGI9200 LOGI9200 1809 | ||
| 1800 | tqma31 MACH_TQMA31 TQMA31 1810 | ||
| 1801 | ccw9p9215js MACH_CCW9P9215JS CCW9P9215JS 1811 | ||
| 1802 | rd88f5181l_ge MACH_RD88F5181L_GE RD88F5181L_GE 1812 | ||
| 1803 | sifmain MACH_SIFMAIN SIFMAIN 1813 | ||
| 1804 | sam9_l9261 MACH_SAM9_L9261 SAM9_L9261 1814 | ||
| 1805 | cc9m2443js MACH_CC9M2443JS CC9M2443JS 1815 | ||
| 1806 | xaria300 MACH_XARIA300 XARIA300 1816 | ||
| 1807 | it9200 MACH_IT9200 IT9200 1817 | ||
| 1808 | rd88f5181l_fxo MACH_RD88F5181L_FXO RD88F5181L_FXO 1818 | ||
| 1809 | kriss_sensor MACH_KRISS_SENSOR KRISS_SENSOR 1819 | ||
| 1810 | pilz_pmi5 MACH_PILZ_PMI5 PILZ_PMI5 1820 | ||
| 1811 | jade MACH_JADE JADE 1821 | ||
| 1812 | ks8695_softplc MACH_KS8695_SOFTPLC KS8695_SOFTPLC 1822 | ||
| 1813 | gprisc4 MACH_GPRISC4 GPRISC4 1823 | ||
| 1814 | stamp9260 MACH_STAMP9260 STAMP9260 1824 | ||
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig index 06046074d68b..119edb839ac3 100644 --- a/arch/avr32/configs/atngw100_defconfig +++ b/arch/avr32/configs/atngw100_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.24-rc7 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Wed Jan 9 23:20:41 2008 | 4 | # Mon May 26 13:30:59 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
| 7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
| @@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y | |||
| 13 | CONFIG_GENERIC_IRQ_PROBE=y | 13 | CONFIG_GENERIC_IRQ_PROBE=y |
| 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 15 | CONFIG_GENERIC_TIME=y | 15 | CONFIG_GENERIC_TIME=y |
| 16 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 16 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 17 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 17 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 19 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 20 | CONFIG_GENERIC_HWEIGHT=y | 20 | CONFIG_GENERIC_HWEIGHT=y |
| 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 22 | CONFIG_GENERIC_BUG=y | 22 | CONFIG_GENERIC_BUG=y |
| @@ -37,17 +37,15 @@ CONFIG_POSIX_MQUEUE=y | |||
| 37 | CONFIG_BSD_PROCESS_ACCT=y | 37 | CONFIG_BSD_PROCESS_ACCT=y |
| 38 | CONFIG_BSD_PROCESS_ACCT_V3=y | 38 | CONFIG_BSD_PROCESS_ACCT_V3=y |
| 39 | # CONFIG_TASKSTATS is not set | 39 | # CONFIG_TASKSTATS is not set |
| 40 | # CONFIG_USER_NS is not set | ||
| 41 | # CONFIG_PID_NS is not set | ||
| 42 | # CONFIG_AUDIT is not set | 40 | # CONFIG_AUDIT is not set |
| 43 | # CONFIG_IKCONFIG is not set | 41 | # CONFIG_IKCONFIG is not set |
| 44 | CONFIG_LOG_BUF_SHIFT=14 | 42 | CONFIG_LOG_BUF_SHIFT=14 |
| 45 | # CONFIG_CGROUPS is not set | 43 | # CONFIG_CGROUPS is not set |
| 46 | CONFIG_FAIR_GROUP_SCHED=y | 44 | # CONFIG_GROUP_SCHED is not set |
| 47 | CONFIG_FAIR_USER_SCHED=y | ||
| 48 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 49 | CONFIG_SYSFS_DEPRECATED=y | 45 | CONFIG_SYSFS_DEPRECATED=y |
| 46 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 50 | # CONFIG_RELAY is not set | 47 | # CONFIG_RELAY is not set |
| 48 | # CONFIG_NAMESPACES is not set | ||
| 51 | CONFIG_BLK_DEV_INITRD=y | 49 | CONFIG_BLK_DEV_INITRD=y |
| 52 | CONFIG_INITRAMFS_SOURCE="" | 50 | CONFIG_INITRAMFS_SOURCE="" |
| 53 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -61,11 +59,13 @@ CONFIG_HOTPLUG=y | |||
| 61 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 62 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 63 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | ||
| 64 | # CONFIG_BASE_FULL is not set | 63 | # CONFIG_BASE_FULL is not set |
| 65 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 66 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
| 67 | CONFIG_EPOLL=y | 66 | CONFIG_EPOLL=y |
| 68 | CONFIG_SIGNALFD=y | 67 | CONFIG_SIGNALFD=y |
| 68 | CONFIG_TIMERFD=y | ||
| 69 | CONFIG_EVENTFD=y | 69 | CONFIG_EVENTFD=y |
| 70 | CONFIG_SHMEM=y | 70 | CONFIG_SHMEM=y |
| 71 | CONFIG_VM_EVENT_COUNTERS=y | 71 | CONFIG_VM_EVENT_COUNTERS=y |
| @@ -73,11 +73,21 @@ CONFIG_SLUB_DEBUG=y | |||
| 73 | # CONFIG_SLAB is not set | 73 | # CONFIG_SLAB is not set |
| 74 | CONFIG_SLUB=y | 74 | CONFIG_SLUB=y |
| 75 | # CONFIG_SLOB is not set | 75 | # CONFIG_SLOB is not set |
| 76 | CONFIG_PROFILING=y | ||
| 77 | # CONFIG_MARKERS is not set | ||
| 78 | CONFIG_OPROFILE=m | ||
| 79 | CONFIG_HAVE_OPROFILE=y | ||
| 80 | CONFIG_KPROBES=y | ||
| 81 | CONFIG_HAVE_KPROBES=y | ||
| 82 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 83 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 84 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 76 | CONFIG_SLABINFO=y | 85 | CONFIG_SLABINFO=y |
| 77 | CONFIG_RT_MUTEXES=y | 86 | CONFIG_RT_MUTEXES=y |
| 78 | # CONFIG_TINY_SHMEM is not set | 87 | # CONFIG_TINY_SHMEM is not set |
| 79 | CONFIG_BASE_SMALL=1 | 88 | CONFIG_BASE_SMALL=1 |
| 80 | CONFIG_MODULES=y | 89 | CONFIG_MODULES=y |
| 90 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 81 | CONFIG_MODULE_UNLOAD=y | 91 | CONFIG_MODULE_UNLOAD=y |
| 82 | CONFIG_MODULE_FORCE_UNLOAD=y | 92 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 83 | # CONFIG_MODVERSIONS is not set | 93 | # CONFIG_MODVERSIONS is not set |
| @@ -101,10 +111,15 @@ CONFIG_IOSCHED_CFQ=y | |||
| 101 | CONFIG_DEFAULT_CFQ=y | 111 | CONFIG_DEFAULT_CFQ=y |
| 102 | # CONFIG_DEFAULT_NOOP is not set | 112 | # CONFIG_DEFAULT_NOOP is not set |
| 103 | CONFIG_DEFAULT_IOSCHED="cfq" | 113 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 114 | CONFIG_CLASSIC_RCU=y | ||
| 104 | 115 | ||
| 105 | # | 116 | # |
| 106 | # System Type and features | 117 | # System Type and features |
| 107 | # | 118 | # |
| 119 | CONFIG_TICK_ONESHOT=y | ||
| 120 | CONFIG_NO_HZ=y | ||
| 121 | CONFIG_HIGH_RES_TIMERS=y | ||
| 122 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 108 | CONFIG_SUBARCH_AVR32B=y | 123 | CONFIG_SUBARCH_AVR32B=y |
| 109 | CONFIG_MMU=y | 124 | CONFIG_MMU=y |
| 110 | CONFIG_PERFORMANCE_COUNTERS=y | 125 | CONFIG_PERFORMANCE_COUNTERS=y |
| @@ -141,16 +156,19 @@ CONFIG_FLATMEM=y | |||
| 141 | CONFIG_FLAT_NODE_MEM_MAP=y | 156 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 142 | # CONFIG_SPARSEMEM_STATIC is not set | 157 | # CONFIG_SPARSEMEM_STATIC is not set |
| 143 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 158 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 159 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 144 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 160 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 145 | # CONFIG_RESOURCES_64BIT is not set | 161 | # CONFIG_RESOURCES_64BIT is not set |
| 146 | CONFIG_ZONE_DMA_FLAG=0 | 162 | CONFIG_ZONE_DMA_FLAG=0 |
| 147 | CONFIG_VIRT_TO_BUS=y | 163 | CONFIG_VIRT_TO_BUS=y |
| 148 | # CONFIG_OWNERSHIP_TRACE is not set | 164 | # CONFIG_OWNERSHIP_TRACE is not set |
| 165 | CONFIG_NMI_DEBUGGING=y | ||
| 149 | # CONFIG_HZ_100 is not set | 166 | # CONFIG_HZ_100 is not set |
| 150 | CONFIG_HZ_250=y | 167 | CONFIG_HZ_250=y |
| 151 | # CONFIG_HZ_300 is not set | 168 | # CONFIG_HZ_300 is not set |
| 152 | # CONFIG_HZ_1000 is not set | 169 | # CONFIG_HZ_1000 is not set |
| 153 | CONFIG_HZ=250 | 170 | CONFIG_HZ=250 |
| 171 | # CONFIG_SCHED_HRTICK is not set | ||
| 154 | CONFIG_CMDLINE="" | 172 | CONFIG_CMDLINE="" |
| 155 | 173 | ||
| 156 | # | 174 | # |
| @@ -164,9 +182,10 @@ CONFIG_CPU_FREQ=y | |||
| 164 | CONFIG_CPU_FREQ_TABLE=y | 182 | CONFIG_CPU_FREQ_TABLE=y |
| 165 | # CONFIG_CPU_FREQ_DEBUG is not set | 183 | # CONFIG_CPU_FREQ_DEBUG is not set |
| 166 | # CONFIG_CPU_FREQ_STAT is not set | 184 | # CONFIG_CPU_FREQ_STAT is not set |
| 167 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 185 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
| 186 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 168 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 187 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
| 169 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 188 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
| 170 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 189 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
| 171 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 190 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
| 172 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 191 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
| @@ -202,6 +221,7 @@ CONFIG_XFRM=y | |||
| 202 | CONFIG_XFRM_USER=y | 221 | CONFIG_XFRM_USER=y |
| 203 | # CONFIG_XFRM_SUB_POLICY is not set | 222 | # CONFIG_XFRM_SUB_POLICY is not set |
| 204 | # CONFIG_XFRM_MIGRATE is not set | 223 | # CONFIG_XFRM_MIGRATE is not set |
| 224 | # CONFIG_XFRM_STATISTICS is not set | ||
| 205 | CONFIG_NET_KEY=y | 225 | CONFIG_NET_KEY=y |
| 206 | # CONFIG_NET_KEY_MIGRATE is not set | 226 | # CONFIG_NET_KEY_MIGRATE is not set |
| 207 | CONFIG_INET=y | 227 | CONFIG_INET=y |
| @@ -255,87 +275,40 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 255 | CONFIG_INET6_XFRM_MODE_BEET=y | 275 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 256 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 276 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 257 | CONFIG_IPV6_SIT=y | 277 | CONFIG_IPV6_SIT=y |
| 278 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 258 | # CONFIG_IPV6_TUNNEL is not set | 279 | # CONFIG_IPV6_TUNNEL is not set |
| 259 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 280 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 281 | # CONFIG_IPV6_MROUTE is not set | ||
| 260 | # CONFIG_NETWORK_SECMARK is not set | 282 | # CONFIG_NETWORK_SECMARK is not set |
| 261 | CONFIG_NETFILTER=y | 283 | CONFIG_NETFILTER=y |
| 262 | # CONFIG_NETFILTER_DEBUG is not set | 284 | # CONFIG_NETFILTER_DEBUG is not set |
| 263 | CONFIG_BRIDGE_NETFILTER=y | 285 | # CONFIG_NETFILTER_ADVANCED is not set |
| 264 | 286 | ||
| 265 | # | 287 | # |
| 266 | # Core Netfilter Configuration | 288 | # Core Netfilter Configuration |
| 267 | # | 289 | # |
| 268 | # CONFIG_NETFILTER_NETLINK is not set | 290 | CONFIG_NETFILTER_NETLINK=m |
| 269 | CONFIG_NF_CONNTRACK_ENABLED=m | 291 | CONFIG_NETFILTER_NETLINK_LOG=m |
| 270 | CONFIG_NF_CONNTRACK=m | 292 | CONFIG_NF_CONNTRACK=m |
| 271 | CONFIG_NF_CT_ACCT=y | ||
| 272 | CONFIG_NF_CONNTRACK_MARK=y | ||
| 273 | # CONFIG_NF_CONNTRACK_EVENTS is not set | ||
| 274 | CONFIG_NF_CT_PROTO_GRE=m | ||
| 275 | # CONFIG_NF_CT_PROTO_SCTP is not set | ||
| 276 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | ||
| 277 | CONFIG_NF_CONNTRACK_AMANDA=m | ||
| 278 | CONFIG_NF_CONNTRACK_FTP=m | 293 | CONFIG_NF_CONNTRACK_FTP=m |
| 279 | CONFIG_NF_CONNTRACK_H323=m | ||
| 280 | CONFIG_NF_CONNTRACK_IRC=m | 294 | CONFIG_NF_CONNTRACK_IRC=m |
| 281 | CONFIG_NF_CONNTRACK_NETBIOS_NS=m | ||
| 282 | CONFIG_NF_CONNTRACK_PPTP=m | ||
| 283 | CONFIG_NF_CONNTRACK_SANE=m | ||
| 284 | CONFIG_NF_CONNTRACK_SIP=m | 295 | CONFIG_NF_CONNTRACK_SIP=m |
| 285 | CONFIG_NF_CONNTRACK_TFTP=m | 296 | CONFIG_NF_CT_NETLINK=m |
| 286 | CONFIG_NETFILTER_XTABLES=y | 297 | CONFIG_NETFILTER_XTABLES=y |
| 287 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
| 288 | # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set | ||
| 289 | # CONFIG_NETFILTER_XT_TARGET_DSCP is not set | ||
| 290 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 298 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
| 291 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| 292 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 299 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
| 293 | # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set | ||
| 294 | # CONFIG_NETFILTER_XT_TARGET_TRACE is not set | ||
| 295 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 300 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
| 296 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
| 297 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
| 298 | # CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set | ||
| 299 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
| 300 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 301 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
| 301 | # CONFIG_NETFILTER_XT_MATCH_DCCP is not set | ||
| 302 | # CONFIG_NETFILTER_XT_MATCH_DSCP is not set | ||
| 303 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
| 304 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
| 305 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
| 306 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
| 307 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
| 308 | CONFIG_NETFILTER_XT_MATCH_MARK=m | 302 | CONFIG_NETFILTER_XT_MATCH_MARK=m |
| 309 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | 303 | CONFIG_NETFILTER_XT_MATCH_POLICY=m |
| 310 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
| 311 | # CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | ||
| 312 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
| 313 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
| 314 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
| 315 | # CONFIG_NETFILTER_XT_MATCH_SCTP is not set | ||
| 316 | CONFIG_NETFILTER_XT_MATCH_STATE=m | 304 | CONFIG_NETFILTER_XT_MATCH_STATE=m |
| 317 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
| 318 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
| 319 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
| 320 | # CONFIG_NETFILTER_XT_MATCH_TIME is not set | ||
| 321 | # CONFIG_NETFILTER_XT_MATCH_U32 is not set | ||
| 322 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
| 323 | 305 | ||
| 324 | # | 306 | # |
| 325 | # IP: Netfilter Configuration | 307 | # IP: Netfilter Configuration |
| 326 | # | 308 | # |
| 327 | CONFIG_NF_CONNTRACK_IPV4=m | 309 | CONFIG_NF_CONNTRACK_IPV4=m |
| 328 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 310 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
| 329 | # CONFIG_IP_NF_QUEUE is not set | ||
| 330 | CONFIG_IP_NF_IPTABLES=m | 311 | CONFIG_IP_NF_IPTABLES=m |
| 331 | CONFIG_IP_NF_MATCH_IPRANGE=m | ||
| 332 | CONFIG_IP_NF_MATCH_TOS=m | ||
| 333 | CONFIG_IP_NF_MATCH_RECENT=m | ||
| 334 | CONFIG_IP_NF_MATCH_ECN=m | ||
| 335 | CONFIG_IP_NF_MATCH_AH=m | ||
| 336 | CONFIG_IP_NF_MATCH_TTL=m | ||
| 337 | CONFIG_IP_NF_MATCH_OWNER=m | ||
| 338 | CONFIG_IP_NF_MATCH_ADDRTYPE=m | ||
| 339 | CONFIG_IP_NF_FILTER=m | 312 | CONFIG_IP_NF_FILTER=m |
| 340 | CONFIG_IP_NF_TARGET_REJECT=m | 313 | CONFIG_IP_NF_TARGET_REJECT=m |
| 341 | CONFIG_IP_NF_TARGET_LOG=m | 314 | CONFIG_IP_NF_TARGET_LOG=m |
| @@ -343,54 +316,25 @@ CONFIG_IP_NF_TARGET_LOG=m | |||
| 343 | CONFIG_NF_NAT=m | 316 | CONFIG_NF_NAT=m |
| 344 | CONFIG_NF_NAT_NEEDED=y | 317 | CONFIG_NF_NAT_NEEDED=y |
| 345 | CONFIG_IP_NF_TARGET_MASQUERADE=m | 318 | CONFIG_IP_NF_TARGET_MASQUERADE=m |
| 346 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| 347 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
| 348 | CONFIG_IP_NF_TARGET_SAME=m | ||
| 349 | CONFIG_NF_NAT_SNMP_BASIC=m | ||
| 350 | CONFIG_NF_NAT_PROTO_GRE=m | ||
| 351 | CONFIG_NF_NAT_FTP=m | 319 | CONFIG_NF_NAT_FTP=m |
| 352 | CONFIG_NF_NAT_IRC=m | 320 | CONFIG_NF_NAT_IRC=m |
| 353 | CONFIG_NF_NAT_TFTP=m | 321 | # CONFIG_NF_NAT_TFTP is not set |
| 354 | CONFIG_NF_NAT_AMANDA=m | 322 | # CONFIG_NF_NAT_AMANDA is not set |
| 355 | CONFIG_NF_NAT_PPTP=m | 323 | # CONFIG_NF_NAT_PPTP is not set |
| 356 | CONFIG_NF_NAT_H323=m | 324 | # CONFIG_NF_NAT_H323 is not set |
| 357 | CONFIG_NF_NAT_SIP=m | 325 | CONFIG_NF_NAT_SIP=m |
| 358 | CONFIG_IP_NF_MANGLE=m | 326 | CONFIG_IP_NF_MANGLE=m |
| 359 | CONFIG_IP_NF_TARGET_TOS=m | ||
| 360 | CONFIG_IP_NF_TARGET_ECN=m | ||
| 361 | CONFIG_IP_NF_TARGET_TTL=m | ||
| 362 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | ||
| 363 | CONFIG_IP_NF_RAW=m | ||
| 364 | CONFIG_IP_NF_ARPTABLES=m | ||
| 365 | CONFIG_IP_NF_ARPFILTER=m | ||
| 366 | CONFIG_IP_NF_ARP_MANGLE=m | ||
| 367 | 327 | ||
| 368 | # | 328 | # |
| 369 | # IPv6: Netfilter Configuration (EXPERIMENTAL) | 329 | # IPv6: Netfilter Configuration |
| 370 | # | 330 | # |
| 371 | CONFIG_NF_CONNTRACK_IPV6=m | 331 | CONFIG_NF_CONNTRACK_IPV6=m |
| 372 | CONFIG_IP6_NF_QUEUE=m | ||
| 373 | CONFIG_IP6_NF_IPTABLES=m | 332 | CONFIG_IP6_NF_IPTABLES=m |
| 374 | CONFIG_IP6_NF_MATCH_RT=m | ||
| 375 | CONFIG_IP6_NF_MATCH_OPTS=m | ||
| 376 | CONFIG_IP6_NF_MATCH_FRAG=m | ||
| 377 | CONFIG_IP6_NF_MATCH_HL=m | ||
| 378 | CONFIG_IP6_NF_MATCH_OWNER=m | ||
| 379 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | 333 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m |
| 380 | CONFIG_IP6_NF_MATCH_AH=m | ||
| 381 | CONFIG_IP6_NF_MATCH_MH=m | ||
| 382 | CONFIG_IP6_NF_MATCH_EUI64=m | ||
| 383 | CONFIG_IP6_NF_FILTER=m | 334 | CONFIG_IP6_NF_FILTER=m |
| 384 | CONFIG_IP6_NF_TARGET_LOG=m | 335 | CONFIG_IP6_NF_TARGET_LOG=m |
| 385 | CONFIG_IP6_NF_TARGET_REJECT=m | 336 | CONFIG_IP6_NF_TARGET_REJECT=m |
| 386 | CONFIG_IP6_NF_MANGLE=m | 337 | CONFIG_IP6_NF_MANGLE=m |
| 387 | CONFIG_IP6_NF_TARGET_HL=m | ||
| 388 | CONFIG_IP6_NF_RAW=m | ||
| 389 | |||
| 390 | # | ||
| 391 | # Bridge: Netfilter Configuration | ||
| 392 | # | ||
| 393 | # CONFIG_BRIDGE_NF_EBTABLES is not set | ||
| 394 | # CONFIG_IP_DCCP is not set | 338 | # CONFIG_IP_DCCP is not set |
| 395 | # CONFIG_IP_SCTP is not set | 339 | # CONFIG_IP_SCTP is not set |
| 396 | # CONFIG_TIPC is not set | 340 | # CONFIG_TIPC is not set |
| @@ -407,7 +351,6 @@ CONFIG_LLC=m | |||
| 407 | # CONFIG_ECONET is not set | 351 | # CONFIG_ECONET is not set |
| 408 | # CONFIG_WAN_ROUTER is not set | 352 | # CONFIG_WAN_ROUTER is not set |
| 409 | # CONFIG_NET_SCHED is not set | 353 | # CONFIG_NET_SCHED is not set |
| 410 | CONFIG_NET_CLS_ROUTE=y | ||
| 411 | 354 | ||
| 412 | # | 355 | # |
| 413 | # Network testing | 356 | # Network testing |
| @@ -415,6 +358,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
| 415 | # CONFIG_NET_PKTGEN is not set | 358 | # CONFIG_NET_PKTGEN is not set |
| 416 | # CONFIG_NET_TCPPROBE is not set | 359 | # CONFIG_NET_TCPPROBE is not set |
| 417 | # CONFIG_HAMRADIO is not set | 360 | # CONFIG_HAMRADIO is not set |
| 361 | # CONFIG_CAN is not set | ||
| 418 | # CONFIG_IRDA is not set | 362 | # CONFIG_IRDA is not set |
| 419 | # CONFIG_BT is not set | 363 | # CONFIG_BT is not set |
| 420 | # CONFIG_AF_RXRPC is not set | 364 | # CONFIG_AF_RXRPC is not set |
| @@ -450,6 +394,7 @@ CONFIG_MTD=y | |||
| 450 | CONFIG_MTD_PARTITIONS=y | 394 | CONFIG_MTD_PARTITIONS=y |
| 451 | # CONFIG_MTD_REDBOOT_PARTS is not set | 395 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 452 | CONFIG_MTD_CMDLINE_PARTS=y | 396 | CONFIG_MTD_CMDLINE_PARTS=y |
| 397 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 453 | 398 | ||
| 454 | # | 399 | # |
| 455 | # User Modules And Translation Layers | 400 | # User Modules And Translation Layers |
| @@ -531,11 +476,18 @@ CONFIG_BLK_DEV_NBD=m | |||
| 531 | CONFIG_BLK_DEV_RAM=m | 476 | CONFIG_BLK_DEV_RAM=m |
| 532 | CONFIG_BLK_DEV_RAM_COUNT=16 | 477 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 533 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 478 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 534 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 479 | # CONFIG_BLK_DEV_XIP is not set |
| 535 | # CONFIG_CDROM_PKTCDVD is not set | 480 | # CONFIG_CDROM_PKTCDVD is not set |
| 536 | # CONFIG_ATA_OVER_ETH is not set | 481 | # CONFIG_ATA_OVER_ETH is not set |
| 537 | # CONFIG_MISC_DEVICES is not set | 482 | CONFIG_MISC_DEVICES=y |
| 538 | # CONFIG_IDE is not set | 483 | # CONFIG_ATMEL_PWM is not set |
| 484 | CONFIG_ATMEL_TCLIB=y | ||
| 485 | CONFIG_ATMEL_TCB_CLKSRC=y | ||
| 486 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | ||
| 487 | # CONFIG_EEPROM_93CX6 is not set | ||
| 488 | # CONFIG_ATMEL_SSC is not set | ||
| 489 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 490 | # CONFIG_HAVE_IDE is not set | ||
| 539 | 491 | ||
| 540 | # | 492 | # |
| 541 | # SCSI device support | 493 | # SCSI device support |
| @@ -568,11 +520,13 @@ CONFIG_PHYLIB=y | |||
| 568 | # CONFIG_SMSC_PHY is not set | 520 | # CONFIG_SMSC_PHY is not set |
| 569 | # CONFIG_BROADCOM_PHY is not set | 521 | # CONFIG_BROADCOM_PHY is not set |
| 570 | # CONFIG_ICPLUS_PHY is not set | 522 | # CONFIG_ICPLUS_PHY is not set |
| 523 | # CONFIG_REALTEK_PHY is not set | ||
| 571 | # CONFIG_FIXED_PHY is not set | 524 | # CONFIG_FIXED_PHY is not set |
| 572 | # CONFIG_MDIO_BITBANG is not set | 525 | # CONFIG_MDIO_BITBANG is not set |
| 573 | CONFIG_NET_ETHERNET=y | 526 | CONFIG_NET_ETHERNET=y |
| 574 | # CONFIG_MII is not set | 527 | # CONFIG_MII is not set |
| 575 | CONFIG_MACB=y | 528 | CONFIG_MACB=y |
| 529 | # CONFIG_ENC28J60 is not set | ||
| 576 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 530 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 577 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 531 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 578 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 532 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -586,6 +540,7 @@ CONFIG_MACB=y | |||
| 586 | # | 540 | # |
| 587 | # CONFIG_WLAN_PRE80211 is not set | 541 | # CONFIG_WLAN_PRE80211 is not set |
| 588 | # CONFIG_WLAN_80211 is not set | 542 | # CONFIG_WLAN_80211 is not set |
| 543 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 589 | # CONFIG_WAN is not set | 544 | # CONFIG_WAN is not set |
| 590 | CONFIG_PPP=m | 545 | CONFIG_PPP=m |
| 591 | # CONFIG_PPP_MULTILINK is not set | 546 | # CONFIG_PPP_MULTILINK is not set |
| @@ -599,7 +554,6 @@ CONFIG_PPPOE=m | |||
| 599 | # CONFIG_PPPOL2TP is not set | 554 | # CONFIG_PPPOL2TP is not set |
| 600 | # CONFIG_SLIP is not set | 555 | # CONFIG_SLIP is not set |
| 601 | CONFIG_SLHC=m | 556 | CONFIG_SLHC=m |
| 602 | # CONFIG_SHAPER is not set | ||
| 603 | # CONFIG_NETCONSOLE is not set | 557 | # CONFIG_NETCONSOLE is not set |
| 604 | # CONFIG_NETPOLL is not set | 558 | # CONFIG_NETPOLL is not set |
| 605 | # CONFIG_NET_POLL_CONTROLLER is not set | 559 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -621,6 +575,7 @@ CONFIG_SLHC=m | |||
| 621 | # Character devices | 575 | # Character devices |
| 622 | # | 576 | # |
| 623 | # CONFIG_VT is not set | 577 | # CONFIG_VT is not set |
| 578 | # CONFIG_DEVKMEM is not set | ||
| 624 | # CONFIG_SERIAL_NONSTANDARD is not set | 579 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 625 | 580 | ||
| 626 | # | 581 | # |
| @@ -633,6 +588,7 @@ CONFIG_SLHC=m | |||
| 633 | # | 588 | # |
| 634 | CONFIG_SERIAL_ATMEL=y | 589 | CONFIG_SERIAL_ATMEL=y |
| 635 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 590 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
| 591 | CONFIG_SERIAL_ATMEL_PDC=y | ||
| 636 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | 592 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
| 637 | CONFIG_SERIAL_CORE=y | 593 | CONFIG_SERIAL_CORE=y |
| 638 | CONFIG_SERIAL_CORE_CONSOLE=y | 594 | CONFIG_SERIAL_CORE_CONSOLE=y |
| @@ -640,21 +596,13 @@ CONFIG_UNIX98_PTYS=y | |||
| 640 | # CONFIG_LEGACY_PTYS is not set | 596 | # CONFIG_LEGACY_PTYS is not set |
| 641 | # CONFIG_IPMI_HANDLER is not set | 597 | # CONFIG_IPMI_HANDLER is not set |
| 642 | # CONFIG_HW_RANDOM is not set | 598 | # CONFIG_HW_RANDOM is not set |
| 643 | # CONFIG_RTC is not set | ||
| 644 | # CONFIG_GEN_RTC is not set | ||
| 645 | # CONFIG_R3964 is not set | 599 | # CONFIG_R3964 is not set |
| 646 | # CONFIG_RAW_DRIVER is not set | 600 | # CONFIG_RAW_DRIVER is not set |
| 647 | # CONFIG_TCG_TPM is not set | 601 | # CONFIG_TCG_TPM is not set |
| 648 | CONFIG_I2C=m | 602 | CONFIG_I2C=m |
| 649 | CONFIG_I2C_BOARDINFO=y | 603 | CONFIG_I2C_BOARDINFO=y |
| 650 | CONFIG_I2C_CHARDEV=m | 604 | CONFIG_I2C_CHARDEV=m |
| 651 | |||
| 652 | # | ||
| 653 | # I2C Algorithms | ||
| 654 | # | ||
| 655 | CONFIG_I2C_ALGOBIT=m | 605 | CONFIG_I2C_ALGOBIT=m |
| 656 | # CONFIG_I2C_ALGOPCF is not set | ||
| 657 | # CONFIG_I2C_ALGOPCA is not set | ||
| 658 | 606 | ||
| 659 | # | 607 | # |
| 660 | # I2C Hardware Bus support | 608 | # I2C Hardware Bus support |
| @@ -665,27 +613,23 @@ CONFIG_I2C_GPIO=m | |||
| 665 | # CONFIG_I2C_SIMTEC is not set | 613 | # CONFIG_I2C_SIMTEC is not set |
| 666 | # CONFIG_I2C_TAOS_EVM is not set | 614 | # CONFIG_I2C_TAOS_EVM is not set |
| 667 | # CONFIG_I2C_STUB is not set | 615 | # CONFIG_I2C_STUB is not set |
| 616 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 668 | 617 | ||
| 669 | # | 618 | # |
| 670 | # Miscellaneous I2C Chip support | 619 | # Miscellaneous I2C Chip support |
| 671 | # | 620 | # |
| 672 | # CONFIG_SENSORS_DS1337 is not set | ||
| 673 | # CONFIG_SENSORS_DS1374 is not set | ||
| 674 | # CONFIG_DS1682 is not set | 621 | # CONFIG_DS1682 is not set |
| 675 | # CONFIG_SENSORS_EEPROM is not set | 622 | # CONFIG_SENSORS_EEPROM is not set |
| 676 | # CONFIG_SENSORS_PCF8574 is not set | 623 | # CONFIG_SENSORS_PCF8574 is not set |
| 677 | # CONFIG_SENSORS_PCA9539 is not set | 624 | # CONFIG_PCF8575 is not set |
| 678 | # CONFIG_SENSORS_PCF8591 is not set | 625 | # CONFIG_SENSORS_PCF8591 is not set |
| 626 | # CONFIG_TPS65010 is not set | ||
| 679 | # CONFIG_SENSORS_MAX6875 is not set | 627 | # CONFIG_SENSORS_MAX6875 is not set |
| 680 | # CONFIG_SENSORS_TSL2550 is not set | 628 | # CONFIG_SENSORS_TSL2550 is not set |
| 681 | # CONFIG_I2C_DEBUG_CORE is not set | 629 | # CONFIG_I2C_DEBUG_CORE is not set |
| 682 | # CONFIG_I2C_DEBUG_ALGO is not set | 630 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 683 | # CONFIG_I2C_DEBUG_BUS is not set | 631 | # CONFIG_I2C_DEBUG_BUS is not set |
| 684 | # CONFIG_I2C_DEBUG_CHIP is not set | 632 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 685 | |||
| 686 | # | ||
| 687 | # SPI support | ||
| 688 | # | ||
| 689 | CONFIG_SPI=y | 633 | CONFIG_SPI=y |
| 690 | # CONFIG_SPI_DEBUG is not set | 634 | # CONFIG_SPI_DEBUG is not set |
| 691 | CONFIG_SPI_MASTER=y | 635 | CONFIG_SPI_MASTER=y |
| @@ -702,9 +646,27 @@ CONFIG_SPI_ATMEL=y | |||
| 702 | # CONFIG_SPI_AT25 is not set | 646 | # CONFIG_SPI_AT25 is not set |
| 703 | CONFIG_SPI_SPIDEV=m | 647 | CONFIG_SPI_SPIDEV=m |
| 704 | # CONFIG_SPI_TLE62X0 is not set | 648 | # CONFIG_SPI_TLE62X0 is not set |
| 649 | CONFIG_HAVE_GPIO_LIB=y | ||
| 650 | |||
| 651 | # | ||
| 652 | # GPIO Support | ||
| 653 | # | ||
| 654 | # CONFIG_DEBUG_GPIO is not set | ||
| 655 | |||
| 656 | # | ||
| 657 | # I2C GPIO expanders: | ||
| 658 | # | ||
| 659 | # CONFIG_GPIO_PCA953X is not set | ||
| 660 | # CONFIG_GPIO_PCF857X is not set | ||
| 661 | |||
| 662 | # | ||
| 663 | # SPI GPIO expanders: | ||
| 664 | # | ||
| 665 | # CONFIG_GPIO_MCP23S08 is not set | ||
| 705 | # CONFIG_W1 is not set | 666 | # CONFIG_W1 is not set |
| 706 | # CONFIG_POWER_SUPPLY is not set | 667 | # CONFIG_POWER_SUPPLY is not set |
| 707 | # CONFIG_HWMON is not set | 668 | # CONFIG_HWMON is not set |
| 669 | # CONFIG_THERMAL is not set | ||
| 708 | CONFIG_WATCHDOG=y | 670 | CONFIG_WATCHDOG=y |
| 709 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 671 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 710 | 672 | ||
| @@ -724,12 +686,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 724 | # Multifunction device drivers | 686 | # Multifunction device drivers |
| 725 | # | 687 | # |
| 726 | # CONFIG_MFD_SM501 is not set | 688 | # CONFIG_MFD_SM501 is not set |
| 689 | # CONFIG_HTC_PASIC3 is not set | ||
| 727 | 690 | ||
| 728 | # | 691 | # |
| 729 | # Multimedia devices | 692 | # Multimedia devices |
| 730 | # | 693 | # |
| 694 | |||
| 695 | # | ||
| 696 | # Multimedia core support | ||
| 697 | # | ||
| 731 | # CONFIG_VIDEO_DEV is not set | 698 | # CONFIG_VIDEO_DEV is not set |
| 732 | # CONFIG_DVB_CORE is not set | 699 | # CONFIG_DVB_CORE is not set |
| 700 | # CONFIG_VIDEO_MEDIA is not set | ||
| 701 | |||
| 702 | # | ||
| 703 | # Multimedia drivers | ||
| 704 | # | ||
| 733 | # CONFIG_DAB is not set | 705 | # CONFIG_DAB is not set |
| 734 | 706 | ||
| 735 | # | 707 | # |
| @@ -753,14 +725,12 @@ CONFIG_USB_SUPPORT=y | |||
| 753 | # CONFIG_USB_ARCH_HAS_HCD is not set | 725 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 754 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 726 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 755 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 727 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 728 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 729 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 756 | 730 | ||
| 757 | # | 731 | # |
| 758 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 732 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 759 | # | 733 | # |
| 760 | |||
| 761 | # | ||
| 762 | # USB Gadget Support | ||
| 763 | # | ||
| 764 | CONFIG_USB_GADGET=y | 734 | CONFIG_USB_GADGET=y |
| 765 | # CONFIG_USB_GADGET_DEBUG is not set | 735 | # CONFIG_USB_GADGET_DEBUG is not set |
| 766 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 736 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -772,6 +742,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
| 772 | # CONFIG_USB_GADGET_NET2280 is not set | 742 | # CONFIG_USB_GADGET_NET2280 is not set |
| 773 | # CONFIG_USB_GADGET_PXA2XX is not set | 743 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 774 | # CONFIG_USB_GADGET_M66592 is not set | 744 | # CONFIG_USB_GADGET_M66592 is not set |
| 745 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 775 | # CONFIG_USB_GADGET_GOKU is not set | 746 | # CONFIG_USB_GADGET_GOKU is not set |
| 776 | # CONFIG_USB_GADGET_LH7A40X is not set | 747 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 777 | # CONFIG_USB_GADGET_OMAP is not set | 748 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -787,6 +758,7 @@ CONFIG_USB_FILE_STORAGE=m | |||
| 787 | # CONFIG_USB_FILE_STORAGE_TEST is not set | 758 | # CONFIG_USB_FILE_STORAGE_TEST is not set |
| 788 | CONFIG_USB_G_SERIAL=m | 759 | CONFIG_USB_G_SERIAL=m |
| 789 | # CONFIG_USB_MIDI_GADGET is not set | 760 | # CONFIG_USB_MIDI_GADGET is not set |
| 761 | # CONFIG_USB_G_PRINTER is not set | ||
| 790 | CONFIG_MMC=m | 762 | CONFIG_MMC=m |
| 791 | # CONFIG_MMC_DEBUG is not set | 763 | # CONFIG_MMC_DEBUG is not set |
| 792 | # CONFIG_MMC_UNSAFE_RESUME is not set | 764 | # CONFIG_MMC_UNSAFE_RESUME is not set |
| @@ -797,11 +769,13 @@ CONFIG_MMC=m | |||
| 797 | CONFIG_MMC_BLOCK=m | 769 | CONFIG_MMC_BLOCK=m |
| 798 | CONFIG_MMC_BLOCK_BOUNCE=y | 770 | CONFIG_MMC_BLOCK_BOUNCE=y |
| 799 | # CONFIG_SDIO_UART is not set | 771 | # CONFIG_SDIO_UART is not set |
| 772 | # CONFIG_MMC_TEST is not set | ||
| 800 | 773 | ||
| 801 | # | 774 | # |
| 802 | # MMC/SD Host Controller Drivers | 775 | # MMC/SD Host Controller Drivers |
| 803 | # | 776 | # |
| 804 | CONFIG_MMC_SPI=m | 777 | CONFIG_MMC_SPI=m |
| 778 | # CONFIG_MEMSTICK is not set | ||
| 805 | CONFIG_NEW_LEDS=y | 779 | CONFIG_NEW_LEDS=y |
| 806 | CONFIG_LEDS_CLASS=y | 780 | CONFIG_LEDS_CLASS=y |
| 807 | 781 | ||
| @@ -816,6 +790,8 @@ CONFIG_LEDS_GPIO=y | |||
| 816 | CONFIG_LEDS_TRIGGERS=y | 790 | CONFIG_LEDS_TRIGGERS=y |
| 817 | CONFIG_LEDS_TRIGGER_TIMER=y | 791 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 818 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 792 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 793 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
| 794 | # CONFIG_ACCESSIBILITY is not set | ||
| 819 | CONFIG_RTC_LIB=y | 795 | CONFIG_RTC_LIB=y |
| 820 | CONFIG_RTC_CLASS=y | 796 | CONFIG_RTC_CLASS=y |
| 821 | CONFIG_RTC_HCTOSYS=y | 797 | CONFIG_RTC_HCTOSYS=y |
| @@ -844,19 +820,22 @@ CONFIG_RTC_INTF_DEV=y | |||
| 844 | # CONFIG_RTC_DRV_PCF8563 is not set | 820 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 845 | # CONFIG_RTC_DRV_PCF8583 is not set | 821 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 846 | # CONFIG_RTC_DRV_M41T80 is not set | 822 | # CONFIG_RTC_DRV_M41T80 is not set |
| 823 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 847 | 824 | ||
| 848 | # | 825 | # |
| 849 | # SPI RTC drivers | 826 | # SPI RTC drivers |
| 850 | # | 827 | # |
| 851 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 852 | # CONFIG_RTC_DRV_MAX6902 is not set | 828 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 829 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 830 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 853 | 831 | ||
| 854 | # | 832 | # |
| 855 | # Platform RTC drivers | 833 | # Platform RTC drivers |
| 856 | # | 834 | # |
| 835 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 857 | # CONFIG_RTC_DRV_DS1553 is not set | 836 | # CONFIG_RTC_DRV_DS1553 is not set |
| 858 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 859 | # CONFIG_RTC_DRV_DS1742 is not set | 837 | # CONFIG_RTC_DRV_DS1742 is not set |
| 838 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 860 | # CONFIG_RTC_DRV_M48T86 is not set | 839 | # CONFIG_RTC_DRV_M48T86 is not set |
| 861 | # CONFIG_RTC_DRV_M48T59 is not set | 840 | # CONFIG_RTC_DRV_M48T59 is not set |
| 862 | # CONFIG_RTC_DRV_V3020 is not set | 841 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -865,10 +844,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 865 | # on-CPU RTC drivers | 844 | # on-CPU RTC drivers |
| 866 | # | 845 | # |
| 867 | CONFIG_RTC_DRV_AT32AP700X=y | 846 | CONFIG_RTC_DRV_AT32AP700X=y |
| 868 | |||
| 869 | # | ||
| 870 | # Userspace I/O | ||
| 871 | # | ||
| 872 | # CONFIG_UIO is not set | 847 | # CONFIG_UIO is not set |
| 873 | 848 | ||
| 874 | # | 849 | # |
| @@ -885,14 +860,11 @@ CONFIG_JBD=m | |||
| 885 | # CONFIG_JFS_FS is not set | 860 | # CONFIG_JFS_FS is not set |
| 886 | # CONFIG_FS_POSIX_ACL is not set | 861 | # CONFIG_FS_POSIX_ACL is not set |
| 887 | # CONFIG_XFS_FS is not set | 862 | # CONFIG_XFS_FS is not set |
| 888 | # CONFIG_GFS2_FS is not set | ||
| 889 | # CONFIG_OCFS2_FS is not set | 863 | # CONFIG_OCFS2_FS is not set |
| 890 | # CONFIG_MINIX_FS is not set | 864 | # CONFIG_DNOTIFY is not set |
| 891 | # CONFIG_ROMFS_FS is not set | ||
| 892 | CONFIG_INOTIFY=y | 865 | CONFIG_INOTIFY=y |
| 893 | CONFIG_INOTIFY_USER=y | 866 | CONFIG_INOTIFY_USER=y |
| 894 | # CONFIG_QUOTA is not set | 867 | # CONFIG_QUOTA is not set |
| 895 | # CONFIG_DNOTIFY is not set | ||
| 896 | # CONFIG_AUTOFS_FS is not set | 868 | # CONFIG_AUTOFS_FS is not set |
| 897 | # CONFIG_AUTOFS4_FS is not set | 869 | # CONFIG_AUTOFS4_FS is not set |
| 898 | CONFIG_FUSE_FS=m | 870 | CONFIG_FUSE_FS=m |
| @@ -948,8 +920,10 @@ CONFIG_JFFS2_RTIME=y | |||
| 948 | # CONFIG_JFFS2_RUBIN is not set | 920 | # CONFIG_JFFS2_RUBIN is not set |
| 949 | # CONFIG_CRAMFS is not set | 921 | # CONFIG_CRAMFS is not set |
| 950 | # CONFIG_VXFS_FS is not set | 922 | # CONFIG_VXFS_FS is not set |
| 923 | # CONFIG_MINIX_FS is not set | ||
| 951 | # CONFIG_HPFS_FS is not set | 924 | # CONFIG_HPFS_FS is not set |
| 952 | # CONFIG_QNX4FS_FS is not set | 925 | # CONFIG_QNX4FS_FS is not set |
| 926 | # CONFIG_ROMFS_FS is not set | ||
| 953 | # CONFIG_SYSV_FS is not set | 927 | # CONFIG_SYSV_FS is not set |
| 954 | # CONFIG_UFS_FS is not set | 928 | # CONFIG_UFS_FS is not set |
| 955 | CONFIG_NETWORK_FILESYSTEMS=y | 929 | CONFIG_NETWORK_FILESYSTEMS=y |
| @@ -957,12 +931,10 @@ CONFIG_NFS_FS=y | |||
| 957 | CONFIG_NFS_V3=y | 931 | CONFIG_NFS_V3=y |
| 958 | # CONFIG_NFS_V3_ACL is not set | 932 | # CONFIG_NFS_V3_ACL is not set |
| 959 | # CONFIG_NFS_V4 is not set | 933 | # CONFIG_NFS_V4 is not set |
| 960 | # CONFIG_NFS_DIRECTIO is not set | ||
| 961 | CONFIG_NFSD=m | 934 | CONFIG_NFSD=m |
| 962 | CONFIG_NFSD_V3=y | 935 | CONFIG_NFSD_V3=y |
| 963 | # CONFIG_NFSD_V3_ACL is not set | 936 | # CONFIG_NFSD_V3_ACL is not set |
| 964 | # CONFIG_NFSD_V4 is not set | 937 | # CONFIG_NFSD_V4 is not set |
| 965 | CONFIG_NFSD_TCP=y | ||
| 966 | CONFIG_ROOT_NFS=y | 938 | CONFIG_ROOT_NFS=y |
| 967 | CONFIG_LOCKD=y | 939 | CONFIG_LOCKD=y |
| 968 | CONFIG_LOCKD_V4=y | 940 | CONFIG_LOCKD_V4=y |
| @@ -1030,11 +1002,6 @@ CONFIG_NLS_ISO8859_1=m | |||
| 1030 | # CONFIG_NLS_KOI8_U is not set | 1002 | # CONFIG_NLS_KOI8_U is not set |
| 1031 | CONFIG_NLS_UTF8=m | 1003 | CONFIG_NLS_UTF8=m |
| 1032 | # CONFIG_DLM is not set | 1004 | # CONFIG_DLM is not set |
| 1033 | CONFIG_INSTRUMENTATION=y | ||
| 1034 | CONFIG_PROFILING=y | ||
| 1035 | CONFIG_OPROFILE=m | ||
| 1036 | CONFIG_KPROBES=y | ||
| 1037 | # CONFIG_MARKERS is not set | ||
| 1038 | 1005 | ||
| 1039 | # | 1006 | # |
| 1040 | # Kernel hacking | 1007 | # Kernel hacking |
| @@ -1042,6 +1009,7 @@ CONFIG_KPROBES=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1009 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1010 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1011 | CONFIG_ENABLE_MUST_CHECK=y |
| 1012 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | CONFIG_MAGIC_SYSRQ=y | 1013 | CONFIG_MAGIC_SYSRQ=y |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1014 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1015 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,7 +1020,9 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1052 | CONFIG_SCHED_DEBUG=y | 1020 | CONFIG_SCHED_DEBUG=y |
| 1053 | # CONFIG_SCHEDSTATS is not set | 1021 | # CONFIG_SCHEDSTATS is not set |
| 1054 | # CONFIG_TIMER_STATS is not set | 1022 | # CONFIG_TIMER_STATS is not set |
| 1023 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1055 | # CONFIG_SLUB_DEBUG_ON is not set | 1024 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1025 | # CONFIG_SLUB_STATS is not set | ||
| 1056 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1026 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1057 | # CONFIG_RT_MUTEX_TESTER is not set | 1027 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1058 | # CONFIG_DEBUG_SPINLOCK is not set | 1028 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -1066,12 +1036,14 @@ CONFIG_SCHED_DEBUG=y | |||
| 1066 | CONFIG_DEBUG_BUGVERBOSE=y | 1036 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1067 | # CONFIG_DEBUG_INFO is not set | 1037 | # CONFIG_DEBUG_INFO is not set |
| 1068 | # CONFIG_DEBUG_VM is not set | 1038 | # CONFIG_DEBUG_VM is not set |
| 1039 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1069 | # CONFIG_DEBUG_LIST is not set | 1040 | # CONFIG_DEBUG_LIST is not set |
| 1070 | # CONFIG_DEBUG_SG is not set | 1041 | # CONFIG_DEBUG_SG is not set |
| 1071 | CONFIG_FRAME_POINTER=y | 1042 | CONFIG_FRAME_POINTER=y |
| 1072 | # CONFIG_FORCED_INLINING is not set | ||
| 1073 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1043 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1074 | # CONFIG_RCU_TORTURE_TEST is not set | 1044 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1045 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 1046 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1075 | # CONFIG_LKDTM is not set | 1047 | # CONFIG_LKDTM is not set |
| 1076 | # CONFIG_FAULT_INJECTION is not set | 1048 | # CONFIG_FAULT_INJECTION is not set |
| 1077 | # CONFIG_SAMPLES is not set | 1049 | # CONFIG_SAMPLES is not set |
| @@ -1083,52 +1055,90 @@ CONFIG_FRAME_POINTER=y | |||
| 1083 | # CONFIG_SECURITY is not set | 1055 | # CONFIG_SECURITY is not set |
| 1084 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1056 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1085 | CONFIG_CRYPTO=y | 1057 | CONFIG_CRYPTO=y |
| 1058 | |||
| 1059 | # | ||
| 1060 | # Crypto core or helper | ||
| 1061 | # | ||
| 1086 | CONFIG_CRYPTO_ALGAPI=y | 1062 | CONFIG_CRYPTO_ALGAPI=y |
| 1063 | CONFIG_CRYPTO_AEAD=y | ||
| 1087 | CONFIG_CRYPTO_BLKCIPHER=y | 1064 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1088 | CONFIG_CRYPTO_HASH=y | 1065 | CONFIG_CRYPTO_HASH=y |
| 1089 | CONFIG_CRYPTO_MANAGER=y | 1066 | CONFIG_CRYPTO_MANAGER=y |
| 1067 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1068 | # CONFIG_CRYPTO_NULL is not set | ||
| 1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1070 | CONFIG_CRYPTO_AUTHENC=y | ||
| 1071 | # CONFIG_CRYPTO_TEST is not set | ||
| 1072 | |||
| 1073 | # | ||
| 1074 | # Authenticated Encryption with Associated Data | ||
| 1075 | # | ||
| 1076 | # CONFIG_CRYPTO_CCM is not set | ||
| 1077 | # CONFIG_CRYPTO_GCM is not set | ||
| 1078 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1079 | |||
| 1080 | # | ||
| 1081 | # Block modes | ||
| 1082 | # | ||
| 1083 | CONFIG_CRYPTO_CBC=y | ||
| 1084 | # CONFIG_CRYPTO_CTR is not set | ||
| 1085 | # CONFIG_CRYPTO_CTS is not set | ||
| 1086 | CONFIG_CRYPTO_ECB=m | ||
| 1087 | # CONFIG_CRYPTO_LRW is not set | ||
| 1088 | CONFIG_CRYPTO_PCBC=m | ||
| 1089 | # CONFIG_CRYPTO_XTS is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Hash modes | ||
| 1093 | # | ||
| 1090 | CONFIG_CRYPTO_HMAC=y | 1094 | CONFIG_CRYPTO_HMAC=y |
| 1091 | # CONFIG_CRYPTO_XCBC is not set | 1095 | # CONFIG_CRYPTO_XCBC is not set |
| 1092 | # CONFIG_CRYPTO_NULL is not set | 1096 | |
| 1097 | # | ||
| 1098 | # Digest | ||
| 1099 | # | ||
| 1100 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1093 | # CONFIG_CRYPTO_MD4 is not set | 1101 | # CONFIG_CRYPTO_MD4 is not set |
| 1094 | CONFIG_CRYPTO_MD5=y | 1102 | CONFIG_CRYPTO_MD5=y |
| 1103 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1095 | CONFIG_CRYPTO_SHA1=y | 1104 | CONFIG_CRYPTO_SHA1=y |
| 1096 | # CONFIG_CRYPTO_SHA256 is not set | 1105 | # CONFIG_CRYPTO_SHA256 is not set |
| 1097 | # CONFIG_CRYPTO_SHA512 is not set | 1106 | # CONFIG_CRYPTO_SHA512 is not set |
| 1098 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1099 | # CONFIG_CRYPTO_TGR192 is not set | 1107 | # CONFIG_CRYPTO_TGR192 is not set |
| 1100 | # CONFIG_CRYPTO_GF128MUL is not set | 1108 | # CONFIG_CRYPTO_WP512 is not set |
| 1101 | CONFIG_CRYPTO_ECB=m | 1109 | |
| 1102 | CONFIG_CRYPTO_CBC=y | 1110 | # |
| 1103 | CONFIG_CRYPTO_PCBC=m | 1111 | # Ciphers |
| 1104 | # CONFIG_CRYPTO_LRW is not set | 1112 | # |
| 1105 | # CONFIG_CRYPTO_XTS is not set | ||
| 1106 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1107 | CONFIG_CRYPTO_DES=y | ||
| 1108 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1109 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1110 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1111 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1112 | # CONFIG_CRYPTO_AES is not set | 1113 | # CONFIG_CRYPTO_AES is not set |
| 1114 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1115 | CONFIG_CRYPTO_ARC4=m | ||
| 1116 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1117 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1113 | # CONFIG_CRYPTO_CAST5 is not set | 1118 | # CONFIG_CRYPTO_CAST5 is not set |
| 1114 | # CONFIG_CRYPTO_CAST6 is not set | 1119 | # CONFIG_CRYPTO_CAST6 is not set |
| 1115 | # CONFIG_CRYPTO_TEA is not set | 1120 | CONFIG_CRYPTO_DES=y |
| 1116 | CONFIG_CRYPTO_ARC4=m | 1121 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1117 | # CONFIG_CRYPTO_KHAZAD is not set | 1122 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1118 | # CONFIG_CRYPTO_ANUBIS is not set | 1123 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1119 | # CONFIG_CRYPTO_SEED is not set | 1124 | # CONFIG_CRYPTO_SEED is not set |
| 1125 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1126 | # CONFIG_CRYPTO_TEA is not set | ||
| 1127 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1128 | |||
| 1129 | # | ||
| 1130 | # Compression | ||
| 1131 | # | ||
| 1120 | CONFIG_CRYPTO_DEFLATE=y | 1132 | CONFIG_CRYPTO_DEFLATE=y |
| 1121 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1133 | # CONFIG_CRYPTO_LZO is not set |
| 1122 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1123 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1124 | # CONFIG_CRYPTO_TEST is not set | ||
| 1125 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1126 | CONFIG_CRYPTO_HW=y | 1134 | CONFIG_CRYPTO_HW=y |
| 1127 | 1135 | ||
| 1128 | # | 1136 | # |
| 1129 | # Library routines | 1137 | # Library routines |
| 1130 | # | 1138 | # |
| 1131 | CONFIG_BITREVERSE=y | 1139 | CONFIG_BITREVERSE=y |
| 1140 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1141 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1132 | CONFIG_CRC_CCITT=m | 1142 | CONFIG_CRC_CCITT=m |
| 1133 | # CONFIG_CRC16 is not set | 1143 | # CONFIG_CRC16 is not set |
| 1134 | CONFIG_CRC_ITU_T=m | 1144 | CONFIG_CRC_ITU_T=m |
| @@ -1137,10 +1147,6 @@ CONFIG_CRC7=m | |||
| 1137 | # CONFIG_LIBCRC32C is not set | 1147 | # CONFIG_LIBCRC32C is not set |
| 1138 | CONFIG_ZLIB_INFLATE=y | 1148 | CONFIG_ZLIB_INFLATE=y |
| 1139 | CONFIG_ZLIB_DEFLATE=y | 1149 | CONFIG_ZLIB_DEFLATE=y |
| 1140 | CONFIG_TEXTSEARCH=y | ||
| 1141 | CONFIG_TEXTSEARCH_KMP=m | ||
| 1142 | CONFIG_TEXTSEARCH_BM=m | ||
| 1143 | CONFIG_TEXTSEARCH_FSM=m | ||
| 1144 | CONFIG_PLIST=y | 1150 | CONFIG_PLIST=y |
| 1145 | CONFIG_HAS_IOMEM=y | 1151 | CONFIG_HAS_IOMEM=y |
| 1146 | CONFIG_HAS_IOPORT=y | 1152 | CONFIG_HAS_IOPORT=y |
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig index 2fb2ede5f2b4..c6d02eac8791 100644 --- a/arch/avr32/configs/atstk1002_defconfig +++ b/arch/avr32/configs/atstk1002_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.24-rc7 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Wed Jan 9 23:07:43 2008 | 4 | # Mon May 26 13:30:20 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
| 7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
| @@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y | |||
| 13 | CONFIG_GENERIC_IRQ_PROBE=y | 13 | CONFIG_GENERIC_IRQ_PROBE=y |
| 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 15 | CONFIG_GENERIC_TIME=y | 15 | CONFIG_GENERIC_TIME=y |
| 16 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 16 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 17 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 17 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 19 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 20 | CONFIG_GENERIC_HWEIGHT=y | 20 | CONFIG_GENERIC_HWEIGHT=y |
| 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 22 | CONFIG_GENERIC_BUG=y | 22 | CONFIG_GENERIC_BUG=y |
| @@ -36,15 +36,15 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 36 | CONFIG_POSIX_MQUEUE=y | 36 | CONFIG_POSIX_MQUEUE=y |
| 37 | # CONFIG_BSD_PROCESS_ACCT is not set | 37 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 38 | # CONFIG_TASKSTATS is not set | 38 | # CONFIG_TASKSTATS is not set |
| 39 | # CONFIG_USER_NS is not set | ||
| 40 | # CONFIG_PID_NS is not set | ||
| 41 | # CONFIG_AUDIT is not set | 39 | # CONFIG_AUDIT is not set |
| 42 | # CONFIG_IKCONFIG is not set | 40 | # CONFIG_IKCONFIG is not set |
| 43 | CONFIG_LOG_BUF_SHIFT=14 | 41 | CONFIG_LOG_BUF_SHIFT=14 |
| 44 | # CONFIG_CGROUPS is not set | 42 | # CONFIG_CGROUPS is not set |
| 45 | # CONFIG_FAIR_GROUP_SCHED is not set | 43 | # CONFIG_GROUP_SCHED is not set |
| 46 | CONFIG_SYSFS_DEPRECATED=y | 44 | CONFIG_SYSFS_DEPRECATED=y |
| 45 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 47 | CONFIG_RELAY=y | 46 | CONFIG_RELAY=y |
| 47 | # CONFIG_NAMESPACES is not set | ||
| 48 | CONFIG_BLK_DEV_INITRD=y | 48 | CONFIG_BLK_DEV_INITRD=y |
| 49 | CONFIG_INITRAMFS_SOURCE="" | 49 | CONFIG_INITRAMFS_SOURCE="" |
| 50 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 50 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -58,11 +58,13 @@ CONFIG_HOTPLUG=y | |||
| 58 | CONFIG_PRINTK=y | 58 | CONFIG_PRINTK=y |
| 59 | CONFIG_BUG=y | 59 | CONFIG_BUG=y |
| 60 | CONFIG_ELF_CORE=y | 60 | CONFIG_ELF_CORE=y |
| 61 | # CONFIG_COMPAT_BRK is not set | ||
| 61 | # CONFIG_BASE_FULL is not set | 62 | # CONFIG_BASE_FULL is not set |
| 62 | CONFIG_FUTEX=y | 63 | CONFIG_FUTEX=y |
| 63 | CONFIG_ANON_INODES=y | 64 | CONFIG_ANON_INODES=y |
| 64 | CONFIG_EPOLL=y | 65 | CONFIG_EPOLL=y |
| 65 | CONFIG_SIGNALFD=y | 66 | CONFIG_SIGNALFD=y |
| 67 | CONFIG_TIMERFD=y | ||
| 66 | CONFIG_EVENTFD=y | 68 | CONFIG_EVENTFD=y |
| 67 | CONFIG_SHMEM=y | 69 | CONFIG_SHMEM=y |
| 68 | CONFIG_VM_EVENT_COUNTERS=y | 70 | CONFIG_VM_EVENT_COUNTERS=y |
| @@ -70,11 +72,21 @@ CONFIG_SLUB_DEBUG=y | |||
| 70 | # CONFIG_SLAB is not set | 72 | # CONFIG_SLAB is not set |
| 71 | CONFIG_SLUB=y | 73 | CONFIG_SLUB=y |
| 72 | # CONFIG_SLOB is not set | 74 | # CONFIG_SLOB is not set |
| 75 | CONFIG_PROFILING=y | ||
| 76 | # CONFIG_MARKERS is not set | ||
| 77 | CONFIG_OPROFILE=m | ||
| 78 | CONFIG_HAVE_OPROFILE=y | ||
| 79 | CONFIG_KPROBES=y | ||
| 80 | CONFIG_HAVE_KPROBES=y | ||
| 81 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 73 | CONFIG_SLABINFO=y | 84 | CONFIG_SLABINFO=y |
| 74 | CONFIG_RT_MUTEXES=y | 85 | CONFIG_RT_MUTEXES=y |
| 75 | # CONFIG_TINY_SHMEM is not set | 86 | # CONFIG_TINY_SHMEM is not set |
| 76 | CONFIG_BASE_SMALL=1 | 87 | CONFIG_BASE_SMALL=1 |
| 77 | CONFIG_MODULES=y | 88 | CONFIG_MODULES=y |
| 89 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 78 | CONFIG_MODULE_UNLOAD=y | 90 | CONFIG_MODULE_UNLOAD=y |
| 79 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 91 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 80 | # CONFIG_MODVERSIONS is not set | 92 | # CONFIG_MODVERSIONS is not set |
| @@ -98,10 +110,15 @@ CONFIG_IOSCHED_CFQ=y | |||
| 98 | CONFIG_DEFAULT_CFQ=y | 110 | CONFIG_DEFAULT_CFQ=y |
| 99 | # CONFIG_DEFAULT_NOOP is not set | 111 | # CONFIG_DEFAULT_NOOP is not set |
| 100 | CONFIG_DEFAULT_IOSCHED="cfq" | 112 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 113 | CONFIG_CLASSIC_RCU=y | ||
| 101 | 114 | ||
| 102 | # | 115 | # |
| 103 | # System Type and features | 116 | # System Type and features |
| 104 | # | 117 | # |
| 118 | CONFIG_TICK_ONESHOT=y | ||
| 119 | CONFIG_NO_HZ=y | ||
| 120 | CONFIG_HIGH_RES_TIMERS=y | ||
| 121 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 105 | CONFIG_SUBARCH_AVR32B=y | 122 | CONFIG_SUBARCH_AVR32B=y |
| 106 | CONFIG_MMU=y | 123 | CONFIG_MMU=y |
| 107 | CONFIG_PERFORMANCE_COUNTERS=y | 124 | CONFIG_PERFORMANCE_COUNTERS=y |
| @@ -147,16 +164,19 @@ CONFIG_FLATMEM=y | |||
| 147 | CONFIG_FLAT_NODE_MEM_MAP=y | 164 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 148 | # CONFIG_SPARSEMEM_STATIC is not set | 165 | # CONFIG_SPARSEMEM_STATIC is not set |
| 149 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 166 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 167 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 168 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 151 | # CONFIG_RESOURCES_64BIT is not set | 169 | # CONFIG_RESOURCES_64BIT is not set |
| 152 | CONFIG_ZONE_DMA_FLAG=0 | 170 | CONFIG_ZONE_DMA_FLAG=0 |
| 153 | CONFIG_VIRT_TO_BUS=y | 171 | CONFIG_VIRT_TO_BUS=y |
| 154 | # CONFIG_OWNERSHIP_TRACE is not set | 172 | # CONFIG_OWNERSHIP_TRACE is not set |
| 173 | CONFIG_NMI_DEBUGGING=y | ||
| 155 | # CONFIG_HZ_100 is not set | 174 | # CONFIG_HZ_100 is not set |
| 156 | CONFIG_HZ_250=y | 175 | CONFIG_HZ_250=y |
| 157 | # CONFIG_HZ_300 is not set | 176 | # CONFIG_HZ_300 is not set |
| 158 | # CONFIG_HZ_1000 is not set | 177 | # CONFIG_HZ_1000 is not set |
| 159 | CONFIG_HZ=250 | 178 | CONFIG_HZ=250 |
| 179 | # CONFIG_SCHED_HRTICK is not set | ||
| 160 | CONFIG_CMDLINE="" | 180 | CONFIG_CMDLINE="" |
| 161 | 181 | ||
| 162 | # | 182 | # |
| @@ -170,9 +190,10 @@ CONFIG_CPU_FREQ=y | |||
| 170 | CONFIG_CPU_FREQ_TABLE=y | 190 | CONFIG_CPU_FREQ_TABLE=y |
| 171 | # CONFIG_CPU_FREQ_DEBUG is not set | 191 | # CONFIG_CPU_FREQ_DEBUG is not set |
| 172 | # CONFIG_CPU_FREQ_STAT is not set | 192 | # CONFIG_CPU_FREQ_STAT is not set |
| 173 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 193 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
| 194 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 174 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
| 175 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 196 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
| 176 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 197 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
| 177 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 198 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
| 178 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 199 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
| @@ -208,6 +229,7 @@ CONFIG_XFRM=y | |||
| 208 | CONFIG_XFRM_USER=m | 229 | CONFIG_XFRM_USER=m |
| 209 | # CONFIG_XFRM_SUB_POLICY is not set | 230 | # CONFIG_XFRM_SUB_POLICY is not set |
| 210 | # CONFIG_XFRM_MIGRATE is not set | 231 | # CONFIG_XFRM_MIGRATE is not set |
| 232 | # CONFIG_XFRM_STATISTICS is not set | ||
| 211 | CONFIG_NET_KEY=m | 233 | CONFIG_NET_KEY=m |
| 212 | # CONFIG_NET_KEY_MIGRATE is not set | 234 | # CONFIG_NET_KEY_MIGRATE is not set |
| 213 | CONFIG_INET=y | 235 | CONFIG_INET=y |
| @@ -252,8 +274,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
| 252 | CONFIG_INET6_XFRM_MODE_BEET=m | 274 | CONFIG_INET6_XFRM_MODE_BEET=m |
| 253 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 275 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 254 | CONFIG_IPV6_SIT=m | 276 | CONFIG_IPV6_SIT=m |
| 277 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 255 | CONFIG_IPV6_TUNNEL=m | 278 | CONFIG_IPV6_TUNNEL=m |
| 256 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 279 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 280 | # CONFIG_IPV6_MROUTE is not set | ||
| 257 | # CONFIG_NETWORK_SECMARK is not set | 281 | # CONFIG_NETWORK_SECMARK is not set |
| 258 | # CONFIG_NETFILTER is not set | 282 | # CONFIG_NETFILTER is not set |
| 259 | # CONFIG_IP_DCCP is not set | 283 | # CONFIG_IP_DCCP is not set |
| @@ -279,6 +303,7 @@ CONFIG_LLC=m | |||
| 279 | # CONFIG_NET_PKTGEN is not set | 303 | # CONFIG_NET_PKTGEN is not set |
| 280 | # CONFIG_NET_TCPPROBE is not set | 304 | # CONFIG_NET_TCPPROBE is not set |
| 281 | # CONFIG_HAMRADIO is not set | 305 | # CONFIG_HAMRADIO is not set |
| 306 | # CONFIG_CAN is not set | ||
| 282 | # CONFIG_IRDA is not set | 307 | # CONFIG_IRDA is not set |
| 283 | # CONFIG_BT is not set | 308 | # CONFIG_BT is not set |
| 284 | # CONFIG_AF_RXRPC is not set | 309 | # CONFIG_AF_RXRPC is not set |
| @@ -314,6 +339,7 @@ CONFIG_MTD=y | |||
| 314 | CONFIG_MTD_PARTITIONS=y | 339 | CONFIG_MTD_PARTITIONS=y |
| 315 | # CONFIG_MTD_REDBOOT_PARTS is not set | 340 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 316 | CONFIG_MTD_CMDLINE_PARTS=y | 341 | CONFIG_MTD_CMDLINE_PARTS=y |
| 342 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 317 | 343 | ||
| 318 | # | 344 | # |
| 319 | # User Modules And Translation Layers | 345 | # User Modules And Translation Layers |
| @@ -368,6 +394,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 368 | # | 394 | # |
| 369 | CONFIG_MTD_DATAFLASH=m | 395 | CONFIG_MTD_DATAFLASH=m |
| 370 | CONFIG_MTD_M25P80=m | 396 | CONFIG_MTD_M25P80=m |
| 397 | CONFIG_M25PXX_USE_FAST_READ=y | ||
| 371 | # CONFIG_MTD_SLRAM is not set | 398 | # CONFIG_MTD_SLRAM is not set |
| 372 | # CONFIG_MTD_PHRAM is not set | 399 | # CONFIG_MTD_PHRAM is not set |
| 373 | # CONFIG_MTD_MTDRAM is not set | 400 | # CONFIG_MTD_MTDRAM is not set |
| @@ -395,13 +422,18 @@ CONFIG_BLK_DEV_NBD=m | |||
| 395 | CONFIG_BLK_DEV_RAM=m | 422 | CONFIG_BLK_DEV_RAM=m |
| 396 | CONFIG_BLK_DEV_RAM_COUNT=16 | 423 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 397 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 424 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 398 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 425 | # CONFIG_BLK_DEV_XIP is not set |
| 399 | # CONFIG_CDROM_PKTCDVD is not set | 426 | # CONFIG_CDROM_PKTCDVD is not set |
| 400 | # CONFIG_ATA_OVER_ETH is not set | 427 | # CONFIG_ATA_OVER_ETH is not set |
| 401 | CONFIG_MISC_DEVICES=y | 428 | CONFIG_MISC_DEVICES=y |
| 429 | CONFIG_ATMEL_PWM=m | ||
| 430 | CONFIG_ATMEL_TCLIB=y | ||
| 431 | CONFIG_ATMEL_TCB_CLKSRC=y | ||
| 432 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | ||
| 402 | # CONFIG_EEPROM_93CX6 is not set | 433 | # CONFIG_EEPROM_93CX6 is not set |
| 403 | CONFIG_ATMEL_SSC=m | 434 | CONFIG_ATMEL_SSC=m |
| 404 | # CONFIG_IDE is not set | 435 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 436 | # CONFIG_HAVE_IDE is not set | ||
| 405 | 437 | ||
| 406 | # | 438 | # |
| 407 | # SCSI device support | 439 | # SCSI device support |
| @@ -444,6 +476,9 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 444 | # CONFIG_SCSI_LOWLEVEL is not set | 476 | # CONFIG_SCSI_LOWLEVEL is not set |
| 445 | CONFIG_ATA=m | 477 | CONFIG_ATA=m |
| 446 | # CONFIG_ATA_NONSTANDARD is not set | 478 | # CONFIG_ATA_NONSTANDARD is not set |
| 479 | # CONFIG_SATA_PMP is not set | ||
| 480 | CONFIG_ATA_SFF=y | ||
| 481 | # CONFIG_SATA_MV is not set | ||
| 447 | CONFIG_PATA_AT32=m | 482 | CONFIG_PATA_AT32=m |
| 448 | # CONFIG_PATA_PLATFORM is not set | 483 | # CONFIG_PATA_PLATFORM is not set |
| 449 | # CONFIG_MD is not set | 484 | # CONFIG_MD is not set |
| @@ -469,11 +504,13 @@ CONFIG_PHYLIB=y | |||
| 469 | # CONFIG_SMSC_PHY is not set | 504 | # CONFIG_SMSC_PHY is not set |
| 470 | # CONFIG_BROADCOM_PHY is not set | 505 | # CONFIG_BROADCOM_PHY is not set |
| 471 | # CONFIG_ICPLUS_PHY is not set | 506 | # CONFIG_ICPLUS_PHY is not set |
| 507 | # CONFIG_REALTEK_PHY is not set | ||
| 472 | # CONFIG_FIXED_PHY is not set | 508 | # CONFIG_FIXED_PHY is not set |
| 473 | # CONFIG_MDIO_BITBANG is not set | 509 | # CONFIG_MDIO_BITBANG is not set |
| 474 | CONFIG_NET_ETHERNET=y | 510 | CONFIG_NET_ETHERNET=y |
| 475 | # CONFIG_MII is not set | 511 | # CONFIG_MII is not set |
| 476 | CONFIG_MACB=y | 512 | CONFIG_MACB=y |
| 513 | # CONFIG_ENC28J60 is not set | ||
| 477 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 514 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 478 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 515 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 479 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 516 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| @@ -487,6 +524,7 @@ CONFIG_MACB=y | |||
| 487 | # | 524 | # |
| 488 | # CONFIG_WLAN_PRE80211 is not set | 525 | # CONFIG_WLAN_PRE80211 is not set |
| 489 | # CONFIG_WLAN_80211 is not set | 526 | # CONFIG_WLAN_80211 is not set |
| 527 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 490 | # CONFIG_WAN is not set | 528 | # CONFIG_WAN is not set |
| 491 | CONFIG_PPP=m | 529 | CONFIG_PPP=m |
| 492 | # CONFIG_PPP_MULTILINK is not set | 530 | # CONFIG_PPP_MULTILINK is not set |
| @@ -500,7 +538,6 @@ CONFIG_PPP_BSDCOMP=m | |||
| 500 | # CONFIG_PPPOL2TP is not set | 538 | # CONFIG_PPPOL2TP is not set |
| 501 | # CONFIG_SLIP is not set | 539 | # CONFIG_SLIP is not set |
| 502 | CONFIG_SLHC=m | 540 | CONFIG_SLHC=m |
| 503 | # CONFIG_SHAPER is not set | ||
| 504 | # CONFIG_NETCONSOLE is not set | 541 | # CONFIG_NETCONSOLE is not set |
| 505 | # CONFIG_NETPOLL is not set | 542 | # CONFIG_NETPOLL is not set |
| 506 | # CONFIG_NET_POLL_CONTROLLER is not set | 543 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -556,6 +593,7 @@ CONFIG_MOUSE_GPIO=m | |||
| 556 | # Character devices | 593 | # Character devices |
| 557 | # | 594 | # |
| 558 | # CONFIG_VT is not set | 595 | # CONFIG_VT is not set |
| 596 | # CONFIG_DEVKMEM is not set | ||
| 559 | # CONFIG_SERIAL_NONSTANDARD is not set | 597 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 560 | 598 | ||
| 561 | # | 599 | # |
| @@ -568,6 +606,7 @@ CONFIG_MOUSE_GPIO=m | |||
| 568 | # | 606 | # |
| 569 | CONFIG_SERIAL_ATMEL=y | 607 | CONFIG_SERIAL_ATMEL=y |
| 570 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 608 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
| 609 | CONFIG_SERIAL_ATMEL_PDC=y | ||
| 571 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | 610 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
| 572 | CONFIG_SERIAL_CORE=y | 611 | CONFIG_SERIAL_CORE=y |
| 573 | CONFIG_SERIAL_CORE_CONSOLE=y | 612 | CONFIG_SERIAL_CORE_CONSOLE=y |
| @@ -575,21 +614,13 @@ CONFIG_UNIX98_PTYS=y | |||
| 575 | # CONFIG_LEGACY_PTYS is not set | 614 | # CONFIG_LEGACY_PTYS is not set |
| 576 | # CONFIG_IPMI_HANDLER is not set | 615 | # CONFIG_IPMI_HANDLER is not set |
| 577 | # CONFIG_HW_RANDOM is not set | 616 | # CONFIG_HW_RANDOM is not set |
| 578 | # CONFIG_RTC is not set | ||
| 579 | # CONFIG_GEN_RTC is not set | ||
| 580 | # CONFIG_R3964 is not set | 617 | # CONFIG_R3964 is not set |
| 581 | # CONFIG_RAW_DRIVER is not set | 618 | # CONFIG_RAW_DRIVER is not set |
| 582 | # CONFIG_TCG_TPM is not set | 619 | # CONFIG_TCG_TPM is not set |
| 583 | CONFIG_I2C=m | 620 | CONFIG_I2C=m |
| 584 | CONFIG_I2C_BOARDINFO=y | 621 | CONFIG_I2C_BOARDINFO=y |
| 585 | CONFIG_I2C_CHARDEV=m | 622 | CONFIG_I2C_CHARDEV=m |
| 586 | |||
| 587 | # | ||
| 588 | # I2C Algorithms | ||
| 589 | # | ||
| 590 | CONFIG_I2C_ALGOBIT=m | 623 | CONFIG_I2C_ALGOBIT=m |
| 591 | # CONFIG_I2C_ALGOPCF is not set | ||
| 592 | # CONFIG_I2C_ALGOPCA is not set | ||
| 593 | 624 | ||
| 594 | # | 625 | # |
| 595 | # I2C Hardware Bus support | 626 | # I2C Hardware Bus support |
| @@ -600,27 +631,23 @@ CONFIG_I2C_GPIO=m | |||
| 600 | # CONFIG_I2C_SIMTEC is not set | 631 | # CONFIG_I2C_SIMTEC is not set |
| 601 | # CONFIG_I2C_TAOS_EVM is not set | 632 | # CONFIG_I2C_TAOS_EVM is not set |
| 602 | # CONFIG_I2C_STUB is not set | 633 | # CONFIG_I2C_STUB is not set |
| 634 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 603 | 635 | ||
| 604 | # | 636 | # |
| 605 | # Miscellaneous I2C Chip support | 637 | # Miscellaneous I2C Chip support |
| 606 | # | 638 | # |
| 607 | # CONFIG_SENSORS_DS1337 is not set | ||
| 608 | # CONFIG_SENSORS_DS1374 is not set | ||
| 609 | # CONFIG_DS1682 is not set | 639 | # CONFIG_DS1682 is not set |
| 610 | # CONFIG_SENSORS_EEPROM is not set | 640 | # CONFIG_SENSORS_EEPROM is not set |
| 611 | # CONFIG_SENSORS_PCF8574 is not set | 641 | # CONFIG_SENSORS_PCF8574 is not set |
| 612 | # CONFIG_SENSORS_PCA9539 is not set | 642 | # CONFIG_PCF8575 is not set |
| 613 | # CONFIG_SENSORS_PCF8591 is not set | 643 | # CONFIG_SENSORS_PCF8591 is not set |
| 644 | # CONFIG_TPS65010 is not set | ||
| 614 | # CONFIG_SENSORS_MAX6875 is not set | 645 | # CONFIG_SENSORS_MAX6875 is not set |
| 615 | # CONFIG_SENSORS_TSL2550 is not set | 646 | # CONFIG_SENSORS_TSL2550 is not set |
| 616 | # CONFIG_I2C_DEBUG_CORE is not set | 647 | # CONFIG_I2C_DEBUG_CORE is not set |
| 617 | # CONFIG_I2C_DEBUG_ALGO is not set | 648 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 618 | # CONFIG_I2C_DEBUG_BUS is not set | 649 | # CONFIG_I2C_DEBUG_BUS is not set |
| 619 | # CONFIG_I2C_DEBUG_CHIP is not set | 650 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 620 | |||
| 621 | # | ||
| 622 | # SPI support | ||
| 623 | # | ||
| 624 | CONFIG_SPI=y | 651 | CONFIG_SPI=y |
| 625 | # CONFIG_SPI_DEBUG is not set | 652 | # CONFIG_SPI_DEBUG is not set |
| 626 | CONFIG_SPI_MASTER=y | 653 | CONFIG_SPI_MASTER=y |
| @@ -637,9 +664,27 @@ CONFIG_SPI_ATMEL=y | |||
| 637 | # CONFIG_SPI_AT25 is not set | 664 | # CONFIG_SPI_AT25 is not set |
| 638 | CONFIG_SPI_SPIDEV=m | 665 | CONFIG_SPI_SPIDEV=m |
| 639 | # CONFIG_SPI_TLE62X0 is not set | 666 | # CONFIG_SPI_TLE62X0 is not set |
| 667 | CONFIG_HAVE_GPIO_LIB=y | ||
| 668 | |||
| 669 | # | ||
| 670 | # GPIO Support | ||
| 671 | # | ||
| 672 | # CONFIG_DEBUG_GPIO is not set | ||
| 673 | |||
| 674 | # | ||
| 675 | # I2C GPIO expanders: | ||
| 676 | # | ||
| 677 | # CONFIG_GPIO_PCA953X is not set | ||
| 678 | # CONFIG_GPIO_PCF857X is not set | ||
| 679 | |||
| 680 | # | ||
| 681 | # SPI GPIO expanders: | ||
| 682 | # | ||
| 683 | # CONFIG_GPIO_MCP23S08 is not set | ||
| 640 | # CONFIG_W1 is not set | 684 | # CONFIG_W1 is not set |
| 641 | # CONFIG_POWER_SUPPLY is not set | 685 | # CONFIG_POWER_SUPPLY is not set |
| 642 | # CONFIG_HWMON is not set | 686 | # CONFIG_HWMON is not set |
| 687 | # CONFIG_THERMAL is not set | ||
| 643 | CONFIG_WATCHDOG=y | 688 | CONFIG_WATCHDOG=y |
| 644 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 689 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 645 | 690 | ||
| @@ -659,12 +704,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 659 | # Multifunction device drivers | 704 | # Multifunction device drivers |
| 660 | # | 705 | # |
| 661 | # CONFIG_MFD_SM501 is not set | 706 | # CONFIG_MFD_SM501 is not set |
| 707 | # CONFIG_HTC_PASIC3 is not set | ||
| 662 | 708 | ||
| 663 | # | 709 | # |
| 664 | # Multimedia devices | 710 | # Multimedia devices |
| 665 | # | 711 | # |
| 712 | |||
| 713 | # | ||
| 714 | # Multimedia core support | ||
| 715 | # | ||
| 666 | # CONFIG_VIDEO_DEV is not set | 716 | # CONFIG_VIDEO_DEV is not set |
| 667 | # CONFIG_DVB_CORE is not set | 717 | # CONFIG_DVB_CORE is not set |
| 718 | # CONFIG_VIDEO_MEDIA is not set | ||
| 719 | |||
| 720 | # | ||
| 721 | # Multimedia drivers | ||
| 722 | # | ||
| 668 | # CONFIG_DAB is not set | 723 | # CONFIG_DAB is not set |
| 669 | 724 | ||
| 670 | # | 725 | # |
| @@ -682,8 +737,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 682 | # CONFIG_FB_SYS_FILLRECT is not set | 737 | # CONFIG_FB_SYS_FILLRECT is not set |
| 683 | # CONFIG_FB_SYS_COPYAREA is not set | 738 | # CONFIG_FB_SYS_COPYAREA is not set |
| 684 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 739 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 740 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 685 | # CONFIG_FB_SYS_FOPS is not set | 741 | # CONFIG_FB_SYS_FOPS is not set |
| 686 | CONFIG_FB_DEFERRED_IO=y | ||
| 687 | # CONFIG_FB_SVGALIB is not set | 742 | # CONFIG_FB_SVGALIB is not set |
| 688 | # CONFIG_FB_MACMODES is not set | 743 | # CONFIG_FB_MACMODES is not set |
| 689 | # CONFIG_FB_BACKLIGHT is not set | 744 | # CONFIG_FB_BACKLIGHT is not set |
| @@ -749,7 +804,11 @@ CONFIG_SND_AT73C213_TARGET_BITRATE=48000 | |||
| 749 | # CONFIG_SND_SOC is not set | 804 | # CONFIG_SND_SOC is not set |
| 750 | 805 | ||
| 751 | # | 806 | # |
| 752 | # SoC Audio support for SuperH | 807 | # ALSA SoC audio for Freescale SOCs |
| 808 | # | ||
| 809 | |||
| 810 | # | ||
| 811 | # SoC Audio for the Texas Instruments OMAP | ||
| 753 | # | 812 | # |
| 754 | 813 | ||
| 755 | # | 814 | # |
| @@ -761,14 +820,12 @@ CONFIG_USB_SUPPORT=y | |||
| 761 | # CONFIG_USB_ARCH_HAS_HCD is not set | 820 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 762 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 821 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 763 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 822 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 823 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 824 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 764 | 825 | ||
| 765 | # | 826 | # |
| 766 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 827 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 767 | # | 828 | # |
| 768 | |||
| 769 | # | ||
| 770 | # USB Gadget Support | ||
| 771 | # | ||
| 772 | CONFIG_USB_GADGET=y | 829 | CONFIG_USB_GADGET=y |
| 773 | # CONFIG_USB_GADGET_DEBUG is not set | 830 | # CONFIG_USB_GADGET_DEBUG is not set |
| 774 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 831 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -781,6 +838,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
| 781 | # CONFIG_USB_GADGET_NET2280 is not set | 838 | # CONFIG_USB_GADGET_NET2280 is not set |
| 782 | # CONFIG_USB_GADGET_PXA2XX is not set | 839 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 783 | # CONFIG_USB_GADGET_M66592 is not set | 840 | # CONFIG_USB_GADGET_M66592 is not set |
| 841 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 784 | # CONFIG_USB_GADGET_GOKU is not set | 842 | # CONFIG_USB_GADGET_GOKU is not set |
| 785 | # CONFIG_USB_GADGET_LH7A40X is not set | 843 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 786 | # CONFIG_USB_GADGET_OMAP is not set | 844 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -796,6 +854,7 @@ CONFIG_USB_FILE_STORAGE=m | |||
| 796 | # CONFIG_USB_FILE_STORAGE_TEST is not set | 854 | # CONFIG_USB_FILE_STORAGE_TEST is not set |
| 797 | CONFIG_USB_G_SERIAL=m | 855 | CONFIG_USB_G_SERIAL=m |
| 798 | # CONFIG_USB_MIDI_GADGET is not set | 856 | # CONFIG_USB_MIDI_GADGET is not set |
| 857 | # CONFIG_USB_G_PRINTER is not set | ||
| 799 | CONFIG_MMC=m | 858 | CONFIG_MMC=m |
| 800 | # CONFIG_MMC_DEBUG is not set | 859 | # CONFIG_MMC_DEBUG is not set |
| 801 | # CONFIG_MMC_UNSAFE_RESUME is not set | 860 | # CONFIG_MMC_UNSAFE_RESUME is not set |
| @@ -806,17 +865,20 @@ CONFIG_MMC=m | |||
| 806 | CONFIG_MMC_BLOCK=m | 865 | CONFIG_MMC_BLOCK=m |
| 807 | CONFIG_MMC_BLOCK_BOUNCE=y | 866 | CONFIG_MMC_BLOCK_BOUNCE=y |
| 808 | # CONFIG_SDIO_UART is not set | 867 | # CONFIG_SDIO_UART is not set |
| 868 | CONFIG_MMC_TEST=m | ||
| 809 | 869 | ||
| 810 | # | 870 | # |
| 811 | # MMC/SD Host Controller Drivers | 871 | # MMC/SD Host Controller Drivers |
| 812 | # | 872 | # |
| 813 | CONFIG_MMC_SPI=m | 873 | CONFIG_MMC_SPI=m |
| 874 | # CONFIG_MEMSTICK is not set | ||
| 814 | CONFIG_NEW_LEDS=y | 875 | CONFIG_NEW_LEDS=y |
| 815 | CONFIG_LEDS_CLASS=m | 876 | CONFIG_LEDS_CLASS=m |
| 816 | 877 | ||
| 817 | # | 878 | # |
| 818 | # LED drivers | 879 | # LED drivers |
| 819 | # | 880 | # |
| 881 | CONFIG_LEDS_ATMEL_PWM=m | ||
| 820 | CONFIG_LEDS_GPIO=m | 882 | CONFIG_LEDS_GPIO=m |
| 821 | 883 | ||
| 822 | # | 884 | # |
| @@ -825,6 +887,8 @@ CONFIG_LEDS_GPIO=m | |||
| 825 | CONFIG_LEDS_TRIGGERS=y | 887 | CONFIG_LEDS_TRIGGERS=y |
| 826 | CONFIG_LEDS_TRIGGER_TIMER=m | 888 | CONFIG_LEDS_TRIGGER_TIMER=m |
| 827 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 889 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
| 890 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | ||
| 891 | # CONFIG_ACCESSIBILITY is not set | ||
| 828 | CONFIG_RTC_LIB=y | 892 | CONFIG_RTC_LIB=y |
| 829 | CONFIG_RTC_CLASS=y | 893 | CONFIG_RTC_CLASS=y |
| 830 | CONFIG_RTC_HCTOSYS=y | 894 | CONFIG_RTC_HCTOSYS=y |
| @@ -853,19 +917,22 @@ CONFIG_RTC_INTF_DEV=y | |||
| 853 | # CONFIG_RTC_DRV_PCF8563 is not set | 917 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 854 | # CONFIG_RTC_DRV_PCF8583 is not set | 918 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 855 | # CONFIG_RTC_DRV_M41T80 is not set | 919 | # CONFIG_RTC_DRV_M41T80 is not set |
| 920 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 856 | 921 | ||
| 857 | # | 922 | # |
| 858 | # SPI RTC drivers | 923 | # SPI RTC drivers |
| 859 | # | 924 | # |
| 860 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 861 | # CONFIG_RTC_DRV_MAX6902 is not set | 925 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 926 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 927 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 862 | 928 | ||
| 863 | # | 929 | # |
| 864 | # Platform RTC drivers | 930 | # Platform RTC drivers |
| 865 | # | 931 | # |
| 932 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 866 | # CONFIG_RTC_DRV_DS1553 is not set | 933 | # CONFIG_RTC_DRV_DS1553 is not set |
| 867 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 868 | # CONFIG_RTC_DRV_DS1742 is not set | 934 | # CONFIG_RTC_DRV_DS1742 is not set |
| 935 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 869 | # CONFIG_RTC_DRV_M48T86 is not set | 936 | # CONFIG_RTC_DRV_M48T86 is not set |
| 870 | # CONFIG_RTC_DRV_M48T59 is not set | 937 | # CONFIG_RTC_DRV_M48T59 is not set |
| 871 | # CONFIG_RTC_DRV_V3020 is not set | 938 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -874,10 +941,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 874 | # on-CPU RTC drivers | 941 | # on-CPU RTC drivers |
| 875 | # | 942 | # |
| 876 | CONFIG_RTC_DRV_AT32AP700X=y | 943 | CONFIG_RTC_DRV_AT32AP700X=y |
| 877 | |||
| 878 | # | ||
| 879 | # Userspace I/O | ||
| 880 | # | ||
| 881 | # CONFIG_UIO is not set | 944 | # CONFIG_UIO is not set |
| 882 | 945 | ||
| 883 | # | 946 | # |
| @@ -895,14 +958,11 @@ CONFIG_JBD=m | |||
| 895 | # CONFIG_JFS_FS is not set | 958 | # CONFIG_JFS_FS is not set |
| 896 | # CONFIG_FS_POSIX_ACL is not set | 959 | # CONFIG_FS_POSIX_ACL is not set |
| 897 | # CONFIG_XFS_FS is not set | 960 | # CONFIG_XFS_FS is not set |
| 898 | # CONFIG_GFS2_FS is not set | ||
| 899 | # CONFIG_OCFS2_FS is not set | 961 | # CONFIG_OCFS2_FS is not set |
| 900 | CONFIG_MINIX_FS=m | 962 | # CONFIG_DNOTIFY is not set |
| 901 | # CONFIG_ROMFS_FS is not set | ||
| 902 | CONFIG_INOTIFY=y | 963 | CONFIG_INOTIFY=y |
| 903 | CONFIG_INOTIFY_USER=y | 964 | CONFIG_INOTIFY_USER=y |
| 904 | # CONFIG_QUOTA is not set | 965 | # CONFIG_QUOTA is not set |
| 905 | # CONFIG_DNOTIFY is not set | ||
| 906 | # CONFIG_AUTOFS_FS is not set | 966 | # CONFIG_AUTOFS_FS is not set |
| 907 | # CONFIG_AUTOFS4_FS is not set | 967 | # CONFIG_AUTOFS4_FS is not set |
| 908 | CONFIG_FUSE_FS=m | 968 | CONFIG_FUSE_FS=m |
| @@ -957,8 +1017,10 @@ CONFIG_JFFS2_RTIME=y | |||
| 957 | # CONFIG_JFFS2_RUBIN is not set | 1017 | # CONFIG_JFFS2_RUBIN is not set |
| 958 | # CONFIG_CRAMFS is not set | 1018 | # CONFIG_CRAMFS is not set |
| 959 | # CONFIG_VXFS_FS is not set | 1019 | # CONFIG_VXFS_FS is not set |
| 1020 | CONFIG_MINIX_FS=m | ||
| 960 | # CONFIG_HPFS_FS is not set | 1021 | # CONFIG_HPFS_FS is not set |
| 961 | # CONFIG_QNX4FS_FS is not set | 1022 | # CONFIG_QNX4FS_FS is not set |
| 1023 | # CONFIG_ROMFS_FS is not set | ||
| 962 | # CONFIG_SYSV_FS is not set | 1024 | # CONFIG_SYSV_FS is not set |
| 963 | # CONFIG_UFS_FS is not set | 1025 | # CONFIG_UFS_FS is not set |
| 964 | CONFIG_NETWORK_FILESYSTEMS=y | 1026 | CONFIG_NETWORK_FILESYSTEMS=y |
| @@ -966,7 +1028,6 @@ CONFIG_NFS_FS=y | |||
| 966 | CONFIG_NFS_V3=y | 1028 | CONFIG_NFS_V3=y |
| 967 | # CONFIG_NFS_V3_ACL is not set | 1029 | # CONFIG_NFS_V3_ACL is not set |
| 968 | # CONFIG_NFS_V4 is not set | 1030 | # CONFIG_NFS_V4 is not set |
| 969 | # CONFIG_NFS_DIRECTIO is not set | ||
| 970 | # CONFIG_NFSD is not set | 1031 | # CONFIG_NFSD is not set |
| 971 | CONFIG_ROOT_NFS=y | 1032 | CONFIG_ROOT_NFS=y |
| 972 | CONFIG_LOCKD=y | 1033 | CONFIG_LOCKD=y |
| @@ -1028,11 +1089,6 @@ CONFIG_NLS_ISO8859_1=m | |||
| 1028 | # CONFIG_NLS_KOI8_U is not set | 1089 | # CONFIG_NLS_KOI8_U is not set |
| 1029 | CONFIG_NLS_UTF8=m | 1090 | CONFIG_NLS_UTF8=m |
| 1030 | # CONFIG_DLM is not set | 1091 | # CONFIG_DLM is not set |
| 1031 | CONFIG_INSTRUMENTATION=y | ||
| 1032 | CONFIG_PROFILING=y | ||
| 1033 | CONFIG_OPROFILE=m | ||
| 1034 | CONFIG_KPROBES=y | ||
| 1035 | # CONFIG_MARKERS is not set | ||
| 1036 | 1092 | ||
| 1037 | # | 1093 | # |
| 1038 | # Kernel hacking | 1094 | # Kernel hacking |
| @@ -1040,6 +1096,7 @@ CONFIG_KPROBES=y | |||
| 1040 | # CONFIG_PRINTK_TIME is not set | 1096 | # CONFIG_PRINTK_TIME is not set |
| 1041 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1097 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1042 | CONFIG_ENABLE_MUST_CHECK=y | 1098 | CONFIG_ENABLE_MUST_CHECK=y |
| 1099 | CONFIG_FRAME_WARN=1024 | ||
| 1043 | CONFIG_MAGIC_SYSRQ=y | 1100 | CONFIG_MAGIC_SYSRQ=y |
| 1044 | # CONFIG_UNUSED_SYMBOLS is not set | 1101 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1045 | CONFIG_DEBUG_FS=y | 1102 | CONFIG_DEBUG_FS=y |
| @@ -1050,7 +1107,9 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1050 | CONFIG_SCHED_DEBUG=y | 1107 | CONFIG_SCHED_DEBUG=y |
| 1051 | # CONFIG_SCHEDSTATS is not set | 1108 | # CONFIG_SCHEDSTATS is not set |
| 1052 | # CONFIG_TIMER_STATS is not set | 1109 | # CONFIG_TIMER_STATS is not set |
| 1110 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1053 | # CONFIG_SLUB_DEBUG_ON is not set | 1111 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1112 | # CONFIG_SLUB_STATS is not set | ||
| 1054 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1113 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1055 | # CONFIG_RT_MUTEX_TESTER is not set | 1114 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1056 | # CONFIG_DEBUG_SPINLOCK is not set | 1115 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -1064,12 +1123,14 @@ CONFIG_SCHED_DEBUG=y | |||
| 1064 | CONFIG_DEBUG_BUGVERBOSE=y | 1123 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1065 | # CONFIG_DEBUG_INFO is not set | 1124 | # CONFIG_DEBUG_INFO is not set |
| 1066 | # CONFIG_DEBUG_VM is not set | 1125 | # CONFIG_DEBUG_VM is not set |
| 1126 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1067 | # CONFIG_DEBUG_LIST is not set | 1127 | # CONFIG_DEBUG_LIST is not set |
| 1068 | # CONFIG_DEBUG_SG is not set | 1128 | # CONFIG_DEBUG_SG is not set |
| 1069 | CONFIG_FRAME_POINTER=y | 1129 | CONFIG_FRAME_POINTER=y |
| 1070 | CONFIG_FORCED_INLINING=y | ||
| 1071 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1130 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1072 | # CONFIG_RCU_TORTURE_TEST is not set | 1131 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1132 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 1133 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1073 | # CONFIG_LKDTM is not set | 1134 | # CONFIG_LKDTM is not set |
| 1074 | # CONFIG_FAULT_INJECTION is not set | 1135 | # CONFIG_FAULT_INJECTION is not set |
| 1075 | # CONFIG_SAMPLES is not set | 1136 | # CONFIG_SAMPLES is not set |
| @@ -1081,52 +1142,90 @@ CONFIG_FORCED_INLINING=y | |||
| 1081 | # CONFIG_SECURITY is not set | 1142 | # CONFIG_SECURITY is not set |
| 1082 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1143 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1083 | CONFIG_CRYPTO=y | 1144 | CONFIG_CRYPTO=y |
| 1145 | |||
| 1146 | # | ||
| 1147 | # Crypto core or helper | ||
| 1148 | # | ||
| 1084 | CONFIG_CRYPTO_ALGAPI=m | 1149 | CONFIG_CRYPTO_ALGAPI=m |
| 1150 | CONFIG_CRYPTO_AEAD=m | ||
| 1085 | CONFIG_CRYPTO_BLKCIPHER=m | 1151 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1086 | CONFIG_CRYPTO_HASH=m | 1152 | CONFIG_CRYPTO_HASH=m |
| 1087 | CONFIG_CRYPTO_MANAGER=m | 1153 | CONFIG_CRYPTO_MANAGER=m |
| 1154 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1155 | # CONFIG_CRYPTO_NULL is not set | ||
| 1156 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1157 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1158 | # CONFIG_CRYPTO_TEST is not set | ||
| 1159 | |||
| 1160 | # | ||
| 1161 | # Authenticated Encryption with Associated Data | ||
| 1162 | # | ||
| 1163 | # CONFIG_CRYPTO_CCM is not set | ||
| 1164 | # CONFIG_CRYPTO_GCM is not set | ||
| 1165 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1166 | |||
| 1167 | # | ||
| 1168 | # Block modes | ||
| 1169 | # | ||
| 1170 | CONFIG_CRYPTO_CBC=m | ||
| 1171 | # CONFIG_CRYPTO_CTR is not set | ||
| 1172 | # CONFIG_CRYPTO_CTS is not set | ||
| 1173 | # CONFIG_CRYPTO_ECB is not set | ||
| 1174 | # CONFIG_CRYPTO_LRW is not set | ||
| 1175 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1176 | # CONFIG_CRYPTO_XTS is not set | ||
| 1177 | |||
| 1178 | # | ||
| 1179 | # Hash modes | ||
| 1180 | # | ||
| 1088 | CONFIG_CRYPTO_HMAC=m | 1181 | CONFIG_CRYPTO_HMAC=m |
| 1089 | # CONFIG_CRYPTO_XCBC is not set | 1182 | # CONFIG_CRYPTO_XCBC is not set |
| 1090 | # CONFIG_CRYPTO_NULL is not set | 1183 | |
| 1184 | # | ||
| 1185 | # Digest | ||
| 1186 | # | ||
| 1187 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1091 | # CONFIG_CRYPTO_MD4 is not set | 1188 | # CONFIG_CRYPTO_MD4 is not set |
| 1092 | CONFIG_CRYPTO_MD5=m | 1189 | CONFIG_CRYPTO_MD5=m |
| 1190 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1093 | CONFIG_CRYPTO_SHA1=m | 1191 | CONFIG_CRYPTO_SHA1=m |
| 1094 | # CONFIG_CRYPTO_SHA256 is not set | 1192 | # CONFIG_CRYPTO_SHA256 is not set |
| 1095 | # CONFIG_CRYPTO_SHA512 is not set | 1193 | # CONFIG_CRYPTO_SHA512 is not set |
| 1096 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1097 | # CONFIG_CRYPTO_TGR192 is not set | 1194 | # CONFIG_CRYPTO_TGR192 is not set |
| 1098 | # CONFIG_CRYPTO_GF128MUL is not set | 1195 | # CONFIG_CRYPTO_WP512 is not set |
| 1099 | # CONFIG_CRYPTO_ECB is not set | 1196 | |
| 1100 | CONFIG_CRYPTO_CBC=m | 1197 | # |
| 1101 | # CONFIG_CRYPTO_PCBC is not set | 1198 | # Ciphers |
| 1102 | # CONFIG_CRYPTO_LRW is not set | 1199 | # |
| 1103 | # CONFIG_CRYPTO_XTS is not set | ||
| 1104 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1105 | CONFIG_CRYPTO_DES=m | ||
| 1106 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1107 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1108 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1109 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1110 | # CONFIG_CRYPTO_AES is not set | 1200 | # CONFIG_CRYPTO_AES is not set |
| 1201 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1202 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1203 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1204 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1111 | # CONFIG_CRYPTO_CAST5 is not set | 1205 | # CONFIG_CRYPTO_CAST5 is not set |
| 1112 | # CONFIG_CRYPTO_CAST6 is not set | 1206 | # CONFIG_CRYPTO_CAST6 is not set |
| 1113 | # CONFIG_CRYPTO_TEA is not set | 1207 | CONFIG_CRYPTO_DES=m |
| 1114 | # CONFIG_CRYPTO_ARC4 is not set | 1208 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1115 | # CONFIG_CRYPTO_KHAZAD is not set | 1209 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1116 | # CONFIG_CRYPTO_ANUBIS is not set | 1210 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1117 | # CONFIG_CRYPTO_SEED is not set | 1211 | # CONFIG_CRYPTO_SEED is not set |
| 1212 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1213 | # CONFIG_CRYPTO_TEA is not set | ||
| 1214 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1215 | |||
| 1216 | # | ||
| 1217 | # Compression | ||
| 1218 | # | ||
| 1118 | CONFIG_CRYPTO_DEFLATE=m | 1219 | CONFIG_CRYPTO_DEFLATE=m |
| 1119 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1220 | # CONFIG_CRYPTO_LZO is not set |
| 1120 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1121 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1122 | # CONFIG_CRYPTO_TEST is not set | ||
| 1123 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1124 | # CONFIG_CRYPTO_HW is not set | 1221 | # CONFIG_CRYPTO_HW is not set |
| 1125 | 1222 | ||
| 1126 | # | 1223 | # |
| 1127 | # Library routines | 1224 | # Library routines |
| 1128 | # | 1225 | # |
| 1129 | CONFIG_BITREVERSE=y | 1226 | CONFIG_BITREVERSE=y |
| 1227 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1228 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1130 | CONFIG_CRC_CCITT=m | 1229 | CONFIG_CRC_CCITT=m |
| 1131 | # CONFIG_CRC16 is not set | 1230 | # CONFIG_CRC16 is not set |
| 1132 | CONFIG_CRC_ITU_T=m | 1231 | CONFIG_CRC_ITU_T=m |
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig index 45e23e03f074..5a4ae6b5d28f 100644 --- a/arch/avr32/configs/atstk1003_defconfig +++ b/arch/avr32/configs/atstk1003_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.24-rc7 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Wed Jan 9 22:54:34 2008 | 4 | # Mon May 26 13:33:05 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
| 7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
| @@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y | |||
| 13 | CONFIG_GENERIC_IRQ_PROBE=y | 13 | CONFIG_GENERIC_IRQ_PROBE=y |
| 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 15 | CONFIG_GENERIC_TIME=y | 15 | CONFIG_GENERIC_TIME=y |
| 16 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 16 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 17 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 17 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 19 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 20 | CONFIG_GENERIC_HWEIGHT=y | 20 | CONFIG_GENERIC_HWEIGHT=y |
| 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 22 | CONFIG_GENERIC_BUG=y | 22 | CONFIG_GENERIC_BUG=y |
| @@ -39,17 +39,15 @@ CONFIG_BSD_PROCESS_ACCT_V3=y | |||
| 39 | CONFIG_TASKSTATS=y | 39 | CONFIG_TASKSTATS=y |
| 40 | CONFIG_TASK_DELAY_ACCT=y | 40 | CONFIG_TASK_DELAY_ACCT=y |
| 41 | # CONFIG_TASK_XACCT is not set | 41 | # CONFIG_TASK_XACCT is not set |
| 42 | # CONFIG_USER_NS is not set | ||
| 43 | # CONFIG_PID_NS is not set | ||
| 44 | CONFIG_AUDIT=y | 42 | CONFIG_AUDIT=y |
| 45 | # CONFIG_IKCONFIG is not set | 43 | # CONFIG_IKCONFIG is not set |
| 46 | CONFIG_LOG_BUF_SHIFT=14 | 44 | CONFIG_LOG_BUF_SHIFT=14 |
| 47 | # CONFIG_CGROUPS is not set | 45 | # CONFIG_CGROUPS is not set |
| 48 | CONFIG_FAIR_GROUP_SCHED=y | 46 | # CONFIG_GROUP_SCHED is not set |
| 49 | CONFIG_FAIR_USER_SCHED=y | ||
| 50 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 51 | CONFIG_SYSFS_DEPRECATED=y | 47 | CONFIG_SYSFS_DEPRECATED=y |
| 48 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 52 | CONFIG_RELAY=y | 49 | CONFIG_RELAY=y |
| 50 | # CONFIG_NAMESPACES is not set | ||
| 53 | CONFIG_BLK_DEV_INITRD=y | 51 | CONFIG_BLK_DEV_INITRD=y |
| 54 | CONFIG_INITRAMFS_SOURCE="" | 52 | CONFIG_INITRAMFS_SOURCE="" |
| 55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 53 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -63,11 +61,13 @@ CONFIG_HOTPLUG=y | |||
| 63 | CONFIG_PRINTK=y | 61 | CONFIG_PRINTK=y |
| 64 | CONFIG_BUG=y | 62 | CONFIG_BUG=y |
| 65 | CONFIG_ELF_CORE=y | 63 | CONFIG_ELF_CORE=y |
| 64 | # CONFIG_COMPAT_BRK is not set | ||
| 66 | # CONFIG_BASE_FULL is not set | 65 | # CONFIG_BASE_FULL is not set |
| 67 | CONFIG_FUTEX=y | 66 | CONFIG_FUTEX=y |
| 68 | CONFIG_ANON_INODES=y | 67 | CONFIG_ANON_INODES=y |
| 69 | CONFIG_EPOLL=y | 68 | CONFIG_EPOLL=y |
| 70 | CONFIG_SIGNALFD=y | 69 | CONFIG_SIGNALFD=y |
| 70 | CONFIG_TIMERFD=y | ||
| 71 | CONFIG_EVENTFD=y | 71 | CONFIG_EVENTFD=y |
| 72 | CONFIG_SHMEM=y | 72 | CONFIG_SHMEM=y |
| 73 | CONFIG_VM_EVENT_COUNTERS=y | 73 | CONFIG_VM_EVENT_COUNTERS=y |
| @@ -75,11 +75,20 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 75 | # CONFIG_SLAB is not set | 75 | # CONFIG_SLAB is not set |
| 76 | CONFIG_SLUB=y | 76 | CONFIG_SLUB=y |
| 77 | # CONFIG_SLOB is not set | 77 | # CONFIG_SLOB is not set |
| 78 | CONFIG_SLABINFO=y | 78 | CONFIG_PROFILING=y |
| 79 | # CONFIG_MARKERS is not set | ||
| 80 | CONFIG_OPROFILE=m | ||
| 81 | CONFIG_HAVE_OPROFILE=y | ||
| 82 | CONFIG_KPROBES=y | ||
| 83 | CONFIG_HAVE_KPROBES=y | ||
| 84 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 85 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 86 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 79 | CONFIG_RT_MUTEXES=y | 87 | CONFIG_RT_MUTEXES=y |
| 80 | # CONFIG_TINY_SHMEM is not set | 88 | # CONFIG_TINY_SHMEM is not set |
| 81 | CONFIG_BASE_SMALL=1 | 89 | CONFIG_BASE_SMALL=1 |
| 82 | CONFIG_MODULES=y | 90 | CONFIG_MODULES=y |
| 91 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 83 | CONFIG_MODULE_UNLOAD=y | 92 | CONFIG_MODULE_UNLOAD=y |
| 84 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 93 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 85 | # CONFIG_MODVERSIONS is not set | 94 | # CONFIG_MODVERSIONS is not set |
| @@ -103,10 +112,15 @@ CONFIG_IOSCHED_CFQ=y | |||
| 103 | CONFIG_DEFAULT_CFQ=y | 112 | CONFIG_DEFAULT_CFQ=y |
| 104 | # CONFIG_DEFAULT_NOOP is not set | 113 | # CONFIG_DEFAULT_NOOP is not set |
| 105 | CONFIG_DEFAULT_IOSCHED="cfq" | 114 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 115 | CONFIG_CLASSIC_RCU=y | ||
| 106 | 116 | ||
| 107 | # | 117 | # |
| 108 | # System Type and features | 118 | # System Type and features |
| 109 | # | 119 | # |
| 120 | CONFIG_TICK_ONESHOT=y | ||
| 121 | CONFIG_NO_HZ=y | ||
| 122 | CONFIG_HIGH_RES_TIMERS=y | ||
| 123 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 110 | CONFIG_SUBARCH_AVR32B=y | 124 | CONFIG_SUBARCH_AVR32B=y |
| 111 | CONFIG_MMU=y | 125 | CONFIG_MMU=y |
| 112 | CONFIG_PERFORMANCE_COUNTERS=y | 126 | CONFIG_PERFORMANCE_COUNTERS=y |
| @@ -152,16 +166,19 @@ CONFIG_FLATMEM=y | |||
| 152 | CONFIG_FLAT_NODE_MEM_MAP=y | 166 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 153 | # CONFIG_SPARSEMEM_STATIC is not set | 167 | # CONFIG_SPARSEMEM_STATIC is not set |
| 154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 168 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 169 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 170 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 156 | # CONFIG_RESOURCES_64BIT is not set | 171 | # CONFIG_RESOURCES_64BIT is not set |
| 157 | CONFIG_ZONE_DMA_FLAG=0 | 172 | CONFIG_ZONE_DMA_FLAG=0 |
| 158 | CONFIG_VIRT_TO_BUS=y | 173 | CONFIG_VIRT_TO_BUS=y |
| 159 | # CONFIG_OWNERSHIP_TRACE is not set | 174 | # CONFIG_OWNERSHIP_TRACE is not set |
| 175 | CONFIG_NMI_DEBUGGING=y | ||
| 160 | # CONFIG_HZ_100 is not set | 176 | # CONFIG_HZ_100 is not set |
| 161 | CONFIG_HZ_250=y | 177 | CONFIG_HZ_250=y |
| 162 | # CONFIG_HZ_300 is not set | 178 | # CONFIG_HZ_300 is not set |
| 163 | # CONFIG_HZ_1000 is not set | 179 | # CONFIG_HZ_1000 is not set |
| 164 | CONFIG_HZ=250 | 180 | CONFIG_HZ=250 |
| 181 | # CONFIG_SCHED_HRTICK is not set | ||
| 165 | CONFIG_CMDLINE="" | 182 | CONFIG_CMDLINE="" |
| 166 | 183 | ||
| 167 | # | 184 | # |
| @@ -175,9 +192,10 @@ CONFIG_CPU_FREQ=y | |||
| 175 | CONFIG_CPU_FREQ_TABLE=y | 192 | CONFIG_CPU_FREQ_TABLE=y |
| 176 | # CONFIG_CPU_FREQ_DEBUG is not set | 193 | # CONFIG_CPU_FREQ_DEBUG is not set |
| 177 | # CONFIG_CPU_FREQ_STAT is not set | 194 | # CONFIG_CPU_FREQ_STAT is not set |
| 178 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
| 196 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 179 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 197 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
| 180 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 198 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
| 181 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 199 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
| 182 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 200 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
| 183 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 201 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
| @@ -234,8 +252,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 234 | CONFIG_DEFAULT_TCP_CONG="cubic" | 252 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 235 | # CONFIG_TCP_MD5SIG is not set | 253 | # CONFIG_TCP_MD5SIG is not set |
| 236 | # CONFIG_IPV6 is not set | 254 | # CONFIG_IPV6 is not set |
| 237 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 238 | # CONFIG_INET6_TUNNEL is not set | ||
| 239 | # CONFIG_NETWORK_SECMARK is not set | 255 | # CONFIG_NETWORK_SECMARK is not set |
| 240 | # CONFIG_NETFILTER is not set | 256 | # CONFIG_NETFILTER is not set |
| 241 | # CONFIG_IP_DCCP is not set | 257 | # CONFIG_IP_DCCP is not set |
| @@ -260,6 +276,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 260 | # CONFIG_NET_PKTGEN is not set | 276 | # CONFIG_NET_PKTGEN is not set |
| 261 | # CONFIG_NET_TCPPROBE is not set | 277 | # CONFIG_NET_TCPPROBE is not set |
| 262 | # CONFIG_HAMRADIO is not set | 278 | # CONFIG_HAMRADIO is not set |
| 279 | # CONFIG_CAN is not set | ||
| 263 | # CONFIG_IRDA is not set | 280 | # CONFIG_IRDA is not set |
| 264 | # CONFIG_BT is not set | 281 | # CONFIG_BT is not set |
| 265 | # CONFIG_AF_RXRPC is not set | 282 | # CONFIG_AF_RXRPC is not set |
| @@ -295,6 +312,7 @@ CONFIG_MTD=y | |||
| 295 | CONFIG_MTD_PARTITIONS=y | 312 | CONFIG_MTD_PARTITIONS=y |
| 296 | # CONFIG_MTD_REDBOOT_PARTS is not set | 313 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 297 | CONFIG_MTD_CMDLINE_PARTS=y | 314 | CONFIG_MTD_CMDLINE_PARTS=y |
| 315 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 298 | 316 | ||
| 299 | # | 317 | # |
| 300 | # User Modules And Translation Layers | 318 | # User Modules And Translation Layers |
| @@ -349,6 +367,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 349 | # | 367 | # |
| 350 | CONFIG_MTD_DATAFLASH=m | 368 | CONFIG_MTD_DATAFLASH=m |
| 351 | CONFIG_MTD_M25P80=m | 369 | CONFIG_MTD_M25P80=m |
| 370 | CONFIG_M25PXX_USE_FAST_READ=y | ||
| 352 | # CONFIG_MTD_SLRAM is not set | 371 | # CONFIG_MTD_SLRAM is not set |
| 353 | # CONFIG_MTD_PHRAM is not set | 372 | # CONFIG_MTD_PHRAM is not set |
| 354 | # CONFIG_MTD_MTDRAM is not set | 373 | # CONFIG_MTD_MTDRAM is not set |
| @@ -376,13 +395,18 @@ CONFIG_BLK_DEV_NBD=m | |||
| 376 | CONFIG_BLK_DEV_RAM=m | 395 | CONFIG_BLK_DEV_RAM=m |
| 377 | CONFIG_BLK_DEV_RAM_COUNT=16 | 396 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 378 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 397 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 379 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 398 | # CONFIG_BLK_DEV_XIP is not set |
| 380 | # CONFIG_CDROM_PKTCDVD is not set | 399 | # CONFIG_CDROM_PKTCDVD is not set |
| 381 | # CONFIG_ATA_OVER_ETH is not set | 400 | # CONFIG_ATA_OVER_ETH is not set |
| 382 | CONFIG_MISC_DEVICES=y | 401 | CONFIG_MISC_DEVICES=y |
| 402 | CONFIG_ATMEL_PWM=m | ||
| 403 | CONFIG_ATMEL_TCLIB=y | ||
| 404 | CONFIG_ATMEL_TCB_CLKSRC=y | ||
| 405 | CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 | ||
| 383 | # CONFIG_EEPROM_93CX6 is not set | 406 | # CONFIG_EEPROM_93CX6 is not set |
| 384 | CONFIG_ATMEL_SSC=m | 407 | CONFIG_ATMEL_SSC=m |
| 385 | # CONFIG_IDE is not set | 408 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 409 | # CONFIG_HAVE_IDE is not set | ||
| 386 | 410 | ||
| 387 | # | 411 | # |
| 388 | # SCSI device support | 412 | # SCSI device support |
| @@ -427,6 +451,9 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 427 | # CONFIG_SCSI_DEBUG is not set | 451 | # CONFIG_SCSI_DEBUG is not set |
| 428 | CONFIG_ATA=m | 452 | CONFIG_ATA=m |
| 429 | # CONFIG_ATA_NONSTANDARD is not set | 453 | # CONFIG_ATA_NONSTANDARD is not set |
| 454 | # CONFIG_SATA_PMP is not set | ||
| 455 | CONFIG_ATA_SFF=y | ||
| 456 | # CONFIG_SATA_MV is not set | ||
| 430 | CONFIG_PATA_AT32=m | 457 | CONFIG_PATA_AT32=m |
| 431 | # CONFIG_PATA_PLATFORM is not set | 458 | # CONFIG_PATA_PLATFORM is not set |
| 432 | # CONFIG_MD is not set | 459 | # CONFIG_MD is not set |
| @@ -447,6 +474,7 @@ CONFIG_NETDEVICES=y | |||
| 447 | # | 474 | # |
| 448 | # CONFIG_WLAN_PRE80211 is not set | 475 | # CONFIG_WLAN_PRE80211 is not set |
| 449 | # CONFIG_WLAN_80211 is not set | 476 | # CONFIG_WLAN_80211 is not set |
| 477 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 450 | # CONFIG_WAN is not set | 478 | # CONFIG_WAN is not set |
| 451 | CONFIG_PPP=m | 479 | CONFIG_PPP=m |
| 452 | # CONFIG_PPP_MULTILINK is not set | 480 | # CONFIG_PPP_MULTILINK is not set |
| @@ -460,7 +488,6 @@ CONFIG_PPP_BSDCOMP=m | |||
| 460 | # CONFIG_PPPOL2TP is not set | 488 | # CONFIG_PPPOL2TP is not set |
| 461 | # CONFIG_SLIP is not set | 489 | # CONFIG_SLIP is not set |
| 462 | CONFIG_SLHC=m | 490 | CONFIG_SLHC=m |
| 463 | # CONFIG_SHAPER is not set | ||
| 464 | # CONFIG_NETCONSOLE is not set | 491 | # CONFIG_NETCONSOLE is not set |
| 465 | # CONFIG_NETPOLL is not set | 492 | # CONFIG_NETPOLL is not set |
| 466 | # CONFIG_NET_POLL_CONTROLLER is not set | 493 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -516,6 +543,7 @@ CONFIG_MOUSE_GPIO=m | |||
| 516 | # Character devices | 543 | # Character devices |
| 517 | # | 544 | # |
| 518 | # CONFIG_VT is not set | 545 | # CONFIG_VT is not set |
| 546 | # CONFIG_DEVKMEM is not set | ||
| 519 | # CONFIG_SERIAL_NONSTANDARD is not set | 547 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 520 | 548 | ||
| 521 | # | 549 | # |
| @@ -528,6 +556,7 @@ CONFIG_MOUSE_GPIO=m | |||
| 528 | # | 556 | # |
| 529 | CONFIG_SERIAL_ATMEL=y | 557 | CONFIG_SERIAL_ATMEL=y |
| 530 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 558 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
| 559 | CONFIG_SERIAL_ATMEL_PDC=y | ||
| 531 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | 560 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
| 532 | CONFIG_SERIAL_CORE=y | 561 | CONFIG_SERIAL_CORE=y |
| 533 | CONFIG_SERIAL_CORE_CONSOLE=y | 562 | CONFIG_SERIAL_CORE_CONSOLE=y |
| @@ -535,21 +564,13 @@ CONFIG_UNIX98_PTYS=y | |||
| 535 | # CONFIG_LEGACY_PTYS is not set | 564 | # CONFIG_LEGACY_PTYS is not set |
| 536 | # CONFIG_IPMI_HANDLER is not set | 565 | # CONFIG_IPMI_HANDLER is not set |
| 537 | # CONFIG_HW_RANDOM is not set | 566 | # CONFIG_HW_RANDOM is not set |
| 538 | # CONFIG_RTC is not set | ||
| 539 | # CONFIG_GEN_RTC is not set | ||
| 540 | # CONFIG_R3964 is not set | 567 | # CONFIG_R3964 is not set |
| 541 | # CONFIG_RAW_DRIVER is not set | 568 | # CONFIG_RAW_DRIVER is not set |
| 542 | # CONFIG_TCG_TPM is not set | 569 | # CONFIG_TCG_TPM is not set |
| 543 | CONFIG_I2C=m | 570 | CONFIG_I2C=m |
| 544 | CONFIG_I2C_BOARDINFO=y | 571 | CONFIG_I2C_BOARDINFO=y |
| 545 | CONFIG_I2C_CHARDEV=m | 572 | CONFIG_I2C_CHARDEV=m |
| 546 | |||
| 547 | # | ||
| 548 | # I2C Algorithms | ||
| 549 | # | ||
| 550 | CONFIG_I2C_ALGOBIT=m | 573 | CONFIG_I2C_ALGOBIT=m |
| 551 | # CONFIG_I2C_ALGOPCF is not set | ||
| 552 | # CONFIG_I2C_ALGOPCA is not set | ||
| 553 | 574 | ||
| 554 | # | 575 | # |
| 555 | # I2C Hardware Bus support | 576 | # I2C Hardware Bus support |
| @@ -560,27 +581,23 @@ CONFIG_I2C_GPIO=m | |||
| 560 | # CONFIG_I2C_SIMTEC is not set | 581 | # CONFIG_I2C_SIMTEC is not set |
| 561 | # CONFIG_I2C_TAOS_EVM is not set | 582 | # CONFIG_I2C_TAOS_EVM is not set |
| 562 | # CONFIG_I2C_STUB is not set | 583 | # CONFIG_I2C_STUB is not set |
| 584 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 563 | 585 | ||
| 564 | # | 586 | # |
| 565 | # Miscellaneous I2C Chip support | 587 | # Miscellaneous I2C Chip support |
| 566 | # | 588 | # |
| 567 | # CONFIG_SENSORS_DS1337 is not set | ||
| 568 | # CONFIG_SENSORS_DS1374 is not set | ||
| 569 | # CONFIG_DS1682 is not set | 589 | # CONFIG_DS1682 is not set |
| 570 | # CONFIG_SENSORS_EEPROM is not set | 590 | # CONFIG_SENSORS_EEPROM is not set |
| 571 | # CONFIG_SENSORS_PCF8574 is not set | 591 | # CONFIG_SENSORS_PCF8574 is not set |
| 572 | # CONFIG_SENSORS_PCA9539 is not set | 592 | # CONFIG_PCF8575 is not set |
| 573 | # CONFIG_SENSORS_PCF8591 is not set | 593 | # CONFIG_SENSORS_PCF8591 is not set |
| 594 | # CONFIG_TPS65010 is not set | ||
| 574 | # CONFIG_SENSORS_MAX6875 is not set | 595 | # CONFIG_SENSORS_MAX6875 is not set |
| 575 | # CONFIG_SENSORS_TSL2550 is not set | 596 | # CONFIG_SENSORS_TSL2550 is not set |
| 576 | # CONFIG_I2C_DEBUG_CORE is not set | 597 | # CONFIG_I2C_DEBUG_CORE is not set |
| 577 | # CONFIG_I2C_DEBUG_ALGO is not set | 598 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 578 | # CONFIG_I2C_DEBUG_BUS is not set | 599 | # CONFIG_I2C_DEBUG_BUS is not set |
| 579 | # CONFIG_I2C_DEBUG_CHIP is not set | 600 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 580 | |||
| 581 | # | ||
| 582 | # SPI support | ||
| 583 | # | ||
| 584 | CONFIG_SPI=y | 601 | CONFIG_SPI=y |
| 585 | # CONFIG_SPI_DEBUG is not set | 602 | # CONFIG_SPI_DEBUG is not set |
| 586 | CONFIG_SPI_MASTER=y | 603 | CONFIG_SPI_MASTER=y |
| @@ -597,9 +614,27 @@ CONFIG_SPI_ATMEL=y | |||
| 597 | # CONFIG_SPI_AT25 is not set | 614 | # CONFIG_SPI_AT25 is not set |
| 598 | CONFIG_SPI_SPIDEV=m | 615 | CONFIG_SPI_SPIDEV=m |
| 599 | # CONFIG_SPI_TLE62X0 is not set | 616 | # CONFIG_SPI_TLE62X0 is not set |
| 617 | CONFIG_HAVE_GPIO_LIB=y | ||
| 618 | |||
| 619 | # | ||
| 620 | # GPIO Support | ||
| 621 | # | ||
| 622 | # CONFIG_DEBUG_GPIO is not set | ||
| 623 | |||
| 624 | # | ||
| 625 | # I2C GPIO expanders: | ||
| 626 | # | ||
| 627 | # CONFIG_GPIO_PCA953X is not set | ||
| 628 | # CONFIG_GPIO_PCF857X is not set | ||
| 629 | |||
| 630 | # | ||
| 631 | # SPI GPIO expanders: | ||
| 632 | # | ||
| 633 | # CONFIG_GPIO_MCP23S08 is not set | ||
| 600 | # CONFIG_W1 is not set | 634 | # CONFIG_W1 is not set |
| 601 | # CONFIG_POWER_SUPPLY is not set | 635 | # CONFIG_POWER_SUPPLY is not set |
| 602 | # CONFIG_HWMON is not set | 636 | # CONFIG_HWMON is not set |
| 637 | # CONFIG_THERMAL is not set | ||
| 603 | CONFIG_WATCHDOG=y | 638 | CONFIG_WATCHDOG=y |
| 604 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 639 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 605 | 640 | ||
| @@ -619,12 +654,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 619 | # Multifunction device drivers | 654 | # Multifunction device drivers |
| 620 | # | 655 | # |
| 621 | # CONFIG_MFD_SM501 is not set | 656 | # CONFIG_MFD_SM501 is not set |
| 657 | # CONFIG_HTC_PASIC3 is not set | ||
| 622 | 658 | ||
| 623 | # | 659 | # |
| 624 | # Multimedia devices | 660 | # Multimedia devices |
| 625 | # | 661 | # |
| 662 | |||
| 663 | # | ||
| 664 | # Multimedia core support | ||
| 665 | # | ||
| 626 | # CONFIG_VIDEO_DEV is not set | 666 | # CONFIG_VIDEO_DEV is not set |
| 627 | # CONFIG_DVB_CORE is not set | 667 | # CONFIG_DVB_CORE is not set |
| 668 | # CONFIG_VIDEO_MEDIA is not set | ||
| 669 | |||
| 670 | # | ||
| 671 | # Multimedia drivers | ||
| 672 | # | ||
| 628 | # CONFIG_DAB is not set | 673 | # CONFIG_DAB is not set |
| 629 | 674 | ||
| 630 | # | 675 | # |
| @@ -682,7 +727,11 @@ CONFIG_SND_AT73C213_TARGET_BITRATE=48000 | |||
| 682 | # CONFIG_SND_SOC is not set | 727 | # CONFIG_SND_SOC is not set |
| 683 | 728 | ||
| 684 | # | 729 | # |
| 685 | # SoC Audio support for SuperH | 730 | # ALSA SoC audio for Freescale SOCs |
| 731 | # | ||
| 732 | |||
| 733 | # | ||
| 734 | # SoC Audio for the Texas Instruments OMAP | ||
| 686 | # | 735 | # |
| 687 | 736 | ||
| 688 | # | 737 | # |
| @@ -694,14 +743,12 @@ CONFIG_USB_SUPPORT=y | |||
| 694 | # CONFIG_USB_ARCH_HAS_HCD is not set | 743 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 695 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 744 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 696 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 745 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 746 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 747 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 697 | 748 | ||
| 698 | # | 749 | # |
| 699 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 750 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 700 | # | 751 | # |
| 701 | |||
| 702 | # | ||
| 703 | # USB Gadget Support | ||
| 704 | # | ||
| 705 | CONFIG_USB_GADGET=y | 752 | CONFIG_USB_GADGET=y |
| 706 | # CONFIG_USB_GADGET_DEBUG is not set | 753 | # CONFIG_USB_GADGET_DEBUG is not set |
| 707 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 754 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -714,6 +761,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
| 714 | # CONFIG_USB_GADGET_NET2280 is not set | 761 | # CONFIG_USB_GADGET_NET2280 is not set |
| 715 | # CONFIG_USB_GADGET_PXA2XX is not set | 762 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 716 | # CONFIG_USB_GADGET_M66592 is not set | 763 | # CONFIG_USB_GADGET_M66592 is not set |
| 764 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 717 | # CONFIG_USB_GADGET_GOKU is not set | 765 | # CONFIG_USB_GADGET_GOKU is not set |
| 718 | # CONFIG_USB_GADGET_LH7A40X is not set | 766 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 719 | # CONFIG_USB_GADGET_OMAP is not set | 767 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -729,6 +777,7 @@ CONFIG_USB_FILE_STORAGE=m | |||
| 729 | # CONFIG_USB_FILE_STORAGE_TEST is not set | 777 | # CONFIG_USB_FILE_STORAGE_TEST is not set |
| 730 | CONFIG_USB_G_SERIAL=m | 778 | CONFIG_USB_G_SERIAL=m |
| 731 | # CONFIG_USB_MIDI_GADGET is not set | 779 | # CONFIG_USB_MIDI_GADGET is not set |
| 780 | # CONFIG_USB_G_PRINTER is not set | ||
| 732 | CONFIG_MMC=m | 781 | CONFIG_MMC=m |
| 733 | # CONFIG_MMC_DEBUG is not set | 782 | # CONFIG_MMC_DEBUG is not set |
| 734 | # CONFIG_MMC_UNSAFE_RESUME is not set | 783 | # CONFIG_MMC_UNSAFE_RESUME is not set |
| @@ -739,17 +788,20 @@ CONFIG_MMC=m | |||
| 739 | CONFIG_MMC_BLOCK=m | 788 | CONFIG_MMC_BLOCK=m |
| 740 | # CONFIG_MMC_BLOCK_BOUNCE is not set | 789 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
| 741 | # CONFIG_SDIO_UART is not set | 790 | # CONFIG_SDIO_UART is not set |
| 791 | # CONFIG_MMC_TEST is not set | ||
| 742 | 792 | ||
| 743 | # | 793 | # |
| 744 | # MMC/SD Host Controller Drivers | 794 | # MMC/SD Host Controller Drivers |
| 745 | # | 795 | # |
| 746 | CONFIG_MMC_SPI=m | 796 | CONFIG_MMC_SPI=m |
| 797 | # CONFIG_MEMSTICK is not set | ||
| 747 | CONFIG_NEW_LEDS=y | 798 | CONFIG_NEW_LEDS=y |
| 748 | CONFIG_LEDS_CLASS=y | 799 | CONFIG_LEDS_CLASS=y |
| 749 | 800 | ||
| 750 | # | 801 | # |
| 751 | # LED drivers | 802 | # LED drivers |
| 752 | # | 803 | # |
| 804 | CONFIG_LEDS_ATMEL_PWM=m | ||
| 753 | CONFIG_LEDS_GPIO=y | 805 | CONFIG_LEDS_GPIO=y |
| 754 | 806 | ||
| 755 | # | 807 | # |
| @@ -758,6 +810,8 @@ CONFIG_LEDS_GPIO=y | |||
| 758 | CONFIG_LEDS_TRIGGERS=y | 810 | CONFIG_LEDS_TRIGGERS=y |
| 759 | CONFIG_LEDS_TRIGGER_TIMER=y | 811 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 760 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 812 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 813 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
| 814 | # CONFIG_ACCESSIBILITY is not set | ||
| 761 | CONFIG_RTC_LIB=y | 815 | CONFIG_RTC_LIB=y |
| 762 | CONFIG_RTC_CLASS=y | 816 | CONFIG_RTC_CLASS=y |
| 763 | CONFIG_RTC_HCTOSYS=y | 817 | CONFIG_RTC_HCTOSYS=y |
| @@ -786,19 +840,22 @@ CONFIG_RTC_INTF_DEV=y | |||
| 786 | # CONFIG_RTC_DRV_PCF8563 is not set | 840 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 787 | # CONFIG_RTC_DRV_PCF8583 is not set | 841 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 788 | # CONFIG_RTC_DRV_M41T80 is not set | 842 | # CONFIG_RTC_DRV_M41T80 is not set |
| 843 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 789 | 844 | ||
| 790 | # | 845 | # |
| 791 | # SPI RTC drivers | 846 | # SPI RTC drivers |
| 792 | # | 847 | # |
| 793 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 794 | # CONFIG_RTC_DRV_MAX6902 is not set | 848 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 849 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 850 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 795 | 851 | ||
| 796 | # | 852 | # |
| 797 | # Platform RTC drivers | 853 | # Platform RTC drivers |
| 798 | # | 854 | # |
| 855 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 799 | # CONFIG_RTC_DRV_DS1553 is not set | 856 | # CONFIG_RTC_DRV_DS1553 is not set |
| 800 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 801 | # CONFIG_RTC_DRV_DS1742 is not set | 857 | # CONFIG_RTC_DRV_DS1742 is not set |
| 858 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 802 | # CONFIG_RTC_DRV_M48T86 is not set | 859 | # CONFIG_RTC_DRV_M48T86 is not set |
| 803 | # CONFIG_RTC_DRV_M48T59 is not set | 860 | # CONFIG_RTC_DRV_M48T59 is not set |
| 804 | # CONFIG_RTC_DRV_V3020 is not set | 861 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -807,11 +864,8 @@ CONFIG_RTC_INTF_DEV=y | |||
| 807 | # on-CPU RTC drivers | 864 | # on-CPU RTC drivers |
| 808 | # | 865 | # |
| 809 | CONFIG_RTC_DRV_AT32AP700X=y | 866 | CONFIG_RTC_DRV_AT32AP700X=y |
| 810 | |||
| 811 | # | ||
| 812 | # Userspace I/O | ||
| 813 | # | ||
| 814 | CONFIG_UIO=m | 867 | CONFIG_UIO=m |
| 868 | # CONFIG_UIO_SMX is not set | ||
| 815 | 869 | ||
| 816 | # | 870 | # |
| 817 | # File systems | 871 | # File systems |
| @@ -828,14 +882,11 @@ CONFIG_JBD=m | |||
| 828 | # CONFIG_JFS_FS is not set | 882 | # CONFIG_JFS_FS is not set |
| 829 | # CONFIG_FS_POSIX_ACL is not set | 883 | # CONFIG_FS_POSIX_ACL is not set |
| 830 | # CONFIG_XFS_FS is not set | 884 | # CONFIG_XFS_FS is not set |
| 831 | # CONFIG_GFS2_FS is not set | ||
| 832 | # CONFIG_OCFS2_FS is not set | 885 | # CONFIG_OCFS2_FS is not set |
| 833 | # CONFIG_MINIX_FS is not set | 886 | # CONFIG_DNOTIFY is not set |
| 834 | # CONFIG_ROMFS_FS is not set | ||
| 835 | CONFIG_INOTIFY=y | 887 | CONFIG_INOTIFY=y |
| 836 | CONFIG_INOTIFY_USER=y | 888 | CONFIG_INOTIFY_USER=y |
| 837 | # CONFIG_QUOTA is not set | 889 | # CONFIG_QUOTA is not set |
| 838 | # CONFIG_DNOTIFY is not set | ||
| 839 | # CONFIG_AUTOFS_FS is not set | 890 | # CONFIG_AUTOFS_FS is not set |
| 840 | # CONFIG_AUTOFS4_FS is not set | 891 | # CONFIG_AUTOFS4_FS is not set |
| 841 | CONFIG_FUSE_FS=m | 892 | CONFIG_FUSE_FS=m |
| @@ -891,8 +942,10 @@ CONFIG_JFFS2_RTIME=y | |||
| 891 | # CONFIG_JFFS2_RUBIN is not set | 942 | # CONFIG_JFFS2_RUBIN is not set |
| 892 | # CONFIG_CRAMFS is not set | 943 | # CONFIG_CRAMFS is not set |
| 893 | # CONFIG_VXFS_FS is not set | 944 | # CONFIG_VXFS_FS is not set |
| 945 | # CONFIG_MINIX_FS is not set | ||
| 894 | # CONFIG_HPFS_FS is not set | 946 | # CONFIG_HPFS_FS is not set |
| 895 | # CONFIG_QNX4FS_FS is not set | 947 | # CONFIG_QNX4FS_FS is not set |
| 948 | # CONFIG_ROMFS_FS is not set | ||
| 896 | # CONFIG_SYSV_FS is not set | 949 | # CONFIG_SYSV_FS is not set |
| 897 | # CONFIG_UFS_FS is not set | 950 | # CONFIG_UFS_FS is not set |
| 898 | # CONFIG_NETWORK_FILESYSTEMS is not set | 951 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| @@ -943,11 +996,6 @@ CONFIG_NLS_ISO8859_1=m | |||
| 943 | # CONFIG_NLS_KOI8_U is not set | 996 | # CONFIG_NLS_KOI8_U is not set |
| 944 | CONFIG_NLS_UTF8=m | 997 | CONFIG_NLS_UTF8=m |
| 945 | # CONFIG_DLM is not set | 998 | # CONFIG_DLM is not set |
| 946 | CONFIG_INSTRUMENTATION=y | ||
| 947 | CONFIG_PROFILING=y | ||
| 948 | CONFIG_OPROFILE=m | ||
| 949 | CONFIG_KPROBES=y | ||
| 950 | # CONFIG_MARKERS is not set | ||
| 951 | 999 | ||
| 952 | # | 1000 | # |
| 953 | # Kernel hacking | 1001 | # Kernel hacking |
| @@ -955,6 +1003,7 @@ CONFIG_KPROBES=y | |||
| 955 | # CONFIG_PRINTK_TIME is not set | 1003 | # CONFIG_PRINTK_TIME is not set |
| 956 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1004 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 957 | CONFIG_ENABLE_MUST_CHECK=y | 1005 | CONFIG_ENABLE_MUST_CHECK=y |
| 1006 | CONFIG_FRAME_WARN=1024 | ||
| 958 | CONFIG_MAGIC_SYSRQ=y | 1007 | CONFIG_MAGIC_SYSRQ=y |
| 959 | # CONFIG_UNUSED_SYMBOLS is not set | 1008 | # CONFIG_UNUSED_SYMBOLS is not set |
| 960 | CONFIG_DEBUG_FS=y | 1009 | CONFIG_DEBUG_FS=y |
| @@ -965,6 +1014,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 965 | CONFIG_SCHED_DEBUG=y | 1014 | CONFIG_SCHED_DEBUG=y |
| 966 | # CONFIG_SCHEDSTATS is not set | 1015 | # CONFIG_SCHEDSTATS is not set |
| 967 | # CONFIG_TIMER_STATS is not set | 1016 | # CONFIG_TIMER_STATS is not set |
| 1017 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 968 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1018 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 969 | # CONFIG_RT_MUTEX_TESTER is not set | 1019 | # CONFIG_RT_MUTEX_TESTER is not set |
| 970 | # CONFIG_DEBUG_SPINLOCK is not set | 1020 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -978,12 +1028,14 @@ CONFIG_SCHED_DEBUG=y | |||
| 978 | CONFIG_DEBUG_BUGVERBOSE=y | 1028 | CONFIG_DEBUG_BUGVERBOSE=y |
| 979 | # CONFIG_DEBUG_INFO is not set | 1029 | # CONFIG_DEBUG_INFO is not set |
| 980 | # CONFIG_DEBUG_VM is not set | 1030 | # CONFIG_DEBUG_VM is not set |
| 1031 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 981 | # CONFIG_DEBUG_LIST is not set | 1032 | # CONFIG_DEBUG_LIST is not set |
| 982 | # CONFIG_DEBUG_SG is not set | 1033 | # CONFIG_DEBUG_SG is not set |
| 983 | CONFIG_FRAME_POINTER=y | 1034 | CONFIG_FRAME_POINTER=y |
| 984 | CONFIG_FORCED_INLINING=y | ||
| 985 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1035 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 986 | # CONFIG_RCU_TORTURE_TEST is not set | 1036 | # CONFIG_RCU_TORTURE_TEST is not set |
| 1037 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 1038 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 987 | # CONFIG_LKDTM is not set | 1039 | # CONFIG_LKDTM is not set |
| 988 | # CONFIG_FAULT_INJECTION is not set | 1040 | # CONFIG_FAULT_INJECTION is not set |
| 989 | # CONFIG_SAMPLES is not set | 1041 | # CONFIG_SAMPLES is not set |
| @@ -1000,6 +1052,8 @@ CONFIG_FORCED_INLINING=y | |||
| 1000 | # Library routines | 1052 | # Library routines |
| 1001 | # | 1053 | # |
| 1002 | CONFIG_BITREVERSE=y | 1054 | CONFIG_BITREVERSE=y |
| 1055 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1056 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 1003 | CONFIG_CRC_CCITT=m | 1057 | CONFIG_CRC_CCITT=m |
| 1004 | # CONFIG_CRC16 is not set | 1058 | # CONFIG_CRC16 is not set |
| 1005 | CONFIG_CRC_ITU_T=m | 1059 | CONFIG_CRC_ITU_T=m |
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig index 634c52760349..a0912fb7c92e 100644 --- a/arch/avr32/configs/atstk1004_defconfig +++ b/arch/avr32/configs/atstk1004_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.24-rc7 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Wed Jan 9 23:04:20 2008 | 4 | # Mon May 26 13:34:57 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_AVR32=y | 6 | CONFIG_AVR32=y |
| 7 | CONFIG_GENERIC_GPIO=y | 7 | CONFIG_GENERIC_GPIO=y |
| @@ -13,10 +13,10 @@ CONFIG_HARDIRQS_SW_RESEND=y | |||
| 13 | CONFIG_GENERIC_IRQ_PROBE=y | 13 | CONFIG_GENERIC_IRQ_PROBE=y |
| 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 14 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 15 | CONFIG_GENERIC_TIME=y | 15 | CONFIG_GENERIC_TIME=y |
| 16 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 16 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 17 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
| 17 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 18 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 19 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 20 | CONFIG_GENERIC_HWEIGHT=y | 20 | CONFIG_GENERIC_HWEIGHT=y |
| 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 21 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 22 | CONFIG_GENERIC_BUG=y | 22 | CONFIG_GENERIC_BUG=y |
| @@ -34,15 +34,15 @@ CONFIG_LOCALVERSION="" | |||
| 34 | # CONFIG_POSIX_MQUEUE is not set | 34 | # CONFIG_POSIX_MQUEUE is not set |
| 35 | # CONFIG_BSD_PROCESS_ACCT is not set | 35 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 36 | # CONFIG_TASKSTATS is not set | 36 | # CONFIG_TASKSTATS is not set |
| 37 | # CONFIG_USER_NS is not set | ||
| 38 | # CONFIG_PID_NS is not set | ||
| 39 | # CONFIG_AUDIT is not set | 37 | # CONFIG_AUDIT is not set |
| 40 | # CONFIG_IKCONFIG is not set | 38 | # CONFIG_IKCONFIG is not set |
| 41 | CONFIG_LOG_BUF_SHIFT=14 | 39 | CONFIG_LOG_BUF_SHIFT=14 |
| 42 | # CONFIG_CGROUPS is not set | 40 | # CONFIG_CGROUPS is not set |
| 43 | # CONFIG_FAIR_GROUP_SCHED is not set | 41 | # CONFIG_GROUP_SCHED is not set |
| 44 | CONFIG_SYSFS_DEPRECATED=y | 42 | CONFIG_SYSFS_DEPRECATED=y |
| 43 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 45 | # CONFIG_RELAY is not set | 44 | # CONFIG_RELAY is not set |
| 45 | # CONFIG_NAMESPACES is not set | ||
| 46 | # CONFIG_BLK_DEV_INITRD is not set | 46 | # CONFIG_BLK_DEV_INITRD is not set |
| 47 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 47 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 48 | CONFIG_SYSCTL=y | 48 | CONFIG_SYSCTL=y |
| @@ -54,24 +54,38 @@ CONFIG_HOTPLUG=y | |||
| 54 | CONFIG_PRINTK=y | 54 | CONFIG_PRINTK=y |
| 55 | CONFIG_BUG=y | 55 | CONFIG_BUG=y |
| 56 | CONFIG_ELF_CORE=y | 56 | CONFIG_ELF_CORE=y |
| 57 | # CONFIG_COMPAT_BRK is not set | ||
| 57 | # CONFIG_BASE_FULL is not set | 58 | # CONFIG_BASE_FULL is not set |
| 58 | # CONFIG_FUTEX is not set | 59 | # CONFIG_FUTEX is not set |
| 59 | # CONFIG_EPOLL is not set | 60 | # CONFIG_EPOLL is not set |
| 60 | # CONFIG_SIGNALFD is not set | 61 | # CONFIG_SIGNALFD is not set |
| 62 | # CONFIG_TIMERFD is not set | ||
| 61 | # CONFIG_EVENTFD is not set | 63 | # CONFIG_EVENTFD is not set |
| 62 | CONFIG_SHMEM=y | 64 | CONFIG_SHMEM=y |
| 63 | CONFIG_VM_EVENT_COUNTERS=y | 65 | CONFIG_VM_EVENT_COUNTERS=y |
| 64 | # CONFIG_SLAB is not set | 66 | # CONFIG_SLAB is not set |
| 65 | # CONFIG_SLUB is not set | 67 | # CONFIG_SLUB is not set |
| 66 | CONFIG_SLOB=y | 68 | CONFIG_SLOB=y |
| 69 | # CONFIG_PROFILING is not set | ||
| 70 | # CONFIG_MARKERS is not set | ||
| 71 | CONFIG_HAVE_OPROFILE=y | ||
| 72 | CONFIG_HAVE_KPROBES=y | ||
| 73 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 74 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 75 | # CONFIG_PROC_PAGE_MONITOR is not set | ||
| 67 | # CONFIG_TINY_SHMEM is not set | 76 | # CONFIG_TINY_SHMEM is not set |
| 68 | CONFIG_BASE_SMALL=1 | 77 | CONFIG_BASE_SMALL=1 |
| 69 | # CONFIG_MODULES is not set | 78 | # CONFIG_MODULES is not set |
| 70 | # CONFIG_BLOCK is not set | 79 | # CONFIG_BLOCK is not set |
| 80 | CONFIG_CLASSIC_RCU=y | ||
| 71 | 81 | ||
| 72 | # | 82 | # |
| 73 | # System Type and features | 83 | # System Type and features |
| 74 | # | 84 | # |
| 85 | # CONFIG_TICK_ONESHOT is not set | ||
| 86 | # CONFIG_NO_HZ is not set | ||
| 87 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 88 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 75 | CONFIG_SUBARCH_AVR32B=y | 89 | CONFIG_SUBARCH_AVR32B=y |
| 76 | CONFIG_MMU=y | 90 | CONFIG_MMU=y |
| 77 | CONFIG_PERFORMANCE_COUNTERS=y | 91 | CONFIG_PERFORMANCE_COUNTERS=y |
| @@ -115,16 +129,19 @@ CONFIG_FLATMEM=y | |||
| 115 | CONFIG_FLAT_NODE_MEM_MAP=y | 129 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 116 | # CONFIG_SPARSEMEM_STATIC is not set | 130 | # CONFIG_SPARSEMEM_STATIC is not set |
| 117 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 131 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 132 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 118 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 133 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 119 | # CONFIG_RESOURCES_64BIT is not set | 134 | # CONFIG_RESOURCES_64BIT is not set |
| 120 | CONFIG_ZONE_DMA_FLAG=0 | 135 | CONFIG_ZONE_DMA_FLAG=0 |
| 121 | CONFIG_VIRT_TO_BUS=y | 136 | CONFIG_VIRT_TO_BUS=y |
| 122 | # CONFIG_OWNERSHIP_TRACE is not set | 137 | # CONFIG_OWNERSHIP_TRACE is not set |
| 138 | # CONFIG_NMI_DEBUGGING is not set | ||
| 123 | # CONFIG_HZ_100 is not set | 139 | # CONFIG_HZ_100 is not set |
| 124 | CONFIG_HZ_250=y | 140 | CONFIG_HZ_250=y |
| 125 | # CONFIG_HZ_300 is not set | 141 | # CONFIG_HZ_300 is not set |
| 126 | # CONFIG_HZ_1000 is not set | 142 | # CONFIG_HZ_1000 is not set |
| 127 | CONFIG_HZ=250 | 143 | CONFIG_HZ=250 |
| 144 | # CONFIG_SCHED_HRTICK is not set | ||
| 128 | CONFIG_CMDLINE="" | 145 | CONFIG_CMDLINE="" |
| 129 | 146 | ||
| 130 | # | 147 | # |
| @@ -134,20 +151,7 @@ CONFIG_CMDLINE="" | |||
| 134 | # | 151 | # |
| 135 | # CPU Frequency scaling | 152 | # CPU Frequency scaling |
| 136 | # | 153 | # |
| 137 | CONFIG_CPU_FREQ=y | 154 | # CONFIG_CPU_FREQ is not set |
| 138 | CONFIG_CPU_FREQ_TABLE=y | ||
| 139 | # CONFIG_CPU_FREQ_DEBUG is not set | ||
| 140 | # CONFIG_CPU_FREQ_STAT is not set | ||
| 141 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | ||
| 142 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | ||
| 143 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 144 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 145 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | ||
| 146 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | ||
| 147 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | ||
| 148 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | ||
| 149 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | ||
| 150 | CONFIG_CPU_FREQ_AT32AP=y | ||
| 151 | 155 | ||
| 152 | # | 156 | # |
| 153 | # Bus options | 157 | # Bus options |
| @@ -197,8 +201,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 197 | CONFIG_DEFAULT_TCP_CONG="cubic" | 201 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 198 | # CONFIG_TCP_MD5SIG is not set | 202 | # CONFIG_TCP_MD5SIG is not set |
| 199 | # CONFIG_IPV6 is not set | 203 | # CONFIG_IPV6 is not set |
| 200 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 201 | # CONFIG_INET6_TUNNEL is not set | ||
| 202 | # CONFIG_NETWORK_SECMARK is not set | 204 | # CONFIG_NETWORK_SECMARK is not set |
| 203 | # CONFIG_NETFILTER is not set | 205 | # CONFIG_NETFILTER is not set |
| 204 | # CONFIG_IP_DCCP is not set | 206 | # CONFIG_IP_DCCP is not set |
| @@ -222,6 +224,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 222 | # | 224 | # |
| 223 | # CONFIG_NET_PKTGEN is not set | 225 | # CONFIG_NET_PKTGEN is not set |
| 224 | # CONFIG_HAMRADIO is not set | 226 | # CONFIG_HAMRADIO is not set |
| 227 | # CONFIG_CAN is not set | ||
| 225 | # CONFIG_IRDA is not set | 228 | # CONFIG_IRDA is not set |
| 226 | # CONFIG_BT is not set | 229 | # CONFIG_BT is not set |
| 227 | # CONFIG_AF_RXRPC is not set | 230 | # CONFIG_AF_RXRPC is not set |
| @@ -255,6 +258,7 @@ CONFIG_MTD=y | |||
| 255 | CONFIG_MTD_PARTITIONS=y | 258 | CONFIG_MTD_PARTITIONS=y |
| 256 | # CONFIG_MTD_REDBOOT_PARTS is not set | 259 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 257 | CONFIG_MTD_CMDLINE_PARTS=y | 260 | CONFIG_MTD_CMDLINE_PARTS=y |
| 261 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 258 | 262 | ||
| 259 | # | 263 | # |
| 260 | # User Modules And Translation Layers | 264 | # User Modules And Translation Layers |
| @@ -321,6 +325,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 321 | # CONFIG_MTD_UBI is not set | 325 | # CONFIG_MTD_UBI is not set |
| 322 | # CONFIG_PARPORT is not set | 326 | # CONFIG_PARPORT is not set |
| 323 | # CONFIG_MISC_DEVICES is not set | 327 | # CONFIG_MISC_DEVICES is not set |
| 328 | # CONFIG_HAVE_IDE is not set | ||
| 324 | 329 | ||
| 325 | # | 330 | # |
| 326 | # SCSI device support | 331 | # SCSI device support |
| @@ -346,6 +351,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 346 | # Character devices | 351 | # Character devices |
| 347 | # | 352 | # |
| 348 | # CONFIG_VT is not set | 353 | # CONFIG_VT is not set |
| 354 | # CONFIG_DEVKMEM is not set | ||
| 349 | # CONFIG_SERIAL_NONSTANDARD is not set | 355 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 350 | 356 | ||
| 351 | # | 357 | # |
| @@ -358,6 +364,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 358 | # | 364 | # |
| 359 | CONFIG_SERIAL_ATMEL=y | 365 | CONFIG_SERIAL_ATMEL=y |
| 360 | CONFIG_SERIAL_ATMEL_CONSOLE=y | 366 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
| 367 | # CONFIG_SERIAL_ATMEL_PDC is not set | ||
| 361 | # CONFIG_SERIAL_ATMEL_TTYAT is not set | 368 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
| 362 | CONFIG_SERIAL_CORE=y | 369 | CONFIG_SERIAL_CORE=y |
| 363 | CONFIG_SERIAL_CORE_CONSOLE=y | 370 | CONFIG_SERIAL_CORE_CONSOLE=y |
| @@ -365,15 +372,9 @@ CONFIG_UNIX98_PTYS=y | |||
| 365 | # CONFIG_LEGACY_PTYS is not set | 372 | # CONFIG_LEGACY_PTYS is not set |
| 366 | # CONFIG_IPMI_HANDLER is not set | 373 | # CONFIG_IPMI_HANDLER is not set |
| 367 | # CONFIG_HW_RANDOM is not set | 374 | # CONFIG_HW_RANDOM is not set |
| 368 | # CONFIG_RTC is not set | ||
| 369 | # CONFIG_GEN_RTC is not set | ||
| 370 | # CONFIG_R3964 is not set | 375 | # CONFIG_R3964 is not set |
| 371 | # CONFIG_TCG_TPM is not set | 376 | # CONFIG_TCG_TPM is not set |
| 372 | # CONFIG_I2C is not set | 377 | # CONFIG_I2C is not set |
| 373 | |||
| 374 | # | ||
| 375 | # SPI support | ||
| 376 | # | ||
| 377 | CONFIG_SPI=y | 378 | CONFIG_SPI=y |
| 378 | CONFIG_SPI_MASTER=y | 379 | CONFIG_SPI_MASTER=y |
| 379 | 380 | ||
| @@ -389,9 +390,24 @@ CONFIG_SPI_ATMEL=y | |||
| 389 | # CONFIG_SPI_AT25 is not set | 390 | # CONFIG_SPI_AT25 is not set |
| 390 | # CONFIG_SPI_SPIDEV is not set | 391 | # CONFIG_SPI_SPIDEV is not set |
| 391 | # CONFIG_SPI_TLE62X0 is not set | 392 | # CONFIG_SPI_TLE62X0 is not set |
| 393 | CONFIG_HAVE_GPIO_LIB=y | ||
| 394 | |||
| 395 | # | ||
| 396 | # GPIO Support | ||
| 397 | # | ||
| 398 | |||
| 399 | # | ||
| 400 | # I2C GPIO expanders: | ||
| 401 | # | ||
| 402 | |||
| 403 | # | ||
| 404 | # SPI GPIO expanders: | ||
| 405 | # | ||
| 406 | # CONFIG_GPIO_MCP23S08 is not set | ||
| 392 | # CONFIG_W1 is not set | 407 | # CONFIG_W1 is not set |
| 393 | # CONFIG_POWER_SUPPLY is not set | 408 | # CONFIG_POWER_SUPPLY is not set |
| 394 | # CONFIG_HWMON is not set | 409 | # CONFIG_HWMON is not set |
| 410 | # CONFIG_THERMAL is not set | ||
| 395 | CONFIG_WATCHDOG=y | 411 | CONFIG_WATCHDOG=y |
| 396 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 412 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
| 397 | 413 | ||
| @@ -411,12 +427,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 411 | # Multifunction device drivers | 427 | # Multifunction device drivers |
| 412 | # | 428 | # |
| 413 | # CONFIG_MFD_SM501 is not set | 429 | # CONFIG_MFD_SM501 is not set |
| 430 | # CONFIG_HTC_PASIC3 is not set | ||
| 414 | 431 | ||
| 415 | # | 432 | # |
| 416 | # Multimedia devices | 433 | # Multimedia devices |
| 417 | # | 434 | # |
| 435 | |||
| 436 | # | ||
| 437 | # Multimedia core support | ||
| 438 | # | ||
| 418 | # CONFIG_VIDEO_DEV is not set | 439 | # CONFIG_VIDEO_DEV is not set |
| 419 | # CONFIG_DVB_CORE is not set | 440 | # CONFIG_DVB_CORE is not set |
| 441 | # CONFIG_VIDEO_MEDIA is not set | ||
| 442 | |||
| 443 | # | ||
| 444 | # Multimedia drivers | ||
| 445 | # | ||
| 420 | # CONFIG_DAB is not set | 446 | # CONFIG_DAB is not set |
| 421 | 447 | ||
| 422 | # | 448 | # |
| @@ -434,8 +460,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 434 | # CONFIG_FB_SYS_FILLRECT is not set | 460 | # CONFIG_FB_SYS_FILLRECT is not set |
| 435 | # CONFIG_FB_SYS_COPYAREA is not set | 461 | # CONFIG_FB_SYS_COPYAREA is not set |
| 436 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 462 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 463 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 437 | # CONFIG_FB_SYS_FOPS is not set | 464 | # CONFIG_FB_SYS_FOPS is not set |
| 438 | CONFIG_FB_DEFERRED_IO=y | ||
| 439 | # CONFIG_FB_SVGALIB is not set | 465 | # CONFIG_FB_SVGALIB is not set |
| 440 | # CONFIG_FB_MACMODES is not set | 466 | # CONFIG_FB_MACMODES is not set |
| 441 | # CONFIG_FB_BACKLIGHT is not set | 467 | # CONFIG_FB_BACKLIGHT is not set |
| @@ -467,14 +493,12 @@ CONFIG_USB_SUPPORT=y | |||
| 467 | # CONFIG_USB_ARCH_HAS_HCD is not set | 493 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 468 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 494 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 469 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 495 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 496 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 497 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 470 | 498 | ||
| 471 | # | 499 | # |
| 472 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 500 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 473 | # | 501 | # |
| 474 | |||
| 475 | # | ||
| 476 | # USB Gadget Support | ||
| 477 | # | ||
| 478 | CONFIG_USB_GADGET=y | 502 | CONFIG_USB_GADGET=y |
| 479 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 503 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| 480 | CONFIG_USB_GADGET_SELECTED=y | 504 | CONFIG_USB_GADGET_SELECTED=y |
| @@ -485,6 +509,7 @@ CONFIG_USB_ATMEL_USBA=y | |||
| 485 | # CONFIG_USB_GADGET_NET2280 is not set | 509 | # CONFIG_USB_GADGET_NET2280 is not set |
| 486 | # CONFIG_USB_GADGET_PXA2XX is not set | 510 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 487 | # CONFIG_USB_GADGET_M66592 is not set | 511 | # CONFIG_USB_GADGET_M66592 is not set |
| 512 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 488 | # CONFIG_USB_GADGET_GOKU is not set | 513 | # CONFIG_USB_GADGET_GOKU is not set |
| 489 | # CONFIG_USB_GADGET_LH7A40X is not set | 514 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 490 | # CONFIG_USB_GADGET_OMAP is not set | 515 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -499,8 +524,11 @@ CONFIG_USB_ETH=y | |||
| 499 | # CONFIG_USB_FILE_STORAGE is not set | 524 | # CONFIG_USB_FILE_STORAGE is not set |
| 500 | # CONFIG_USB_G_SERIAL is not set | 525 | # CONFIG_USB_G_SERIAL is not set |
| 501 | # CONFIG_USB_MIDI_GADGET is not set | 526 | # CONFIG_USB_MIDI_GADGET is not set |
| 527 | # CONFIG_USB_G_PRINTER is not set | ||
| 502 | # CONFIG_MMC is not set | 528 | # CONFIG_MMC is not set |
| 529 | # CONFIG_MEMSTICK is not set | ||
| 503 | # CONFIG_NEW_LEDS is not set | 530 | # CONFIG_NEW_LEDS is not set |
| 531 | # CONFIG_ACCESSIBILITY is not set | ||
| 504 | CONFIG_RTC_LIB=y | 532 | CONFIG_RTC_LIB=y |
| 505 | CONFIG_RTC_CLASS=y | 533 | CONFIG_RTC_CLASS=y |
| 506 | CONFIG_RTC_HCTOSYS=y | 534 | CONFIG_RTC_HCTOSYS=y |
| @@ -519,15 +547,17 @@ CONFIG_RTC_INTF_DEV=y | |||
| 519 | # | 547 | # |
| 520 | # SPI RTC drivers | 548 | # SPI RTC drivers |
| 521 | # | 549 | # |
| 522 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 523 | # CONFIG_RTC_DRV_MAX6902 is not set | 550 | # CONFIG_RTC_DRV_MAX6902 is not set |
| 551 | # CONFIG_RTC_DRV_R9701 is not set | ||
| 552 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
| 524 | 553 | ||
| 525 | # | 554 | # |
| 526 | # Platform RTC drivers | 555 | # Platform RTC drivers |
| 527 | # | 556 | # |
| 557 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 528 | # CONFIG_RTC_DRV_DS1553 is not set | 558 | # CONFIG_RTC_DRV_DS1553 is not set |
| 529 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 530 | # CONFIG_RTC_DRV_DS1742 is not set | 559 | # CONFIG_RTC_DRV_DS1742 is not set |
| 560 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 531 | # CONFIG_RTC_DRV_M48T86 is not set | 561 | # CONFIG_RTC_DRV_M48T86 is not set |
| 532 | # CONFIG_RTC_DRV_M48T59 is not set | 562 | # CONFIG_RTC_DRV_M48T59 is not set |
| 533 | # CONFIG_RTC_DRV_V3020 is not set | 563 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -536,18 +566,14 @@ CONFIG_RTC_INTF_DEV=y | |||
| 536 | # on-CPU RTC drivers | 566 | # on-CPU RTC drivers |
| 537 | # | 567 | # |
| 538 | CONFIG_RTC_DRV_AT32AP700X=y | 568 | CONFIG_RTC_DRV_AT32AP700X=y |
| 539 | |||
| 540 | # | ||
| 541 | # Userspace I/O | ||
| 542 | # | ||
| 543 | # CONFIG_UIO is not set | 569 | # CONFIG_UIO is not set |
| 544 | 570 | ||
| 545 | # | 571 | # |
| 546 | # File systems | 572 | # File systems |
| 547 | # | 573 | # |
| 574 | # CONFIG_DNOTIFY is not set | ||
| 548 | # CONFIG_INOTIFY is not set | 575 | # CONFIG_INOTIFY is not set |
| 549 | # CONFIG_QUOTA is not set | 576 | # CONFIG_QUOTA is not set |
| 550 | # CONFIG_DNOTIFY is not set | ||
| 551 | # CONFIG_AUTOFS_FS is not set | 577 | # CONFIG_AUTOFS_FS is not set |
| 552 | # CONFIG_AUTOFS4_FS is not set | 578 | # CONFIG_AUTOFS4_FS is not set |
| 553 | # CONFIG_FUSE_FS is not set | 579 | # CONFIG_FUSE_FS is not set |
| @@ -580,7 +606,6 @@ CONFIG_JFFS2_RTIME=y | |||
| 580 | # CONFIG_NETWORK_FILESYSTEMS is not set | 606 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| 581 | # CONFIG_NLS is not set | 607 | # CONFIG_NLS is not set |
| 582 | # CONFIG_DLM is not set | 608 | # CONFIG_DLM is not set |
| 583 | # CONFIG_INSTRUMENTATION is not set | ||
| 584 | 609 | ||
| 585 | # | 610 | # |
| 586 | # Kernel hacking | 611 | # Kernel hacking |
| @@ -588,6 +613,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 588 | # CONFIG_PRINTK_TIME is not set | 613 | # CONFIG_PRINTK_TIME is not set |
| 589 | CONFIG_ENABLE_WARN_DEPRECATED=y | 614 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 590 | CONFIG_ENABLE_MUST_CHECK=y | 615 | CONFIG_ENABLE_MUST_CHECK=y |
| 616 | CONFIG_FRAME_WARN=1024 | ||
| 591 | CONFIG_MAGIC_SYSRQ=y | 617 | CONFIG_MAGIC_SYSRQ=y |
| 592 | # CONFIG_UNUSED_SYMBOLS is not set | 618 | # CONFIG_UNUSED_SYMBOLS is not set |
| 593 | # CONFIG_DEBUG_FS is not set | 619 | # CONFIG_DEBUG_FS is not set |
| @@ -608,6 +634,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
| 608 | # Library routines | 634 | # Library routines |
| 609 | # | 635 | # |
| 610 | CONFIG_BITREVERSE=y | 636 | CONFIG_BITREVERSE=y |
| 637 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 638 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | ||
| 611 | # CONFIG_CRC_CCITT is not set | 639 | # CONFIG_CRC_CCITT is not set |
| 612 | # CONFIG_CRC16 is not set | 640 | # CONFIG_CRC16 is not set |
| 613 | # CONFIG_CRC_ITU_T is not set | 641 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/avr32/kernel/avr32_ksyms.c b/arch/avr32/kernel/avr32_ksyms.c index 80f55f8dbf1c..84a7d44edc67 100644 --- a/arch/avr32/kernel/avr32_ksyms.c +++ b/arch/avr32/kernel/avr32_ksyms.c | |||
| @@ -29,7 +29,9 @@ EXPORT_SYMBOL(__avr32_asr64); | |||
| 29 | */ | 29 | */ |
| 30 | EXPORT_SYMBOL(memset); | 30 | EXPORT_SYMBOL(memset); |
| 31 | EXPORT_SYMBOL(memcpy); | 31 | EXPORT_SYMBOL(memcpy); |
| 32 | |||
| 32 | EXPORT_SYMBOL(clear_page); | 33 | EXPORT_SYMBOL(clear_page); |
| 34 | EXPORT_SYMBOL(copy_page); | ||
| 33 | 35 | ||
| 34 | /* | 36 | /* |
| 35 | * Userspace access stuff. | 37 | * Userspace access stuff. |
| @@ -41,6 +43,8 @@ EXPORT_SYMBOL(strncpy_from_user); | |||
| 41 | EXPORT_SYMBOL(__strncpy_from_user); | 43 | EXPORT_SYMBOL(__strncpy_from_user); |
| 42 | EXPORT_SYMBOL(clear_user); | 44 | EXPORT_SYMBOL(clear_user); |
| 43 | EXPORT_SYMBOL(__clear_user); | 45 | EXPORT_SYMBOL(__clear_user); |
| 46 | EXPORT_SYMBOL(strnlen_user); | ||
| 47 | |||
| 44 | EXPORT_SYMBOL(csum_partial); | 48 | EXPORT_SYMBOL(csum_partial); |
| 45 | EXPORT_SYMBOL(csum_partial_copy_generic); | 49 | EXPORT_SYMBOL(csum_partial_copy_generic); |
| 46 | 50 | ||
diff --git a/arch/avr32/kernel/init_task.c b/arch/avr32/kernel/init_task.c index effcacf9d1a2..44058469c6ec 100644 --- a/arch/avr32/kernel/init_task.c +++ b/arch/avr32/kernel/init_task.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
| 15 | 15 | ||
| 16 | static struct fs_struct init_fs = INIT_FS; | 16 | static struct fs_struct init_fs = INIT_FS; |
| 17 | static struct files_struct init_files = INIT_FILES; | ||
| 18 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 19 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 20 | struct mm_struct init_mm = INIT_MM(init_mm); | 19 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/arch/avr32/mach-at32ap/cpufreq.c index 235524b79193..5dd8d25428bf 100644 --- a/arch/avr32/mach-at32ap/cpufreq.c +++ b/arch/avr32/mach-at32ap/cpufreq.c | |||
| @@ -108,5 +108,4 @@ static int __init at32_cpufreq_init(void) | |||
| 108 | { | 108 | { |
| 109 | return cpufreq_register_driver(&at32_driver); | 109 | return cpufreq_register_driver(&at32_driver); |
| 110 | } | 110 | } |
| 111 | 111 | late_initcall(at32_cpufreq_init); | |
| 112 | arch_initcall(at32_cpufreq_init); | ||
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index fd5708523f2e..b87634e75f20 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -479,16 +479,6 @@ comment "Memory Setup" | |||
| 479 | 479 | ||
| 480 | comment "Misc" | 480 | comment "Misc" |
| 481 | 481 | ||
| 482 | config ENET_FLASH_PIN | ||
| 483 | int "PF port/pin used for flash and ethernet sharing" | ||
| 484 | depends on (BFIN533_STAMP) | ||
| 485 | default 0 | ||
| 486 | help | ||
| 487 | PF port/pin used for flash and ethernet sharing to allow other PF | ||
| 488 | pins to be used on other platforms without having to touch common | ||
| 489 | code. | ||
| 490 | For example: PF0 --> 0,PF1 --> 1,PF2 --> 2, etc. | ||
| 491 | |||
| 492 | choice | 482 | choice |
| 493 | prompt "Blackfin Exception Scratch Register" | 483 | prompt "Blackfin Exception Scratch Register" |
| 494 | default BFIN_SCRATCH_REG_RETN | 484 | default BFIN_SCRATCH_REG_RETN |
| @@ -695,6 +685,8 @@ choice | |||
| 695 | prompt "Uncached SDRAM region" | 685 | prompt "Uncached SDRAM region" |
| 696 | default DMA_UNCACHED_1M | 686 | default DMA_UNCACHED_1M |
| 697 | depends on BFIN_DMA_5XX | 687 | depends on BFIN_DMA_5XX |
| 688 | config DMA_UNCACHED_4M | ||
| 689 | bool "Enable 4M DMA region" | ||
| 698 | config DMA_UNCACHED_2M | 690 | config DMA_UNCACHED_2M |
| 699 | bool "Enable 2M DMA region" | 691 | bool "Enable 2M DMA region" |
| 700 | config DMA_UNCACHED_1M | 692 | config DMA_UNCACHED_1M |
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index 64876dfc2e55..5e6fb9d8e50f 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig | |||
| @@ -1,6 +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.22.16 | 3 | # Linux kernel version: 2.6.24.7 |
| 4 | # Fri May 16 10:02:29 2008 | ||
| 4 | # | 5 | # |
| 5 | # CONFIG_MMU is not set | 6 | # CONFIG_MMU is not set |
| 6 | # CONFIG_FPU is not set | 7 | # CONFIG_FPU is not set |
| @@ -13,35 +14,34 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 14 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_HARDIRQS=y | 15 | CONFIG_GENERIC_HARDIRQS=y |
| 15 | CONFIG_GENERIC_IRQ_PROBE=y | 16 | CONFIG_GENERIC_IRQ_PROBE=y |
| 16 | CONFIG_GENERIC_TIME=y | ||
| 17 | CONFIG_GENERIC_GPIO=y | 17 | CONFIG_GENERIC_GPIO=y |
| 18 | CONFIG_FORCE_MAX_ZONEORDER=14 | 18 | CONFIG_FORCE_MAX_ZONEORDER=14 |
| 19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 19 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 21 | 21 | ||
| 22 | # | 22 | # |
| 23 | # Code maturity level options | 23 | # General setup |
| 24 | # | 24 | # |
| 25 | CONFIG_EXPERIMENTAL=y | 25 | CONFIG_EXPERIMENTAL=y |
| 26 | CONFIG_BROKEN_ON_SMP=y | 26 | CONFIG_BROKEN_ON_SMP=y |
| 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 28 | |||
| 29 | # | ||
| 30 | # General setup | ||
| 31 | # | ||
| 32 | CONFIG_LOCALVERSION="" | 28 | CONFIG_LOCALVERSION="" |
| 33 | CONFIG_LOCALVERSION_AUTO=y | 29 | CONFIG_LOCALVERSION_AUTO=y |
| 34 | CONFIG_SYSVIPC=y | 30 | CONFIG_SYSVIPC=y |
| 35 | # CONFIG_IPC_NS is not set | ||
| 36 | CONFIG_SYSVIPC_SYSCTL=y | 31 | CONFIG_SYSVIPC_SYSCTL=y |
| 37 | # CONFIG_POSIX_MQUEUE is not set | 32 | # CONFIG_POSIX_MQUEUE is not set |
| 38 | # CONFIG_BSD_PROCESS_ACCT is not set | 33 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 39 | # CONFIG_TASKSTATS is not set | 34 | # CONFIG_TASKSTATS is not set |
| 40 | # CONFIG_UTS_NS is not set | 35 | # CONFIG_USER_NS is not set |
| 36 | # CONFIG_PID_NS is not set | ||
| 41 | # CONFIG_AUDIT is not set | 37 | # CONFIG_AUDIT is not set |
| 42 | CONFIG_IKCONFIG=y | 38 | CONFIG_IKCONFIG=y |
| 43 | CONFIG_IKCONFIG_PROC=y | 39 | CONFIG_IKCONFIG_PROC=y |
| 44 | CONFIG_LOG_BUF_SHIFT=14 | 40 | CONFIG_LOG_BUF_SHIFT=14 |
| 41 | # CONFIG_CGROUPS is not set | ||
| 42 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 43 | CONFIG_FAIR_USER_SCHED=y | ||
| 44 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 45 | CONFIG_SYSFS_DEPRECATED=y | 45 | CONFIG_SYSFS_DEPRECATED=y |
| 46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
| 47 | CONFIG_BLK_DEV_INITRD=y | 47 | CONFIG_BLK_DEV_INITRD=y |
| @@ -64,32 +64,24 @@ CONFIG_EPOLL=y | |||
| 64 | CONFIG_SIGNALFD=y | 64 | CONFIG_SIGNALFD=y |
| 65 | CONFIG_EVENTFD=y | 65 | CONFIG_EVENTFD=y |
| 66 | CONFIG_VM_EVENT_COUNTERS=y | 66 | CONFIG_VM_EVENT_COUNTERS=y |
| 67 | CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 | ||
| 68 | # CONFIG_NP2 is not set | ||
| 69 | CONFIG_SLAB=y | 67 | CONFIG_SLAB=y |
| 70 | # CONFIG_SLUB is not set | 68 | # CONFIG_SLUB is not set |
| 71 | # CONFIG_SLOB is not set | 69 | # CONFIG_SLOB is not set |
| 70 | CONFIG_SLABINFO=y | ||
| 72 | CONFIG_RT_MUTEXES=y | 71 | CONFIG_RT_MUTEXES=y |
| 73 | CONFIG_TINY_SHMEM=y | 72 | CONFIG_TINY_SHMEM=y |
| 74 | CONFIG_BASE_SMALL=0 | 73 | CONFIG_BASE_SMALL=0 |
| 75 | |||
| 76 | # | ||
| 77 | # Loadable module support | ||
| 78 | # | ||
| 79 | CONFIG_MODULES=y | 74 | CONFIG_MODULES=y |
| 80 | CONFIG_MODULE_UNLOAD=y | 75 | CONFIG_MODULE_UNLOAD=y |
| 81 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 76 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 82 | # CONFIG_MODVERSIONS is not set | 77 | # CONFIG_MODVERSIONS is not set |
| 83 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 78 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 84 | CONFIG_KMOD=y | 79 | CONFIG_KMOD=y |
| 85 | |||
| 86 | # | ||
| 87 | # Block layer | ||
| 88 | # | ||
| 89 | CONFIG_BLOCK=y | 80 | CONFIG_BLOCK=y |
| 90 | # CONFIG_LBD is not set | 81 | # CONFIG_LBD is not set |
| 91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 82 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 92 | # CONFIG_LSF is not set | 83 | # CONFIG_LSF is not set |
| 84 | # CONFIG_BLK_DEV_BSG is not set | ||
| 93 | 85 | ||
| 94 | # | 86 | # |
| 95 | # IO Schedulers | 87 | # IO Schedulers |
| @@ -141,7 +133,6 @@ CONFIG_BF_REV_0_0=y | |||
| 141 | # CONFIG_BF_REV_ANY is not set | 133 | # CONFIG_BF_REV_ANY is not set |
| 142 | # CONFIG_BF_REV_NONE is not set | 134 | # CONFIG_BF_REV_NONE is not set |
| 143 | CONFIG_BF52x=y | 135 | CONFIG_BF52x=y |
| 144 | CONFIG_BFIN_SINGLE_CORE=y | ||
| 145 | CONFIG_MEM_MT48LC32M16A2TG_75=y | 136 | CONFIG_MEM_MT48LC32M16A2TG_75=y |
| 146 | CONFIG_BFIN527_EZKIT=y | 137 | CONFIG_BFIN527_EZKIT=y |
| 147 | 138 | ||
| @@ -227,12 +218,14 @@ CONFIG_IRQ_USB_DMA=11 | |||
| 227 | # Board customizations | 218 | # Board customizations |
| 228 | # | 219 | # |
| 229 | # CONFIG_CMDLINE_BOOL is not set | 220 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | CONFIG_BOOT_LOAD=0x1000 | ||
| 230 | 222 | ||
| 231 | # | 223 | # |
| 232 | # Clock/PLL Setup | 224 | # Clock/PLL Setup |
| 233 | # | 225 | # |
| 234 | CONFIG_CLKIN_HZ=25000000 | 226 | CONFIG_CLKIN_HZ=25000000 |
| 235 | # CONFIG_BFIN_KERNEL_CLOCK is not set | 227 | # CONFIG_BFIN_KERNEL_CLOCK is not set |
| 228 | CONFIG_MAX_MEM_SIZE=512 | ||
| 236 | CONFIG_MAX_VCO_HZ=600000000 | 229 | CONFIG_MAX_VCO_HZ=600000000 |
| 237 | CONFIG_MIN_VCO_HZ=50000000 | 230 | CONFIG_MIN_VCO_HZ=50000000 |
| 238 | CONFIG_MAX_SCLK_HZ=133333333 | 231 | CONFIG_MAX_SCLK_HZ=133333333 |
| @@ -246,13 +239,17 @@ CONFIG_HZ_250=y | |||
| 246 | # CONFIG_HZ_300 is not set | 239 | # CONFIG_HZ_300 is not set |
| 247 | # CONFIG_HZ_1000 is not set | 240 | # CONFIG_HZ_1000 is not set |
| 248 | CONFIG_HZ=250 | 241 | CONFIG_HZ=250 |
| 242 | CONFIG_GENERIC_TIME=y | ||
| 243 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 244 | # CONFIG_CYCLES_CLOCKSOURCE is not set | ||
| 245 | # CONFIG_TICK_ONESHOT is not set | ||
| 246 | # CONFIG_NO_HZ is not set | ||
| 247 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 248 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 249 | 249 | ||
| 250 | # | 250 | # |
| 251 | # Memory Setup | 251 | # Misc |
| 252 | # | 252 | # |
| 253 | CONFIG_MAX_MEM_SIZE=512 | ||
| 254 | CONFIG_MEM_ADD_WIDTH=10 | ||
| 255 | CONFIG_BOOT_LOAD=0x1000 | ||
| 256 | CONFIG_BFIN_SCRATCH_REG_RETN=y | 253 | CONFIG_BFIN_SCRATCH_REG_RETN=y |
| 257 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set | 254 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set |
| 258 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set | 255 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set |
| @@ -288,12 +285,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 288 | CONFIG_FLATMEM=y | 285 | CONFIG_FLATMEM=y |
| 289 | CONFIG_FLAT_NODE_MEM_MAP=y | 286 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 290 | # CONFIG_SPARSEMEM_STATIC is not set | 287 | # CONFIG_SPARSEMEM_STATIC is not set |
| 288 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 291 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 289 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 292 | # CONFIG_RESOURCES_64BIT is not set | 290 | # CONFIG_RESOURCES_64BIT is not set |
| 293 | CONFIG_ZONE_DMA_FLAG=1 | 291 | CONFIG_ZONE_DMA_FLAG=1 |
| 294 | CONFIG_LARGE_ALLOCS=y | 292 | CONFIG_VIRT_TO_BUS=y |
| 295 | # CONFIG_BFIN_GPTIMERS is not set | 293 | # CONFIG_BFIN_GPTIMERS is not set |
| 296 | CONFIG_BFIN_DMA_5XX=y | 294 | CONFIG_BFIN_DMA_5XX=y |
| 295 | # CONFIG_DMA_UNCACHED_4M is not set | ||
| 297 | # CONFIG_DMA_UNCACHED_2M is not set | 296 | # CONFIG_DMA_UNCACHED_2M is not set |
| 298 | CONFIG_DMA_UNCACHED_1M=y | 297 | CONFIG_DMA_UNCACHED_1M=y |
| 299 | # CONFIG_DMA_UNCACHED_NONE is not set | 298 | # CONFIG_DMA_UNCACHED_NONE is not set |
| @@ -338,10 +337,6 @@ CONFIG_BANK_3=0xFFC0 | |||
| 338 | # | 337 | # |
| 339 | # CONFIG_PCI is not set | 338 | # CONFIG_PCI is not set |
| 340 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 339 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 341 | |||
| 342 | # | ||
| 343 | # PCCARD (PCMCIA/CardBus) support | ||
| 344 | # | ||
| 345 | # CONFIG_PCCARD is not set | 340 | # CONFIG_PCCARD is not set |
| 346 | 341 | ||
| 347 | # | 342 | # |
| @@ -357,9 +352,15 @@ CONFIG_BINFMT_ZFLAT=y | |||
| 357 | # Power management options | 352 | # Power management options |
| 358 | # | 353 | # |
| 359 | # CONFIG_PM is not set | 354 | # CONFIG_PM is not set |
| 355 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 360 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | 356 | # CONFIG_PM_WAKEUP_BY_GPIO is not set |
| 361 | 357 | ||
| 362 | # | 358 | # |
| 359 | # CPU Frequency scaling | ||
| 360 | # | ||
| 361 | # CONFIG_CPU_FREQ is not set | ||
| 362 | |||
| 363 | # | ||
| 363 | # Networking | 364 | # Networking |
| 364 | # | 365 | # |
| 365 | CONFIG_NET=y | 366 | CONFIG_NET=y |
| @@ -395,6 +396,7 @@ CONFIG_SYN_COOKIES=y | |||
| 395 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 396 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 396 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 397 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 397 | CONFIG_INET_XFRM_MODE_BEET=y | 398 | CONFIG_INET_XFRM_MODE_BEET=y |
| 399 | # CONFIG_INET_LRO is not set | ||
| 398 | CONFIG_INET_DIAG=y | 400 | CONFIG_INET_DIAG=y |
| 399 | CONFIG_INET_TCP_DIAG=y | 401 | CONFIG_INET_TCP_DIAG=y |
| 400 | # CONFIG_TCP_CONG_ADVANCED is not set | 402 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -421,10 +423,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 421 | # CONFIG_LAPB is not set | 423 | # CONFIG_LAPB is not set |
| 422 | # CONFIG_ECONET is not set | 424 | # CONFIG_ECONET is not set |
| 423 | # CONFIG_WAN_ROUTER is not set | 425 | # CONFIG_WAN_ROUTER is not set |
| 424 | |||
| 425 | # | ||
| 426 | # QoS and/or fair queueing | ||
| 427 | # | ||
| 428 | # CONFIG_NET_SCHED is not set | 426 | # CONFIG_NET_SCHED is not set |
| 429 | 427 | ||
| 430 | # | 428 | # |
| @@ -444,6 +442,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 444 | # CONFIG_MAC80211 is not set | 442 | # CONFIG_MAC80211 is not set |
| 445 | # CONFIG_IEEE80211 is not set | 443 | # CONFIG_IEEE80211 is not set |
| 446 | # CONFIG_RFKILL is not set | 444 | # CONFIG_RFKILL is not set |
| 445 | # CONFIG_NET_9P is not set | ||
| 447 | 446 | ||
| 448 | # | 447 | # |
| 449 | # Device Drivers | 448 | # Device Drivers |
| @@ -452,14 +451,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 452 | # | 451 | # |
| 453 | # Generic Driver Options | 452 | # Generic Driver Options |
| 454 | # | 453 | # |
| 454 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 455 | CONFIG_STANDALONE=y | 455 | CONFIG_STANDALONE=y |
| 456 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 456 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 457 | # CONFIG_FW_LOADER is not set | 457 | # CONFIG_FW_LOADER is not set |
| 458 | # CONFIG_SYS_HYPERVISOR is not set | 458 | # CONFIG_SYS_HYPERVISOR is not set |
| 459 | |||
| 460 | # | ||
| 461 | # Connector - unified userspace <-> kernelspace linker | ||
| 462 | # | ||
| 463 | # CONFIG_CONNECTOR is not set | 459 | # CONFIG_CONNECTOR is not set |
| 464 | CONFIG_MTD=y | 460 | CONFIG_MTD=y |
| 465 | # CONFIG_MTD_DEBUG is not set | 461 | # CONFIG_MTD_DEBUG is not set |
| @@ -479,6 +475,7 @@ CONFIG_MTD_BLOCK=y | |||
| 479 | # CONFIG_INFTL is not set | 475 | # CONFIG_INFTL is not set |
| 480 | # CONFIG_RFD_FTL is not set | 476 | # CONFIG_RFD_FTL is not set |
| 481 | # CONFIG_SSFDC is not set | 477 | # CONFIG_SSFDC is not set |
| 478 | # CONFIG_MTD_OOPS is not set | ||
| 482 | 479 | ||
| 483 | # | 480 | # |
| 484 | # RAM/ROM/Flash chip drivers | 481 | # RAM/ROM/Flash chip drivers |
| @@ -542,39 +539,27 @@ CONFIG_MTD_NAND_IDS=m | |||
| 542 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 539 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 543 | # CONFIG_MTD_NAND_NANDSIM is not set | 540 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 544 | # CONFIG_MTD_NAND_PLATFORM is not set | 541 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 542 | # CONFIG_MTD_ALAUDA is not set | ||
| 545 | # CONFIG_MTD_ONENAND is not set | 543 | # CONFIG_MTD_ONENAND is not set |
| 546 | 544 | ||
| 547 | # | 545 | # |
| 548 | # UBI - Unsorted block images | 546 | # UBI - Unsorted block images |
| 549 | # | 547 | # |
| 550 | # CONFIG_MTD_UBI is not set | 548 | # CONFIG_MTD_UBI is not set |
| 551 | |||
| 552 | # | ||
| 553 | # Parallel port support | ||
| 554 | # | ||
| 555 | # CONFIG_PARPORT is not set | 549 | # CONFIG_PARPORT is not set |
| 556 | 550 | CONFIG_BLK_DEV=y | |
| 557 | # | ||
| 558 | # Plug and Play support | ||
| 559 | # | ||
| 560 | # CONFIG_PNPACPI is not set | ||
| 561 | |||
| 562 | # | ||
| 563 | # Block devices | ||
| 564 | # | ||
| 565 | # CONFIG_BLK_DEV_COW_COMMON is not set | 551 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 566 | # CONFIG_BLK_DEV_LOOP is not set | 552 | # CONFIG_BLK_DEV_LOOP is not set |
| 567 | # CONFIG_BLK_DEV_NBD is not set | 553 | # CONFIG_BLK_DEV_NBD is not set |
| 554 | # CONFIG_BLK_DEV_UB is not set | ||
| 568 | CONFIG_BLK_DEV_RAM=y | 555 | CONFIG_BLK_DEV_RAM=y |
| 569 | CONFIG_BLK_DEV_RAM_COUNT=16 | 556 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 570 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 557 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 571 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 558 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 572 | # CONFIG_CDROM_PKTCDVD is not set | 559 | # CONFIG_CDROM_PKTCDVD is not set |
| 573 | # CONFIG_ATA_OVER_ETH is not set | 560 | # CONFIG_ATA_OVER_ETH is not set |
| 574 | 561 | CONFIG_MISC_DEVICES=y | |
| 575 | # | 562 | # CONFIG_EEPROM_93CX6 is not set |
| 576 | # Misc devices | ||
| 577 | # | ||
| 578 | # CONFIG_IDE is not set | 563 | # CONFIG_IDE is not set |
| 579 | 564 | ||
| 580 | # | 565 | # |
| @@ -582,22 +567,18 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 582 | # | 567 | # |
| 583 | # CONFIG_RAID_ATTRS is not set | 568 | # CONFIG_RAID_ATTRS is not set |
| 584 | # CONFIG_SCSI is not set | 569 | # CONFIG_SCSI is not set |
| 570 | # CONFIG_SCSI_DMA is not set | ||
| 585 | # CONFIG_SCSI_NETLINK is not set | 571 | # CONFIG_SCSI_NETLINK is not set |
| 586 | # CONFIG_ATA is not set | 572 | # CONFIG_ATA is not set |
| 587 | |||
| 588 | # | ||
| 589 | # Multi-device support (RAID and LVM) | ||
| 590 | # | ||
| 591 | # CONFIG_MD is not set | 573 | # CONFIG_MD is not set |
| 592 | |||
| 593 | # | ||
| 594 | # Network device support | ||
| 595 | # | ||
| 596 | CONFIG_NETDEVICES=y | 574 | CONFIG_NETDEVICES=y |
| 575 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 597 | # CONFIG_DUMMY is not set | 576 | # CONFIG_DUMMY is not set |
| 598 | # CONFIG_BONDING is not set | 577 | # CONFIG_BONDING is not set |
| 578 | # CONFIG_MACVLAN is not set | ||
| 599 | # CONFIG_EQUALIZER is not set | 579 | # CONFIG_EQUALIZER is not set |
| 600 | # CONFIG_TUN is not set | 580 | # CONFIG_TUN is not set |
| 581 | # CONFIG_VETH is not set | ||
| 601 | CONFIG_PHYLIB=y | 582 | CONFIG_PHYLIB=y |
| 602 | 583 | ||
| 603 | # | 584 | # |
| @@ -611,21 +592,24 @@ CONFIG_PHYLIB=y | |||
| 611 | # CONFIG_VITESSE_PHY is not set | 592 | # CONFIG_VITESSE_PHY is not set |
| 612 | # CONFIG_SMSC_PHY is not set | 593 | # CONFIG_SMSC_PHY is not set |
| 613 | # CONFIG_BROADCOM_PHY is not set | 594 | # CONFIG_BROADCOM_PHY is not set |
| 595 | # CONFIG_ICPLUS_PHY is not set | ||
| 614 | # CONFIG_FIXED_PHY is not set | 596 | # CONFIG_FIXED_PHY is not set |
| 615 | 597 | # CONFIG_MDIO_BITBANG is not set | |
| 616 | # | ||
| 617 | # Ethernet (10 or 100Mbit) | ||
| 618 | # | ||
| 619 | CONFIG_NET_ETHERNET=y | 598 | CONFIG_NET_ETHERNET=y |
| 620 | CONFIG_MII=y | 599 | CONFIG_MII=y |
| 621 | # CONFIG_SMC91X is not set | ||
| 622 | CONFIG_BFIN_MAC=y | 600 | CONFIG_BFIN_MAC=y |
| 623 | CONFIG_BFIN_MAC_USE_L1=y | 601 | CONFIG_BFIN_MAC_USE_L1=y |
| 624 | CONFIG_BFIN_TX_DESC_NUM=10 | 602 | CONFIG_BFIN_TX_DESC_NUM=10 |
| 625 | CONFIG_BFIN_RX_DESC_NUM=20 | 603 | CONFIG_BFIN_RX_DESC_NUM=20 |
| 626 | CONFIG_BFIN_MAC_RMII=y | 604 | CONFIG_BFIN_MAC_RMII=y |
| 605 | # CONFIG_SMC91X is not set | ||
| 627 | # CONFIG_SMSC911X is not set | 606 | # CONFIG_SMSC911X is not set |
| 628 | # CONFIG_DM9000 is not set | 607 | # CONFIG_DM9000 is not set |
| 608 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 609 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 610 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 611 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 612 | # CONFIG_B44 is not set | ||
| 629 | CONFIG_NETDEV_1000=y | 613 | CONFIG_NETDEV_1000=y |
| 630 | # CONFIG_AX88180 is not set | 614 | # CONFIG_AX88180 is not set |
| 631 | CONFIG_NETDEV_10000=y | 615 | CONFIG_NETDEV_10000=y |
| @@ -635,6 +619,15 @@ CONFIG_NETDEV_10000=y | |||
| 635 | # | 619 | # |
| 636 | # CONFIG_WLAN_PRE80211 is not set | 620 | # CONFIG_WLAN_PRE80211 is not set |
| 637 | # CONFIG_WLAN_80211 is not set | 621 | # CONFIG_WLAN_80211 is not set |
| 622 | |||
| 623 | # | ||
| 624 | # USB Network Adapters | ||
| 625 | # | ||
| 626 | # CONFIG_USB_CATC is not set | ||
| 627 | # CONFIG_USB_KAWETH is not set | ||
| 628 | # CONFIG_USB_PEGASUS is not set | ||
| 629 | # CONFIG_USB_RTL8150 is not set | ||
| 630 | # CONFIG_USB_USBNET is not set | ||
| 638 | # CONFIG_WAN is not set | 631 | # CONFIG_WAN is not set |
| 639 | # CONFIG_PPP is not set | 632 | # CONFIG_PPP is not set |
| 640 | # CONFIG_SLIP is not set | 633 | # CONFIG_SLIP is not set |
| @@ -642,15 +635,7 @@ CONFIG_NETDEV_10000=y | |||
| 642 | # CONFIG_NETCONSOLE is not set | 635 | # CONFIG_NETCONSOLE is not set |
| 643 | # CONFIG_NETPOLL is not set | 636 | # CONFIG_NETPOLL is not set |
| 644 | # CONFIG_NET_POLL_CONTROLLER is not set | 637 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 645 | |||
| 646 | # | ||
| 647 | # ISDN subsystem | ||
| 648 | # | ||
| 649 | # CONFIG_ISDN is not set | 638 | # CONFIG_ISDN is not set |
| 650 | |||
| 651 | # | ||
| 652 | # Telephony Support | ||
| 653 | # | ||
| 654 | # CONFIG_PHONE is not set | 639 | # CONFIG_PHONE is not set |
| 655 | 640 | ||
| 656 | # | 641 | # |
| @@ -665,7 +650,6 @@ CONFIG_INPUT=y | |||
| 665 | # | 650 | # |
| 666 | # CONFIG_INPUT_MOUSEDEV is not set | 651 | # CONFIG_INPUT_MOUSEDEV is not set |
| 667 | # CONFIG_INPUT_JOYDEV is not set | 652 | # CONFIG_INPUT_JOYDEV is not set |
| 668 | # CONFIG_INPUT_TSDEV is not set | ||
| 669 | # CONFIG_INPUT_EVDEV is not set | 653 | # CONFIG_INPUT_EVDEV is not set |
| 670 | # CONFIG_INPUT_EVBUG is not set | 654 | # CONFIG_INPUT_EVBUG is not set |
| 671 | 655 | ||
| @@ -697,7 +681,6 @@ CONFIG_INPUT_MISC=y | |||
| 697 | # | 681 | # |
| 698 | # CONFIG_AD9960 is not set | 682 | # CONFIG_AD9960 is not set |
| 699 | # CONFIG_SPI_ADC_BF533 is not set | 683 | # CONFIG_SPI_ADC_BF533 is not set |
| 700 | # CONFIG_BF5xx_PFLAGS is not set | ||
| 701 | # CONFIG_BF5xx_PPIFCD is not set | 684 | # CONFIG_BF5xx_PPIFCD is not set |
| 702 | # CONFIG_BFIN_SIMPLE_TIMER is not set | 685 | # CONFIG_BFIN_SIMPLE_TIMER is not set |
| 703 | # CONFIG_BF5xx_PPI is not set | 686 | # CONFIG_BF5xx_PPI is not set |
| @@ -706,7 +689,7 @@ CONFIG_BFIN_OTP=y | |||
| 706 | # CONFIG_BFIN_SPORT is not set | 689 | # CONFIG_BFIN_SPORT is not set |
| 707 | # CONFIG_BFIN_TIMER_LATENCY is not set | 690 | # CONFIG_BFIN_TIMER_LATENCY is not set |
| 708 | # CONFIG_TWI_LCD is not set | 691 | # CONFIG_TWI_LCD is not set |
| 709 | # CONFIG_AD5304 is not set | 692 | # CONFIG_SIMPLE_GPIO is not set |
| 710 | # CONFIG_VT is not set | 693 | # CONFIG_VT is not set |
| 711 | # CONFIG_SERIAL_NONSTANDARD is not set | 694 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 712 | 695 | ||
| @@ -735,27 +718,11 @@ CONFIG_UNIX98_PTYS=y | |||
| 735 | # CAN, the car bus and industrial fieldbus | 718 | # CAN, the car bus and industrial fieldbus |
| 736 | # | 719 | # |
| 737 | # CONFIG_CAN4LINUX is not set | 720 | # CONFIG_CAN4LINUX is not set |
| 738 | |||
| 739 | # | ||
| 740 | # IPMI | ||
| 741 | # | ||
| 742 | # CONFIG_IPMI_HANDLER is not set | 721 | # CONFIG_IPMI_HANDLER is not set |
| 743 | CONFIG_WATCHDOG=y | ||
| 744 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 745 | |||
| 746 | # | ||
| 747 | # Watchdog Device Drivers | ||
| 748 | # | ||
| 749 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 750 | CONFIG_BFIN_WDT=y | ||
| 751 | CONFIG_HW_RANDOM=y | 722 | CONFIG_HW_RANDOM=y |
| 752 | # CONFIG_GEN_RTC is not set | 723 | # CONFIG_GEN_RTC is not set |
| 753 | # CONFIG_R3964 is not set | 724 | # CONFIG_R3964 is not set |
| 754 | # CONFIG_RAW_DRIVER is not set | 725 | # CONFIG_RAW_DRIVER is not set |
| 755 | |||
| 756 | # | ||
| 757 | # TPM devices | ||
| 758 | # | ||
| 759 | # CONFIG_TCG_TPM is not set | 726 | # CONFIG_TCG_TPM is not set |
| 760 | CONFIG_I2C=y | 727 | CONFIG_I2C=y |
| 761 | CONFIG_I2C_BOARDINFO=y | 728 | CONFIG_I2C_BOARDINFO=y |
| @@ -777,21 +744,24 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50 | |||
| 777 | # CONFIG_I2C_OCORES is not set | 744 | # CONFIG_I2C_OCORES is not set |
| 778 | # CONFIG_I2C_PARPORT_LIGHT is not set | 745 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 779 | # CONFIG_I2C_SIMTEC is not set | 746 | # CONFIG_I2C_SIMTEC is not set |
| 747 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 780 | # CONFIG_I2C_STUB is not set | 748 | # CONFIG_I2C_STUB is not set |
| 749 | # CONFIG_I2C_TINY_USB is not set | ||
| 781 | 750 | ||
| 782 | # | 751 | # |
| 783 | # Miscellaneous I2C Chip support | 752 | # Miscellaneous I2C Chip support |
| 784 | # | 753 | # |
| 785 | # CONFIG_SENSORS_DS1337 is not set | 754 | # CONFIG_SENSORS_DS1337 is not set |
| 786 | # CONFIG_SENSORS_DS1374 is not set | 755 | # CONFIG_SENSORS_DS1374 is not set |
| 756 | # CONFIG_DS1682 is not set | ||
| 787 | # CONFIG_SENSORS_AD5252 is not set | 757 | # CONFIG_SENSORS_AD5252 is not set |
| 788 | # CONFIG_SENSORS_EEPROM is not set | 758 | # CONFIG_SENSORS_EEPROM is not set |
| 789 | # CONFIG_SENSORS_PCF8574 is not set | 759 | # CONFIG_SENSORS_PCF8574 is not set |
| 790 | # CONFIG_SENSORS_PCF8575 is not set | 760 | # CONFIG_SENSORS_PCF8575 is not set |
| 791 | # CONFIG_SENSORS_PCA9543 is not set | ||
| 792 | # CONFIG_SENSORS_PCA9539 is not set | 761 | # CONFIG_SENSORS_PCA9539 is not set |
| 793 | # CONFIG_SENSORS_PCF8591 is not set | 762 | # CONFIG_SENSORS_PCF8591 is not set |
| 794 | # CONFIG_SENSORS_MAX6875 is not set | 763 | # CONFIG_SENSORS_MAX6875 is not set |
| 764 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 795 | # CONFIG_I2C_DEBUG_CORE is not set | 765 | # CONFIG_I2C_DEBUG_CORE is not set |
| 796 | # CONFIG_I2C_DEBUG_ALGO is not set | 766 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 797 | # CONFIG_I2C_DEBUG_BUS is not set | 767 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -814,14 +784,11 @@ CONFIG_SPI_BFIN=y | |||
| 814 | # | 784 | # |
| 815 | # CONFIG_SPI_AT25 is not set | 785 | # CONFIG_SPI_AT25 is not set |
| 816 | # CONFIG_SPI_SPIDEV is not set | 786 | # CONFIG_SPI_SPIDEV is not set |
| 817 | 787 | # CONFIG_SPI_TLE62X0 is not set | |
| 818 | # | ||
| 819 | # Dallas's 1-wire bus | ||
| 820 | # | ||
| 821 | # CONFIG_W1 is not set | 788 | # CONFIG_W1 is not set |
| 789 | # CONFIG_POWER_SUPPLY is not set | ||
| 822 | CONFIG_HWMON=y | 790 | CONFIG_HWMON=y |
| 823 | # CONFIG_HWMON_VID is not set | 791 | # CONFIG_HWMON_VID is not set |
| 824 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 825 | # CONFIG_SENSORS_AD7418 is not set | 792 | # CONFIG_SENSORS_AD7418 is not set |
| 826 | # CONFIG_SENSORS_ADM1021 is not set | 793 | # CONFIG_SENSORS_ADM1021 is not set |
| 827 | # CONFIG_SENSORS_ADM1025 is not set | 794 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -829,12 +796,12 @@ CONFIG_HWMON=y | |||
| 829 | # CONFIG_SENSORS_ADM1029 is not set | 796 | # CONFIG_SENSORS_ADM1029 is not set |
| 830 | # CONFIG_SENSORS_ADM1031 is not set | 797 | # CONFIG_SENSORS_ADM1031 is not set |
| 831 | # CONFIG_SENSORS_ADM9240 is not set | 798 | # CONFIG_SENSORS_ADM9240 is not set |
| 832 | # CONFIG_SENSORS_ASB100 is not set | 799 | # CONFIG_SENSORS_ADT7470 is not set |
| 833 | # CONFIG_SENSORS_ATXP1 is not set | 800 | # CONFIG_SENSORS_ATXP1 is not set |
| 834 | # CONFIG_SENSORS_DS1621 is not set | 801 | # CONFIG_SENSORS_DS1621 is not set |
| 835 | # CONFIG_SENSORS_F71805F is not set | 802 | # CONFIG_SENSORS_F71805F is not set |
| 836 | # CONFIG_SENSORS_FSCHER is not set | 803 | # CONFIG_SENSORS_F71882FG is not set |
| 837 | # CONFIG_SENSORS_FSCPOS is not set | 804 | # CONFIG_SENSORS_F75375S is not set |
| 838 | # CONFIG_SENSORS_GL518SM is not set | 805 | # CONFIG_SENSORS_GL518SM is not set |
| 839 | # CONFIG_SENSORS_GL520SM is not set | 806 | # CONFIG_SENSORS_GL520SM is not set |
| 840 | # CONFIG_SENSORS_IT87 is not set | 807 | # CONFIG_SENSORS_IT87 is not set |
| @@ -849,13 +816,16 @@ CONFIG_HWMON=y | |||
| 849 | # CONFIG_SENSORS_LM87 is not set | 816 | # CONFIG_SENSORS_LM87 is not set |
| 850 | # CONFIG_SENSORS_LM90 is not set | 817 | # CONFIG_SENSORS_LM90 is not set |
| 851 | # CONFIG_SENSORS_LM92 is not set | 818 | # CONFIG_SENSORS_LM92 is not set |
| 819 | # CONFIG_SENSORS_LM93 is not set | ||
| 852 | # CONFIG_SENSORS_MAX1619 is not set | 820 | # CONFIG_SENSORS_MAX1619 is not set |
| 853 | # CONFIG_SENSORS_MAX6650 is not set | 821 | # CONFIG_SENSORS_MAX6650 is not set |
| 854 | # CONFIG_SENSORS_PC87360 is not set | 822 | # CONFIG_SENSORS_PC87360 is not set |
| 855 | # CONFIG_SENSORS_PC87427 is not set | 823 | # CONFIG_SENSORS_PC87427 is not set |
| 824 | # CONFIG_SENSORS_DME1737 is not set | ||
| 856 | # CONFIG_SENSORS_SMSC47M1 is not set | 825 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 857 | # CONFIG_SENSORS_SMSC47M192 is not set | 826 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 858 | # CONFIG_SENSORS_SMSC47B397 is not set | 827 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 828 | # CONFIG_SENSORS_THMC50 is not set | ||
| 859 | # CONFIG_SENSORS_VT1211 is not set | 829 | # CONFIG_SENSORS_VT1211 is not set |
| 860 | # CONFIG_SENSORS_W83781D is not set | 830 | # CONFIG_SENSORS_W83781D is not set |
| 861 | # CONFIG_SENSORS_W83791D is not set | 831 | # CONFIG_SENSORS_W83791D is not set |
| @@ -865,6 +835,25 @@ CONFIG_HWMON=y | |||
| 865 | # CONFIG_SENSORS_W83627HF is not set | 835 | # CONFIG_SENSORS_W83627HF is not set |
| 866 | # CONFIG_SENSORS_W83627EHF is not set | 836 | # CONFIG_SENSORS_W83627EHF is not set |
| 867 | # CONFIG_HWMON_DEBUG_CHIP is not set | 837 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 838 | CONFIG_WATCHDOG=y | ||
| 839 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 840 | |||
| 841 | # | ||
| 842 | # Watchdog Device Drivers | ||
| 843 | # | ||
| 844 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 845 | CONFIG_BFIN_WDT=y | ||
| 846 | |||
| 847 | # | ||
| 848 | # USB-based Watchdog Cards | ||
| 849 | # | ||
| 850 | # CONFIG_USBPCWATCHDOG is not set | ||
| 851 | |||
| 852 | # | ||
| 853 | # Sonics Silicon Backplane | ||
| 854 | # | ||
| 855 | CONFIG_SSB_POSSIBLE=y | ||
| 856 | # CONFIG_SSB is not set | ||
| 868 | 857 | ||
| 869 | # | 858 | # |
| 870 | # Multifunction device drivers | 859 | # Multifunction device drivers |
| @@ -881,72 +870,133 @@ CONFIG_HWMON=y | |||
| 881 | # | 870 | # |
| 882 | # Graphics support | 871 | # Graphics support |
| 883 | # | 872 | # |
| 873 | # CONFIG_VGASTATE is not set | ||
| 874 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 875 | # CONFIG_FB is not set | ||
| 884 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 876 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 885 | 877 | ||
| 886 | # | 878 | # |
| 887 | # Display device support | 879 | # Display device support |
| 888 | # | 880 | # |
| 889 | # CONFIG_DISPLAY_SUPPORT is not set | 881 | # CONFIG_DISPLAY_SUPPORT is not set |
| 890 | # CONFIG_VGASTATE is not set | ||
| 891 | # CONFIG_FB is not set | ||
| 892 | 882 | ||
| 893 | # | 883 | # |
| 894 | # Sound | 884 | # Sound |
| 895 | # | 885 | # |
| 896 | # CONFIG_SOUND is not set | 886 | # CONFIG_SOUND is not set |
| 897 | 887 | CONFIG_HID_SUPPORT=y | |
| 898 | # | ||
| 899 | # HID Devices | ||
| 900 | # | ||
| 901 | CONFIG_HID=y | 888 | CONFIG_HID=y |
| 902 | # CONFIG_HID_DEBUG is not set | 889 | # CONFIG_HID_DEBUG is not set |
| 890 | # CONFIG_HIDRAW is not set | ||
| 903 | 891 | ||
| 904 | # | 892 | # |
| 905 | # USB support | 893 | # USB Input Devices |
| 906 | # | 894 | # |
| 895 | CONFIG_USB_HID=y | ||
| 896 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 897 | # CONFIG_HID_FF is not set | ||
| 898 | # CONFIG_USB_HIDDEV is not set | ||
| 899 | CONFIG_USB_SUPPORT=y | ||
| 907 | CONFIG_USB_ARCH_HAS_HCD=y | 900 | CONFIG_USB_ARCH_HAS_HCD=y |
| 908 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 901 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 909 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 902 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 910 | # CONFIG_USB is not set | 903 | CONFIG_USB=y |
| 904 | # CONFIG_USB_DEBUG is not set | ||
| 905 | |||
| 906 | # | ||
| 907 | # Miscellaneous USB options | ||
| 908 | # | ||
| 909 | # CONFIG_USB_DEVICEFS is not set | ||
| 910 | CONFIG_USB_DEVICE_CLASS=y | ||
| 911 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 912 | # CONFIG_USB_OTG is not set | ||
| 913 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 914 | CONFIG_USB_OTG_BLACKLIST_HUB=y | ||
| 915 | |||
| 916 | # | ||
| 917 | # USB Host Controller Drivers | ||
| 918 | # | ||
| 919 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 920 | # CONFIG_USB_ISP1362_HCD is not set | ||
| 921 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 922 | # CONFIG_USB_SL811_HCD is not set | ||
| 923 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 924 | CONFIG_USB_MUSB_HDRC=y | ||
| 925 | CONFIG_USB_MUSB_SOC=y | ||
| 911 | 926 | ||
| 912 | # | 927 | # |
| 913 | # Enable Host or Gadget support to see Inventra options | 928 | # Blackfin high speed USB support |
| 914 | # | 929 | # |
| 930 | CONFIG_USB_MUSB_HOST=y | ||
| 931 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
| 932 | # CONFIG_USB_MUSB_OTG is not set | ||
| 933 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
| 934 | CONFIG_MUSB_PIO_ONLY=y | ||
| 935 | CONFIG_USB_MUSB_LOGLEVEL=0 | ||
| 936 | |||
| 937 | # | ||
| 938 | # USB Device Class drivers | ||
| 939 | # | ||
| 940 | # CONFIG_USB_ACM is not set | ||
| 941 | # CONFIG_USB_PRINTER is not set | ||
| 915 | 942 | ||
| 916 | # | 943 | # |
| 917 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 944 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 918 | # | 945 | # |
| 919 | 946 | ||
| 920 | # | 947 | # |
| 921 | # USB Gadget Support | 948 | # may also be needed; see USB_STORAGE Help for more information |
| 922 | # | 949 | # |
| 923 | # CONFIG_USB_GADGET is not set | 950 | # CONFIG_USB_LIBUSUAL is not set |
| 924 | # CONFIG_MMC is not set | ||
| 925 | 951 | ||
| 926 | # | 952 | # |
| 927 | # LED devices | 953 | # USB Imaging devices |
| 928 | # | 954 | # |
| 929 | # CONFIG_NEW_LEDS is not set | 955 | # CONFIG_USB_MDC800 is not set |
| 956 | CONFIG_USB_MON=y | ||
| 930 | 957 | ||
| 931 | # | 958 | # |
| 932 | # LED drivers | 959 | # USB port drivers |
| 933 | # | 960 | # |
| 934 | 961 | ||
| 935 | # | 962 | # |
| 936 | # LED Triggers | 963 | # USB Serial Converter support |
| 937 | # | 964 | # |
| 965 | # CONFIG_USB_SERIAL is not set | ||
| 938 | 966 | ||
| 939 | # | 967 | # |
| 940 | # InfiniBand support | 968 | # USB Miscellaneous drivers |
| 941 | # | 969 | # |
| 970 | # CONFIG_USB_EMI62 is not set | ||
| 971 | # CONFIG_USB_EMI26 is not set | ||
| 972 | # CONFIG_USB_ADUTUX is not set | ||
| 973 | # CONFIG_USB_AUERSWALD is not set | ||
| 974 | # CONFIG_USB_RIO500 is not set | ||
| 975 | # CONFIG_USB_LEGOTOWER is not set | ||
| 976 | # CONFIG_USB_LCD is not set | ||
| 977 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 978 | # CONFIG_USB_LED is not set | ||
| 979 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 980 | # CONFIG_USB_CYTHERM is not set | ||
| 981 | # CONFIG_USB_PHIDGET is not set | ||
| 982 | # CONFIG_USB_IDMOUSE is not set | ||
| 983 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 984 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 985 | # CONFIG_USB_SISUSBVGA is not set | ||
| 986 | # CONFIG_USB_LD is not set | ||
| 987 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 988 | # CONFIG_USB_IOWARRIOR is not set | ||
| 942 | 989 | ||
| 943 | # | 990 | # |
| 944 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 991 | # USB DSL modem support |
| 945 | # | 992 | # |
| 946 | 993 | ||
| 947 | # | 994 | # |
| 948 | # Real Time Clock | 995 | # USB Gadget Support |
| 949 | # | 996 | # |
| 997 | # CONFIG_USB_GADGET is not set | ||
| 998 | # CONFIG_MMC is not set | ||
| 999 | # CONFIG_NEW_LEDS is not set | ||
| 950 | CONFIG_RTC_LIB=y | 1000 | CONFIG_RTC_LIB=y |
| 951 | CONFIG_RTC_CLASS=y | 1001 | CONFIG_RTC_CLASS=y |
| 952 | CONFIG_RTC_HCTOSYS=y | 1002 | CONFIG_RTC_HCTOSYS=y |
| @@ -966,6 +1016,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 966 | # I2C RTC drivers | 1016 | # I2C RTC drivers |
| 967 | # | 1017 | # |
| 968 | # CONFIG_RTC_DRV_DS1307 is not set | 1018 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1019 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 969 | # CONFIG_RTC_DRV_DS1672 is not set | 1020 | # CONFIG_RTC_DRV_DS1672 is not set |
| 970 | # CONFIG_RTC_DRV_MAX6900 is not set | 1021 | # CONFIG_RTC_DRV_MAX6900 is not set |
| 971 | # CONFIG_RTC_DRV_RS5C372 is not set | 1022 | # CONFIG_RTC_DRV_RS5C372 is not set |
| @@ -973,6 +1024,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 973 | # CONFIG_RTC_DRV_X1205 is not set | 1024 | # CONFIG_RTC_DRV_X1205 is not set |
| 974 | # CONFIG_RTC_DRV_PCF8563 is not set | 1025 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 975 | # CONFIG_RTC_DRV_PCF8583 is not set | 1026 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1027 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 976 | 1028 | ||
| 977 | # | 1029 | # |
| 978 | # SPI RTC drivers | 1030 | # SPI RTC drivers |
| @@ -984,8 +1036,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 984 | # Platform RTC drivers | 1036 | # Platform RTC drivers |
| 985 | # | 1037 | # |
| 986 | # CONFIG_RTC_DRV_DS1553 is not set | 1038 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1039 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 987 | # CONFIG_RTC_DRV_DS1742 is not set | 1040 | # CONFIG_RTC_DRV_DS1742 is not set |
| 988 | # CONFIG_RTC_DRV_M48T86 is not set | 1041 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1042 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 989 | # CONFIG_RTC_DRV_V3020 is not set | 1043 | # CONFIG_RTC_DRV_V3020 is not set |
| 990 | 1044 | ||
| 991 | # | 1045 | # |
| @@ -994,22 +1048,9 @@ CONFIG_RTC_INTF_DEV=y | |||
| 994 | CONFIG_RTC_DRV_BFIN=y | 1048 | CONFIG_RTC_DRV_BFIN=y |
| 995 | 1049 | ||
| 996 | # | 1050 | # |
| 997 | # DMA Engine support | 1051 | # Userspace I/O |
| 998 | # | ||
| 999 | # CONFIG_DMA_ENGINE is not set | ||
| 1000 | |||
| 1001 | # | ||
| 1002 | # DMA Clients | ||
| 1003 | # | 1052 | # |
| 1004 | 1053 | # CONFIG_UIO is not set | |
| 1005 | # | ||
| 1006 | # DMA Devices | ||
| 1007 | # | ||
| 1008 | |||
| 1009 | # | ||
| 1010 | # PBX support | ||
| 1011 | # | ||
| 1012 | # CONFIG_PBX is not set | ||
| 1013 | 1054 | ||
| 1014 | # | 1055 | # |
| 1015 | # File systems | 1056 | # File systems |
| @@ -1054,7 +1095,6 @@ CONFIG_PROC_SYSCTL=y | |||
| 1054 | CONFIG_SYSFS=y | 1095 | CONFIG_SYSFS=y |
| 1055 | # CONFIG_TMPFS is not set | 1096 | # CONFIG_TMPFS is not set |
| 1056 | # CONFIG_HUGETLB_PAGE is not set | 1097 | # CONFIG_HUGETLB_PAGE is not set |
| 1057 | CONFIG_RAMFS=y | ||
| 1058 | # CONFIG_CONFIGFS_FS is not set | 1098 | # CONFIG_CONFIGFS_FS is not set |
| 1059 | 1099 | ||
| 1060 | # | 1100 | # |
| @@ -1080,10 +1120,12 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y | |||
| 1080 | CONFIG_JFFS2_FS=m | 1120 | CONFIG_JFFS2_FS=m |
| 1081 | CONFIG_JFFS2_FS_DEBUG=0 | 1121 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1082 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1122 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1123 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1083 | # CONFIG_JFFS2_SUMMARY is not set | 1124 | # CONFIG_JFFS2_SUMMARY is not set |
| 1084 | # CONFIG_JFFS2_FS_XATTR is not set | 1125 | # CONFIG_JFFS2_FS_XATTR is not set |
| 1085 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1126 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
| 1086 | CONFIG_JFFS2_ZLIB=y | 1127 | CONFIG_JFFS2_ZLIB=y |
| 1128 | # CONFIG_JFFS2_LZO is not set | ||
| 1087 | CONFIG_JFFS2_RTIME=y | 1129 | CONFIG_JFFS2_RTIME=y |
| 1088 | # CONFIG_JFFS2_RUBIN is not set | 1130 | # CONFIG_JFFS2_RUBIN is not set |
| 1089 | # CONFIG_CRAMFS is not set | 1131 | # CONFIG_CRAMFS is not set |
| @@ -1092,10 +1134,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1092 | # CONFIG_QNX4FS_FS is not set | 1134 | # CONFIG_QNX4FS_FS is not set |
| 1093 | # CONFIG_SYSV_FS is not set | 1135 | # CONFIG_SYSV_FS is not set |
| 1094 | # CONFIG_UFS_FS is not set | 1136 | # CONFIG_UFS_FS is not set |
| 1095 | 1137 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1096 | # | ||
| 1097 | # Network File Systems | ||
| 1098 | # | ||
| 1099 | CONFIG_NFS_FS=m | 1138 | CONFIG_NFS_FS=m |
| 1100 | CONFIG_NFS_V3=y | 1139 | CONFIG_NFS_V3=y |
| 1101 | # CONFIG_NFS_V3_ACL is not set | 1140 | # CONFIG_NFS_V3_ACL is not set |
| @@ -1115,17 +1154,12 @@ CONFIG_SMB_FS=m | |||
| 1115 | # CONFIG_NCP_FS is not set | 1154 | # CONFIG_NCP_FS is not set |
| 1116 | # CONFIG_CODA_FS is not set | 1155 | # CONFIG_CODA_FS is not set |
| 1117 | # CONFIG_AFS_FS is not set | 1156 | # CONFIG_AFS_FS is not set |
| 1118 | # CONFIG_9P_FS is not set | ||
| 1119 | 1157 | ||
| 1120 | # | 1158 | # |
| 1121 | # Partition Types | 1159 | # Partition Types |
| 1122 | # | 1160 | # |
| 1123 | # CONFIG_PARTITION_ADVANCED is not set | 1161 | # CONFIG_PARTITION_ADVANCED is not set |
| 1124 | CONFIG_MSDOS_PARTITION=y | 1162 | CONFIG_MSDOS_PARTITION=y |
| 1125 | |||
| 1126 | # | ||
| 1127 | # Native Language Support | ||
| 1128 | # | ||
| 1129 | CONFIG_NLS=m | 1163 | CONFIG_NLS=m |
| 1130 | CONFIG_NLS_DEFAULT="iso8859-1" | 1164 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1131 | # CONFIG_NLS_CODEPAGE_437 is not set | 1165 | # CONFIG_NLS_CODEPAGE_437 is not set |
| @@ -1166,21 +1200,16 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1166 | # CONFIG_NLS_KOI8_R is not set | 1200 | # CONFIG_NLS_KOI8_R is not set |
| 1167 | # CONFIG_NLS_KOI8_U is not set | 1201 | # CONFIG_NLS_KOI8_U is not set |
| 1168 | # CONFIG_NLS_UTF8 is not set | 1202 | # CONFIG_NLS_UTF8 is not set |
| 1169 | |||
| 1170 | # | ||
| 1171 | # Distributed Lock Manager | ||
| 1172 | # | ||
| 1173 | # CONFIG_DLM is not set | 1203 | # CONFIG_DLM is not set |
| 1174 | 1204 | CONFIG_INSTRUMENTATION=y | |
| 1175 | # | ||
| 1176 | # Profiling support | ||
| 1177 | # | ||
| 1178 | # CONFIG_PROFILING is not set | 1205 | # CONFIG_PROFILING is not set |
| 1206 | # CONFIG_MARKERS is not set | ||
| 1179 | 1207 | ||
| 1180 | # | 1208 | # |
| 1181 | # Kernel hacking | 1209 | # Kernel hacking |
| 1182 | # | 1210 | # |
| 1183 | # CONFIG_PRINTK_TIME is not set | 1211 | # CONFIG_PRINTK_TIME is not set |
| 1212 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1184 | CONFIG_ENABLE_MUST_CHECK=y | 1213 | CONFIG_ENABLE_MUST_CHECK=y |
| 1185 | # CONFIG_MAGIC_SYSRQ is not set | 1214 | # CONFIG_MAGIC_SYSRQ is not set |
| 1186 | # CONFIG_UNUSED_SYMBOLS is not set | 1215 | # CONFIG_UNUSED_SYMBOLS is not set |
| @@ -1188,6 +1217,7 @@ CONFIG_DEBUG_FS=y | |||
| 1188 | # CONFIG_HEADERS_CHECK is not set | 1217 | # CONFIG_HEADERS_CHECK is not set |
| 1189 | # CONFIG_DEBUG_KERNEL is not set | 1218 | # CONFIG_DEBUG_KERNEL is not set |
| 1190 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1219 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1220 | # CONFIG_SAMPLES is not set | ||
| 1191 | CONFIG_DEBUG_MMRS=y | 1221 | CONFIG_DEBUG_MMRS=y |
| 1192 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | 1222 | CONFIG_DEBUG_HUNT_FOR_ZERO=y |
| 1193 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | 1223 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y |
| @@ -1207,11 +1237,8 @@ CONFIG_ACCESS_CHECK=y | |||
| 1207 | # CONFIG_KEYS is not set | 1237 | # CONFIG_KEYS is not set |
| 1208 | CONFIG_SECURITY=y | 1238 | CONFIG_SECURITY=y |
| 1209 | # CONFIG_SECURITY_NETWORK is not set | 1239 | # CONFIG_SECURITY_NETWORK is not set |
| 1210 | CONFIG_SECURITY_CAPABILITIES=m | 1240 | # CONFIG_SECURITY_CAPABILITIES is not set |
| 1211 | 1241 | # CONFIG_SECURITY_ROOTPLUG is not set | |
| 1212 | # | ||
| 1213 | # Cryptographic options | ||
| 1214 | # | ||
| 1215 | # CONFIG_CRYPTO is not set | 1242 | # CONFIG_CRYPTO is not set |
| 1216 | 1243 | ||
| 1217 | # | 1244 | # |
| @@ -1222,6 +1249,7 @@ CONFIG_CRC_CCITT=m | |||
| 1222 | # CONFIG_CRC16 is not set | 1249 | # CONFIG_CRC16 is not set |
| 1223 | # CONFIG_CRC_ITU_T is not set | 1250 | # CONFIG_CRC_ITU_T is not set |
| 1224 | CONFIG_CRC32=y | 1251 | CONFIG_CRC32=y |
| 1252 | # CONFIG_CRC7 is not set | ||
| 1225 | # CONFIG_LIBCRC32C is not set | 1253 | # CONFIG_LIBCRC32C is not set |
| 1226 | CONFIG_ZLIB_INFLATE=y | 1254 | CONFIG_ZLIB_INFLATE=y |
| 1227 | CONFIG_ZLIB_DEFLATE=m | 1255 | CONFIG_ZLIB_DEFLATE=m |
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig index 5bfdfb287d13..1ff2ff4b49aa 100644 --- a/arch/blackfin/configs/BF548-EZKIT_defconfig +++ b/arch/blackfin/configs/BF548-EZKIT_defconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22.16 | 3 | # Linux kernel version: 2.6.24.7 |
| 4 | # | 4 | # |
| 5 | # CONFIG_MMU is not set | 5 | # CONFIG_MMU is not set |
| 6 | # CONFIG_FPU is not set | 6 | # CONFIG_FPU is not set |
| @@ -13,35 +13,34 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y | |||
| 13 | CONFIG_GENERIC_HWEIGHT=y | 13 | CONFIG_GENERIC_HWEIGHT=y |
| 14 | CONFIG_GENERIC_HARDIRQS=y | 14 | CONFIG_GENERIC_HARDIRQS=y |
| 15 | CONFIG_GENERIC_IRQ_PROBE=y | 15 | CONFIG_GENERIC_IRQ_PROBE=y |
| 16 | CONFIG_GENERIC_TIME=y | ||
| 17 | CONFIG_GENERIC_GPIO=y | 16 | CONFIG_GENERIC_GPIO=y |
| 18 | CONFIG_FORCE_MAX_ZONEORDER=14 | 17 | CONFIG_FORCE_MAX_ZONEORDER=14 |
| 19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 18 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 19 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 21 | 20 | ||
| 22 | # | 21 | # |
| 23 | # Code maturity level options | 22 | # General setup |
| 24 | # | 23 | # |
| 25 | CONFIG_EXPERIMENTAL=y | 24 | CONFIG_EXPERIMENTAL=y |
| 26 | CONFIG_BROKEN_ON_SMP=y | 25 | CONFIG_BROKEN_ON_SMP=y |
| 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 26 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 28 | |||
| 29 | # | ||
| 30 | # General setup | ||
| 31 | # | ||
| 32 | CONFIG_LOCALVERSION="" | 27 | CONFIG_LOCALVERSION="" |
| 33 | CONFIG_LOCALVERSION_AUTO=y | 28 | CONFIG_LOCALVERSION_AUTO=y |
| 34 | CONFIG_SYSVIPC=y | 29 | CONFIG_SYSVIPC=y |
| 35 | # CONFIG_IPC_NS is not set | ||
| 36 | CONFIG_SYSVIPC_SYSCTL=y | 30 | CONFIG_SYSVIPC_SYSCTL=y |
| 37 | # CONFIG_POSIX_MQUEUE is not set | 31 | # CONFIG_POSIX_MQUEUE is not set |
| 38 | # CONFIG_BSD_PROCESS_ACCT is not set | 32 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 39 | # CONFIG_TASKSTATS is not set | 33 | # CONFIG_TASKSTATS is not set |
| 40 | # CONFIG_UTS_NS is not set | 34 | # CONFIG_USER_NS is not set |
| 35 | # CONFIG_PID_NS is not set | ||
| 41 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
| 42 | CONFIG_IKCONFIG=y | 37 | CONFIG_IKCONFIG=y |
| 43 | CONFIG_IKCONFIG_PROC=y | 38 | CONFIG_IKCONFIG_PROC=y |
| 44 | CONFIG_LOG_BUF_SHIFT=14 | 39 | CONFIG_LOG_BUF_SHIFT=14 |
| 40 | # CONFIG_CGROUPS is not set | ||
| 41 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 42 | CONFIG_FAIR_USER_SCHED=y | ||
| 43 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 45 | CONFIG_SYSFS_DEPRECATED=y | 44 | CONFIG_SYSFS_DEPRECATED=y |
| 46 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
| 47 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
| @@ -64,32 +63,24 @@ CONFIG_EPOLL=y | |||
| 64 | CONFIG_SIGNALFD=y | 63 | CONFIG_SIGNALFD=y |
| 65 | CONFIG_EVENTFD=y | 64 | CONFIG_EVENTFD=y |
| 66 | CONFIG_VM_EVENT_COUNTERS=y | 65 | CONFIG_VM_EVENT_COUNTERS=y |
| 67 | CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 | ||
| 68 | # CONFIG_NP2 is not set | ||
| 69 | CONFIG_SLAB=y | 66 | CONFIG_SLAB=y |
| 70 | # CONFIG_SLUB is not set | 67 | # CONFIG_SLUB is not set |
| 71 | # CONFIG_SLOB is not set | 68 | # CONFIG_SLOB is not set |
| 69 | CONFIG_SLABINFO=y | ||
| 72 | CONFIG_RT_MUTEXES=y | 70 | CONFIG_RT_MUTEXES=y |
| 73 | CONFIG_TINY_SHMEM=y | 71 | CONFIG_TINY_SHMEM=y |
| 74 | CONFIG_BASE_SMALL=0 | 72 | CONFIG_BASE_SMALL=0 |
| 75 | |||
| 76 | # | ||
| 77 | # Loadable module support | ||
| 78 | # | ||
| 79 | CONFIG_MODULES=y | 73 | CONFIG_MODULES=y |
| 80 | CONFIG_MODULE_UNLOAD=y | 74 | CONFIG_MODULE_UNLOAD=y |
| 81 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 75 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 82 | # CONFIG_MODVERSIONS is not set | 76 | # CONFIG_MODVERSIONS is not set |
| 83 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 77 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 84 | CONFIG_KMOD=y | 78 | CONFIG_KMOD=y |
| 85 | |||
| 86 | # | ||
| 87 | # Block layer | ||
| 88 | # | ||
| 89 | CONFIG_BLOCK=y | 79 | CONFIG_BLOCK=y |
| 90 | # CONFIG_LBD is not set | 80 | # CONFIG_LBD is not set |
| 91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 81 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 92 | # CONFIG_LSF is not set | 82 | # CONFIG_LSF is not set |
| 83 | # CONFIG_BLK_DEV_BSG is not set | ||
| 93 | 84 | ||
| 94 | # | 85 | # |
| 95 | # IO Schedulers | 86 | # IO Schedulers |
| @@ -141,7 +132,6 @@ CONFIG_BF_REV_0_0=y | |||
| 141 | # CONFIG_BF_REV_ANY is not set | 132 | # CONFIG_BF_REV_ANY is not set |
| 142 | # CONFIG_BF_REV_NONE is not set | 133 | # CONFIG_BF_REV_NONE is not set |
| 143 | CONFIG_BF54x=y | 134 | CONFIG_BF54x=y |
| 144 | CONFIG_BFIN_SINGLE_CORE=y | ||
| 145 | CONFIG_IRQ_PLL_WAKEUP=7 | 135 | CONFIG_IRQ_PLL_WAKEUP=7 |
| 146 | CONFIG_IRQ_RTC=8 | 136 | CONFIG_IRQ_RTC=8 |
| 147 | CONFIG_IRQ_SPORT0_RX=9 | 137 | CONFIG_IRQ_SPORT0_RX=9 |
| @@ -169,6 +159,7 @@ CONFIG_IRQ_TIMER8=11 | |||
| 169 | CONFIG_IRQ_TIMER9=11 | 159 | CONFIG_IRQ_TIMER9=11 |
| 170 | CONFIG_IRQ_TIMER10=11 | 160 | CONFIG_IRQ_TIMER10=11 |
| 171 | CONFIG_BFIN548_EZKIT=y | 161 | CONFIG_BFIN548_EZKIT=y |
| 162 | # CONFIG_BFIN548_BLUETECHNIX_CM is not set | ||
| 172 | 163 | ||
| 173 | # | 164 | # |
| 174 | # BF548 Specific Configuration | 165 | # BF548 Specific Configuration |
| @@ -262,12 +253,14 @@ CONFIG_PINT3_ASSIGN=0x02020303 | |||
| 262 | # Board customizations | 253 | # Board customizations |
| 263 | # | 254 | # |
| 264 | # CONFIG_CMDLINE_BOOL is not set | 255 | # CONFIG_CMDLINE_BOOL is not set |
| 256 | CONFIG_BOOT_LOAD=0x1000 | ||
| 265 | 257 | ||
| 266 | # | 258 | # |
| 267 | # Clock/PLL Setup | 259 | # Clock/PLL Setup |
| 268 | # | 260 | # |
| 269 | CONFIG_CLKIN_HZ=25000000 | 261 | CONFIG_CLKIN_HZ=25000000 |
| 270 | # CONFIG_BFIN_KERNEL_CLOCK is not set | 262 | # CONFIG_BFIN_KERNEL_CLOCK is not set |
| 263 | CONFIG_MAX_MEM_SIZE=512 | ||
| 271 | CONFIG_MAX_VCO_HZ=600000000 | 264 | CONFIG_MAX_VCO_HZ=600000000 |
| 272 | CONFIG_MIN_VCO_HZ=50000000 | 265 | CONFIG_MIN_VCO_HZ=50000000 |
| 273 | CONFIG_MAX_SCLK_HZ=133333333 | 266 | CONFIG_MAX_SCLK_HZ=133333333 |
| @@ -281,14 +274,17 @@ CONFIG_HZ_250=y | |||
| 281 | # CONFIG_HZ_300 is not set | 274 | # CONFIG_HZ_300 is not set |
| 282 | # CONFIG_HZ_1000 is not set | 275 | # CONFIG_HZ_1000 is not set |
| 283 | CONFIG_HZ=250 | 276 | CONFIG_HZ=250 |
| 277 | CONFIG_GENERIC_TIME=y | ||
| 278 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 279 | # CONFIG_CYCLES_CLOCKSOURCE is not set | ||
| 280 | # CONFIG_TICK_ONESHOT is not set | ||
| 281 | # CONFIG_NO_HZ is not set | ||
| 282 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 283 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 284 | 284 | ||
| 285 | # | 285 | # |
| 286 | # Memory Setup | 286 | # Misc |
| 287 | # | 287 | # |
| 288 | CONFIG_MAX_MEM_SIZE=512 | ||
| 289 | # CONFIG_MEM_MT46V32M16_6T is not set | ||
| 290 | CONFIG_MEM_MT46V32M16_5B=y | ||
| 291 | CONFIG_BOOT_LOAD=0x1000 | ||
| 292 | CONFIG_BFIN_SCRATCH_REG_RETN=y | 288 | CONFIG_BFIN_SCRATCH_REG_RETN=y |
| 293 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set | 289 | # CONFIG_BFIN_SCRATCH_REG_RETE is not set |
| 294 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set | 290 | # CONFIG_BFIN_SCRATCH_REG_CYCLES is not set |
| @@ -324,12 +320,14 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 324 | CONFIG_FLATMEM=y | 320 | CONFIG_FLATMEM=y |
| 325 | CONFIG_FLAT_NODE_MEM_MAP=y | 321 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 326 | # CONFIG_SPARSEMEM_STATIC is not set | 322 | # CONFIG_SPARSEMEM_STATIC is not set |
| 323 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 327 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 324 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 328 | # CONFIG_RESOURCES_64BIT is not set | 325 | # CONFIG_RESOURCES_64BIT is not set |
| 329 | CONFIG_ZONE_DMA_FLAG=1 | 326 | CONFIG_ZONE_DMA_FLAG=1 |
| 330 | CONFIG_LARGE_ALLOCS=y | 327 | CONFIG_VIRT_TO_BUS=y |
| 331 | # CONFIG_BFIN_GPTIMERS is not set | 328 | # CONFIG_BFIN_GPTIMERS is not set |
| 332 | CONFIG_BFIN_DMA_5XX=y | 329 | CONFIG_BFIN_DMA_5XX=y |
| 330 | # CONFIG_DMA_UNCACHED_4M is not set | ||
| 333 | CONFIG_DMA_UNCACHED_2M=y | 331 | CONFIG_DMA_UNCACHED_2M=y |
| 334 | # CONFIG_DMA_UNCACHED_1M is not set | 332 | # CONFIG_DMA_UNCACHED_1M is not set |
| 335 | # CONFIG_DMA_UNCACHED_NONE is not set | 333 | # CONFIG_DMA_UNCACHED_NONE is not set |
| @@ -377,10 +375,6 @@ CONFIG_EBIU_FCTLVAL=0x6 | |||
| 377 | # | 375 | # |
| 378 | # CONFIG_PCI is not set | 376 | # CONFIG_PCI is not set |
| 379 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 377 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 380 | |||
| 381 | # | ||
| 382 | # PCCARD (PCMCIA/CardBus) support | ||
| 383 | # | ||
| 384 | # CONFIG_PCCARD is not set | 378 | # CONFIG_PCCARD is not set |
| 385 | 379 | ||
| 386 | # | 380 | # |
| @@ -396,6 +390,7 @@ CONFIG_BINFMT_ZFLAT=y | |||
| 396 | # Power management options | 390 | # Power management options |
| 397 | # | 391 | # |
| 398 | # CONFIG_PM is not set | 392 | # CONFIG_PM is not set |
| 393 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
| 399 | # CONFIG_PM_WAKEUP_BY_GPIO is not set | 394 | # CONFIG_PM_WAKEUP_BY_GPIO is not set |
| 400 | 395 | ||
| 401 | # | 396 | # |
| @@ -439,6 +434,7 @@ CONFIG_SYN_COOKIES=y | |||
| 439 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 434 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
| 440 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 435 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
| 441 | CONFIG_INET_XFRM_MODE_BEET=y | 436 | CONFIG_INET_XFRM_MODE_BEET=y |
| 437 | # CONFIG_INET_LRO is not set | ||
| 442 | CONFIG_INET_DIAG=y | 438 | CONFIG_INET_DIAG=y |
| 443 | CONFIG_INET_TCP_DIAG=y | 439 | CONFIG_INET_TCP_DIAG=y |
| 444 | # CONFIG_TCP_CONG_ADVANCED is not set | 440 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -465,10 +461,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 465 | # CONFIG_LAPB is not set | 461 | # CONFIG_LAPB is not set |
| 466 | # CONFIG_ECONET is not set | 462 | # CONFIG_ECONET is not set |
| 467 | # CONFIG_WAN_ROUTER is not set | 463 | # CONFIG_WAN_ROUTER is not set |
| 468 | |||
| 469 | # | ||
| 470 | # QoS and/or fair queueing | ||
| 471 | # | ||
| 472 | # CONFIG_NET_SCHED is not set | 464 | # CONFIG_NET_SCHED is not set |
| 473 | 465 | ||
| 474 | # | 466 | # |
| @@ -488,6 +480,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 488 | # CONFIG_MAC80211 is not set | 480 | # CONFIG_MAC80211 is not set |
| 489 | # CONFIG_IEEE80211 is not set | 481 | # CONFIG_IEEE80211 is not set |
| 490 | # CONFIG_RFKILL is not set | 482 | # CONFIG_RFKILL is not set |
| 483 | # CONFIG_NET_9P is not set | ||
| 491 | 484 | ||
| 492 | # | 485 | # |
| 493 | # Device Drivers | 486 | # Device Drivers |
| @@ -496,14 +489,11 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 496 | # | 489 | # |
| 497 | # Generic Driver Options | 490 | # Generic Driver Options |
| 498 | # | 491 | # |
| 492 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 499 | CONFIG_STANDALONE=y | 493 | CONFIG_STANDALONE=y |
| 500 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 494 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 501 | # CONFIG_FW_LOADER is not set | 495 | # CONFIG_FW_LOADER is not set |
| 502 | # CONFIG_SYS_HYPERVISOR is not set | 496 | # CONFIG_SYS_HYPERVISOR is not set |
| 503 | |||
| 504 | # | ||
| 505 | # Connector - unified userspace <-> kernelspace linker | ||
| 506 | # | ||
| 507 | # CONFIG_CONNECTOR is not set | 497 | # CONFIG_CONNECTOR is not set |
| 508 | CONFIG_MTD=y | 498 | CONFIG_MTD=y |
| 509 | # CONFIG_MTD_DEBUG is not set | 499 | # CONFIG_MTD_DEBUG is not set |
| @@ -523,6 +513,7 @@ CONFIG_MTD_BLOCK=y | |||
| 523 | # CONFIG_INFTL is not set | 513 | # CONFIG_INFTL is not set |
| 524 | # CONFIG_RFD_FTL is not set | 514 | # CONFIG_RFD_FTL is not set |
| 525 | # CONFIG_SSFDC is not set | 515 | # CONFIG_SSFDC is not set |
| 516 | # CONFIG_MTD_OOPS is not set | ||
| 526 | 517 | ||
| 527 | # | 518 | # |
| 528 | # RAM/ROM/Flash chip drivers | 519 | # RAM/ROM/Flash chip drivers |
| @@ -587,39 +578,27 @@ CONFIG_MTD_NAND_BF5XX_HWECC=y | |||
| 587 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 578 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
| 588 | # CONFIG_MTD_NAND_NANDSIM is not set | 579 | # CONFIG_MTD_NAND_NANDSIM is not set |
| 589 | # CONFIG_MTD_NAND_PLATFORM is not set | 580 | # CONFIG_MTD_NAND_PLATFORM is not set |
| 581 | # CONFIG_MTD_ALAUDA is not set | ||
| 590 | # CONFIG_MTD_ONENAND is not set | 582 | # CONFIG_MTD_ONENAND is not set |
| 591 | 583 | ||
| 592 | # | 584 | # |
| 593 | # UBI - Unsorted block images | 585 | # UBI - Unsorted block images |
| 594 | # | 586 | # |
| 595 | # CONFIG_MTD_UBI is not set | 587 | # CONFIG_MTD_UBI is not set |
| 596 | |||
| 597 | # | ||
| 598 | # Parallel port support | ||
| 599 | # | ||
| 600 | # CONFIG_PARPORT is not set | 588 | # CONFIG_PARPORT is not set |
| 601 | 589 | CONFIG_BLK_DEV=y | |
| 602 | # | ||
| 603 | # Plug and Play support | ||
| 604 | # | ||
| 605 | # CONFIG_PNPACPI is not set | ||
| 606 | |||
| 607 | # | ||
| 608 | # Block devices | ||
| 609 | # | ||
| 610 | # CONFIG_BLK_DEV_COW_COMMON is not set | 590 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 611 | # CONFIG_BLK_DEV_LOOP is not set | 591 | # CONFIG_BLK_DEV_LOOP is not set |
| 612 | # CONFIG_BLK_DEV_NBD is not set | 592 | # CONFIG_BLK_DEV_NBD is not set |
| 593 | # CONFIG_BLK_DEV_UB is not set | ||
| 613 | CONFIG_BLK_DEV_RAM=y | 594 | CONFIG_BLK_DEV_RAM=y |
| 614 | CONFIG_BLK_DEV_RAM_COUNT=16 | 595 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 615 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 596 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 616 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 597 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
| 617 | # CONFIG_CDROM_PKTCDVD is not set | 598 | # CONFIG_CDROM_PKTCDVD is not set |
| 618 | # CONFIG_ATA_OVER_ETH is not set | 599 | # CONFIG_ATA_OVER_ETH is not set |
| 619 | 600 | CONFIG_MISC_DEVICES=y | |
| 620 | # | 601 | # CONFIG_EEPROM_93CX6 is not set |
| 621 | # Misc devices | ||
| 622 | # | ||
| 623 | # CONFIG_IDE is not set | 602 | # CONFIG_IDE is not set |
| 624 | 603 | ||
| 625 | # | 604 | # |
| @@ -627,6 +606,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 627 | # | 606 | # |
| 628 | # CONFIG_RAID_ATTRS is not set | 607 | # CONFIG_RAID_ATTRS is not set |
| 629 | CONFIG_SCSI=y | 608 | CONFIG_SCSI=y |
| 609 | CONFIG_SCSI_DMA=y | ||
| 630 | # CONFIG_SCSI_TGT is not set | 610 | # CONFIG_SCSI_TGT is not set |
| 631 | # CONFIG_SCSI_NETLINK is not set | 611 | # CONFIG_SCSI_NETLINK is not set |
| 632 | CONFIG_SCSI_PROC_FS=y | 612 | CONFIG_SCSI_PROC_FS=y |
| @@ -657,43 +637,35 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 657 | # CONFIG_SCSI_SPI_ATTRS is not set | 637 | # CONFIG_SCSI_SPI_ATTRS is not set |
| 658 | # CONFIG_SCSI_FC_ATTRS is not set | 638 | # CONFIG_SCSI_FC_ATTRS is not set |
| 659 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 639 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 660 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
| 661 | # CONFIG_SCSI_SAS_LIBSAS is not set | 640 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 662 | 641 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 663 | # | 642 | CONFIG_SCSI_LOWLEVEL=y |
| 664 | # SCSI low-level drivers | ||
| 665 | # | ||
| 666 | # CONFIG_ISCSI_TCP is not set | 643 | # CONFIG_ISCSI_TCP is not set |
| 667 | # CONFIG_SCSI_DEBUG is not set | 644 | # CONFIG_SCSI_DEBUG is not set |
| 668 | CONFIG_ATA=y | 645 | CONFIG_ATA=y |
| 669 | # CONFIG_ATA_NONSTANDARD is not set | 646 | # CONFIG_ATA_NONSTANDARD is not set |
| 670 | # CONFIG_PATA_PLATFORM is not set | 647 | # CONFIG_PATA_PLATFORM is not set |
| 671 | CONFIG_PATA_BF54X=y | 648 | CONFIG_PATA_BF54X=y |
| 672 | CONFIG_PATA_BF54X_DMA=y | ||
| 673 | |||
| 674 | # | ||
| 675 | # Multi-device support (RAID and LVM) | ||
| 676 | # | ||
| 677 | # CONFIG_MD is not set | 649 | # CONFIG_MD is not set |
| 678 | |||
| 679 | # | ||
| 680 | # Network device support | ||
| 681 | # | ||
| 682 | CONFIG_NETDEVICES=y | 650 | CONFIG_NETDEVICES=y |
| 651 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 683 | # CONFIG_DUMMY is not set | 652 | # CONFIG_DUMMY is not set |
| 684 | # CONFIG_BONDING is not set | 653 | # CONFIG_BONDING is not set |
| 654 | # CONFIG_MACVLAN is not set | ||
| 685 | # CONFIG_EQUALIZER is not set | 655 | # CONFIG_EQUALIZER is not set |
| 686 | # CONFIG_TUN is not set | 656 | # CONFIG_TUN is not set |
| 657 | # CONFIG_VETH is not set | ||
| 687 | # CONFIG_PHYLIB is not set | 658 | # CONFIG_PHYLIB is not set |
| 688 | |||
| 689 | # | ||
| 690 | # Ethernet (10 or 100Mbit) | ||
| 691 | # | ||
| 692 | CONFIG_NET_ETHERNET=y | 659 | CONFIG_NET_ETHERNET=y |
| 693 | CONFIG_MII=y | 660 | CONFIG_MII=y |
| 694 | # CONFIG_SMC91X is not set | 661 | # CONFIG_SMC91X is not set |
| 695 | CONFIG_SMSC911X=y | 662 | CONFIG_SMSC911X=y |
| 696 | # CONFIG_DM9000 is not set | 663 | # CONFIG_DM9000 is not set |
| 664 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 665 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 666 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 667 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 668 | # CONFIG_B44 is not set | ||
| 697 | CONFIG_NETDEV_1000=y | 669 | CONFIG_NETDEV_1000=y |
| 698 | # CONFIG_AX88180 is not set | 670 | # CONFIG_AX88180 is not set |
| 699 | CONFIG_NETDEV_10000=y | 671 | CONFIG_NETDEV_10000=y |
| @@ -703,6 +675,15 @@ CONFIG_NETDEV_10000=y | |||
| 703 | # | 675 | # |
| 704 | # CONFIG_WLAN_PRE80211 is not set | 676 | # CONFIG_WLAN_PRE80211 is not set |
| 705 | # CONFIG_WLAN_80211 is not set | 677 | # CONFIG_WLAN_80211 is not set |
| 678 | |||
| 679 | # | ||
| 680 | # USB Network Adapters | ||
| 681 | # | ||
| 682 | # CONFIG_USB_CATC is not set | ||
| 683 | # CONFIG_USB_KAWETH is not set | ||
| 684 | # CONFIG_USB_PEGASUS is not set | ||
| 685 | # CONFIG_USB_RTL8150 is not set | ||
| 686 | # CONFIG_USB_USBNET is not set | ||
| 706 | # CONFIG_WAN is not set | 687 | # CONFIG_WAN is not set |
| 707 | # CONFIG_PPP is not set | 688 | # CONFIG_PPP is not set |
| 708 | # CONFIG_SLIP is not set | 689 | # CONFIG_SLIP is not set |
| @@ -710,15 +691,7 @@ CONFIG_NETDEV_10000=y | |||
| 710 | # CONFIG_NETCONSOLE is not set | 691 | # CONFIG_NETCONSOLE is not set |
| 711 | # CONFIG_NETPOLL is not set | 692 | # CONFIG_NETPOLL is not set |
| 712 | # CONFIG_NET_POLL_CONTROLLER is not set | 693 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 713 | |||
| 714 | # | ||
| 715 | # ISDN subsystem | ||
| 716 | # | ||
| 717 | # CONFIG_ISDN is not set | 694 | # CONFIG_ISDN is not set |
| 718 | |||
| 719 | # | ||
| 720 | # Telephony Support | ||
| 721 | # | ||
| 722 | # CONFIG_PHONE is not set | 695 | # CONFIG_PHONE is not set |
| 723 | 696 | ||
| 724 | # | 697 | # |
| @@ -733,9 +706,6 @@ CONFIG_INPUT=y | |||
| 733 | # | 706 | # |
| 734 | # CONFIG_INPUT_MOUSEDEV is not set | 707 | # CONFIG_INPUT_MOUSEDEV is not set |
| 735 | # CONFIG_INPUT_JOYDEV is not set | 708 | # CONFIG_INPUT_JOYDEV is not set |
| 736 | CONFIG_INPUT_TSDEV=m | ||
| 737 | CONFIG_INPUT_TSDEV_SCREEN_X=240 | ||
| 738 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 | ||
| 739 | CONFIG_INPUT_EVDEV=m | 709 | CONFIG_INPUT_EVDEV=m |
| 740 | CONFIG_INPUT_EVBUG=m | 710 | CONFIG_INPUT_EVBUG=m |
| 741 | 711 | ||
| @@ -758,6 +728,7 @@ CONFIG_KEYBOARD_BFIN=y | |||
| 758 | CONFIG_INPUT_TOUCHSCREEN=y | 728 | CONFIG_INPUT_TOUCHSCREEN=y |
| 759 | # CONFIG_TOUCHSCREEN_ADS7846 is not set | 729 | # CONFIG_TOUCHSCREEN_ADS7846 is not set |
| 760 | CONFIG_TOUCHSCREEN_AD7877=m | 730 | CONFIG_TOUCHSCREEN_AD7877=m |
| 731 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 761 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 732 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
| 762 | # CONFIG_TOUCHSCREEN_ELO is not set | 733 | # CONFIG_TOUCHSCREEN_ELO is not set |
| 763 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 734 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
| @@ -787,7 +758,6 @@ CONFIG_INPUT_MISC=y | |||
| 787 | # | 758 | # |
| 788 | # CONFIG_AD9960 is not set | 759 | # CONFIG_AD9960 is not set |
| 789 | # CONFIG_SPI_ADC_BF533 is not set | 760 | # CONFIG_SPI_ADC_BF533 is not set |
| 790 | # CONFIG_BF5xx_PFLAGS is not set | ||
| 791 | # CONFIG_BF5xx_PPIFCD is not set | 761 | # CONFIG_BF5xx_PPIFCD is not set |
| 792 | # CONFIG_BFIN_SIMPLE_TIMER is not set | 762 | # CONFIG_BFIN_SIMPLE_TIMER is not set |
| 793 | # CONFIG_BF5xx_PPI is not set | 763 | # CONFIG_BF5xx_PPI is not set |
| @@ -796,7 +766,7 @@ CONFIG_BFIN_OTP=y | |||
| 796 | # CONFIG_BFIN_SPORT is not set | 766 | # CONFIG_BFIN_SPORT is not set |
| 797 | # CONFIG_BFIN_TIMER_LATENCY is not set | 767 | # CONFIG_BFIN_TIMER_LATENCY is not set |
| 798 | # CONFIG_TWI_LCD is not set | 768 | # CONFIG_TWI_LCD is not set |
| 799 | # CONFIG_AD5304 is not set | 769 | # CONFIG_SIMPLE_GPIO is not set |
| 800 | CONFIG_VT=y | 770 | CONFIG_VT=y |
| 801 | CONFIG_VT_CONSOLE=y | 771 | CONFIG_VT_CONSOLE=y |
| 802 | CONFIG_HW_CONSOLE=y | 772 | CONFIG_HW_CONSOLE=y |
| @@ -830,27 +800,11 @@ CONFIG_UNIX98_PTYS=y | |||
| 830 | # CAN, the car bus and industrial fieldbus | 800 | # CAN, the car bus and industrial fieldbus |
| 831 | # | 801 | # |
| 832 | # CONFIG_CAN4LINUX is not set | 802 | # CONFIG_CAN4LINUX is not set |
| 833 | |||
| 834 | # | ||
| 835 | # IPMI | ||
| 836 | # | ||
| 837 | # CONFIG_IPMI_HANDLER is not set | 803 | # CONFIG_IPMI_HANDLER is not set |
| 838 | CONFIG_WATCHDOG=y | ||
| 839 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 840 | |||
| 841 | # | ||
| 842 | # Watchdog Device Drivers | ||
| 843 | # | ||
| 844 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 845 | CONFIG_BFIN_WDT=y | ||
| 846 | CONFIG_HW_RANDOM=y | 804 | CONFIG_HW_RANDOM=y |
| 847 | # CONFIG_GEN_RTC is not set | 805 | # CONFIG_GEN_RTC is not set |
| 848 | # CONFIG_R3964 is not set | 806 | # CONFIG_R3964 is not set |
| 849 | # CONFIG_RAW_DRIVER is not set | 807 | # CONFIG_RAW_DRIVER is not set |
| 850 | |||
| 851 | # | ||
| 852 | # TPM devices | ||
| 853 | # | ||
| 854 | # CONFIG_TCG_TPM is not set | 808 | # CONFIG_TCG_TPM is not set |
| 855 | CONFIG_I2C=y | 809 | CONFIG_I2C=y |
| 856 | CONFIG_I2C_BOARDINFO=y | 810 | CONFIG_I2C_BOARDINFO=y |
| @@ -872,21 +826,24 @@ CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50 | |||
| 872 | # CONFIG_I2C_OCORES is not set | 826 | # CONFIG_I2C_OCORES is not set |
| 873 | # CONFIG_I2C_PARPORT_LIGHT is not set | 827 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 874 | # CONFIG_I2C_SIMTEC is not set | 828 | # CONFIG_I2C_SIMTEC is not set |
| 829 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 875 | # CONFIG_I2C_STUB is not set | 830 | # CONFIG_I2C_STUB is not set |
| 831 | # CONFIG_I2C_TINY_USB is not set | ||
| 876 | 832 | ||
| 877 | # | 833 | # |
| 878 | # Miscellaneous I2C Chip support | 834 | # Miscellaneous I2C Chip support |
| 879 | # | 835 | # |
| 880 | # CONFIG_SENSORS_DS1337 is not set | 836 | # CONFIG_SENSORS_DS1337 is not set |
| 881 | # CONFIG_SENSORS_DS1374 is not set | 837 | # CONFIG_SENSORS_DS1374 is not set |
| 838 | # CONFIG_DS1682 is not set | ||
| 882 | # CONFIG_SENSORS_AD5252 is not set | 839 | # CONFIG_SENSORS_AD5252 is not set |
| 883 | # CONFIG_SENSORS_EEPROM is not set | 840 | # CONFIG_SENSORS_EEPROM is not set |
| 884 | # CONFIG_SENSORS_PCF8574 is not set | 841 | # CONFIG_SENSORS_PCF8574 is not set |
| 885 | # CONFIG_SENSORS_PCF8575 is not set | 842 | # CONFIG_SENSORS_PCF8575 is not set |
| 886 | # CONFIG_SENSORS_PCA9543 is not set | ||
| 887 | # CONFIG_SENSORS_PCA9539 is not set | 843 | # CONFIG_SENSORS_PCA9539 is not set |
| 888 | # CONFIG_SENSORS_PCF8591 is not set | 844 | # CONFIG_SENSORS_PCF8591 is not set |
| 889 | # CONFIG_SENSORS_MAX6875 is not set | 845 | # CONFIG_SENSORS_MAX6875 is not set |
| 846 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 890 | # CONFIG_I2C_DEBUG_CORE is not set | 847 | # CONFIG_I2C_DEBUG_CORE is not set |
| 891 | # CONFIG_I2C_DEBUG_ALGO is not set | 848 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 892 | # CONFIG_I2C_DEBUG_BUS is not set | 849 | # CONFIG_I2C_DEBUG_BUS is not set |
| @@ -909,14 +866,11 @@ CONFIG_SPI_BFIN=y | |||
| 909 | # | 866 | # |
| 910 | # CONFIG_SPI_AT25 is not set | 867 | # CONFIG_SPI_AT25 is not set |
| 911 | # CONFIG_SPI_SPIDEV is not set | 868 | # CONFIG_SPI_SPIDEV is not set |
| 912 | 869 | # CONFIG_SPI_TLE62X0 is not set | |
| 913 | # | ||
| 914 | # Dallas's 1-wire bus | ||
| 915 | # | ||
| 916 | # CONFIG_W1 is not set | 870 | # CONFIG_W1 is not set |
| 871 | # CONFIG_POWER_SUPPLY is not set | ||
| 917 | CONFIG_HWMON=y | 872 | CONFIG_HWMON=y |
| 918 | # CONFIG_HWMON_VID is not set | 873 | # CONFIG_HWMON_VID is not set |
| 919 | # CONFIG_SENSORS_ABITUGURU is not set | ||
| 920 | # CONFIG_SENSORS_AD7418 is not set | 874 | # CONFIG_SENSORS_AD7418 is not set |
| 921 | # CONFIG_SENSORS_ADM1021 is not set | 875 | # CONFIG_SENSORS_ADM1021 is not set |
| 922 | # CONFIG_SENSORS_ADM1025 is not set | 876 | # CONFIG_SENSORS_ADM1025 is not set |
| @@ -924,12 +878,12 @@ CONFIG_HWMON=y | |||
| 924 | # CONFIG_SENSORS_ADM1029 is not set | 878 | # CONFIG_SENSORS_ADM1029 is not set |
| 925 | # CONFIG_SENSORS_ADM1031 is not set | 879 | # CONFIG_SENSORS_ADM1031 is not set |
| 926 | # CONFIG_SENSORS_ADM9240 is not set | 880 | # CONFIG_SENSORS_ADM9240 is not set |
| 927 | # CONFIG_SENSORS_ASB100 is not set | 881 | # CONFIG_SENSORS_ADT7470 is not set |
| 928 | # CONFIG_SENSORS_ATXP1 is not set | 882 | # CONFIG_SENSORS_ATXP1 is not set |
| 929 | # CONFIG_SENSORS_DS1621 is not set | 883 | # CONFIG_SENSORS_DS1621 is not set |
| 930 | # CONFIG_SENSORS_F71805F is not set | 884 | # CONFIG_SENSORS_F71805F is not set |
| 931 | # CONFIG_SENSORS_FSCHER is not set | 885 | # CONFIG_SENSORS_F71882FG is not set |
| 932 | # CONFIG_SENSORS_FSCPOS is not set | 886 | # CONFIG_SENSORS_F75375S is not set |
| 933 | # CONFIG_SENSORS_GL518SM is not set | 887 | # CONFIG_SENSORS_GL518SM is not set |
| 934 | # CONFIG_SENSORS_GL520SM is not set | 888 | # CONFIG_SENSORS_GL520SM is not set |
| 935 | # CONFIG_SENSORS_IT87 is not set | 889 | # CONFIG_SENSORS_IT87 is not set |
| @@ -944,13 +898,16 @@ CONFIG_HWMON=y | |||
| 944 | # CONFIG_SENSORS_LM87 is not set | 898 | # CONFIG_SENSORS_LM87 is not set |
| 945 | # CONFIG_SENSORS_LM90 is not set | 899 | # CONFIG_SENSORS_LM90 is not set |
| 946 | # CONFIG_SENSORS_LM92 is not set | 900 | # CONFIG_SENSORS_LM92 is not set |
| 901 | # CONFIG_SENSORS_LM93 is not set | ||
| 947 | # CONFIG_SENSORS_MAX1619 is not set | 902 | # CONFIG_SENSORS_MAX1619 is not set |
| 948 | # CONFIG_SENSORS_MAX6650 is not set | 903 | # CONFIG_SENSORS_MAX6650 is not set |
| 949 | # CONFIG_SENSORS_PC87360 is not set | 904 | # CONFIG_SENSORS_PC87360 is not set |
| 950 | # CONFIG_SENSORS_PC87427 is not set | 905 | # CONFIG_SENSORS_PC87427 is not set |
| 906 | # CONFIG_SENSORS_DME1737 is not set | ||
| 951 | # CONFIG_SENSORS_SMSC47M1 is not set | 907 | # CONFIG_SENSORS_SMSC47M1 is not set |
| 952 | # CONFIG_SENSORS_SMSC47M192 is not set | 908 | # CONFIG_SENSORS_SMSC47M192 is not set |
| 953 | # CONFIG_SENSORS_SMSC47B397 is not set | 909 | # CONFIG_SENSORS_SMSC47B397 is not set |
| 910 | # CONFIG_SENSORS_THMC50 is not set | ||
| 954 | # CONFIG_SENSORS_VT1211 is not set | 911 | # CONFIG_SENSORS_VT1211 is not set |
| 955 | # CONFIG_SENSORS_W83781D is not set | 912 | # CONFIG_SENSORS_W83781D is not set |
| 956 | # CONFIG_SENSORS_W83791D is not set | 913 | # CONFIG_SENSORS_W83791D is not set |
| @@ -960,6 +917,25 @@ CONFIG_HWMON=y | |||
| 960 | # CONFIG_SENSORS_W83627HF is not set | 917 | # CONFIG_SENSORS_W83627HF is not set |
| 961 | # CONFIG_SENSORS_W83627EHF is not set | 918 | # CONFIG_SENSORS_W83627EHF is not set |
| 962 | # CONFIG_HWMON_DEBUG_CHIP is not set | 919 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 920 | CONFIG_WATCHDOG=y | ||
| 921 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 922 | |||
| 923 | # | ||
| 924 | # Watchdog Device Drivers | ||
| 925 | # | ||
| 926 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 927 | CONFIG_BFIN_WDT=y | ||
| 928 | |||
| 929 | # | ||
| 930 | # USB-based Watchdog Cards | ||
| 931 | # | ||
| 932 | # CONFIG_USBPCWATCHDOG is not set | ||
| 933 | |||
| 934 | # | ||
| 935 | # Sonics Silicon Backplane | ||
| 936 | # | ||
| 937 | CONFIG_SSB_POSSIBLE=y | ||
| 938 | # CONFIG_SSB is not set | ||
| 963 | 939 | ||
| 964 | # | 940 | # |
| 965 | # Multifunction device drivers | 941 | # Multifunction device drivers |
| @@ -972,23 +948,20 @@ CONFIG_HWMON=y | |||
| 972 | # CONFIG_VIDEO_DEV is not set | 948 | # CONFIG_VIDEO_DEV is not set |
| 973 | # CONFIG_DVB_CORE is not set | 949 | # CONFIG_DVB_CORE is not set |
| 974 | CONFIG_DAB=y | 950 | CONFIG_DAB=y |
| 951 | # CONFIG_USB_DABUSB is not set | ||
| 975 | 952 | ||
| 976 | # | 953 | # |
| 977 | # Graphics support | 954 | # Graphics support |
| 978 | # | 955 | # |
| 979 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 980 | |||
| 981 | # | ||
| 982 | # Display device support | ||
| 983 | # | ||
| 984 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 985 | # CONFIG_VGASTATE is not set | 956 | # CONFIG_VGASTATE is not set |
| 957 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 986 | CONFIG_FB=y | 958 | CONFIG_FB=y |
| 987 | CONFIG_FIRMWARE_EDID=y | 959 | CONFIG_FIRMWARE_EDID=y |
| 988 | # CONFIG_FB_DDC is not set | 960 | # CONFIG_FB_DDC is not set |
| 989 | CONFIG_FB_CFB_FILLRECT=y | 961 | CONFIG_FB_CFB_FILLRECT=y |
| 990 | CONFIG_FB_CFB_COPYAREA=y | 962 | CONFIG_FB_CFB_COPYAREA=y |
| 991 | CONFIG_FB_CFB_IMAGEBLIT=y | 963 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 964 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 992 | # CONFIG_FB_SYS_FILLRECT is not set | 965 | # CONFIG_FB_SYS_FILLRECT is not set |
| 993 | # CONFIG_FB_SYS_COPYAREA is not set | 966 | # CONFIG_FB_SYS_COPYAREA is not set |
| 994 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 967 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| @@ -1003,18 +976,24 @@ CONFIG_FB_DEFERRED_IO=y | |||
| 1003 | # | 976 | # |
| 1004 | # Frame buffer hardware drivers | 977 | # Frame buffer hardware drivers |
| 1005 | # | 978 | # |
| 1006 | # CONFIG_FB_BFIN_7171 is not set | ||
| 1007 | # CONFIG_FB_BFIN_7393 is not set | ||
| 1008 | CONFIG_FB_BF54X_LQ043=y | 979 | CONFIG_FB_BF54X_LQ043=y |
| 1009 | # CONFIG_FB_BFIN_T350MCQB is not set | 980 | # CONFIG_FB_BFIN_T350MCQB is not set |
| 981 | # CONFIG_FB_BFIN_7393 is not set | ||
| 1010 | # CONFIG_FB_S1D13XXX is not set | 982 | # CONFIG_FB_S1D13XXX is not set |
| 1011 | # CONFIG_FB_VIRTUAL is not set | 983 | # CONFIG_FB_VIRTUAL is not set |
| 984 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 985 | |||
| 986 | # | ||
| 987 | # Display device support | ||
| 988 | # | ||
| 989 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 1012 | 990 | ||
| 1013 | # | 991 | # |
| 1014 | # Console display driver support | 992 | # Console display driver support |
| 1015 | # | 993 | # |
| 1016 | CONFIG_DUMMY_CONSOLE=y | 994 | CONFIG_DUMMY_CONSOLE=y |
| 1017 | CONFIG_FRAMEBUFFER_CONSOLE=y | 995 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 996 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
| 1018 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 997 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
| 1019 | CONFIG_FONTS=y | 998 | CONFIG_FONTS=y |
| 1020 | # CONFIG_FONT_8x8 is not set | 999 | # CONFIG_FONT_8x8 is not set |
| @@ -1065,10 +1044,21 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1065 | # CONFIG_SND_MPU401 is not set | 1044 | # CONFIG_SND_MPU401 is not set |
| 1066 | 1045 | ||
| 1067 | # | 1046 | # |
| 1047 | # SPI devices | ||
| 1048 | # | ||
| 1049 | |||
| 1050 | # | ||
| 1068 | # ALSA Blackfin devices | 1051 | # ALSA Blackfin devices |
| 1069 | # | 1052 | # |
| 1070 | # CONFIG_SND_BLACKFIN_AD1836 is not set | 1053 | # CONFIG_SND_BLACKFIN_AD1836 is not set |
| 1071 | # CONFIG_SND_BFIN_AD73311 is not set | 1054 | # CONFIG_SND_BFIN_AD73311 is not set |
| 1055 | # CONFIG_SND_BFIN_AD73322 is not set | ||
| 1056 | |||
| 1057 | # | ||
| 1058 | # USB devices | ||
| 1059 | # | ||
| 1060 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1061 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1072 | 1062 | ||
| 1073 | # | 1063 | # |
| 1074 | # System on Chip audio support | 1064 | # System on Chip audio support |
| @@ -1084,6 +1074,10 @@ CONFIG_SND_BF5XX_SOC_BF548_EZKIT=y | |||
| 1084 | CONFIG_SND_BF5XX_SPORT_NUM=0 | 1074 | CONFIG_SND_BF5XX_SPORT_NUM=0 |
| 1085 | CONFIG_SND_BF5XX_HAVE_COLD_RESET=y | 1075 | CONFIG_SND_BF5XX_HAVE_COLD_RESET=y |
| 1086 | CONFIG_SND_BF5XX_RESET_GPIO_NUM=19 | 1076 | CONFIG_SND_BF5XX_RESET_GPIO_NUM=19 |
| 1077 | |||
| 1078 | # | ||
| 1079 | # SoC Audio support for SuperH | ||
| 1080 | # | ||
| 1087 | CONFIG_SND_SOC_AD1980=y | 1081 | CONFIG_SND_SOC_AD1980=y |
| 1088 | 1082 | ||
| 1089 | # | 1083 | # |
| @@ -1091,72 +1085,152 @@ CONFIG_SND_SOC_AD1980=y | |||
| 1091 | # | 1085 | # |
| 1092 | # CONFIG_SOUND_PRIME is not set | 1086 | # CONFIG_SOUND_PRIME is not set |
| 1093 | CONFIG_AC97_BUS=y | 1087 | CONFIG_AC97_BUS=y |
| 1094 | 1088 | CONFIG_HID_SUPPORT=y | |
| 1095 | # | 1089 | CONFIG_HID=y |
| 1096 | # HID Devices | ||
| 1097 | # | ||
| 1098 | CONFIG_HID=m | ||
| 1099 | # CONFIG_HID_DEBUG is not set | 1090 | # CONFIG_HID_DEBUG is not set |
| 1091 | # CONFIG_HIDRAW is not set | ||
| 1100 | 1092 | ||
| 1101 | # | 1093 | # |
| 1102 | # USB support | 1094 | # USB Input Devices |
| 1103 | # | 1095 | # |
| 1096 | CONFIG_USB_HID=y | ||
| 1097 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 1098 | # CONFIG_HID_FF is not set | ||
| 1099 | # CONFIG_USB_HIDDEV is not set | ||
| 1100 | CONFIG_USB_SUPPORT=y | ||
| 1104 | CONFIG_USB_ARCH_HAS_HCD=y | 1101 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1105 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 1102 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 1106 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 1103 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 1107 | # CONFIG_USB is not set | 1104 | CONFIG_USB=y |
| 1105 | # CONFIG_USB_DEBUG is not set | ||
| 1106 | |||
| 1107 | # | ||
| 1108 | # Miscellaneous USB options | ||
| 1109 | # | ||
| 1110 | # CONFIG_USB_DEVICEFS is not set | ||
| 1111 | CONFIG_USB_DEVICE_CLASS=y | ||
| 1112 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 1113 | # CONFIG_USB_OTG is not set | ||
| 1114 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1115 | CONFIG_USB_OTG_BLACKLIST_HUB=y | ||
| 1108 | 1116 | ||
| 1109 | # | 1117 | # |
| 1110 | # Enable Host or Gadget support to see Inventra options | 1118 | # USB Host Controller Drivers |
| 1111 | # | 1119 | # |
| 1120 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 1121 | # CONFIG_USB_ISP1362_HCD is not set | ||
| 1122 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1123 | # CONFIG_USB_SL811_HCD is not set | ||
| 1124 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 1125 | CONFIG_USB_MUSB_HDRC=y | ||
| 1126 | CONFIG_USB_MUSB_SOC=y | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Blackfin high speed USB support | ||
| 1130 | # | ||
| 1131 | CONFIG_USB_MUSB_HOST=y | ||
| 1132 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
| 1133 | # CONFIG_USB_MUSB_OTG is not set | ||
| 1134 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
| 1135 | # CONFIG_MUSB_PIO_ONLY is not set | ||
| 1136 | # CONFIG_USB_INVENTRA_DMA is not set | ||
| 1137 | # CONFIG_USB_TI_CPPI_DMA is not set | ||
| 1138 | CONFIG_USB_MUSB_LOGLEVEL=0 | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # USB Device Class drivers | ||
| 1142 | # | ||
| 1143 | # CONFIG_USB_ACM is not set | ||
| 1144 | # CONFIG_USB_PRINTER is not set | ||
| 1112 | 1145 | ||
| 1113 | # | 1146 | # |
| 1114 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1147 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 1115 | # | 1148 | # |
| 1116 | 1149 | ||
| 1117 | # | 1150 | # |
| 1118 | # USB Gadget Support | 1151 | # may also be needed; see USB_STORAGE Help for more information |
| 1119 | # | 1152 | # |
| 1120 | # CONFIG_USB_GADGET is not set | 1153 | CONFIG_USB_STORAGE=m |
| 1121 | CONFIG_MMC=m | 1154 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 1122 | # CONFIG_MMC_DEBUG is not set | 1155 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 1123 | # CONFIG_MMC_UNSAFE_RESUME is not set | 1156 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 1157 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 1158 | # CONFIG_USB_STORAGE_DPCM is not set | ||
| 1159 | # CONFIG_USB_STORAGE_USBAT is not set | ||
| 1160 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
| 1161 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
| 1162 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
| 1163 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
| 1164 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1165 | # CONFIG_USB_STORAGE_KARMA is not set | ||
| 1166 | # CONFIG_USB_LIBUSUAL is not set | ||
| 1124 | 1167 | ||
| 1125 | # | 1168 | # |
| 1126 | # MMC/SD Card Drivers | 1169 | # USB Imaging devices |
| 1127 | # | 1170 | # |
| 1128 | CONFIG_MMC_BLOCK=m | 1171 | # CONFIG_USB_MDC800 is not set |
| 1172 | # CONFIG_USB_MICROTEK is not set | ||
| 1173 | CONFIG_USB_MON=y | ||
| 1129 | 1174 | ||
| 1130 | # | 1175 | # |
| 1131 | # MMC/SD Host Controller Drivers | 1176 | # USB port drivers |
| 1132 | # | 1177 | # |
| 1133 | CONFIG_SDH_BFIN=m | ||
| 1134 | # CONFIG_SPI_MMC is not set | ||
| 1135 | 1178 | ||
| 1136 | # | 1179 | # |
| 1137 | # LED devices | 1180 | # USB Serial Converter support |
| 1138 | # | 1181 | # |
| 1139 | # CONFIG_NEW_LEDS is not set | 1182 | # CONFIG_USB_SERIAL is not set |
| 1140 | 1183 | ||
| 1141 | # | 1184 | # |
| 1142 | # LED drivers | 1185 | # USB Miscellaneous drivers |
| 1143 | # | 1186 | # |
| 1187 | # CONFIG_USB_EMI62 is not set | ||
| 1188 | # CONFIG_USB_EMI26 is not set | ||
| 1189 | # CONFIG_USB_ADUTUX is not set | ||
| 1190 | # CONFIG_USB_AUERSWALD is not set | ||
| 1191 | # CONFIG_USB_RIO500 is not set | ||
| 1192 | # CONFIG_USB_LEGOTOWER is not set | ||
| 1193 | # CONFIG_USB_LCD is not set | ||
| 1194 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 1195 | # CONFIG_USB_LED is not set | ||
| 1196 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 1197 | # CONFIG_USB_CYTHERM is not set | ||
| 1198 | # CONFIG_USB_PHIDGET is not set | ||
| 1199 | # CONFIG_USB_IDMOUSE is not set | ||
| 1200 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 1201 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 1202 | # CONFIG_USB_SISUSBVGA is not set | ||
| 1203 | # CONFIG_USB_LD is not set | ||
| 1204 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 1205 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1144 | 1206 | ||
| 1145 | # | 1207 | # |
| 1146 | # LED Triggers | 1208 | # USB DSL modem support |
| 1147 | # | 1209 | # |
| 1148 | 1210 | ||
| 1149 | # | 1211 | # |
| 1150 | # InfiniBand support | 1212 | # USB Gadget Support |
| 1151 | # | 1213 | # |
| 1214 | # CONFIG_USB_GADGET is not set | ||
| 1215 | CONFIG_MMC=m | ||
| 1216 | # CONFIG_MMC_DEBUG is not set | ||
| 1217 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
| 1152 | 1218 | ||
| 1153 | # | 1219 | # |
| 1154 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1220 | # MMC/SD Card Drivers |
| 1155 | # | 1221 | # |
| 1222 | CONFIG_MMC_BLOCK=m | ||
| 1223 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
| 1224 | # CONFIG_SDIO_UART is not set | ||
| 1156 | 1225 | ||
| 1157 | # | 1226 | # |
| 1158 | # Real Time Clock | 1227 | # MMC/SD Host Controller Drivers |
| 1159 | # | 1228 | # |
| 1229 | CONFIG_SDH_BFIN=m | ||
| 1230 | # CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND is not set | ||
| 1231 | # CONFIG_MMC_SPI is not set | ||
| 1232 | # CONFIG_SPI_MMC is not set | ||
| 1233 | # CONFIG_NEW_LEDS is not set | ||
| 1160 | CONFIG_RTC_LIB=y | 1234 | CONFIG_RTC_LIB=y |
| 1161 | CONFIG_RTC_CLASS=y | 1235 | CONFIG_RTC_CLASS=y |
| 1162 | CONFIG_RTC_HCTOSYS=y | 1236 | CONFIG_RTC_HCTOSYS=y |
| @@ -1176,6 +1250,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1176 | # I2C RTC drivers | 1250 | # I2C RTC drivers |
| 1177 | # | 1251 | # |
| 1178 | # CONFIG_RTC_DRV_DS1307 is not set | 1252 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1253 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 1179 | # CONFIG_RTC_DRV_DS1672 is not set | 1254 | # CONFIG_RTC_DRV_DS1672 is not set |
| 1180 | # CONFIG_RTC_DRV_MAX6900 is not set | 1255 | # CONFIG_RTC_DRV_MAX6900 is not set |
| 1181 | # CONFIG_RTC_DRV_RS5C372 is not set | 1256 | # CONFIG_RTC_DRV_RS5C372 is not set |
| @@ -1183,6 +1258,7 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1183 | # CONFIG_RTC_DRV_X1205 is not set | 1258 | # CONFIG_RTC_DRV_X1205 is not set |
| 1184 | # CONFIG_RTC_DRV_PCF8563 is not set | 1259 | # CONFIG_RTC_DRV_PCF8563 is not set |
| 1185 | # CONFIG_RTC_DRV_PCF8583 is not set | 1260 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1261 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1186 | 1262 | ||
| 1187 | # | 1263 | # |
| 1188 | # SPI RTC drivers | 1264 | # SPI RTC drivers |
| @@ -1194,8 +1270,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1194 | # Platform RTC drivers | 1270 | # Platform RTC drivers |
| 1195 | # | 1271 | # |
| 1196 | # CONFIG_RTC_DRV_DS1553 is not set | 1272 | # CONFIG_RTC_DRV_DS1553 is not set |
| 1273 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1197 | # CONFIG_RTC_DRV_DS1742 is not set | 1274 | # CONFIG_RTC_DRV_DS1742 is not set |
| 1198 | # CONFIG_RTC_DRV_M48T86 is not set | 1275 | # CONFIG_RTC_DRV_M48T86 is not set |
| 1276 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1199 | # CONFIG_RTC_DRV_V3020 is not set | 1277 | # CONFIG_RTC_DRV_V3020 is not set |
| 1200 | 1278 | ||
| 1201 | # | 1279 | # |
| @@ -1204,22 +1282,9 @@ CONFIG_RTC_INTF_DEV=y | |||
| 1204 | CONFIG_RTC_DRV_BFIN=y | 1282 | CONFIG_RTC_DRV_BFIN=y |
| 1205 | 1283 | ||
| 1206 | # | 1284 | # |
| 1207 | # DMA Engine support | 1285 | # Userspace I/O |
| 1208 | # | ||
| 1209 | # CONFIG_DMA_ENGINE is not set | ||
| 1210 | |||
| 1211 | # | ||
| 1212 | # DMA Clients | ||
| 1213 | # | 1286 | # |
| 1214 | 1287 | # CONFIG_UIO is not set | |
| 1215 | # | ||
| 1216 | # DMA Devices | ||
| 1217 | # | ||
| 1218 | |||
| 1219 | # | ||
| 1220 | # PBX support | ||
| 1221 | # | ||
| 1222 | # CONFIG_PBX is not set | ||
| 1223 | 1288 | ||
| 1224 | # | 1289 | # |
| 1225 | # File systems | 1290 | # File systems |
| @@ -1280,7 +1345,6 @@ CONFIG_PROC_SYSCTL=y | |||
| 1280 | CONFIG_SYSFS=y | 1345 | CONFIG_SYSFS=y |
| 1281 | # CONFIG_TMPFS is not set | 1346 | # CONFIG_TMPFS is not set |
| 1282 | # CONFIG_HUGETLB_PAGE is not set | 1347 | # CONFIG_HUGETLB_PAGE is not set |
| 1283 | CONFIG_RAMFS=y | ||
| 1284 | # CONFIG_CONFIGFS_FS is not set | 1348 | # CONFIG_CONFIGFS_FS is not set |
| 1285 | 1349 | ||
| 1286 | # | 1350 | # |
| @@ -1306,10 +1370,12 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y | |||
| 1306 | CONFIG_JFFS2_FS=m | 1370 | CONFIG_JFFS2_FS=m |
| 1307 | CONFIG_JFFS2_FS_DEBUG=0 | 1371 | CONFIG_JFFS2_FS_DEBUG=0 |
| 1308 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 1372 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 1373 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
| 1309 | # CONFIG_JFFS2_SUMMARY is not set | 1374 | # CONFIG_JFFS2_SUMMARY is not set |
| 1310 | # CONFIG_JFFS2_FS_XATTR is not set | 1375 | # CONFIG_JFFS2_FS_XATTR is not set |
| 1311 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 1376 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
| 1312 | CONFIG_JFFS2_ZLIB=y | 1377 | CONFIG_JFFS2_ZLIB=y |
| 1378 | # CONFIG_JFFS2_LZO is not set | ||
| 1313 | CONFIG_JFFS2_RTIME=y | 1379 | CONFIG_JFFS2_RTIME=y |
| 1314 | # CONFIG_JFFS2_RUBIN is not set | 1380 | # CONFIG_JFFS2_RUBIN is not set |
| 1315 | # CONFIG_CRAMFS is not set | 1381 | # CONFIG_CRAMFS is not set |
| @@ -1318,10 +1384,7 @@ CONFIG_JFFS2_RTIME=y | |||
| 1318 | # CONFIG_QNX4FS_FS is not set | 1384 | # CONFIG_QNX4FS_FS is not set |
| 1319 | # CONFIG_SYSV_FS is not set | 1385 | # CONFIG_SYSV_FS is not set |
| 1320 | # CONFIG_UFS_FS is not set | 1386 | # CONFIG_UFS_FS is not set |
| 1321 | 1387 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1322 | # | ||
| 1323 | # Network File Systems | ||
| 1324 | # | ||
| 1325 | CONFIG_NFS_FS=m | 1388 | CONFIG_NFS_FS=m |
| 1326 | CONFIG_NFS_V3=y | 1389 | CONFIG_NFS_V3=y |
| 1327 | # CONFIG_NFS_V3_ACL is not set | 1390 | # CONFIG_NFS_V3_ACL is not set |
| @@ -1352,7 +1415,6 @@ CONFIG_CIFS=y | |||
| 1352 | # CONFIG_NCP_FS is not set | 1415 | # CONFIG_NCP_FS is not set |
| 1353 | # CONFIG_CODA_FS is not set | 1416 | # CONFIG_CODA_FS is not set |
| 1354 | # CONFIG_AFS_FS is not set | 1417 | # CONFIG_AFS_FS is not set |
| 1355 | # CONFIG_9P_FS is not set | ||
| 1356 | 1418 | ||
| 1357 | # | 1419 | # |
| 1358 | # Partition Types | 1420 | # Partition Types |
| @@ -1375,10 +1437,6 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1375 | # CONFIG_KARMA_PARTITION is not set | 1437 | # CONFIG_KARMA_PARTITION is not set |
| 1376 | # CONFIG_EFI_PARTITION is not set | 1438 | # CONFIG_EFI_PARTITION is not set |
| 1377 | # CONFIG_SYSV68_PARTITION is not set | 1439 | # CONFIG_SYSV68_PARTITION is not set |
| 1378 | |||
| 1379 | # | ||
| 1380 | # Native Language Support | ||
| 1381 | # | ||
| 1382 | CONFIG_NLS=y | 1440 | CONFIG_NLS=y |
| 1383 | CONFIG_NLS_DEFAULT="iso8859-1" | 1441 | CONFIG_NLS_DEFAULT="iso8859-1" |
| 1384 | CONFIG_NLS_CODEPAGE_437=m | 1442 | CONFIG_NLS_CODEPAGE_437=m |
| @@ -1419,21 +1477,16 @@ CONFIG_NLS_ISO8859_15=m | |||
| 1419 | CONFIG_NLS_KOI8_R=m | 1477 | CONFIG_NLS_KOI8_R=m |
| 1420 | CONFIG_NLS_KOI8_U=m | 1478 | CONFIG_NLS_KOI8_U=m |
| 1421 | CONFIG_NLS_UTF8=m | 1479 | CONFIG_NLS_UTF8=m |
| 1422 | |||
| 1423 | # | ||
| 1424 | # Distributed Lock Manager | ||
| 1425 | # | ||
| 1426 | # CONFIG_DLM is not set | 1480 | # CONFIG_DLM is not set |
| 1427 | 1481 | CONFIG_INSTRUMENTATION=y | |
| 1428 | # | ||
| 1429 | # Profiling support | ||
| 1430 | # | ||
| 1431 | # CONFIG_PROFILING is not set | 1482 | # CONFIG_PROFILING is not set |
| 1483 | # CONFIG_MARKERS is not set | ||
| 1432 | 1484 | ||
| 1433 | # | 1485 | # |
| 1434 | # Kernel hacking | 1486 | # Kernel hacking |
| 1435 | # | 1487 | # |
| 1436 | # CONFIG_PRINTK_TIME is not set | 1488 | # CONFIG_PRINTK_TIME is not set |
| 1489 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1437 | CONFIG_ENABLE_MUST_CHECK=y | 1490 | CONFIG_ENABLE_MUST_CHECK=y |
| 1438 | # CONFIG_MAGIC_SYSRQ is not set | 1491 | # CONFIG_MAGIC_SYSRQ is not set |
| 1439 | # CONFIG_UNUSED_SYMBOLS is not set | 1492 | # CONFIG_UNUSED_SYMBOLS is not set |
| @@ -1441,6 +1494,7 @@ CONFIG_DEBUG_FS=y | |||
| 1441 | # CONFIG_HEADERS_CHECK is not set | 1494 | # CONFIG_HEADERS_CHECK is not set |
| 1442 | # CONFIG_DEBUG_KERNEL is not set | 1495 | # CONFIG_DEBUG_KERNEL is not set |
| 1443 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1496 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1497 | # CONFIG_SAMPLES is not set | ||
| 1444 | CONFIG_DEBUG_MMRS=y | 1498 | CONFIG_DEBUG_MMRS=y |
| 1445 | CONFIG_DEBUG_HUNT_FOR_ZERO=y | 1499 | CONFIG_DEBUG_HUNT_FOR_ZERO=y |
| 1446 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y | 1500 | CONFIG_DEBUG_BFIN_HWTRACE_ON=y |
| @@ -1460,11 +1514,8 @@ CONFIG_ACCESS_CHECK=y | |||
| 1460 | # CONFIG_KEYS is not set | 1514 | # CONFIG_KEYS is not set |
| 1461 | CONFIG_SECURITY=y | 1515 | CONFIG_SECURITY=y |
| 1462 | # CONFIG_SECURITY_NETWORK is not set | 1516 | # CONFIG_SECURITY_NETWORK is not set |
| 1463 | CONFIG_SECURITY_CAPABILITIES=m | 1517 | # CONFIG_SECURITY_CAPABILITIES is not set |
| 1464 | 1518 | # CONFIG_SECURITY_ROOTPLUG is not set | |
| 1465 | # | ||
| 1466 | # Cryptographic options | ||
| 1467 | # | ||
| 1468 | # CONFIG_CRYPTO is not set | 1519 | # CONFIG_CRYPTO is not set |
| 1469 | 1520 | ||
| 1470 | # | 1521 | # |
| @@ -1475,6 +1526,7 @@ CONFIG_CRC_CCITT=m | |||
| 1475 | # CONFIG_CRC16 is not set | 1526 | # CONFIG_CRC16 is not set |
| 1476 | # CONFIG_CRC_ITU_T is not set | 1527 | # CONFIG_CRC_ITU_T is not set |
| 1477 | CONFIG_CRC32=y | 1528 | CONFIG_CRC32=y |
| 1529 | # CONFIG_CRC7 is not set | ||
| 1478 | # CONFIG_LIBCRC32C is not set | 1530 | # CONFIG_LIBCRC32C is not set |
| 1479 | CONFIG_ZLIB_INFLATE=y | 1531 | CONFIG_ZLIB_INFLATE=y |
| 1480 | CONFIG_ZLIB_DEFLATE=m | 1532 | CONFIG_ZLIB_DEFLATE=m |
diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig index 5f6ff04a86c3..4384a670a8b8 100644 --- a/arch/blackfin/configs/IP0X_defconfig +++ b/arch/blackfin/configs/IP0X_defconfig | |||
| @@ -212,7 +212,7 @@ CONFIG_HZ=250 | |||
| 212 | # | 212 | # |
| 213 | # Memory Setup | 213 | # Memory Setup |
| 214 | # | 214 | # |
| 215 | CONFIG_MEM_SIZE=64 | 215 | CONFIG_MAX_MEM_SIZE=64 |
| 216 | CONFIG_MEM_ADD_WIDTH=10 | 216 | CONFIG_MEM_ADD_WIDTH=10 |
| 217 | 217 | ||
| 218 | # | 218 | # |
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index fd5448d6107c..d54f19085f37 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c | |||
| @@ -90,6 +90,17 @@ int request_dma(unsigned int channel, char *device_id) | |||
| 90 | { | 90 | { |
| 91 | 91 | ||
| 92 | pr_debug("request_dma() : BEGIN \n"); | 92 | pr_debug("request_dma() : BEGIN \n"); |
| 93 | |||
| 94 | #if defined(CONFIG_BF561) && ANOMALY_05000182 | ||
| 95 | if (channel >= CH_IMEM_STREAM0_DEST && channel <= CH_IMEM_STREAM1_DEST) { | ||
| 96 | if (get_cclk() > 500000000) { | ||
| 97 | printk(KERN_WARNING | ||
| 98 | "Request IMDMA failed due to ANOMALY 05000182\n"); | ||
| 99 | return -EFAULT; | ||
| 100 | } | ||
| 101 | } | ||
| 102 | #endif | ||
| 103 | |||
| 93 | mutex_lock(&(dma_ch[channel].dmalock)); | 104 | mutex_lock(&(dma_ch[channel].dmalock)); |
| 94 | 105 | ||
| 95 | if ((dma_ch[channel].chan_status == DMA_CHANNEL_REQUESTED) | 106 | if ((dma_ch[channel].chan_status == DMA_CHANNEL_REQUESTED) |
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 7e8eaf4a31bb..b6d89d1644cc 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
| @@ -1130,6 +1130,25 @@ void bfin_gpio_irq_prepare(unsigned gpio) | |||
| 1130 | 1130 | ||
| 1131 | #else | 1131 | #else |
| 1132 | 1132 | ||
| 1133 | int gpio_get_value(unsigned gpio) | ||
| 1134 | { | ||
| 1135 | unsigned long flags; | ||
| 1136 | int ret; | ||
| 1137 | |||
| 1138 | if (unlikely(get_gpio_edge(gpio))) { | ||
| 1139 | local_irq_save(flags); | ||
| 1140 | set_gpio_edge(gpio, 0); | ||
| 1141 | ret = get_gpio_data(gpio); | ||
| 1142 | set_gpio_edge(gpio, 1); | ||
| 1143 | local_irq_restore(flags); | ||
| 1144 | |||
| 1145 | return ret; | ||
| 1146 | } else | ||
| 1147 | return get_gpio_data(gpio); | ||
| 1148 | } | ||
| 1149 | EXPORT_SYMBOL(gpio_get_value); | ||
| 1150 | |||
| 1151 | |||
| 1133 | int gpio_direction_input(unsigned gpio) | 1152 | int gpio_direction_input(unsigned gpio) |
| 1134 | { | 1153 | { |
| 1135 | unsigned long flags; | 1154 | unsigned long flags; |
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c index 053edff6c0d8..4367330909b2 100644 --- a/arch/blackfin/kernel/bfin_ksyms.c +++ b/arch/blackfin/kernel/bfin_ksyms.c | |||
| @@ -90,7 +90,9 @@ EXPORT_SYMBOL(__umodsi3); | |||
| 90 | EXPORT_SYMBOL(outsb); | 90 | EXPORT_SYMBOL(outsb); |
| 91 | EXPORT_SYMBOL(insb); | 91 | EXPORT_SYMBOL(insb); |
| 92 | EXPORT_SYMBOL(outsw); | 92 | EXPORT_SYMBOL(outsw); |
| 93 | EXPORT_SYMBOL(outsw_8); | ||
| 93 | EXPORT_SYMBOL(insw); | 94 | EXPORT_SYMBOL(insw); |
| 95 | EXPORT_SYMBOL(insw_8); | ||
| 94 | EXPORT_SYMBOL(outsl); | 96 | EXPORT_SYMBOL(outsl); |
| 95 | EXPORT_SYMBOL(insl); | 97 | EXPORT_SYMBOL(insl); |
| 96 | EXPORT_SYMBOL(insl_16); | 98 | EXPORT_SYMBOL(insl_16); |
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index 917325bfbd84..6be0c50122e8 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c | |||
| @@ -254,7 +254,8 @@ close_cplbtab(struct cplb_tab *table) | |||
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | /* helper function */ | 256 | /* helper function */ |
| 257 | static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | 257 | static void __init |
| 258 | __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | ||
| 258 | { | 259 | { |
| 259 | if (cplb_data[i].psize) { | 260 | if (cplb_data[i].psize) { |
| 260 | fill_cplbtab(t, | 261 | fill_cplbtab(t, |
| @@ -291,7 +292,8 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_en | |||
| 291 | } | 292 | } |
| 292 | } | 293 | } |
| 293 | 294 | ||
| 294 | static void __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | 295 | static void __init |
| 296 | __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | ||
| 295 | { | 297 | { |
| 296 | if (cplb_data[i].psize) { | 298 | if (cplb_data[i].psize) { |
| 297 | fill_cplbtab(t, | 299 | fill_cplbtab(t, |
diff --git a/arch/blackfin/kernel/gptimers.c b/arch/blackfin/kernel/gptimers.c index e698554895a7..3a3e9615b002 100644 --- a/arch/blackfin/kernel/gptimers.c +++ b/arch/blackfin/kernel/gptimers.c | |||
| @@ -10,8 +10,8 @@ | |||
| 10 | 10 | ||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/io.h> | ||
| 13 | 14 | ||
| 14 | #include <asm/io.h> | ||
| 15 | #include <asm/blackfin.h> | 15 | #include <asm/blackfin.h> |
| 16 | #include <asm/gptimers.h> | 16 | #include <asm/gptimers.h> |
| 17 | 17 | ||
diff --git a/arch/blackfin/kernel/init_task.c b/arch/blackfin/kernel/init_task.c index c640154030e2..6bdba7b21109 100644 --- a/arch/blackfin/kernel/init_task.c +++ b/arch/blackfin/kernel/init_task.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
| 35 | 35 | ||
| 36 | static struct fs_struct init_fs = INIT_FS; | 36 | static struct fs_struct init_fs = INIT_FS; |
| 37 | static struct files_struct init_files = INIT_FILES; | ||
| 38 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 37 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 39 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 38 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 40 | 39 | ||
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index 73647c158774..07402f57c9de 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c | |||
| @@ -60,9 +60,14 @@ static struct irq_chip bad_chip = { | |||
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | static struct irq_desc bad_irq_desc = { | 62 | static struct irq_desc bad_irq_desc = { |
| 63 | .status = IRQ_DISABLED, | ||
| 63 | .chip = &bad_chip, | 64 | .chip = &bad_chip, |
| 64 | .handle_irq = handle_bad_irq, | 65 | .handle_irq = handle_bad_irq, |
| 65 | .depth = 1, | 66 | .depth = 1, |
| 67 | .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), | ||
| 68 | #ifdef CONFIG_SMP | ||
| 69 | .affinity = CPU_MASK_ALL | ||
| 70 | #endif | ||
| 66 | }; | 71 | }; |
| 67 | 72 | ||
| 68 | int show_interrupts(struct seq_file *p, void *v) | 73 | int show_interrupts(struct seq_file *p, void *v) |
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 5b847070dae5..f061f5181623 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
| @@ -67,7 +67,7 @@ void __init trap_init(void) | |||
| 67 | CSYNC(); | 67 | CSYNC(); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | void *saved_icplb_fault_addr, *saved_dcplb_fault_addr; | 70 | unsigned long saved_icplb_fault_addr, saved_dcplb_fault_addr; |
| 71 | 71 | ||
| 72 | int kstack_depth_to_print = 48; | 72 | int kstack_depth_to_print = 48; |
| 73 | 73 | ||
| @@ -364,13 +364,13 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
| 364 | /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */ | 364 | /* 0x27 - Data CPLB Multiple Hits - Linux Trap Zero, handled here */ |
| 365 | case VEC_CPLB_MHIT: | 365 | case VEC_CPLB_MHIT: |
| 366 | info.si_code = ILL_CPLB_MULHIT; | 366 | info.si_code = ILL_CPLB_MULHIT; |
| 367 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO | ||
| 368 | sig = SIGSEGV; | 367 | sig = SIGSEGV; |
| 369 | printk(KERN_NOTICE "NULL pointer access (probably)\n"); | 368 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO |
| 370 | #else | 369 | if (saved_dcplb_fault_addr < FIXED_CODE_START) |
| 371 | sig = SIGILL; | 370 | printk(KERN_NOTICE "NULL pointer access\n"); |
| 372 | printk(KERN_NOTICE EXC_0x27(KERN_NOTICE)); | 371 | else |
| 373 | #endif | 372 | #endif |
| 373 | printk(KERN_NOTICE EXC_0x27(KERN_NOTICE)); | ||
| 374 | CHK_DEBUGGER_TRAP(); | 374 | CHK_DEBUGGER_TRAP(); |
| 375 | break; | 375 | break; |
| 376 | /* 0x28 - Emulation Watchpoint, handled here */ | 376 | /* 0x28 - Emulation Watchpoint, handled here */ |
| @@ -419,13 +419,13 @@ asmlinkage void trap_c(struct pt_regs *fp) | |||
| 419 | /* 0x2D - Instruction CPLB Multiple Hits, handled here */ | 419 | /* 0x2D - Instruction CPLB Multiple Hits, handled here */ |
| 420 | case VEC_CPLB_I_MHIT: | 420 | case VEC_CPLB_I_MHIT: |
| 421 | info.si_code = ILL_CPLB_MULHIT; | 421 | info.si_code = ILL_CPLB_MULHIT; |
| 422 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO | ||
| 423 | sig = SIGSEGV; | 422 | sig = SIGSEGV; |
| 424 | printk(KERN_NOTICE "Jump to address 0 - 0x0fff\n"); | 423 | #ifdef CONFIG_DEBUG_HUNT_FOR_ZERO |
| 425 | #else | 424 | if (saved_icplb_fault_addr < FIXED_CODE_START) |
| 426 | sig = SIGILL; | 425 | printk(KERN_NOTICE "Jump to NULL address\n"); |
| 427 | printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE)); | 426 | else |
| 428 | #endif | 427 | #endif |
| 428 | printk(KERN_NOTICE EXC_0x2D(KERN_NOTICE)); | ||
| 429 | CHK_DEBUGGER_TRAP(); | 429 | CHK_DEBUGGER_TRAP(); |
| 430 | break; | 430 | break; |
| 431 | /* 0x2E - Illegal use of Supervisor Resource, handled here */ | 431 | /* 0x2E - Illegal use of Supervisor Resource, handled here */ |
| @@ -939,8 +939,6 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp) | |||
| 939 | 939 | ||
| 940 | oops_in_progress = 1; | 940 | oops_in_progress = 1; |
| 941 | 941 | ||
| 942 | printk(KERN_EMERG "DCPLB_FAULT_ADDR=%p\n", saved_dcplb_fault_addr); | ||
| 943 | printk(KERN_EMERG "ICPLB_FAULT_ADDR=%p\n", saved_icplb_fault_addr); | ||
| 944 | dump_bfin_process(fp); | 942 | dump_bfin_process(fp); |
| 945 | dump_bfin_mem(fp); | 943 | dump_bfin_mem(fp); |
| 946 | show_regs(fp); | 944 | show_regs(fp); |
diff --git a/arch/blackfin/lib/checksum.c b/arch/blackfin/lib/checksum.c index 42768e0c80ca..5c87505165d3 100644 --- a/arch/blackfin/lib/checksum.c +++ b/arch/blackfin/lib/checksum.c | |||
| @@ -72,9 +72,9 @@ static unsigned short do_csum(const unsigned char *buff, int len) | |||
| 72 | * This is a version of ip_compute_csum() optimized for IP headers, | 72 | * This is a version of ip_compute_csum() optimized for IP headers, |
| 73 | * which always checksum on 4 octet boundaries. | 73 | * which always checksum on 4 octet boundaries. |
| 74 | */ | 74 | */ |
| 75 | unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl) | 75 | __sum16 ip_fast_csum(unsigned char *iph, unsigned int ihl) |
| 76 | { | 76 | { |
| 77 | return ~do_csum(iph, ihl * 4); | 77 | return (__force __sum16)~do_csum(iph, ihl * 4); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | /* | 80 | /* |
| @@ -89,7 +89,7 @@ unsigned short ip_fast_csum(unsigned char *iph, unsigned int ihl) | |||
| 89 | * | 89 | * |
| 90 | * it's best to have buff aligned on a 32-bit boundary | 90 | * it's best to have buff aligned on a 32-bit boundary |
| 91 | */ | 91 | */ |
| 92 | unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum) | 92 | __wsum csum_partial(const void *buff, int len, __wsum sum) |
| 93 | { | 93 | { |
| 94 | /* | 94 | /* |
| 95 | * Just in case we get nasty checksum data... | 95 | * Just in case we get nasty checksum data... |
| @@ -109,22 +109,22 @@ unsigned int csum_partial(const unsigned char *buff, int len, unsigned int sum) | |||
| 109 | * this routine is used for miscellaneous IP-like checksums, mainly | 109 | * this routine is used for miscellaneous IP-like checksums, mainly |
| 110 | * in icmp.c | 110 | * in icmp.c |
| 111 | */ | 111 | */ |
| 112 | unsigned short ip_compute_csum(const unsigned char *buff, int len) | 112 | __sum16 ip_compute_csum(const void *buff, int len) |
| 113 | { | 113 | { |
| 114 | return ~do_csum(buff, len); | 114 | return (__force __sum16)~do_csum(buff, len); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | /* | 117 | /* |
| 118 | * copy from fs while checksumming, otherwise like csum_partial | 118 | * copy from fs while checksumming, otherwise like csum_partial |
| 119 | */ | 119 | */ |
| 120 | 120 | ||
| 121 | unsigned int | 121 | __wsum |
| 122 | csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, | 122 | csum_partial_copy_from_user(const void __user *src, void *dst, |
| 123 | int len, int sum, int *csum_err) | 123 | int len, __wsum sum, int *csum_err) |
| 124 | { | 124 | { |
| 125 | if (csum_err) | 125 | if (csum_err) |
| 126 | *csum_err = 0; | 126 | *csum_err = 0; |
| 127 | memcpy(dst, src, len); | 127 | memcpy(dst, (__force void *)src, len); |
| 128 | return csum_partial(dst, len, sum); | 128 | return csum_partial(dst, len, sum); |
| 129 | } | 129 | } |
| 130 | 130 | ||
| @@ -132,8 +132,7 @@ csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst, | |||
| 132 | * copy from ds while checksumming, otherwise like csum_partial | 132 | * copy from ds while checksumming, otherwise like csum_partial |
| 133 | */ | 133 | */ |
| 134 | 134 | ||
| 135 | unsigned int csum_partial_copy(const unsigned char *src, unsigned char *dst, | 135 | __wsum csum_partial_copy(const void *src, void *dst, int len, __wsum sum) |
| 136 | int len, int sum) | ||
| 137 | { | 136 | { |
| 138 | memcpy(dst, src, len); | 137 | memcpy(dst, src, len); |
| 139 | return csum_partial(dst, len, sum); | 138 | return csum_partial(dst, len, sum); |
diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S index df7b8833a0c5..eba2343b1b59 100644 --- a/arch/blackfin/lib/ins.S +++ b/arch/blackfin/lib/ins.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Description: Implementation of ins{bwl} for BlackFin processors using zero overhead loops. | 7 | * Description: Implementation of ins{bwl} for BlackFin processors using zero overhead loops. |
| 8 | * | 8 | * |
| 9 | * Modified: | 9 | * Modified: |
| 10 | * Copyright 2004-2006 Analog Devices Inc. | 10 | * Copyright 2004-2008 Analog Devices Inc. |
| 11 | * Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> | 11 | * Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> |
| 12 | * | 12 | * |
| 13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 13 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
| @@ -63,6 +63,23 @@ ENTRY(_insw) | |||
| 63 | RTS; | 63 | RTS; |
| 64 | ENDPROC(_insw) | 64 | ENDPROC(_insw) |
| 65 | 65 | ||
| 66 | ENTRY(_insw_8) | ||
| 67 | P0 = R0; /* P0 = port */ | ||
| 68 | cli R3; | ||
| 69 | P1 = R1; /* P1 = address */ | ||
| 70 | P2 = R2; /* P2 = count */ | ||
| 71 | SSYNC; | ||
| 72 | LSETUP( .Lword8_loop_s, .Lword8_loop_e) LC0 = P2; | ||
| 73 | .Lword8_loop_s: R0 = W[P0]; | ||
| 74 | B[P1++] = R0; | ||
| 75 | R0 = R0 >> 8; | ||
| 76 | B[P1++] = R0; | ||
| 77 | NOP; | ||
| 78 | .Lword8_loop_e: NOP; | ||
| 79 | sti R3; | ||
| 80 | RTS; | ||
| 81 | ENDPROC(_insw_8) | ||
| 82 | |||
| 66 | ENTRY(_insb) | 83 | ENTRY(_insb) |
| 67 | P0 = R0; /* P0 = port */ | 84 | P0 = R0; /* P0 = port */ |
| 68 | cli R3; | 85 | cli R3; |
| @@ -78,8 +95,6 @@ ENTRY(_insb) | |||
| 78 | RTS; | 95 | RTS; |
| 79 | ENDPROC(_insb) | 96 | ENDPROC(_insb) |
| 80 | 97 | ||
| 81 | |||
| 82 | |||
| 83 | ENTRY(_insl_16) | 98 | ENTRY(_insl_16) |
| 84 | P0 = R0; /* P0 = port */ | 99 | P0 = R0; /* P0 = port */ |
| 85 | cli R3; | 100 | cli R3; |
diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S index 4c3da8ae094e..4685b7aa0080 100644 --- a/arch/blackfin/lib/outs.S +++ b/arch/blackfin/lib/outs.S | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * Description: Implementation of outs{bwl} for BlackFin processors using zero overhead loops. | 7 | * Description: Implementation of outs{bwl} for BlackFin processors using zero overhead loops. |
| 8 | * | 8 | * |
| 9 | * Modified: Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> | 9 | * Modified: Copyright (C) 2005 Bas Vermeulen, BuyWays BV <bas@buyways.nl> |
| 10 | * Copyright 2004-2006 Analog Devices Inc. | 10 | * Copyright 2004-2008 Analog Devices Inc. |
| 11 | * | 11 | * |
| 12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ | 12 | * Bugs: Enter bugs at http://blackfin.uclinux.org/ |
| 13 | * | 13 | * |
| @@ -63,3 +63,17 @@ ENTRY(_outsb) | |||
| 63 | .Lbyte_loop_e: B[P0] = R0; | 63 | .Lbyte_loop_e: B[P0] = R0; |
| 64 | RTS; | 64 | RTS; |
| 65 | ENDPROC(_outsb) | 65 | ENDPROC(_outsb) |
| 66 | |||
| 67 | ENTRY(_outsw_8) | ||
| 68 | P0 = R0; /* P0 = port */ | ||
| 69 | P1 = R1; /* P1 = address */ | ||
| 70 | P2 = R2; /* P2 = count */ | ||
| 71 | |||
| 72 | LSETUP( .Lword8_loop_s, .Lword8_loop_e) LC0 = P2; | ||
| 73 | .Lword8_loop_s: R1 = B[P1++]; | ||
| 74 | R0 = B[P1++]; | ||
| 75 | R0 = R0 << 8; | ||
| 76 | R0 = R0 + R1; | ||
| 77 | .Lword8_loop_e: W[P0] = R0; | ||
| 78 | RTS; | ||
| 79 | ENDPROC(_outsw_8) | ||
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index bb6d58c931de..5958eecefcf1 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
| @@ -451,9 +451,6 @@ static struct platform_device net2272_bfin_device = { | |||
| 451 | }; | 451 | }; |
| 452 | #endif | 452 | #endif |
| 453 | 453 | ||
| 454 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 455 | /* all SPI peripherals info goes here */ | ||
| 456 | |||
| 457 | #if defined(CONFIG_MTD_M25P80) \ | 454 | #if defined(CONFIG_MTD_M25P80) \ |
| 458 | || defined(CONFIG_MTD_M25P80_MODULE) | 455 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 459 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 456 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| @@ -647,10 +644,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 647 | { | 644 | { |
| 648 | .modalias = "ad7877", | 645 | .modalias = "ad7877", |
| 649 | .platform_data = &bfin_ad7877_ts_info, | 646 | .platform_data = &bfin_ad7877_ts_info, |
| 650 | .irq = IRQ_PF6, | 647 | .irq = IRQ_PF8, |
| 651 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ | 648 | .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */ |
| 652 | .bus_num = 0, | 649 | .bus_num = 0, |
| 653 | .chip_select = 1, | 650 | .chip_select = 2, |
| 654 | .controller_data = &spi_ad7877_chip_info, | 651 | .controller_data = &spi_ad7877_chip_info, |
| 655 | }, | 652 | }, |
| 656 | #endif | 653 | #endif |
| @@ -676,6 +673,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 676 | #endif | 673 | #endif |
| 677 | }; | 674 | }; |
| 678 | 675 | ||
| 676 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 679 | /* SPI controller data */ | 677 | /* SPI controller data */ |
| 680 | static struct bfin5xx_spi_master bfin_spi0_info = { | 678 | static struct bfin5xx_spi_master bfin_spi0_info = { |
| 681 | .num_chipselect = 8, | 679 | .num_chipselect = 8, |
| @@ -1018,10 +1016,7 @@ static int __init stamp_init(void) | |||
| 1018 | #endif | 1016 | #endif |
| 1019 | 1017 | ||
| 1020 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 1018 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
| 1021 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 1019 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 1022 | spi_register_board_info(bfin_spi_board_info, | ||
| 1023 | ARRAY_SIZE(bfin_spi_board_info)); | ||
| 1024 | #endif | ||
| 1025 | 1020 | ||
| 1026 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 1021 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 1027 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 1022 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 9d28415163ea..079389cbd859 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
| @@ -87,9 +87,6 @@ static struct platform_device smc91x_device = { | |||
| 87 | }; | 87 | }; |
| 88 | #endif | 88 | #endif |
| 89 | 89 | ||
| 90 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 91 | /* all SPI peripherals info goes here */ | ||
| 92 | |||
| 93 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 90 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 94 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 91 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 95 | { | 92 | { |
| @@ -189,6 +186,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 189 | #endif | 186 | #endif |
| 190 | }; | 187 | }; |
| 191 | 188 | ||
| 189 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 192 | /* SPI (0) */ | 190 | /* SPI (0) */ |
| 193 | static struct resource bfin_spi0_resource[] = { | 191 | static struct resource bfin_spi0_resource[] = { |
| 194 | [0] = { | 192 | [0] = { |
| @@ -425,9 +423,7 @@ static int __init ezkit_init(void) | |||
| 425 | { | 423 | { |
| 426 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 424 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
| 427 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 425 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
| 428 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 429 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 426 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 430 | #endif | ||
| 431 | 427 | ||
| 432 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 428 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 433 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 429 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index 7fd35fb32fd5..13ae49515f73 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
| @@ -111,7 +111,7 @@ static struct platform_device net2272_bfin_device = { | |||
| 111 | }; | 111 | }; |
| 112 | #endif | 112 | #endif |
| 113 | 113 | ||
| 114 | #if defined(CONFIG_MTD_BF5xx) || defined(CONFIG_MTD_BF5xx_MODULE) | 114 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) |
| 115 | static struct mtd_partition stamp_partitions[] = { | 115 | static struct mtd_partition stamp_partitions[] = { |
| 116 | { | 116 | { |
| 117 | .name = "Bootloader", | 117 | .name = "Bootloader", |
| @@ -141,13 +141,17 @@ static struct resource stamp_flash_resource[] = { | |||
| 141 | .end = 0x203fffff, | 141 | .end = 0x203fffff, |
| 142 | .flags = IORESOURCE_MEM, | 142 | .flags = IORESOURCE_MEM, |
| 143 | }, { | 143 | }, { |
| 144 | .start = CONFIG_ENET_FLASH_PIN, | 144 | .start = 0x7BB07BB0, /* AMBCTL0 setting when accessing flash */ |
| 145 | .end = 0x7BB07BB0, /* AMBCTL1 setting when accessing flash */ | ||
| 146 | .flags = IORESOURCE_MEM, | ||
| 147 | }, { | ||
| 148 | .start = GPIO_PF0, | ||
| 145 | .flags = IORESOURCE_IRQ, | 149 | .flags = IORESOURCE_IRQ, |
| 146 | } | 150 | } |
| 147 | }; | 151 | }; |
| 148 | 152 | ||
| 149 | static struct platform_device stamp_flash_device = { | 153 | static struct platform_device stamp_flash_device = { |
| 150 | .name = "BF5xx-Flash", | 154 | .name = "bfin-async-flash", |
| 151 | .id = 0, | 155 | .id = 0, |
| 152 | .dev = { | 156 | .dev = { |
| 153 | .platform_data = &stamp_flash_data, | 157 | .platform_data = &stamp_flash_data, |
| @@ -157,9 +161,6 @@ static struct platform_device stamp_flash_device = { | |||
| 157 | }; | 161 | }; |
| 158 | #endif | 162 | #endif |
| 159 | 163 | ||
| 160 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 161 | /* all SPI peripherals info goes here */ | ||
| 162 | |||
| 163 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | 164 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) |
| 164 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 165 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| 165 | { | 166 | { |
| @@ -316,6 +317,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 316 | #endif | 317 | #endif |
| 317 | }; | 318 | }; |
| 318 | 319 | ||
| 320 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 319 | /* SPI (0) */ | 321 | /* SPI (0) */ |
| 320 | static struct resource bfin_spi0_resource[] = { | 322 | static struct resource bfin_spi0_resource[] = { |
| 321 | [0] = { | 323 | [0] = { |
| @@ -595,7 +597,7 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
| 595 | 597 | ||
| 596 | &bfin_gpios_device, | 598 | &bfin_gpios_device, |
| 597 | 599 | ||
| 598 | #if defined(CONFIG_MTD_BF5xx) || defined(CONFIG_MTD_BF5xx_MODULE) | 600 | #if defined(CONFIG_MTD_BFIN_ASYNC) || defined(CONFIG_MTD_BFIN_ASYNC_MODULE) |
| 599 | &stamp_flash_device, | 601 | &stamp_flash_device, |
| 600 | #endif | 602 | #endif |
| 601 | }; | 603 | }; |
| @@ -617,15 +619,13 @@ static int __init stamp_init(void) | |||
| 617 | 619 | ||
| 618 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 620 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) |
| 619 | /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */ | 621 | /* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC */ |
| 620 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | (1 << CONFIG_ENET_FLASH_PIN)); | 622 | bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF0); |
| 621 | bfin_write_FIO_FLAG_S(1 << CONFIG_ENET_FLASH_PIN); | 623 | bfin_write_FIO_FLAG_S(PF0); |
| 622 | SSYNC(); | 624 | SSYNC(); |
| 623 | #endif | 625 | #endif |
| 624 | 626 | ||
| 625 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 627 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 626 | spi_register_board_info(bfin_spi_board_info, | 628 | |
| 627 | ARRAY_SIZE(bfin_spi_board_info)); | ||
| 628 | #endif | ||
| 629 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 629 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 630 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 630 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
| 631 | #endif | 631 | #endif |
| @@ -636,8 +636,8 @@ arch_initcall(stamp_init); | |||
| 636 | 636 | ||
| 637 | void native_machine_restart(char *cmd) | 637 | void native_machine_restart(char *cmd) |
| 638 | { | 638 | { |
| 639 | #define BIT_TO_SET (1 << CONFIG_ENET_FLASH_PIN) | 639 | /* workaround pull up on cpld / flash pin not being strong enough */ |
| 640 | bfin_write_FIO_INEN(~BIT_TO_SET); | 640 | bfin_write_FIO_INEN(~PF0); |
| 641 | bfin_write_FIO_DIR(BIT_TO_SET); | 641 | bfin_write_FIO_DIR(PF0); |
| 642 | bfin_write_FIO_FLAG_C(BIT_TO_SET); | 642 | bfin_write_FIO_FLAG_C(PF0); |
| 643 | } | 643 | } |
diff --git a/arch/blackfin/mach-bf537/boards/Makefile b/arch/blackfin/mach-bf537/boards/Makefile index 87e450f29e37..c94f7a5b8211 100644 --- a/arch/blackfin/mach-bf537/boards/Makefile +++ b/arch/blackfin/mach-bf537/boards/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o | 5 | obj-$(CONFIG_GENERIC_BF537_BOARD) += generic_board.o |
| 6 | obj-$(CONFIG_BFIN537_STAMP) += stamp.o led.o | 6 | obj-$(CONFIG_BFIN537_STAMP) += stamp.o |
| 7 | obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o | 7 | obj-$(CONFIG_BFIN537_BLUETECHNIX_CM) += cm_bf537.o |
| 8 | obj-$(CONFIG_PNAV10) += pnav10.o | 8 | obj-$(CONFIG_PNAV10) += pnav10.o |
| 9 | obj-$(CONFIG_CAMSIG_MINOTAUR) += minotaur.o | 9 | obj-$(CONFIG_CAMSIG_MINOTAUR) += minotaur.o |
diff --git a/arch/blackfin/mach-bf537/boards/led.S b/arch/blackfin/mach-bf537/boards/led.S deleted file mode 100644 index 4e9ea4283e5f..000000000000 --- a/arch/blackfin/mach-bf537/boards/led.S +++ /dev/null | |||
| @@ -1,183 +0,0 @@ | |||
| 1 | /**************************************************** | ||
| 2 | * LED1 ---- PF6 LED2 ---- PF7 * | ||
| 3 | * LED3 ---- PF8 LED4 ---- PF9 * | ||
| 4 | * LED5 ---- PF10 LED6 ---- PF11 * | ||
| 5 | ****************************************************/ | ||
| 6 | |||
| 7 | #include <linux/linkage.h> | ||
| 8 | #include <asm/blackfin.h> | ||
| 9 | |||
| 10 | /* All functions in this file save the registers they uses. | ||
| 11 | So there is no need to save any registers before calling them. */ | ||
| 12 | |||
| 13 | .text; | ||
| 14 | |||
| 15 | /* Initialize LEDs. */ | ||
| 16 | |||
| 17 | ENTRY(_led_init) | ||
| 18 | LINK 12; | ||
| 19 | [--SP] = P0; | ||
| 20 | [--SP] = R0; | ||
| 21 | [--SP] = R1; | ||
| 22 | [--SP] = R2; | ||
| 23 | R1 = PF6|PF7|PF8|PF9|PF10|PF11 (Z); | ||
| 24 | R2 = ~R1; | ||
| 25 | |||
| 26 | P0.H = hi(PORTF_FER); | ||
| 27 | P0.L = lo(PORTF_FER); | ||
| 28 | R0 = W[P0](Z); | ||
| 29 | SSYNC; | ||
| 30 | R0 = R0 & R2; | ||
| 31 | W[P0] = R0.L; | ||
| 32 | SSYNC; | ||
| 33 | |||
| 34 | P0.H = hi(PORTFIO_DIR); | ||
| 35 | P0.L = lo(PORTFIO_DIR); | ||
| 36 | R0 = W[P0](Z); | ||
| 37 | SSYNC; | ||
| 38 | R0 = R0 | R1; | ||
| 39 | W[P0] = R0.L; | ||
| 40 | SSYNC; | ||
| 41 | |||
| 42 | P0.H = hi(PORTFIO_INEN); | ||
| 43 | P0.L = lo(PORTFIO_INEN); | ||
| 44 | R0 = W[P0](Z); | ||
| 45 | SSYNC; | ||
| 46 | R0 = R0 & R2; | ||
| 47 | W[P0] = R0.L; | ||
| 48 | SSYNC; | ||
| 49 | |||
| 50 | R2 = [SP++]; | ||
| 51 | R1 = [SP++]; | ||
| 52 | R0 = [SP++]; | ||
| 53 | P0 = [SP++]; | ||
| 54 | UNLINK; | ||
| 55 | RTS; | ||
| 56 | .size _led_init, .-_led_init | ||
| 57 | |||
| 58 | /* Set one LED on. Leave other LEDs unchanged. | ||
| 59 | It expects the LED number passed through R0. */ | ||
| 60 | |||
| 61 | ENTRY(_led_on) | ||
| 62 | LINK 12; | ||
| 63 | [--SP] = P0; | ||
| 64 | [--SP] = R1; | ||
| 65 | CALL _led_init; | ||
| 66 | R1 = 1; | ||
| 67 | R0 += 5; | ||
| 68 | R1 <<= R0; | ||
| 69 | P0.H = hi(PORTFIO); | ||
| 70 | P0.L = lo(PORTFIO); | ||
| 71 | R0 = W[P0](Z); | ||
| 72 | SSYNC; | ||
| 73 | R0 = R0 | R1; | ||
| 74 | W[P0] = R0.L; | ||
| 75 | SSYNC; | ||
| 76 | R1 = [SP++]; | ||
| 77 | P0 = [SP++]; | ||
| 78 | UNLINK; | ||
| 79 | RTS; | ||
| 80 | .size _led_on, .-_led_on | ||
| 81 | |||
| 82 | /* Set one LED off. Leave other LEDs unchanged. */ | ||
| 83 | |||
| 84 | ENTRY(_led_off) | ||
| 85 | LINK 12; | ||
| 86 | [--SP] = P0; | ||
| 87 | [--SP] = R1; | ||
| 88 | CALL _led_init; | ||
| 89 | R1 = 1; | ||
| 90 | R0 += 5; | ||
| 91 | R1 <<= R0; | ||
| 92 | R1 = ~R1; | ||
| 93 | P0.H = hi(PORTFIO); | ||
| 94 | P0.L = lo(PORTFIO); | ||
| 95 | R0 = W[P0](Z); | ||
| 96 | SSYNC; | ||
| 97 | R0 = R0 & R1; | ||
| 98 | W[P0] = R0.L; | ||
| 99 | SSYNC; | ||
| 100 | R1 = [SP++]; | ||
| 101 | P0 = [SP++]; | ||
| 102 | UNLINK; | ||
| 103 | RTS; | ||
| 104 | .size _led_off, .-_led_off | ||
| 105 | |||
| 106 | /* Toggle one LED. Leave other LEDs unchanged. */ | ||
| 107 | |||
| 108 | ENTRY(_led_toggle) | ||
| 109 | LINK 12; | ||
| 110 | [--SP] = P0; | ||
| 111 | [--SP] = R1; | ||
| 112 | CALL _led_init; | ||
| 113 | R1 = 1; | ||
| 114 | R0 += 5; | ||
| 115 | R1 <<= R0; | ||
| 116 | P0.H = hi(PORTFIO); | ||
| 117 | P0.L = lo(PORTFIO); | ||
| 118 | R0 = W[P0](Z); | ||
| 119 | SSYNC; | ||
| 120 | R0 = R0 ^ R1; | ||
| 121 | W[P0] = R0.L; | ||
| 122 | SSYNC; | ||
| 123 | R1 = [SP++]; | ||
| 124 | P0 = [SP++]; | ||
| 125 | UNLINK; | ||
| 126 | RTS; | ||
| 127 | .size _led_toggle, .-_led_toggle | ||
| 128 | |||
| 129 | /* Display the number using LEDs in binary format. */ | ||
| 130 | |||
| 131 | ENTRY(_led_disp_num) | ||
| 132 | LINK 12; | ||
| 133 | [--SP] = P0; | ||
| 134 | [--SP] = R1; | ||
| 135 | [--SP] = R2; | ||
| 136 | CALL _led_init; | ||
| 137 | R1 = 0x3f(X); | ||
| 138 | R0 = R0 & R1; | ||
| 139 | R2 = 6(X); | ||
| 140 | R0 <<= R2; | ||
| 141 | R1 <<= R2; | ||
| 142 | P0.H = hi(PORTFIO); | ||
| 143 | P0.L = lo(PORTFIO); | ||
| 144 | R2 = W[P0](Z); | ||
| 145 | SSYNC; | ||
| 146 | R1 = ~R1; | ||
| 147 | R2 = R2 & R1; | ||
| 148 | R2 = R2 | R0; | ||
| 149 | W[P0] = R2.L; | ||
| 150 | SSYNC; | ||
| 151 | R2 = [SP++]; | ||
| 152 | R1 = [SP++]; | ||
| 153 | P0 = [SP++]; | ||
| 154 | UNLINK; | ||
| 155 | RTS; | ||
| 156 | .size _led_disp_num, .-_led_disp_num | ||
| 157 | |||
| 158 | /* Toggle the number using LEDs in binary format. */ | ||
| 159 | |||
| 160 | ENTRY(_led_toggle_num) | ||
| 161 | LINK 12; | ||
| 162 | [--SP] = P0; | ||
| 163 | [--SP] = R1; | ||
| 164 | [--SP] = R2; | ||
| 165 | CALL _led_init; | ||
| 166 | R1 = 0x3f(X); | ||
| 167 | R0 = R0 & R1; | ||
| 168 | R1 = 6(X); | ||
| 169 | R0 <<= R1; | ||
| 170 | P0.H = hi(PORTFIO); | ||
| 171 | P0.L = lo(PORTFIO); | ||
| 172 | R1 = W[P0](Z); | ||
| 173 | SSYNC; | ||
| 174 | R1 = R1 ^ R0; | ||
| 175 | W[P0] = R1.L; | ||
| 176 | SSYNC; | ||
| 177 | R2 = [SP++]; | ||
| 178 | R1 = [SP++]; | ||
| 179 | P0 = [SP++]; | ||
| 180 | UNLINK; | ||
| 181 | RTS; | ||
| 182 | .size _led_toggle_num, .-_led_toggle_num | ||
| 183 | |||
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 9a756d1f3d73..671f9d67f23a 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
| @@ -400,9 +400,6 @@ static struct platform_device stamp_flash_device = { | |||
| 400 | }; | 400 | }; |
| 401 | #endif | 401 | #endif |
| 402 | 402 | ||
| 403 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 404 | /* all SPI peripherals info goes here */ | ||
| 405 | |||
| 406 | #if defined(CONFIG_MTD_M25P80) \ | 403 | #if defined(CONFIG_MTD_M25P80) \ |
| 407 | || defined(CONFIG_MTD_M25P80_MODULE) | 404 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 408 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 405 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
| @@ -629,6 +626,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
| 629 | #endif | 626 | #endif |
| 630 | }; | 627 | }; |
| 631 | 628 | ||
| 629 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 632 | /* SPI controller data */ | 630 | /* SPI controller data */ |
| 633 | static struct bfin5xx_spi_master bfin_spi0_info = { | 631 | static struct bfin5xx_spi_master bfin_spi0_info = { |
| 634 | .num_chipselect = 8, | 632 | .num_chipselect = 8, |
| @@ -939,10 +937,7 @@ static int __init stamp_init(void) | |||
| 939 | #endif | 937 | #endif |
| 940 | 938 | ||
| 941 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); | 939 | platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); |
| 942 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 940 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 943 | spi_register_board_info(bfin_spi_board_info, | ||
| 944 | ARRAY_SIZE(bfin_spi_board_info)); | ||
| 945 | #endif | ||
| 946 | 941 | ||
| 947 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 942 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 948 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 943 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
diff --git a/arch/blackfin/mach-bf548/boards/Makefile b/arch/blackfin/mach-bf548/boards/Makefile index eed161dd7845..319ef54c4221 100644 --- a/arch/blackfin/mach-bf548/boards/Makefile +++ b/arch/blackfin/mach-bf548/boards/Makefile | |||
| @@ -2,5 +2,5 @@ | |||
| 2 | # arch/blackfin/mach-bf548/boards/Makefile | 2 | # arch/blackfin/mach-bf548/boards/Makefile |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_BFIN548_EZKIT) += ezkit.o led.o | 5 | obj-$(CONFIG_BFIN548_EZKIT) += ezkit.o |
| 6 | obj-$(CONFIG_BFIN548_BLUETECHNIX_CM) += cm_bf548.o | 6 | obj-$(CONFIG_BFIN548_BLUETECHNIX_CM) += cm_bf548.o |
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 3b74f96d3590..4f4ae8787edf 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
| @@ -684,7 +684,7 @@ static struct platform_device *cm_bf548_devices[] __initdata = { | |||
| 684 | 684 | ||
| 685 | static int __init cm_bf548_init(void) | 685 | static int __init cm_bf548_init(void) |
| 686 | { | 686 | { |
| 687 | printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); | 687 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
| 688 | platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices)); | 688 | platform_add_devices(cm_bf548_devices, ARRAY_SIZE(cm_bf548_devices)); |
| 689 | 689 | ||
| 690 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 690 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index d1682bb37509..af7c211a580e 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
| @@ -412,8 +412,6 @@ static struct platform_device ezkit_flash_device = { | |||
| 412 | }; | 412 | }; |
| 413 | #endif | 413 | #endif |
| 414 | 414 | ||
| 415 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 416 | /* all SPI peripherals info goes here */ | ||
| 417 | #if defined(CONFIG_MTD_M25P80) \ | 415 | #if defined(CONFIG_MTD_M25P80) \ |
| 418 | || defined(CONFIG_MTD_M25P80_MODULE) | 416 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 419 | /* SPI flash chip (m25p16) */ | 417 | /* SPI flash chip (m25p16) */ |
| @@ -481,7 +479,7 @@ static struct bfin5xx_spi_chip spidev_chip_info = { | |||
| 481 | }; | 479 | }; |
| 482 | #endif | 480 | #endif |
| 483 | 481 | ||
| 484 | static struct spi_board_info bf54x_spi_board_info[] __initdata = { | 482 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
| 485 | #if defined(CONFIG_MTD_M25P80) \ | 483 | #if defined(CONFIG_MTD_M25P80) \ |
| 486 | || defined(CONFIG_MTD_M25P80_MODULE) | 484 | || defined(CONFIG_MTD_M25P80_MODULE) |
| 487 | { | 485 | { |
| @@ -527,6 +525,7 @@ static struct spi_board_info bf54x_spi_board_info[] __initdata = { | |||
| 527 | #endif | 525 | #endif |
| 528 | }; | 526 | }; |
| 529 | 527 | ||
| 528 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 530 | /* SPI (0) */ | 529 | /* SPI (0) */ |
| 531 | static struct resource bfin_spi0_resource[] = { | 530 | static struct resource bfin_spi0_resource[] = { |
| 532 | [0] = { | 531 | [0] = { |
| @@ -800,10 +799,7 @@ static int __init ezkit_init(void) | |||
| 800 | 799 | ||
| 801 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 800 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
| 802 | 801 | ||
| 803 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 802 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 804 | spi_register_board_info(bf54x_spi_board_info, | ||
| 805 | ARRAY_SIZE(bf54x_spi_board_info)); | ||
| 806 | #endif | ||
| 807 | 803 | ||
| 808 | return 0; | 804 | return 0; |
| 809 | } | 805 | } |
diff --git a/arch/blackfin/mach-bf548/boards/led.S b/arch/blackfin/mach-bf548/boards/led.S deleted file mode 100644 index f47daf3770d0..000000000000 --- a/arch/blackfin/mach-bf548/boards/led.S +++ /dev/null | |||
| @@ -1,172 +0,0 @@ | |||
| 1 | /**************************************************** | ||
| 2 | * LED1 ---- PG6 LED2 ---- PG7 * | ||
| 3 | * LED3 ---- PG8 LED4 ---- PG9 * | ||
| 4 | * LED5 ---- PG10 LED6 ---- PG11 * | ||
| 5 | ****************************************************/ | ||
| 6 | |||
| 7 | #include <linux/linkage.h> | ||
| 8 | #include <asm/blackfin.h> | ||
| 9 | |||
| 10 | /* All functions in this file save the registers they uses. | ||
| 11 | So there is no need to save any registers before calling them. */ | ||
| 12 | |||
| 13 | .text; | ||
| 14 | |||
| 15 | /* Initialize LEDs. */ | ||
| 16 | |||
| 17 | ENTRY(_led_init) | ||
| 18 | LINK 0; | ||
| 19 | [--SP] = P0; | ||
| 20 | [--SP] = R0; | ||
| 21 | [--SP] = R1; | ||
| 22 | [--SP] = R2; | ||
| 23 | R1 = (PG6|PG7|PG8|PG9|PG10|PG11)(Z); | ||
| 24 | R2 = ~R1; | ||
| 25 | |||
| 26 | P0.H = hi(PORTG_FER); | ||
| 27 | P0.L = lo(PORTG_FER); | ||
| 28 | R0 = W[P0](Z); | ||
| 29 | SSYNC; | ||
| 30 | R0 = R0 & R2; | ||
| 31 | W[P0] = R0.L; | ||
| 32 | SSYNC; | ||
| 33 | |||
| 34 | P0.H = hi(PORTG_DIR_SET); | ||
| 35 | P0.L = lo(PORTG_DIR_SET); | ||
| 36 | W[P0] = R1.L; | ||
| 37 | SSYNC; | ||
| 38 | |||
| 39 | P0.H = hi(PORTG_INEN); | ||
| 40 | P0.L = lo(PORTG_INEN); | ||
| 41 | R0 = W[P0](Z); | ||
| 42 | SSYNC; | ||
| 43 | R0 = R0 & R2; | ||
| 44 | W[P0] = R0.L; | ||
| 45 | SSYNC; | ||
| 46 | |||
| 47 | R2 = [SP++]; | ||
| 48 | R1 = [SP++]; | ||
| 49 | R0 = [SP++]; | ||
| 50 | P0 = [SP++]; | ||
| 51 | RTS; | ||
| 52 | .size _led_init, .-_led_init | ||
| 53 | |||
| 54 | /* Set one LED on. Leave other LEDs unchanged. | ||
| 55 | It expects the LED number passed through R0. */ | ||
| 56 | |||
| 57 | ENTRY(_led_on) | ||
| 58 | LINK 0; | ||
| 59 | [--SP] = P0; | ||
| 60 | [--SP] = R1; | ||
| 61 | CALL _led_init; | ||
| 62 | R1 = 1; | ||
| 63 | R0 += 5; | ||
| 64 | R1 <<= R0; | ||
| 65 | P0.H = hi(PORTG_SET); | ||
| 66 | P0.L = lo(PORTG_SET); | ||
| 67 | W[P0] = R1.L; | ||
| 68 | SSYNC; | ||
| 69 | R1 = [SP++]; | ||
| 70 | P0 = [SP++]; | ||
| 71 | UNLINK; | ||
| 72 | RTS; | ||
| 73 | .size _led_on, .-_led_on | ||
| 74 | |||
| 75 | /* Set one LED off. Leave other LEDs unchanged. */ | ||
| 76 | |||
| 77 | ENTRY(_led_off) | ||
| 78 | LINK 0; | ||
| 79 | [--SP] = P0; | ||
| 80 | [--SP] = R1; | ||
| 81 | CALL _led_init; | ||
| 82 | R1 = 1; | ||
| 83 | R0 += 5; | ||
| 84 | R1 <<= R0; | ||
| 85 | P0.H = hi(PORTG_CLEAR); | ||
| 86 | P0.L = lo(PORTG_CLEAR); | ||
| 87 | W[P0] = R1.L; | ||
| 88 | SSYNC; | ||
| 89 | R1 = [SP++]; | ||
| 90 | P0 = [SP++]; | ||
| 91 | UNLINK; | ||
| 92 | RTS; | ||
| 93 | .size _led_off, .-_led_off | ||
| 94 | |||
| 95 | /* Toggle one LED. Leave other LEDs unchanged. */ | ||
| 96 | |||
| 97 | ENTRY(_led_toggle) | ||
| 98 | LINK 0; | ||
| 99 | [--SP] = P0; | ||
| 100 | [--SP] = R1; | ||
| 101 | CALL _led_init; | ||
| 102 | R1 = 1; | ||
| 103 | R0 += 5; | ||
| 104 | R1 <<= R0; | ||
| 105 | P0.H = hi(PORTG); | ||
| 106 | P0.L = lo(PORTG); | ||
| 107 | R0 = W[P0](Z); | ||
| 108 | SSYNC; | ||
| 109 | R0 = R0 ^ R1; | ||
| 110 | W[P0] = R0.L; | ||
| 111 | SSYNC; | ||
| 112 | R1 = [SP++]; | ||
| 113 | P0 = [SP++]; | ||
| 114 | UNLINK; | ||
| 115 | RTS; | ||
| 116 | .size _led_toggle, .-_led_toggle | ||
| 117 | |||
| 118 | /* Display the number using LEDs in binary format. */ | ||
| 119 | |||
| 120 | ENTRY(_led_disp_num) | ||
| 121 | LINK 0; | ||
| 122 | [--SP] = P0; | ||
| 123 | [--SP] = R1; | ||
| 124 | [--SP] = R2; | ||
| 125 | CALL _led_init; | ||
| 126 | R1 = 0x3f(X); | ||
| 127 | R0 = R0 & R1; | ||
| 128 | R2 = 6(X); | ||
| 129 | R0 <<= R2; | ||
| 130 | R1 <<= R2; | ||
| 131 | P0.H = hi(PORTG); | ||
| 132 | P0.L = lo(PORTG); | ||
| 133 | R2 = W[P0](Z); | ||
| 134 | SSYNC; | ||
| 135 | R1 = ~R1; | ||
| 136 | R2 = R2 & R1; | ||
| 137 | R2 = R2 | R0; | ||
| 138 | W[P0] = R2.L; | ||
| 139 | SSYNC; | ||
| 140 | R2 = [SP++]; | ||
| 141 | R1 = [SP++]; | ||
| 142 | P0 = [SP++]; | ||
| 143 | UNLINK; | ||
| 144 | RTS; | ||
| 145 | .size _led_disp_num, .-_led_disp_num | ||
| 146 | |||
| 147 | /* Toggle the number using LEDs in binary format. */ | ||
| 148 | |||
| 149 | ENTRY(_led_toggle_num) | ||
| 150 | LINK 0; | ||
| 151 | [--SP] = P0; | ||
| 152 | [--SP] = R1; | ||
| 153 | [--SP] = R2; | ||
| 154 | CALL _led_init; | ||
| 155 | R1 = 0x3f(X); | ||
| 156 | R0 = R0 & R1; | ||
| 157 | R1 = 6(X); | ||
| 158 | R0 <<= R1; | ||
| 159 | P0.H = hi(PORTG); | ||
| 160 | P0.L = lo(PORTG); | ||
| 161 | R1 = W[P0](Z); | ||
| 162 | SSYNC; | ||
| 163 | R1 = R1 ^ R0; | ||
| 164 | W[P0] = R1.L; | ||
| 165 | SSYNC; | ||
| 166 | R2 = [SP++]; | ||
| 167 | R1 = [SP++]; | ||
| 168 | P0 = [SP++]; | ||
| 169 | UNLINK; | ||
| 170 | RTS; | ||
| 171 | .size _led_toggle_num, .-_led_toggle_num | ||
| 172 | |||
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index 61d8f7648b24..bc6feded8569 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
| @@ -280,7 +280,6 @@ static struct platform_device ezkit_flash_device = { | |||
| 280 | }; | 280 | }; |
| 281 | #endif | 281 | #endif |
| 282 | 282 | ||
| 283 | #ifdef CONFIG_SPI_BFIN | ||
| 284 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 283 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
| 285 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 284 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
| 286 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 285 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
| @@ -295,8 +294,8 @@ static struct bfin5xx_spi_chip spidev_chip_info = { | |||
| 295 | .bits_per_word = 8, | 294 | .bits_per_word = 8, |
| 296 | }; | 295 | }; |
| 297 | #endif | 296 | #endif |
| 298 | #endif | ||
| 299 | 297 | ||
| 298 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | ||
| 300 | /* SPI (0) */ | 299 | /* SPI (0) */ |
| 301 | static struct resource bfin_spi0_resource[] = { | 300 | static struct resource bfin_spi0_resource[] = { |
| 302 | [0] = { | 301 | [0] = { |
| @@ -327,6 +326,7 @@ static struct platform_device bfin_spi0_device = { | |||
| 327 | .platform_data = &bfin_spi0_info, /* Passed to driver */ | 326 | .platform_data = &bfin_spi0_info, /* Passed to driver */ |
| 328 | }, | 327 | }, |
| 329 | }; | 328 | }; |
| 329 | #endif | ||
| 330 | 330 | ||
| 331 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 331 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
| 332 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 332 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
| @@ -537,10 +537,7 @@ static int __init ezkit_init(void) | |||
| 537 | SSYNC(); | 537 | SSYNC(); |
| 538 | #endif | 538 | #endif |
| 539 | 539 | ||
| 540 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 540 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
| 541 | spi_register_board_info(bfin_spi_board_info, | ||
| 542 | ARRAY_SIZE(bfin_spi_board_info)); | ||
| 543 | #endif | ||
| 544 | 541 | ||
| 545 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | 542 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) |
| 546 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | 543 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; |
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c index ef2db8fd102a..5933656db5a2 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | static struct fs_struct init_fs = INIT_FS; | 40 | static struct fs_struct init_fs = INIT_FS; |
| 41 | static struct files_struct init_files = INIT_FILES; | ||
| 42 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 41 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 43 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 42 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 44 | struct mm_struct init_mm = INIT_MM(init_mm); | 43 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/frv/kernel/cmode.S b/arch/frv/kernel/cmode.S index 81ba28ad2207..53deeb5d7e87 100644 --- a/arch/frv/kernel/cmode.S +++ b/arch/frv/kernel/cmode.S | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* cmode.S: clock mode management | 1 | /* cmode.S: clock mode management |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. |
| 4 | * Written by David Woodhouse (dwmw2@redhat.com) | 4 | * Written by David Woodhouse (dwmw2@infradead.org) |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
diff --git a/arch/frv/kernel/init_task.c b/arch/frv/kernel/init_task.c index 22993932b3fc..e2198815b630 100644 --- a/arch/frv/kernel/init_task.c +++ b/arch/frv/kernel/init_task.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
| 14 | static struct files_struct init_files = INIT_FILES; | ||
| 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 17 | struct mm_struct init_mm = INIT_MM(init_mm); | 16 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/frv/kernel/sleep.S b/arch/frv/kernel/sleep.S index c9b2d51ab9ad..f67bf73cd2cc 100644 --- a/arch/frv/kernel/sleep.S +++ b/arch/frv/kernel/sleep.S | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* sleep.S: power saving mode entry | 1 | /* sleep.S: power saving mode entry |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. |
| 4 | * Written by David Woodhouse (dwmw2@redhat.com) | 4 | * Written by David Woodhouse (dwmw2@infradead.org) |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c index 4985466b1a7c..64ee58d748be 100644 --- a/arch/frv/mb93090-mb00/pci-dma-nommu.c +++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* pci-dma-nommu.c: Dynamic DMA mapping support for the FRV | 1 | /* pci-dma-nommu.c: Dynamic DMA mapping support for the FRV |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. |
| 4 | * Written by David Woodhouse (dwmw2@redhat.com) | 4 | * Written by David Woodhouse (dwmw2@infradead.org) |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public License | 7 | * modify it under the terms of the GNU General Public License |
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c index b841ecfd5d5a..9af7740f32fb 100644 --- a/arch/frv/mm/init.c +++ b/arch/frv/mm/init.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 27 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
| 28 | #include <linux/highmem.h> | 28 | #include <linux/highmem.h> |
| 29 | #include <linux/module.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
| 31 | #include <asm/segment.h> | 32 | #include <asm/segment.h> |
| @@ -56,7 +57,9 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
| 56 | */ | 57 | */ |
| 57 | static unsigned long empty_bad_page_table; | 58 | static unsigned long empty_bad_page_table; |
| 58 | static unsigned long empty_bad_page; | 59 | static unsigned long empty_bad_page; |
| 60 | |||
| 59 | unsigned long empty_zero_page; | 61 | unsigned long empty_zero_page; |
| 62 | EXPORT_SYMBOL(empty_zero_page); | ||
| 60 | 63 | ||
| 61 | /*****************************************************************************/ | 64 | /*****************************************************************************/ |
| 62 | /* | 65 | /* |
diff --git a/arch/h8300/kernel/init_task.c b/arch/h8300/kernel/init_task.c index 19272c2ac56a..93a4899e46c2 100644 --- a/arch/h8300/kernel/init_task.c +++ b/arch/h8300/kernel/init_task.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
| 14 | 14 | ||
| 15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
| 16 | static struct files_struct init_files = INIT_FILES; | ||
| 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 88f1a55c6c94..e67ee3f27698 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
| @@ -57,6 +57,7 @@ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ | |||
| 57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ | 57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ |
| 58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ | 58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ |
| 59 | core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ | 59 | core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ |
| 60 | core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ | ||
| 60 | core-$(CONFIG_KVM) += arch/ia64/kvm/ | 61 | core-$(CONFIG_KVM) += arch/ia64/kvm/ |
| 61 | 62 | ||
| 62 | drivers-$(CONFIG_PCI) += arch/ia64/pci/ | 63 | drivers-$(CONFIG_PCI) += arch/ia64/pci/ |
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 853d1f11be00..43687cc60dfb 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -465,7 +465,6 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | |||
| 465 | printk(KERN_ERR | 465 | printk(KERN_ERR |
| 466 | "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n", | 466 | "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n", |
| 467 | len, slit->header.length); | 467 | len, slit->header.length); |
| 468 | memset(numa_slit, 10, sizeof(numa_slit)); | ||
| 469 | return; | 468 | return; |
| 470 | } | 469 | } |
| 471 | slit_table = slit; | 470 | slit_table = slit; |
| @@ -574,8 +573,14 @@ void __init acpi_numa_arch_fixup(void) | |||
| 574 | printk(KERN_INFO "Number of memory chunks in system = %d\n", | 573 | printk(KERN_INFO "Number of memory chunks in system = %d\n", |
| 575 | num_node_memblks); | 574 | num_node_memblks); |
| 576 | 575 | ||
| 577 | if (!slit_table) | 576 | if (!slit_table) { |
| 577 | for (i = 0; i < MAX_NUMNODES; i++) | ||
| 578 | for (j = 0; j < MAX_NUMNODES; j++) | ||
| 579 | node_distance(i, j) = i == j ? LOCAL_DISTANCE : | ||
| 580 | REMOTE_DISTANCE; | ||
| 578 | return; | 581 | return; |
| 582 | } | ||
| 583 | |||
| 579 | memset(numa_slit, -1, sizeof(numa_slit)); | 584 | memset(numa_slit, -1, sizeof(numa_slit)); |
| 580 | for (i = 0; i < slit_table->locality_count; i++) { | 585 | for (i = 0; i < slit_table->locality_count; i++) { |
| 581 | if (!pxm_bit_test(i)) | 586 | if (!pxm_bit_test(i)) |
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c index bc8efcad28b8..9d7e1c66faf4 100644 --- a/arch/ia64/kernel/init_task.c +++ b/arch/ia64/kernel/init_task.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/pgtable.h> | 18 | #include <asm/pgtable.h> |
| 19 | 19 | ||
| 20 | static struct fs_struct init_fs = INIT_FS; | 20 | static struct fs_struct init_fs = INIT_FS; |
| 21 | static struct files_struct init_files = INIT_FILES; | ||
| 22 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 21 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 23 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 22 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 24 | struct mm_struct init_mm = INIT_MM(init_mm); | 23 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 082c31dcfd99..39752cdef6ff 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
| @@ -558,8 +558,6 @@ static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void) | |||
| 558 | if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) { | 558 | if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) { |
| 559 | rte = alloc_bootmem(sizeof(struct iosapic_rte_info) * | 559 | rte = alloc_bootmem(sizeof(struct iosapic_rte_info) * |
| 560 | NR_PREALLOCATE_RTE_ENTRIES); | 560 | NR_PREALLOCATE_RTE_ENTRIES); |
| 561 | if (!rte) | ||
| 562 | return NULL; | ||
| 563 | for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++) | 561 | for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++) |
| 564 | list_add(&rte->rte_list, &free_rte_list); | 562 | list_add(&rte->rte_list, &free_rte_list); |
| 565 | } | 563 | } |
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S index 6678c49daba3..80b44ea052d7 100644 --- a/arch/ia64/kernel/ivt.S +++ b/arch/ia64/kernel/ivt.S | |||
| @@ -1076,48 +1076,6 @@ END(ia64_syscall_setup) | |||
| 1076 | DBG_FAULT(15) | 1076 | DBG_FAULT(15) |
| 1077 | FAULT(15) | 1077 | FAULT(15) |
| 1078 | 1078 | ||
| 1079 | /* | ||
| 1080 | * Squatting in this space ... | ||
| 1081 | * | ||
| 1082 | * This special case dispatcher for illegal operation faults allows preserved | ||
| 1083 | * registers to be modified through a callback function (asm only) that is handed | ||
| 1084 | * back from the fault handler in r8. Up to three arguments can be passed to the | ||
| 1085 | * callback function by returning an aggregate with the callback as its first | ||
| 1086 | * element, followed by the arguments. | ||
| 1087 | */ | ||
| 1088 | ENTRY(dispatch_illegal_op_fault) | ||
| 1089 | .prologue | ||
| 1090 | .body | ||
| 1091 | SAVE_MIN_WITH_COVER | ||
| 1092 | ssm psr.ic | PSR_DEFAULT_BITS | ||
| 1093 | ;; | ||
| 1094 | srlz.i // guarantee that interruption collection is on | ||
| 1095 | ;; | ||
| 1096 | (p15) ssm psr.i // restore psr.i | ||
| 1097 | adds r3=8,r2 // set up second base pointer for SAVE_REST | ||
| 1098 | ;; | ||
| 1099 | alloc r14=ar.pfs,0,0,1,0 // must be first in insn group | ||
| 1100 | mov out0=ar.ec | ||
| 1101 | ;; | ||
| 1102 | SAVE_REST | ||
| 1103 | PT_REGS_UNWIND_INFO(0) | ||
| 1104 | ;; | ||
| 1105 | br.call.sptk.many rp=ia64_illegal_op_fault | ||
| 1106 | .ret0: ;; | ||
| 1107 | alloc r14=ar.pfs,0,0,3,0 // must be first in insn group | ||
| 1108 | mov out0=r9 | ||
| 1109 | mov out1=r10 | ||
| 1110 | mov out2=r11 | ||
| 1111 | movl r15=ia64_leave_kernel | ||
| 1112 | ;; | ||
| 1113 | mov rp=r15 | ||
| 1114 | mov b6=r8 | ||
| 1115 | ;; | ||
| 1116 | cmp.ne p6,p0=0,r8 | ||
| 1117 | (p6) br.call.dpnt.many b6=b6 // call returns to ia64_leave_kernel | ||
| 1118 | br.sptk.many ia64_leave_kernel | ||
| 1119 | END(dispatch_illegal_op_fault) | ||
| 1120 | |||
| 1121 | .org ia64_ivt+0x4000 | 1079 | .org ia64_ivt+0x4000 |
| 1122 | ///////////////////////////////////////////////////////////////////////////////////////// | 1080 | ///////////////////////////////////////////////////////////////////////////////////////// |
| 1123 | // 0x4000 Entry 16 (size 64 bundles) Reserved | 1081 | // 0x4000 Entry 16 (size 64 bundles) Reserved |
| @@ -1715,6 +1673,48 @@ END(ia32_interrupt) | |||
| 1715 | DBG_FAULT(67) | 1673 | DBG_FAULT(67) |
| 1716 | FAULT(67) | 1674 | FAULT(67) |
| 1717 | 1675 | ||
| 1676 | /* | ||
| 1677 | * Squatting in this space ... | ||
| 1678 | * | ||
| 1679 | * This special case dispatcher for illegal operation faults allows preserved | ||
| 1680 | * registers to be modified through a callback function (asm only) that is handed | ||
| 1681 | * back from the fault handler in r8. Up to three arguments can be passed to the | ||
| 1682 | * callback function by returning an aggregate with the callback as its first | ||
| 1683 | * element, followed by the arguments. | ||
| 1684 | */ | ||
| 1685 | ENTRY(dispatch_illegal_op_fault) | ||
| 1686 | .prologue | ||
| 1687 | .body | ||
| 1688 | SAVE_MIN_WITH_COVER | ||
| 1689 | ssm psr.ic | PSR_DEFAULT_BITS | ||
| 1690 | ;; | ||
| 1691 | srlz.i // guarantee that interruption collection is on | ||
| 1692 | ;; | ||
| 1693 | (p15) ssm psr.i // restore psr.i | ||
| 1694 | adds r3=8,r2 // set up second base pointer for SAVE_REST | ||
| 1695 | ;; | ||
| 1696 | alloc r14=ar.pfs,0,0,1,0 // must be first in insn group | ||
| 1697 | mov out0=ar.ec | ||
| 1698 | ;; | ||
| 1699 | SAVE_REST | ||
| 1700 | PT_REGS_UNWIND_INFO(0) | ||
| 1701 | ;; | ||
| 1702 | br.call.sptk.many rp=ia64_illegal_op_fault | ||
| 1703 | .ret0: ;; | ||
| 1704 | alloc r14=ar.pfs,0,0,3,0 // must be first in insn group | ||
| 1705 | mov out0=r9 | ||
| 1706 | mov out1=r10 | ||
| 1707 | mov out2=r11 | ||
| 1708 | movl r15=ia64_leave_kernel | ||
| 1709 | ;; | ||
| 1710 | mov rp=r15 | ||
| 1711 | mov b6=r8 | ||
| 1712 | ;; | ||
| 1713 | cmp.ne p6,p0=0,r8 | ||
| 1714 | (p6) br.call.dpnt.many b6=b6 // call returns to ia64_leave_kernel | ||
| 1715 | br.sptk.many ia64_leave_kernel | ||
| 1716 | END(dispatch_illegal_op_fault) | ||
| 1717 | |||
| 1718 | #ifdef CONFIG_IA32_SUPPORT | 1718 | #ifdef CONFIG_IA32_SUPPORT |
| 1719 | 1719 | ||
| 1720 | /* | 1720 | /* |
diff --git a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h index 7c548ac52bbc..74b6d670aaef 100644 --- a/arch/ia64/kernel/minstate.h +++ b/arch/ia64/kernel/minstate.h | |||
| @@ -15,6 +15,9 @@ | |||
| 15 | #define ACCOUNT_SYS_ENTER | 15 | #define ACCOUNT_SYS_ENTER |
| 16 | #endif | 16 | #endif |
| 17 | 17 | ||
| 18 | .section ".data.patch.rse", "a" | ||
| 19 | .previous | ||
| 20 | |||
| 18 | /* | 21 | /* |
| 19 | * DO_SAVE_MIN switches to the kernel stacks (if necessary) and saves | 22 | * DO_SAVE_MIN switches to the kernel stacks (if necessary) and saves |
| 20 | * the minimum state necessary that allows us to turn psr.ic back | 23 | * the minimum state necessary that allows us to turn psr.ic back |
| @@ -40,7 +43,7 @@ | |||
| 40 | * Note that psr.ic is NOT turned on by this macro. This is so that | 43 | * Note that psr.ic is NOT turned on by this macro. This is so that |
| 41 | * we can pass interruption state as arguments to a handler. | 44 | * we can pass interruption state as arguments to a handler. |
| 42 | */ | 45 | */ |
| 43 | #define DO_SAVE_MIN(COVER,SAVE_IFS,EXTRA) \ | 46 | #define DO_SAVE_MIN(COVER,SAVE_IFS,EXTRA,WORKAROUND) \ |
| 44 | mov r16=IA64_KR(CURRENT); /* M */ \ | 47 | mov r16=IA64_KR(CURRENT); /* M */ \ |
| 45 | mov r27=ar.rsc; /* M */ \ | 48 | mov r27=ar.rsc; /* M */ \ |
| 46 | mov r20=r1; /* A */ \ | 49 | mov r20=r1; /* A */ \ |
| @@ -87,6 +90,7 @@ | |||
| 87 | tbit.nz p15,p0=r29,IA64_PSR_I_BIT; \ | 90 | tbit.nz p15,p0=r29,IA64_PSR_I_BIT; \ |
| 88 | mov r29=b0 \ | 91 | mov r29=b0 \ |
| 89 | ;; \ | 92 | ;; \ |
| 93 | WORKAROUND; \ | ||
| 90 | adds r16=PT(R8),r1; /* initialize first base pointer */ \ | 94 | adds r16=PT(R8),r1; /* initialize first base pointer */ \ |
| 91 | adds r17=PT(R9),r1; /* initialize second base pointer */ \ | 95 | adds r17=PT(R9),r1; /* initialize second base pointer */ \ |
| 92 | (pKStk) mov r18=r0; /* make sure r18 isn't NaT */ \ | 96 | (pKStk) mov r18=r0; /* make sure r18 isn't NaT */ \ |
| @@ -206,6 +210,40 @@ | |||
| 206 | st8 [r25]=r10; /* ar.ssd */ \ | 210 | st8 [r25]=r10; /* ar.ssd */ \ |
| 207 | ;; | 211 | ;; |
| 208 | 212 | ||
| 209 | #define SAVE_MIN_WITH_COVER DO_SAVE_MIN(cover, mov r30=cr.ifs,) | 213 | #define RSE_WORKAROUND \ |
| 210 | #define SAVE_MIN_WITH_COVER_R19 DO_SAVE_MIN(cover, mov r30=cr.ifs, mov r15=r19) | 214 | (pUStk) extr.u r17=r18,3,6; \ |
| 211 | #define SAVE_MIN DO_SAVE_MIN( , mov r30=r0, ) | 215 | (pUStk) sub r16=r18,r22; \ |
| 216 | [1:](pKStk) br.cond.sptk.many 1f; \ | ||
| 217 | .xdata4 ".data.patch.rse",1b-. \ | ||
| 218 | ;; \ | ||
| 219 | cmp.ge p6,p7 = 33,r17; \ | ||
| 220 | ;; \ | ||
| 221 | (p6) mov r17=0x310; \ | ||
| 222 | (p7) mov r17=0x308; \ | ||
| 223 | ;; \ | ||
| 224 | cmp.leu p1,p0=r16,r17; \ | ||
| 225 | (p1) br.cond.sptk.many 1f; \ | ||
| 226 | dep.z r17=r26,0,62; \ | ||
| 227 | movl r16=2f; \ | ||
| 228 | ;; \ | ||
| 229 | mov ar.pfs=r17; \ | ||
| 230 | dep r27=r0,r27,16,14; \ | ||
| 231 | mov b0=r16; \ | ||
| 232 | ;; \ | ||
| 233 | br.ret.sptk b0; \ | ||
| 234 | ;; \ | ||
| 235 | 2: \ | ||
| 236 | mov ar.rsc=r0 \ | ||
| 237 | ;; \ | ||
| 238 | flushrs; \ | ||
| 239 | ;; \ | ||
| 240 | mov ar.bspstore=r22 \ | ||
| 241 | ;; \ | ||
| 242 | mov r18=ar.bsp; \ | ||
| 243 | ;; \ | ||
| 244 | 1: \ | ||
| 245 | .pred.rel "mutex", pKStk, pUStk | ||
| 246 | |||
| 247 | #define SAVE_MIN_WITH_COVER DO_SAVE_MIN(cover, mov r30=cr.ifs, , RSE_WORKAROUND) | ||
| 248 | #define SAVE_MIN_WITH_COVER_R19 DO_SAVE_MIN(cover, mov r30=cr.ifs, mov r15=r19, RSE_WORKAROUND) | ||
| 249 | #define SAVE_MIN DO_SAVE_MIN( , mov r30=r0, , ) | ||
diff --git a/arch/ia64/kernel/patch.c b/arch/ia64/kernel/patch.c index e0dca8743dbb..b83b2c516008 100644 --- a/arch/ia64/kernel/patch.c +++ b/arch/ia64/kernel/patch.c | |||
| @@ -115,6 +115,29 @@ ia64_patch_vtop (unsigned long start, unsigned long end) | |||
| 115 | ia64_srlz_i(); | 115 | ia64_srlz_i(); |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | /* | ||
| 119 | * Disable the RSE workaround by turning the conditional branch | ||
| 120 | * that we tagged in each place the workaround was used into an | ||
| 121 | * unconditional branch. | ||
| 122 | */ | ||
| 123 | void __init | ||
| 124 | ia64_patch_rse (unsigned long start, unsigned long end) | ||
| 125 | { | ||
| 126 | s32 *offp = (s32 *) start; | ||
| 127 | u64 ip, *b; | ||
| 128 | |||
| 129 | while (offp < (s32 *) end) { | ||
| 130 | ip = (u64) offp + *offp; | ||
| 131 | |||
| 132 | b = (u64 *)(ip & -16); | ||
| 133 | b[1] &= ~0xf800000L; | ||
| 134 | ia64_fc((void *) ip); | ||
| 135 | ++offp; | ||
| 136 | } | ||
| 137 | ia64_sync_i(); | ||
| 138 | ia64_srlz_i(); | ||
| 139 | } | ||
| 140 | |||
| 118 | void __init | 141 | void __init |
| 119 | ia64_patch_mckinley_e9 (unsigned long start, unsigned long end) | 142 | ia64_patch_mckinley_e9 (unsigned long start, unsigned long end) |
| 120 | { | 143 | { |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 71d05133f556..7714a97b0104 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -1864,11 +1864,6 @@ pfm_flush(struct file *filp, fl_owner_t id) | |||
| 1864 | * invoked after, it will find an empty queue and no | 1864 | * invoked after, it will find an empty queue and no |
| 1865 | * signal will be sent. In both case, we are safe | 1865 | * signal will be sent. In both case, we are safe |
| 1866 | */ | 1866 | */ |
| 1867 | if (filp->f_flags & FASYNC) { | ||
| 1868 | DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue)); | ||
| 1869 | pfm_do_fasync (-1, filp, ctx, 0); | ||
| 1870 | } | ||
| 1871 | |||
| 1872 | PROTECT_CTX(ctx, flags); | 1867 | PROTECT_CTX(ctx, flags); |
| 1873 | 1868 | ||
| 1874 | state = ctx->ctx_state; | 1869 | state = ctx->ctx_state; |
| @@ -1999,6 +1994,11 @@ pfm_close(struct inode *inode, struct file *filp) | |||
| 1999 | return -EBADF; | 1994 | return -EBADF; |
| 2000 | } | 1995 | } |
| 2001 | 1996 | ||
| 1997 | if (filp->f_flags & FASYNC) { | ||
| 1998 | DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue)); | ||
| 1999 | pfm_do_fasync(-1, filp, ctx, 0); | ||
| 2000 | } | ||
| 2001 | |||
| 2002 | PROTECT_CTX(ctx, flags); | 2002 | PROTECT_CTX(ctx, flags); |
| 2003 | 2003 | ||
| 2004 | state = ctx->ctx_state; | 2004 | state = ctx->ctx_state; |
diff --git a/arch/ia64/kernel/sal.c b/arch/ia64/kernel/sal.c index 7e0259709c04..0464173ea568 100644 --- a/arch/ia64/kernel/sal.c +++ b/arch/ia64/kernel/sal.c | |||
| @@ -252,11 +252,10 @@ check_sal_cache_flush (void) | |||
| 252 | local_irq_save(flags); | 252 | local_irq_save(flags); |
| 253 | 253 | ||
| 254 | /* | 254 | /* |
| 255 | * Schedule a timer interrupt, wait until it's reported, and see if | 255 | * Send ourselves a timer interrupt, wait until it's reported, and see |
| 256 | * SAL_CACHE_FLUSH drops it. | 256 | * if SAL_CACHE_FLUSH drops it. |
| 257 | */ | 257 | */ |
| 258 | ia64_set_itv(IA64_TIMER_VECTOR); | 258 | platform_send_ipi(cpu, IA64_TIMER_VECTOR, IA64_IPI_DM_INT, 0); |
| 259 | ia64_set_itm(ia64_get_itc() + 1000); | ||
| 260 | 259 | ||
| 261 | while (!ia64_get_irr(IA64_TIMER_VECTOR)) | 260 | while (!ia64_get_irr(IA64_TIMER_VECTOR)) |
| 262 | cpu_relax(); | 261 | cpu_relax(); |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index e9596cd0cdab..632cda8f2e76 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -547,7 +547,8 @@ setup_arch (char **cmdline_p) | |||
| 547 | # ifdef CONFIG_ACPI_NUMA | 547 | # ifdef CONFIG_ACPI_NUMA |
| 548 | acpi_numa_init(); | 548 | acpi_numa_init(); |
| 549 | per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ? | 549 | per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ? |
| 550 | 32 : cpus_weight(early_cpu_possible_map)), additional_cpus); | 550 | 32 : cpus_weight(early_cpu_possible_map)), |
| 551 | additional_cpus > 0 ? additional_cpus : 0); | ||
| 551 | # endif | 552 | # endif |
| 552 | #else | 553 | #else |
| 553 | # ifdef CONFIG_SMP | 554 | # ifdef CONFIG_SMP |
| @@ -560,6 +561,17 @@ setup_arch (char **cmdline_p) | |||
| 560 | /* process SAL system table: */ | 561 | /* process SAL system table: */ |
| 561 | ia64_sal_init(__va(efi.sal_systab)); | 562 | ia64_sal_init(__va(efi.sal_systab)); |
| 562 | 563 | ||
| 564 | #ifdef CONFIG_ITANIUM | ||
| 565 | ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist); | ||
| 566 | #else | ||
| 567 | { | ||
| 568 | u64 num_phys_stacked; | ||
| 569 | |||
| 570 | if (ia64_pal_rse_info(&num_phys_stacked, 0) == 0 && num_phys_stacked > 96) | ||
| 571 | ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist); | ||
| 572 | } | ||
| 573 | #endif | ||
| 574 | |||
| 563 | #ifdef CONFIG_SMP | 575 | #ifdef CONFIG_SMP |
| 564 | cpu_physical_id(0) = hard_smp_processor_id(); | 576 | cpu_physical_id(0) = hard_smp_processor_id(); |
| 565 | #endif | 577 | #endif |
| @@ -567,8 +579,6 @@ setup_arch (char **cmdline_p) | |||
| 567 | cpu_init(); /* initialize the bootstrap CPU */ | 579 | cpu_init(); /* initialize the bootstrap CPU */ |
| 568 | mmu_context_init(); /* initialize context_id bitmap */ | 580 | mmu_context_init(); /* initialize context_id bitmap */ |
| 569 | 581 | ||
| 570 | check_sal_cache_flush(); | ||
| 571 | |||
| 572 | #ifdef CONFIG_ACPI | 582 | #ifdef CONFIG_ACPI |
| 573 | acpi_boot_init(); | 583 | acpi_boot_init(); |
| 574 | #endif | 584 | #endif |
| @@ -596,6 +606,7 @@ setup_arch (char **cmdline_p) | |||
| 596 | ia64_mca_init(); | 606 | ia64_mca_init(); |
| 597 | 607 | ||
| 598 | platform_setup(cmdline_p); | 608 | platform_setup(cmdline_p); |
| 609 | check_sal_cache_flush(); | ||
| 599 | paging_init(); | 610 | paging_init(); |
| 600 | } | 611 | } |
| 601 | 612 | ||
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 8c73643f2d66..aad1b7b1fff9 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
| @@ -117,6 +117,7 @@ void account_system_vtime(struct task_struct *tsk) | |||
| 117 | 117 | ||
| 118 | local_irq_restore(flags); | 118 | local_irq_restore(flags); |
| 119 | } | 119 | } |
| 120 | EXPORT_SYMBOL_GPL(account_system_vtime); | ||
| 120 | 121 | ||
| 121 | /* | 122 | /* |
| 122 | * Called from the timer interrupt handler to charge accumulated user time | 123 | * Called from the timer interrupt handler to charge accumulated user time |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 80622acc95de..5929ab10a289 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
| @@ -156,6 +156,13 @@ SECTIONS | |||
| 156 | __end___vtop_patchlist = .; | 156 | __end___vtop_patchlist = .; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | .data.patch.rse : AT(ADDR(.data.patch.rse) - LOAD_OFFSET) | ||
| 160 | { | ||
| 161 | __start___rse_patchlist = .; | ||
| 162 | *(.data.patch.rse) | ||
| 163 | __end___rse_patchlist = .; | ||
| 164 | } | ||
| 165 | |||
| 159 | .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET) | 166 | .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET) |
| 160 | { | 167 | { |
| 161 | __start___mckinley_e9_bundles = .; | 168 | __start___mckinley_e9_bundles = .; |
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 52353397a1a4..112791dd2542 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile | |||
| @@ -7,7 +7,6 @@ offsets-file := asm-offsets.h | |||
| 7 | always := $(offsets-file) | 7 | always := $(offsets-file) |
| 8 | targets := $(offsets-file) | 8 | targets := $(offsets-file) |
| 9 | targets += arch/ia64/kvm/asm-offsets.s | 9 | targets += arch/ia64/kvm/asm-offsets.s |
| 10 | clean-files := $(addprefix $(objtree)/,$(targets) $(obj)/memcpy.S $(obj)/memset.S) | ||
| 11 | 10 | ||
| 12 | # Default sed regexp - multiline due to syntax constraints | 11 | # Default sed regexp - multiline due to syntax constraints |
| 13 | define sed-y | 12 | define sed-y |
| @@ -54,5 +53,5 @@ EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 | |||
| 54 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ | 53 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ |
| 55 | vtlb.o process.o | 54 | vtlb.o process.o |
| 56 | #Add link memcpy and memset to avoid possible structure assignment error | 55 | #Add link memcpy and memset to avoid possible structure assignment error |
| 57 | kvm-intel-objs += ../lib/memset.o ../lib/memcpy.o | 56 | kvm-intel-objs += memcpy.o memset.o |
| 58 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o | 57 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o |
diff --git a/arch/ia64/kvm/memcpy.S b/arch/ia64/kvm/memcpy.S new file mode 100644 index 000000000000..c04cdbe9f80f --- /dev/null +++ b/arch/ia64/kvm/memcpy.S | |||
| @@ -0,0 +1 @@ | |||
| #include "../lib/memcpy.S" | |||
diff --git a/arch/ia64/kvm/memset.S b/arch/ia64/kvm/memset.S new file mode 100644 index 000000000000..83c3066d844a --- /dev/null +++ b/arch/ia64/kvm/memset.S | |||
| @@ -0,0 +1 @@ | |||
| #include "../lib/memset.S" | |||
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c index 351bf70da463..7f1a858bc69f 100644 --- a/arch/ia64/kvm/mmio.c +++ b/arch/ia64/kvm/mmio.c | |||
| @@ -159,7 +159,8 @@ static void mmio_access(struct kvm_vcpu *vcpu, u64 src_pa, u64 *dest, | |||
| 159 | 159 | ||
| 160 | if (p->u.ioreq.state == STATE_IORESP_READY) { | 160 | if (p->u.ioreq.state == STATE_IORESP_READY) { |
| 161 | if (dir == IOREQ_READ) | 161 | if (dir == IOREQ_READ) |
| 162 | *dest = p->u.ioreq.data; | 162 | /* it's necessary to ensure zero extending */ |
| 163 | *dest = p->u.ioreq.data & (~0UL >> (64-(s*8))); | ||
| 163 | } else | 164 | } else |
| 164 | panic_vm(vcpu); | 165 | panic_vm(vcpu); |
| 165 | out: | 166 | out: |
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 49d3120415eb..e585f9a2afb9 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c | |||
| @@ -512,6 +512,8 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si | |||
| 512 | int cpu; | 512 | int cpu; |
| 513 | char optstr[64]; | 513 | char optstr[64]; |
| 514 | 514 | ||
| 515 | if (count == 0 || count > sizeof(optstr)) | ||
| 516 | return -EINVAL; | ||
| 515 | if (copy_from_user(optstr, user, count)) | 517 | if (copy_from_user(optstr, user, count)) |
| 516 | return -EFAULT; | 518 | return -EFAULT; |
| 517 | optstr[count - 1] = '\0'; | 519 | optstr[count - 1] = '\0'; |
diff --git a/arch/ia64/uv/kernel/setup.c b/arch/ia64/uv/kernel/setup.c index 9aa743203c3c..cf5f28ae96c4 100644 --- a/arch/ia64/uv/kernel/setup.c +++ b/arch/ia64/uv/kernel/setup.c | |||
| @@ -17,6 +17,9 @@ | |||
| 17 | DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); | 17 | DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); |
| 18 | EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); | 18 | EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); |
| 19 | 19 | ||
| 20 | #ifdef CONFIG_IA64_SGI_UV | ||
| 21 | int sn_prom_type; | ||
| 22 | #endif | ||
| 20 | 23 | ||
| 21 | struct redir_addr { | 24 | struct redir_addr { |
| 22 | unsigned long redirect; | 25 | unsigned long redirect; |
| @@ -64,6 +67,15 @@ void __init uv_setup(char **cmdline_p) | |||
| 64 | m_n_config.s.m_skt = 37; | 67 | m_n_config.s.m_skt = 37; |
| 65 | m_n_config.s.n_skt = 0; | 68 | m_n_config.s.n_skt = 0; |
| 66 | mmr_base = 0; | 69 | mmr_base = 0; |
| 70 | #if 0 | ||
| 71 | /* Need BIOS calls - TDB */ | ||
| 72 | if (!ia64_sn_is_fake_prom()) | ||
| 73 | sn_prom_type = 1; | ||
| 74 | else | ||
| 75 | #endif | ||
| 76 | sn_prom_type = 2; | ||
| 77 | printk(KERN_INFO "Running on medusa with %s PROM\n", | ||
| 78 | (sn_prom_type == 1) ? "real" : "fake"); | ||
| 67 | } else { | 79 | } else { |
| 68 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); | 80 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); |
| 69 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); | 81 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); |
diff --git a/arch/m32r/kernel/init_task.c b/arch/m32r/kernel/init_task.c index 9e508fd9d970..0d658dbb6766 100644 --- a/arch/m32r/kernel/init_task.c +++ b/arch/m32r/kernel/init_task.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <asm/pgtable.h> | 12 | #include <asm/pgtable.h> |
| 13 | 13 | ||
| 14 | static struct fs_struct init_fs = INIT_FS; | 14 | static struct fs_struct init_fs = INIT_FS; |
| 15 | static struct files_struct init_files = INIT_FILES; | ||
| 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 18 | struct mm_struct init_mm = INIT_MM(init_mm); | 17 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index dca50da9ffd0..8e2a0f5faf53 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:41 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index c3cd5b749d2c..e2d511e2a1d1 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:42 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 073ae4bbe264..6e20d656adaf 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:43 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 0789ede2e9ee..a0a9b30bb502 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:45 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 3e140bf49b22..6778041de262 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:46 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index ba3a91792cbf..7cd375740348 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:47 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 4d23f99227f9..0747fa3984df 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:42:31 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 188847fed824..e7a8246840b5 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:49 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 983e53d990c8..ab536eb172bb 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:50 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 7707f3fb0a70..e05be687b500 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:51 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index a765f6f15d2c..296340d2b315 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:53 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 431513937498..8d3a416c92bf 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_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.26-rc2 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Sun May 18 14:44:54 2008 | 4 | # Wed May 28 22:47:35 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_M68K=y | 6 | CONFIG_M68K=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -59,7 +59,7 @@ CONFIG_HOTPLUG=y | |||
| 59 | CONFIG_PRINTK=y | 59 | CONFIG_PRINTK=y |
| 60 | CONFIG_BUG=y | 60 | CONFIG_BUG=y |
| 61 | CONFIG_ELF_CORE=y | 61 | CONFIG_ELF_CORE=y |
| 62 | # CONFIG_COMPAT_BRK is not set | 62 | CONFIG_COMPAT_BRK=y |
| 63 | CONFIG_BASE_FULL=y | 63 | CONFIG_BASE_FULL=y |
| 64 | CONFIG_FUTEX=y | 64 | CONFIG_FUTEX=y |
| 65 | CONFIG_ANON_INODES=y | 65 | CONFIG_ANON_INODES=y |
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 5de4e4ed76ab..7888cdf91f5d 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | * setup. | 41 | * setup. |
| 42 | */ | 42 | */ |
| 43 | static struct fs_struct init_fs = INIT_FS; | 43 | static struct fs_struct init_fs = INIT_FS; |
| 44 | static struct files_struct init_files = INIT_FILES; | ||
| 45 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 44 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 46 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 45 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 47 | struct mm_struct init_mm = INIT_MM(init_mm); | 46 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c index 891e1347bc4e..4253f870e54f 100644 --- a/arch/m68k/lib/string.c +++ b/arch/m68k/lib/string.c | |||
| @@ -15,6 +15,12 @@ char *strcpy(char *dest, const char *src) | |||
| 15 | } | 15 | } |
| 16 | EXPORT_SYMBOL(strcpy); | 16 | EXPORT_SYMBOL(strcpy); |
| 17 | 17 | ||
| 18 | char *strcat(char *dest, const char *src) | ||
| 19 | { | ||
| 20 | return __kernel_strcpy(dest + __kernel_strlen(dest), src); | ||
| 21 | } | ||
| 22 | EXPORT_SYMBOL(strcat); | ||
| 23 | |||
| 18 | void *memset(void *s, int c, size_t count) | 24 | void *memset(void *s, int c, size_t count) |
| 19 | { | 25 | { |
| 20 | void *xs = s; | 26 | void *xs = s; |
diff --git a/arch/m68knommu/kernel/init_task.c b/arch/m68knommu/kernel/init_task.c index 3897043a126a..344c01aede08 100644 --- a/arch/m68knommu/kernel/init_task.c +++ b/arch/m68knommu/kernel/init_task.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <asm/pgtable.h> | 13 | #include <asm/pgtable.h> |
| 14 | 14 | ||
| 15 | static struct fs_struct init_fs = INIT_FS; | 15 | static struct fs_struct init_fs = INIT_FS; |
| 16 | static struct files_struct init_files = INIT_FILES; | ||
| 17 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 18 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 19 | struct mm_struct init_mm = INIT_MM(init_mm); | 18 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/m68knommu/platform/coldfire/timers.c b/arch/m68knommu/platform/coldfire/timers.c index ba5a9f32ebd4..454f25493491 100644 --- a/arch/m68knommu/platform/coldfire/timers.c +++ b/arch/m68knommu/platform/coldfire/timers.c | |||
| @@ -111,7 +111,13 @@ void hw_timer_init(void) | |||
| 111 | 111 | ||
| 112 | __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); | 112 | __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); |
| 113 | mcftmr_cycles_per_jiffy = FREQ / HZ; | 113 | mcftmr_cycles_per_jiffy = FREQ / HZ; |
| 114 | __raw_writetrr(mcftmr_cycles_per_jiffy, TA(MCFTIMER_TRR)); | 114 | /* |
| 115 | * The coldfire timer runs from 0 to TRR included, then 0 | ||
| 116 | * again and so on. It counts thus actually TRR + 1 steps | ||
| 117 | * for 1 tick, not TRR. So if you want n cycles, | ||
| 118 | * initialize TRR with n - 1. | ||
| 119 | */ | ||
| 120 | __raw_writetrr(mcftmr_cycles_per_jiffy - 1, TA(MCFTIMER_TRR)); | ||
| 115 | __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | | 121 | __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | |
| 116 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); | 122 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); |
| 117 | 123 | ||
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 69648d01acc0..ad36c946ff96 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -538,19 +538,19 @@ cflags-$(CONFIG_SIBYTE_BCM1x80) += -Iinclude/asm-mips/mach-sibyte \ | |||
| 538 | # Sibyte SWARM board | 538 | # Sibyte SWARM board |
| 539 | # Sibyte BCM91x80 (BigSur) board | 539 | # Sibyte BCM91x80 (BigSur) board |
| 540 | # | 540 | # |
| 541 | libs-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/ | 541 | core-$(CONFIG_SIBYTE_CARMEL) += arch/mips/sibyte/swarm/ |
| 542 | load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000 | 542 | load-$(CONFIG_SIBYTE_CARMEL) := 0xffffffff80100000 |
| 543 | libs-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/ | 543 | core-$(CONFIG_SIBYTE_CRHINE) += arch/mips/sibyte/swarm/ |
| 544 | load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000 | 544 | load-$(CONFIG_SIBYTE_CRHINE) := 0xffffffff80100000 |
| 545 | libs-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/ | 545 | core-$(CONFIG_SIBYTE_CRHONE) += arch/mips/sibyte/swarm/ |
| 546 | load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000 | 546 | load-$(CONFIG_SIBYTE_CRHONE) := 0xffffffff80100000 |
| 547 | libs-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/ | 547 | core-$(CONFIG_SIBYTE_RHONE) += arch/mips/sibyte/swarm/ |
| 548 | load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000 | 548 | load-$(CONFIG_SIBYTE_RHONE) := 0xffffffff80100000 |
| 549 | libs-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ | 549 | core-$(CONFIG_SIBYTE_SENTOSA) += arch/mips/sibyte/swarm/ |
| 550 | load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000 | 550 | load-$(CONFIG_SIBYTE_SENTOSA) := 0xffffffff80100000 |
| 551 | libs-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/ | 551 | core-$(CONFIG_SIBYTE_SWARM) += arch/mips/sibyte/swarm/ |
| 552 | load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000 | 552 | load-$(CONFIG_SIBYTE_SWARM) := 0xffffffff80100000 |
| 553 | libs-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ | 553 | core-$(CONFIG_SIBYTE_BIGSUR) += arch/mips/sibyte/swarm/ |
| 554 | load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 | 554 | load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 |
| 555 | 555 | ||
| 556 | # | 556 | # |
| @@ -565,7 +565,11 @@ load-$(CONFIG_BCM47XX) := 0xffffffff80001000 | |||
| 565 | # | 565 | # |
| 566 | core-$(CONFIG_SNI_RM) += arch/mips/sni/ | 566 | core-$(CONFIG_SNI_RM) += arch/mips/sni/ |
| 567 | cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm | 567 | cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm |
| 568 | ifdef CONFIG_CPU_LITTLE_ENDIAN | ||
| 568 | load-$(CONFIG_SNI_RM) += 0xffffffff80600000 | 569 | load-$(CONFIG_SNI_RM) += 0xffffffff80600000 |
| 570 | else | ||
| 571 | load-$(CONFIG_SNI_RM) += 0xffffffff80030000 | ||
| 572 | endif | ||
| 569 | all-$(CONFIG_SNI_RM) := vmlinux.ecoff | 573 | all-$(CONFIG_SNI_RM) := vmlinux.ecoff |
| 570 | 574 | ||
| 571 | # | 575 | # |
diff --git a/arch/mips/au1000/common/clocks.c b/arch/mips/au1000/common/clocks.c index 46f8ee0e2657..043429d17c5f 100644 --- a/arch/mips/au1000/common/clocks.c +++ b/arch/mips/au1000/common/clocks.c | |||
| @@ -45,6 +45,7 @@ unsigned int get_au1x00_speed(void) | |||
| 45 | { | 45 | { |
| 46 | return au1x00_clock; | 46 | return au1x00_clock; |
| 47 | } | 47 | } |
| 48 | EXPORT_SYMBOL(get_au1x00_speed); | ||
| 48 | 49 | ||
| 49 | /* | 50 | /* |
| 50 | * The UART baud base is not known at compile time ... if | 51 | * The UART baud base is not known at compile time ... if |
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index 42d555236de1..601ee9180ee4 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
| @@ -216,6 +216,17 @@ u32 au1xxx_ddma_add_device(dbdev_tab_t *dev) | |||
| 216 | } | 216 | } |
| 217 | EXPORT_SYMBOL(au1xxx_ddma_add_device); | 217 | EXPORT_SYMBOL(au1xxx_ddma_add_device); |
| 218 | 218 | ||
| 219 | void au1xxx_ddma_del_device(u32 devid) | ||
| 220 | { | ||
| 221 | dbdev_tab_t *p = find_dbdev_id(devid); | ||
| 222 | |||
| 223 | if (p != NULL) { | ||
| 224 | memset(p, 0, sizeof(dbdev_tab_t)); | ||
| 225 | p->dev_id = ~0; | ||
| 226 | } | ||
| 227 | } | ||
| 228 | EXPORT_SYMBOL(au1xxx_ddma_del_device); | ||
| 229 | |||
| 219 | /* Allocate a channel and return a non-zero descriptor if successful. */ | 230 | /* Allocate a channel and return a non-zero descriptor if successful. */ |
| 220 | u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, | 231 | u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, |
| 221 | void (*callback)(int, void *), void *callparam) | 232 | void (*callback)(int, void *), void *callparam) |
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 8cae7753ef79..74d6d4a593be 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
| @@ -165,12 +165,12 @@ static struct resource au1xxx_usb_gdt_resources[] = { | |||
| 165 | static struct resource au1xxx_mmc_resources[] = { | 165 | static struct resource au1xxx_mmc_resources[] = { |
| 166 | [0] = { | 166 | [0] = { |
| 167 | .start = SD0_PHYS_ADDR, | 167 | .start = SD0_PHYS_ADDR, |
| 168 | .end = SD0_PHYS_ADDR + 0x40, | 168 | .end = SD0_PHYS_ADDR + 0x7ffff, |
| 169 | .flags = IORESOURCE_MEM, | 169 | .flags = IORESOURCE_MEM, |
| 170 | }, | 170 | }, |
| 171 | [1] = { | 171 | [1] = { |
| 172 | .start = SD1_PHYS_ADDR, | 172 | .start = SD1_PHYS_ADDR, |
| 173 | .end = SD1_PHYS_ADDR + 0x40, | 173 | .end = SD1_PHYS_ADDR + 0x7ffff, |
| 174 | .flags = IORESOURCE_MEM, | 174 | .flags = IORESOURCE_MEM, |
| 175 | }, | 175 | }, |
| 176 | [2] = { | 176 | [2] = { |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 117470b60e34..4b8799802788 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
| @@ -1,67 +1,58 @@ | |||
| 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 |
| 4 | # Tue Feb 20 21:47:40 2007 | 4 | # Sat May 3 00:38:11 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 is not set | ||
| 45 | CONFIG_SIBYTE_SWARM=y | ||
| 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=y | ||
| 38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
| 39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
| 40 | # CONFIG_SIBYTE_BIGSUR is not set | ||
| 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_SB1250=y | 46 | CONFIG_SIBYTE_SB1250=y |
| 57 | CONFIG_SIBYTE_SB1xxx_SOC=y | 47 | CONFIG_SIBYTE_SB1xxx_SOC=y |
| 58 | CONFIG_CPU_SB1_PASS_1=y | 48 | # CONFIG_CPU_SB1_PASS_1 is not set |
| 59 | # CONFIG_CPU_SB1_PASS_2_1250 is not set | 49 | # CONFIG_CPU_SB1_PASS_2_1250 is not set |
| 60 | # CONFIG_CPU_SB1_PASS_2_2 is not set | 50 | CONFIG_CPU_SB1_PASS_2_2=y |
| 61 | # CONFIG_CPU_SB1_PASS_4 is not set | 51 | # CONFIG_CPU_SB1_PASS_4 is not set |
| 62 | # CONFIG_CPU_SB1_PASS_2_112x is not set | 52 | # CONFIG_CPU_SB1_PASS_2_112x is not set |
| 63 | # CONFIG_CPU_SB1_PASS_3 is not set | 53 | # CONFIG_CPU_SB1_PASS_3 is not set |
| 64 | CONFIG_SIBYTE_HAS_LDT=y | 54 | CONFIG_SIBYTE_HAS_LDT=y |
| 55 | CONFIG_SIBYTE_ENABLE_LDT_IF_PCI=y | ||
| 65 | # CONFIG_SIMULATION is not set | 56 | # CONFIG_SIMULATION is not set |
| 66 | # CONFIG_SB1_CEX_ALWAYS_FATAL is not set | 57 | # CONFIG_SB1_CEX_ALWAYS_FATAL is not set |
| 67 | # CONFIG_SB1_CERR_STALL is not set | 58 | # CONFIG_SB1_CERR_STALL is not set |
| @@ -69,20 +60,32 @@ CONFIG_SIBYTE_CFE=y | |||
| 69 | # CONFIG_SIBYTE_CFE_CONSOLE is not set | 60 | # CONFIG_SIBYTE_CFE_CONSOLE is not set |
| 70 | # CONFIG_SIBYTE_BUS_WATCHER is not set | 61 | # CONFIG_SIBYTE_BUS_WATCHER is not set |
| 71 | # CONFIG_SIBYTE_TBPROF is not set | 62 | # CONFIG_SIBYTE_TBPROF is not set |
| 63 | CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y | ||
| 72 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 64 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 73 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 65 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 74 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 66 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 67 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 75 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 68 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 76 | CONFIG_GENERIC_HWEIGHT=y | 69 | CONFIG_GENERIC_HWEIGHT=y |
| 77 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 70 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 71 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 78 | CONFIG_GENERIC_TIME=y | 72 | CONFIG_GENERIC_TIME=y |
| 73 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 79 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 74 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 80 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 75 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
| 76 | CONFIG_CEVT_SB1250=y | ||
| 77 | CONFIG_CSRC_SB1250=y | ||
| 78 | CONFIG_CFE=y | ||
| 81 | CONFIG_DMA_COHERENT=y | 79 | CONFIG_DMA_COHERENT=y |
| 80 | CONFIG_EARLY_PRINTK=y | ||
| 81 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
| 82 | # CONFIG_HOTPLUG_CPU is not set | ||
| 83 | # CONFIG_NO_IOPORT is not set | ||
| 82 | CONFIG_CPU_BIG_ENDIAN=y | 84 | CONFIG_CPU_BIG_ENDIAN=y |
| 83 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 85 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
| 84 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 86 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
| 85 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 87 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
| 88 | CONFIG_IRQ_CPU=y | ||
| 86 | CONFIG_SWAP_IO_SPACE=y | 89 | CONFIG_SWAP_IO_SPACE=y |
| 87 | CONFIG_BOOT_ELF32=y | 90 | CONFIG_BOOT_ELF32=y |
| 88 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 91 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
| @@ -90,6 +93,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
| 90 | # | 93 | # |
| 91 | # CPU selection | 94 | # CPU selection |
| 92 | # | 95 | # |
| 96 | # CONFIG_CPU_LOONGSON2 is not set | ||
| 93 | # CONFIG_CPU_MIPS32_R1 is not set | 97 | # CONFIG_CPU_MIPS32_R1 is not set |
| 94 | # CONFIG_CPU_MIPS32_R2 is not set | 98 | # CONFIG_CPU_MIPS32_R2 is not set |
| 95 | # CONFIG_CPU_MIPS64_R1 is not set | 99 | # CONFIG_CPU_MIPS64_R1 is not set |
| @@ -130,8 +134,7 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
| 130 | CONFIG_MIPS_MT_DISABLED=y | 134 | CONFIG_MIPS_MT_DISABLED=y |
| 131 | # CONFIG_MIPS_MT_SMP is not set | 135 | # CONFIG_MIPS_MT_SMP is not set |
| 132 | # CONFIG_MIPS_MT_SMTC is not set | 136 | # CONFIG_MIPS_MT_SMTC is not set |
| 133 | # CONFIG_MIPS_VPE_LOADER is not set | 137 | CONFIG_SB1_PASS_2_WORKAROUNDS=y |
| 134 | CONFIG_SB1_PASS_1_WORKAROUNDS=y | ||
| 135 | CONFIG_CPU_HAS_LLSC=y | 138 | CONFIG_CPU_HAS_LLSC=y |
| 136 | CONFIG_CPU_HAS_SYNC=y | 139 | CONFIG_CPU_HAS_SYNC=y |
| 137 | CONFIG_GENERIC_HARDIRQS=y | 140 | CONFIG_GENERIC_HARDIRQS=y |
| @@ -140,6 +143,7 @@ CONFIG_IRQ_PER_CPU=y | |||
| 140 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 143 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
| 141 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | 144 | CONFIG_SYS_SUPPORTS_HIGHMEM=y |
| 142 | CONFIG_ARCH_FLATMEM_ENABLE=y | 145 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 146 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 143 | CONFIG_SELECT_MEMORY_MODEL=y | 147 | CONFIG_SELECT_MEMORY_MODEL=y |
| 144 | CONFIG_FLATMEM_MANUAL=y | 148 | CONFIG_FLATMEM_MANUAL=y |
| 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 149 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -147,13 +151,19 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 147 | CONFIG_FLATMEM=y | 151 | CONFIG_FLATMEM=y |
| 148 | CONFIG_FLAT_NODE_MEM_MAP=y | 152 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 149 | # CONFIG_SPARSEMEM_STATIC is not set | 153 | # CONFIG_SPARSEMEM_STATIC is not set |
| 154 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 151 | CONFIG_RESOURCES_64BIT=y | 156 | CONFIG_RESOURCES_64BIT=y |
| 152 | CONFIG_ZONE_DMA_FLAG=1 | 157 | CONFIG_ZONE_DMA_FLAG=0 |
| 158 | CONFIG_VIRT_TO_BUS=y | ||
| 153 | CONFIG_SMP=y | 159 | CONFIG_SMP=y |
| 154 | CONFIG_SYS_SUPPORTS_SMP=y | 160 | CONFIG_SYS_SUPPORTS_SMP=y |
| 155 | CONFIG_NR_CPUS_DEFAULT_2=y | 161 | CONFIG_NR_CPUS_DEFAULT_2=y |
| 156 | CONFIG_NR_CPUS=2 | 162 | CONFIG_NR_CPUS=2 |
| 163 | CONFIG_TICK_ONESHOT=y | ||
| 164 | # CONFIG_NO_HZ is not set | ||
| 165 | CONFIG_HIGH_RES_TIMERS=y | ||
| 166 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 157 | # CONFIG_HZ_48 is not set | 167 | # CONFIG_HZ_48 is not set |
| 158 | # CONFIG_HZ_100 is not set | 168 | # CONFIG_HZ_100 is not set |
| 159 | # CONFIG_HZ_128 is not set | 169 | # CONFIG_HZ_128 is not set |
| @@ -166,38 +176,49 @@ CONFIG_HZ=1000 | |||
| 166 | CONFIG_PREEMPT_NONE=y | 176 | CONFIG_PREEMPT_NONE=y |
| 167 | # CONFIG_PREEMPT_VOLUNTARY is not set | 177 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 168 | # CONFIG_PREEMPT is not set | 178 | # CONFIG_PREEMPT is not set |
| 169 | CONFIG_PREEMPT_BKL=y | ||
| 170 | # CONFIG_KEXEC is not set | 179 | # CONFIG_KEXEC is not set |
| 180 | CONFIG_SECCOMP=y | ||
| 171 | CONFIG_LOCKDEP_SUPPORT=y | 181 | CONFIG_LOCKDEP_SUPPORT=y |
| 172 | CONFIG_STACKTRACE_SUPPORT=y | 182 | CONFIG_STACKTRACE_SUPPORT=y |
| 173 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 183 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 174 | 184 | ||
| 175 | # | 185 | # |
| 176 | # Code maturity level options | 186 | # General setup |
| 177 | # | 187 | # |
| 178 | CONFIG_EXPERIMENTAL=y | 188 | CONFIG_EXPERIMENTAL=y |
| 179 | CONFIG_LOCK_KERNEL=y | 189 | CONFIG_LOCK_KERNEL=y |
| 180 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 190 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 181 | |||
| 182 | # | ||
| 183 | # General setup | ||
| 184 | # | ||
| 185 | CONFIG_LOCALVERSION="" | 191 | CONFIG_LOCALVERSION="" |
| 186 | CONFIG_LOCALVERSION_AUTO=y | 192 | CONFIG_LOCALVERSION_AUTO=y |
| 187 | CONFIG_SWAP=y | 193 | CONFIG_SWAP=y |
| 188 | CONFIG_SYSVIPC=y | 194 | CONFIG_SYSVIPC=y |
| 189 | # CONFIG_IPC_NS is not set | ||
| 190 | CONFIG_SYSVIPC_SYSCTL=y | 195 | CONFIG_SYSVIPC_SYSCTL=y |
| 191 | # CONFIG_POSIX_MQUEUE is not set | 196 | # CONFIG_POSIX_MQUEUE is not set |
| 192 | # CONFIG_BSD_PROCESS_ACCT is not set | 197 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 193 | # CONFIG_TASKSTATS is not set | 198 | # CONFIG_TASKSTATS is not set |
| 194 | # CONFIG_UTS_NS is not set | ||
| 195 | # CONFIG_AUDIT is not set | 199 | # CONFIG_AUDIT is not set |
| 196 | # CONFIG_IKCONFIG is not set | 200 | # CONFIG_IKCONFIG is not set |
| 201 | CONFIG_LOG_BUF_SHIFT=15 | ||
| 197 | CONFIG_CGROUPS=y | 202 | CONFIG_CGROUPS=y |
| 203 | # CONFIG_CGROUP_DEBUG is not set | ||
| 204 | # CONFIG_CGROUP_NS is not set | ||
| 198 | CONFIG_CPUSETS=y | 205 | CONFIG_CPUSETS=y |
| 199 | CONFIG_SYSFS_DEPRECATED=y | 206 | CONFIG_GROUP_SCHED=y |
| 207 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 208 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 209 | CONFIG_USER_SCHED=y | ||
| 210 | # CONFIG_CGROUP_SCHED is not set | ||
| 211 | CONFIG_CGROUP_CPUACCT=y | ||
| 212 | # CONFIG_RESOURCE_COUNTERS is not set | ||
| 213 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 214 | # CONFIG_PROC_PID_CPUSET is not set | ||
| 200 | CONFIG_RELAY=y | 215 | CONFIG_RELAY=y |
| 216 | CONFIG_NAMESPACES=y | ||
| 217 | # CONFIG_UTS_NS is not set | ||
| 218 | # CONFIG_IPC_NS is not set | ||
| 219 | # CONFIG_USER_NS is not set | ||
| 220 | # CONFIG_PID_NS is not set | ||
| 221 | CONFIG_BLK_DEV_INITRD=y | ||
| 201 | CONFIG_INITRAMFS_SOURCE="" | 222 | CONFIG_INITRAMFS_SOURCE="" |
| 202 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 223 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 203 | CONFIG_SYSCTL=y | 224 | CONFIG_SYSCTL=y |
| @@ -209,20 +230,29 @@ CONFIG_HOTPLUG=y | |||
| 209 | CONFIG_PRINTK=y | 230 | CONFIG_PRINTK=y |
| 210 | CONFIG_BUG=y | 231 | CONFIG_BUG=y |
| 211 | CONFIG_ELF_CORE=y | 232 | CONFIG_ELF_CORE=y |
| 233 | # CONFIG_COMPAT_BRK is not set | ||
| 212 | CONFIG_BASE_FULL=y | 234 | CONFIG_BASE_FULL=y |
| 213 | CONFIG_FUTEX=y | 235 | CONFIG_FUTEX=y |
| 236 | CONFIG_ANON_INODES=y | ||
| 214 | CONFIG_EPOLL=y | 237 | CONFIG_EPOLL=y |
| 238 | CONFIG_SIGNALFD=y | ||
| 239 | CONFIG_TIMERFD=y | ||
| 240 | CONFIG_EVENTFD=y | ||
| 215 | CONFIG_SHMEM=y | 241 | CONFIG_SHMEM=y |
| 216 | CONFIG_SLAB=y | ||
| 217 | CONFIG_VM_EVENT_COUNTERS=y | 242 | CONFIG_VM_EVENT_COUNTERS=y |
| 243 | CONFIG_SLAB=y | ||
| 244 | # CONFIG_SLUB is not set | ||
| 245 | # CONFIG_SLOB is not set | ||
| 246 | # CONFIG_PROFILING is not set | ||
| 247 | # CONFIG_MARKERS is not set | ||
| 248 | CONFIG_HAVE_OPROFILE=y | ||
| 249 | # CONFIG_HAVE_KPROBES is not set | ||
| 250 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 251 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 252 | CONFIG_SLABINFO=y | ||
| 218 | CONFIG_RT_MUTEXES=y | 253 | CONFIG_RT_MUTEXES=y |
| 219 | # CONFIG_TINY_SHMEM is not set | 254 | # CONFIG_TINY_SHMEM is not set |
| 220 | CONFIG_BASE_SMALL=0 | 255 | CONFIG_BASE_SMALL=0 |
| 221 | # CONFIG_SLOB is not set | ||
| 222 | |||
| 223 | # | ||
| 224 | # Loadable module support | ||
| 225 | # | ||
| 226 | CONFIG_MODULES=y | 256 | CONFIG_MODULES=y |
| 227 | CONFIG_MODULE_UNLOAD=y | 257 | CONFIG_MODULE_UNLOAD=y |
| 228 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 258 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| @@ -230,12 +260,10 @@ CONFIG_MODVERSIONS=y | |||
| 230 | CONFIG_MODULE_SRCVERSION_ALL=y | 260 | CONFIG_MODULE_SRCVERSION_ALL=y |
| 231 | CONFIG_KMOD=y | 261 | CONFIG_KMOD=y |
| 232 | CONFIG_STOP_MACHINE=y | 262 | CONFIG_STOP_MACHINE=y |
| 233 | |||
| 234 | # | ||
| 235 | # Block layer | ||
| 236 | # | ||
| 237 | CONFIG_BLOCK=y | 263 | CONFIG_BLOCK=y |
| 238 | # CONFIG_BLK_DEV_IO_TRACE is not set | 264 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 265 | CONFIG_BLK_DEV_BSG=y | ||
| 266 | CONFIG_BLOCK_COMPAT=y | ||
| 239 | 267 | ||
| 240 | # | 268 | # |
| 241 | # IO Schedulers | 269 | # IO Schedulers |
| @@ -249,22 +277,19 @@ CONFIG_DEFAULT_AS=y | |||
| 249 | # CONFIG_DEFAULT_CFQ is not set | 277 | # CONFIG_DEFAULT_CFQ is not set |
| 250 | # CONFIG_DEFAULT_NOOP is not set | 278 | # CONFIG_DEFAULT_NOOP is not set |
| 251 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 279 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 280 | CONFIG_CLASSIC_RCU=y | ||
| 252 | 281 | ||
| 253 | # | 282 | # |
| 254 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 283 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 255 | # | 284 | # |
| 256 | CONFIG_HW_HAS_PCI=y | 285 | CONFIG_HW_HAS_PCI=y |
| 257 | CONFIG_PCI=y | 286 | CONFIG_PCI=y |
| 287 | CONFIG_PCI_DOMAINS=y | ||
| 288 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 289 | # CONFIG_PCI_LEGACY is not set | ||
| 258 | CONFIG_MMU=y | 290 | CONFIG_MMU=y |
| 259 | 291 | CONFIG_ZONE_DMA32=y | |
| 260 | # | ||
| 261 | # PCCARD (PCMCIA/CardBus) support | ||
| 262 | # | ||
| 263 | # CONFIG_PCCARD is not set | 292 | # CONFIG_PCCARD is not set |
| 264 | |||
| 265 | # | ||
| 266 | # PCI Hotplug Support | ||
| 267 | # | ||
| 268 | # CONFIG_HOTPLUG_PCI is not set | 293 | # CONFIG_HOTPLUG_PCI is not set |
| 269 | 294 | ||
| 270 | # | 295 | # |
| @@ -272,7 +297,6 @@ CONFIG_MMU=y | |||
| 272 | # | 297 | # |
| 273 | CONFIG_BINFMT_ELF=y | 298 | CONFIG_BINFMT_ELF=y |
| 274 | # CONFIG_BINFMT_MISC is not set | 299 | # CONFIG_BINFMT_MISC is not set |
| 275 | # CONFIG_BUILD_ELF64 is not set | ||
| 276 | CONFIG_MIPS32_COMPAT=y | 300 | CONFIG_MIPS32_COMPAT=y |
| 277 | CONFIG_COMPAT=y | 301 | CONFIG_COMPAT=y |
| 278 | CONFIG_SYSVIPC_COMPAT=y | 302 | CONFIG_SYSVIPC_COMPAT=y |
| @@ -286,7 +310,6 @@ CONFIG_BINFMT_ELF32=y | |||
| 286 | CONFIG_PM=y | 310 | CONFIG_PM=y |
| 287 | # CONFIG_PM_LEGACY is not set | 311 | # CONFIG_PM_LEGACY is not set |
| 288 | # CONFIG_PM_DEBUG is not set | 312 | # CONFIG_PM_DEBUG is not set |
| 289 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
| 290 | 313 | ||
| 291 | # | 314 | # |
| 292 | # Networking | 315 | # Networking |
| @@ -296,7 +319,6 @@ CONFIG_NET=y | |||
| 296 | # | 319 | # |
| 297 | # Networking options | 320 | # Networking options |
| 298 | # | 321 | # |
| 299 | # CONFIG_NETDEBUG is not set | ||
| 300 | CONFIG_PACKET=y | 322 | CONFIG_PACKET=y |
| 301 | CONFIG_PACKET_MMAP=y | 323 | CONFIG_PACKET_MMAP=y |
| 302 | CONFIG_UNIX=y | 324 | CONFIG_UNIX=y |
| @@ -304,6 +326,7 @@ CONFIG_XFRM=y | |||
| 304 | CONFIG_XFRM_USER=m | 326 | CONFIG_XFRM_USER=m |
| 305 | # CONFIG_XFRM_SUB_POLICY is not set | 327 | # CONFIG_XFRM_SUB_POLICY is not set |
| 306 | CONFIG_XFRM_MIGRATE=y | 328 | CONFIG_XFRM_MIGRATE=y |
| 329 | # CONFIG_XFRM_STATISTICS is not set | ||
| 307 | CONFIG_NET_KEY=y | 330 | CONFIG_NET_KEY=y |
| 308 | CONFIG_NET_KEY_MIGRATE=y | 331 | CONFIG_NET_KEY_MIGRATE=y |
| 309 | CONFIG_INET=y | 332 | CONFIG_INET=y |
| @@ -326,6 +349,7 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 326 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 349 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
| 327 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 350 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
| 328 | CONFIG_INET_XFRM_MODE_BEET=m | 351 | CONFIG_INET_XFRM_MODE_BEET=m |
| 352 | CONFIG_INET_LRO=m | ||
| 329 | CONFIG_INET_DIAG=y | 353 | CONFIG_INET_DIAG=y |
| 330 | CONFIG_INET_TCP_DIAG=y | 354 | CONFIG_INET_TCP_DIAG=y |
| 331 | # CONFIG_TCP_CONG_ADVANCED is not set | 355 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -333,24 +357,15 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 333 | CONFIG_DEFAULT_TCP_CONG="cubic" | 357 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 334 | CONFIG_TCP_MD5SIG=y | 358 | CONFIG_TCP_MD5SIG=y |
| 335 | # CONFIG_IPV6 is not set | 359 | # CONFIG_IPV6 is not set |
| 336 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 337 | # CONFIG_INET6_TUNNEL is not set | ||
| 338 | CONFIG_NETWORK_SECMARK=y | 360 | CONFIG_NETWORK_SECMARK=y |
| 339 | # CONFIG_NETFILTER is not set | 361 | # CONFIG_NETFILTER is not set |
| 340 | |||
| 341 | # | ||
| 342 | # DCCP Configuration (EXPERIMENTAL) | ||
| 343 | # | ||
| 344 | # CONFIG_IP_DCCP is not set | 362 | # CONFIG_IP_DCCP is not set |
| 345 | 363 | CONFIG_IP_SCTP=m | |
| 346 | # | 364 | # CONFIG_SCTP_DBG_MSG is not set |
| 347 | # SCTP Configuration (EXPERIMENTAL) | 365 | # CONFIG_SCTP_DBG_OBJCNT is not set |
| 348 | # | 366 | # CONFIG_SCTP_HMAC_NONE is not set |
| 349 | # CONFIG_IP_SCTP is not set | 367 | # CONFIG_SCTP_HMAC_SHA1 is not set |
| 350 | 368 | CONFIG_SCTP_HMAC_MD5=y | |
| 351 | # | ||
| 352 | # TIPC Configuration (EXPERIMENTAL) | ||
| 353 | # | ||
| 354 | # CONFIG_TIPC is not set | 369 | # CONFIG_TIPC is not set |
| 355 | # CONFIG_ATM is not set | 370 | # CONFIG_ATM is not set |
| 356 | # CONFIG_BRIDGE is not set | 371 | # CONFIG_BRIDGE is not set |
| @@ -363,26 +378,52 @@ CONFIG_NETWORK_SECMARK=y | |||
| 363 | # CONFIG_LAPB is not set | 378 | # CONFIG_LAPB is not set |
| 364 | # CONFIG_ECONET is not set | 379 | # CONFIG_ECONET is not set |
| 365 | # CONFIG_WAN_ROUTER is not set | 380 | # CONFIG_WAN_ROUTER is not set |
| 366 | |||
| 367 | # | ||
| 368 | # QoS and/or fair queueing | ||
| 369 | # | ||
| 370 | # CONFIG_NET_SCHED is not set | 381 | # CONFIG_NET_SCHED is not set |
| 382 | CONFIG_NET_SCH_FIFO=y | ||
| 371 | 383 | ||
| 372 | # | 384 | # |
| 373 | # Network testing | 385 | # Network testing |
| 374 | # | 386 | # |
| 375 | # CONFIG_NET_PKTGEN is not set | 387 | # CONFIG_NET_PKTGEN is not set |
| 376 | # CONFIG_HAMRADIO is not set | 388 | # CONFIG_HAMRADIO is not set |
| 389 | # CONFIG_CAN is not set | ||
| 377 | # CONFIG_IRDA is not set | 390 | # CONFIG_IRDA is not set |
| 378 | # CONFIG_BT is not set | 391 | # CONFIG_BT is not set |
| 392 | # CONFIG_AF_RXRPC is not set | ||
| 393 | |||
| 394 | # | ||
| 395 | # Wireless | ||
| 396 | # | ||
| 397 | CONFIG_CFG80211=m | ||
| 398 | CONFIG_NL80211=y | ||
| 399 | CONFIG_WIRELESS_EXT=y | ||
| 400 | CONFIG_MAC80211=m | ||
| 401 | |||
| 402 | # | ||
| 403 | # Rate control algorithm selection | ||
| 404 | # | ||
| 405 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 406 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 407 | |||
| 408 | # | ||
| 409 | # Selecting 'y' for an algorithm will | ||
| 410 | # | ||
| 411 | |||
| 412 | # | ||
| 413 | # build the algorithm into mac80211. | ||
| 414 | # | ||
| 415 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 416 | CONFIG_MAC80211_RC_PID=y | ||
| 417 | # CONFIG_MAC80211_MESH is not set | ||
| 418 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
| 419 | # CONFIG_MAC80211_DEBUG is not set | ||
| 379 | CONFIG_IEEE80211=m | 420 | CONFIG_IEEE80211=m |
| 380 | # CONFIG_IEEE80211_DEBUG is not set | 421 | # CONFIG_IEEE80211_DEBUG is not set |
| 381 | CONFIG_IEEE80211_CRYPT_WEP=m | 422 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 382 | CONFIG_IEEE80211_CRYPT_CCMP=m | 423 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 383 | CONFIG_IEEE80211_SOFTMAC=m | 424 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 384 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 425 | CONFIG_RFKILL=m |
| 385 | CONFIG_WIRELESS_EXT=y | 426 | # CONFIG_NET_9P is not set |
| 386 | 427 | ||
| 387 | # | 428 | # |
| 388 | # Device Drivers | 429 | # Device Drivers |
| @@ -391,34 +432,15 @@ CONFIG_WIRELESS_EXT=y | |||
| 391 | # | 432 | # |
| 392 | # Generic Driver Options | 433 | # Generic Driver Options |
| 393 | # | 434 | # |
| 435 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 394 | CONFIG_STANDALONE=y | 436 | CONFIG_STANDALONE=y |
| 395 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 437 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 396 | CONFIG_FW_LOADER=m | 438 | CONFIG_FW_LOADER=m |
| 397 | # CONFIG_SYS_HYPERVISOR is not set | 439 | # CONFIG_SYS_HYPERVISOR is not set |
| 398 | |||
| 399 | # | ||
| 400 | # Connector - unified userspace <-> kernelspace linker | ||
| 401 | # | ||
| 402 | CONFIG_CONNECTOR=m | 440 | CONFIG_CONNECTOR=m |
| 403 | |||
| 404 | # | ||
| 405 | # Memory Technology Devices (MTD) | ||
| 406 | # | ||
| 407 | # CONFIG_MTD is not set | 441 | # CONFIG_MTD is not set |
| 408 | |||
| 409 | # | ||
| 410 | # Parallel port support | ||
| 411 | # | ||
| 412 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 413 | 443 | CONFIG_BLK_DEV=y | |
| 414 | # | ||
| 415 | # Plug and Play support | ||
| 416 | # | ||
| 417 | # CONFIG_PNPACPI is not set | ||
| 418 | |||
| 419 | # | ||
| 420 | # Block devices | ||
| 421 | # | ||
| 422 | # CONFIG_BLK_CPQ_DA is not set | 444 | # CONFIG_BLK_CPQ_DA is not set |
| 423 | # CONFIG_BLK_CPQ_CISS_DA is not set | 445 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 424 | # CONFIG_BLK_DEV_DAC960 is not set | 446 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -427,49 +449,77 @@ CONFIG_CONNECTOR=m | |||
| 427 | # CONFIG_BLK_DEV_LOOP is not set | 449 | # CONFIG_BLK_DEV_LOOP is not set |
| 428 | # CONFIG_BLK_DEV_NBD is not set | 450 | # CONFIG_BLK_DEV_NBD is not set |
| 429 | # CONFIG_BLK_DEV_SX8 is not set | 451 | # CONFIG_BLK_DEV_SX8 is not set |
| 452 | # CONFIG_BLK_DEV_UB is not set | ||
| 430 | CONFIG_BLK_DEV_RAM=y | 453 | CONFIG_BLK_DEV_RAM=y |
| 431 | CONFIG_BLK_DEV_RAM_COUNT=16 | 454 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 432 | CONFIG_BLK_DEV_RAM_SIZE=9220 | 455 | CONFIG_BLK_DEV_RAM_SIZE=9220 |
| 433 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 456 | # CONFIG_BLK_DEV_XIP is not set |
| 434 | CONFIG_BLK_DEV_INITRD=y | ||
| 435 | CONFIG_CDROM_PKTCDVD=m | 457 | CONFIG_CDROM_PKTCDVD=m |
| 436 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 458 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
| 437 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 459 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
| 438 | CONFIG_ATA_OVER_ETH=m | 460 | CONFIG_ATA_OVER_ETH=m |
| 439 | 461 | CONFIG_MISC_DEVICES=y | |
| 440 | # | 462 | # CONFIG_PHANTOM is not set |
| 441 | # Misc devices | 463 | # CONFIG_EEPROM_93CX6 is not set |
| 442 | # | ||
| 443 | CONFIG_SGI_IOC4=m | 464 | CONFIG_SGI_IOC4=m |
| 444 | # CONFIG_TIFM_CORE is not set | 465 | # CONFIG_TIFM_CORE is not set |
| 445 | 466 | # CONFIG_ENCLOSURE_SERVICES is not set | |
| 446 | # | 467 | CONFIG_HAVE_IDE=y |
| 447 | # ATA/ATAPI/MFM/RLL support | ||
| 448 | # | ||
| 449 | CONFIG_IDE=y | 468 | CONFIG_IDE=y |
| 450 | CONFIG_IDE_MAX_HWIFS=4 | 469 | CONFIG_IDE_MAX_HWIFS=4 |
| 451 | CONFIG_BLK_DEV_IDE=y | 470 | CONFIG_BLK_DEV_IDE=y |
| 452 | 471 | ||
| 453 | # | 472 | # |
| 454 | # Please see Documentation/ide.txt for help/info on IDE drives | 473 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 455 | # | 474 | # |
| 456 | # CONFIG_BLK_DEV_IDE_SATA is not set | 475 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 457 | CONFIG_BLK_DEV_IDEDISK=y | 476 | CONFIG_BLK_DEV_IDEDISK=y |
| 458 | # CONFIG_IDEDISK_MULTI_MODE is not set | 477 | # CONFIG_IDEDISK_MULTI_MODE is not set |
| 459 | CONFIG_BLK_DEV_IDECD=y | 478 | CONFIG_BLK_DEV_IDECD=y |
| 479 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
| 460 | CONFIG_BLK_DEV_IDETAPE=y | 480 | CONFIG_BLK_DEV_IDETAPE=y |
| 461 | CONFIG_BLK_DEV_IDEFLOPPY=y | 481 | CONFIG_BLK_DEV_IDEFLOPPY=y |
| 462 | # CONFIG_IDE_TASK_IOCTL is not set | 482 | # CONFIG_IDE_TASK_IOCTL is not set |
| 483 | CONFIG_IDE_PROC_FS=y | ||
| 463 | 484 | ||
| 464 | # | 485 | # |
| 465 | # IDE chipset support/bugfixes | 486 | # IDE chipset support/bugfixes |
| 466 | # | 487 | # |
| 467 | CONFIG_IDE_GENERIC=y | 488 | # CONFIG_IDE_GENERIC is not set |
| 468 | # CONFIG_BLK_DEV_IDEPCI is not set | 489 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 490 | |||
| 491 | # | ||
| 492 | # PCI IDE chipsets support | ||
| 493 | # | ||
| 494 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 495 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 496 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 497 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 498 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
| 499 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 500 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 501 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 502 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 503 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 504 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 505 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 506 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 507 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 508 | # CONFIG_BLK_DEV_PIIX is not set | ||
| 509 | # CONFIG_BLK_DEV_IT8213 is not set | ||
| 510 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 511 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 512 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 513 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 514 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 515 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 516 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 517 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 518 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 519 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
| 469 | CONFIG_BLK_DEV_IDE_SWARM=y | 520 | CONFIG_BLK_DEV_IDE_SWARM=y |
| 470 | # CONFIG_IDE_ARM is not set | ||
| 471 | # CONFIG_BLK_DEV_IDEDMA is not set | 521 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 472 | # CONFIG_IDEDMA_AUTO is not set | 522 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 473 | # CONFIG_BLK_DEV_HD is not set | 523 | # CONFIG_BLK_DEV_HD is not set |
| 474 | 524 | ||
| 475 | # | 525 | # |
| @@ -477,89 +527,68 @@ CONFIG_BLK_DEV_IDE_SWARM=y | |||
| 477 | # | 527 | # |
| 478 | CONFIG_RAID_ATTRS=m | 528 | CONFIG_RAID_ATTRS=m |
| 479 | # CONFIG_SCSI is not set | 529 | # CONFIG_SCSI is not set |
| 530 | # CONFIG_SCSI_DMA is not set | ||
| 480 | # CONFIG_SCSI_NETLINK is not set | 531 | # CONFIG_SCSI_NETLINK is not set |
| 481 | |||
| 482 | # | ||
| 483 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
| 484 | # | ||
| 485 | # CONFIG_ATA is not set | 532 | # CONFIG_ATA is not set |
| 486 | |||
| 487 | # | ||
| 488 | # Multi-device support (RAID and LVM) | ||
| 489 | # | ||
| 490 | # CONFIG_MD is not set | 533 | # CONFIG_MD is not set |
| 491 | |||
| 492 | # | ||
| 493 | # Fusion MPT device support | ||
| 494 | # | ||
| 495 | # CONFIG_FUSION is not set | 534 | # CONFIG_FUSION is not set |
| 496 | 535 | ||
| 497 | # | 536 | # |
| 498 | # IEEE 1394 (FireWire) support | 537 | # IEEE 1394 (FireWire) support |
| 499 | # | 538 | # |
| 539 | # CONFIG_FIREWIRE is not set | ||
| 500 | # CONFIG_IEEE1394 is not set | 540 | # CONFIG_IEEE1394 is not set |
| 501 | |||
| 502 | # | ||
| 503 | # I2O device support | ||
| 504 | # | ||
| 505 | # CONFIG_I2O is not set | 541 | # CONFIG_I2O is not set |
| 506 | |||
| 507 | # | ||
| 508 | # Network device support | ||
| 509 | # | ||
| 510 | CONFIG_NETDEVICES=y | 542 | CONFIG_NETDEVICES=y |
| 543 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
| 511 | # CONFIG_DUMMY is not set | 544 | # CONFIG_DUMMY is not set |
| 512 | # CONFIG_BONDING is not set | 545 | # CONFIG_BONDING is not set |
| 546 | CONFIG_MACVLAN=m | ||
| 513 | # CONFIG_EQUALIZER is not set | 547 | # CONFIG_EQUALIZER is not set |
| 514 | # CONFIG_TUN is not set | 548 | # CONFIG_TUN is not set |
| 515 | 549 | # CONFIG_VETH is not set | |
| 516 | # | ||
| 517 | # ARCnet devices | ||
| 518 | # | ||
| 519 | # CONFIG_ARCNET is not set | 550 | # CONFIG_ARCNET is not set |
| 520 | 551 | CONFIG_PHYLIB=y | |
| 521 | # | ||
| 522 | # PHY device support | ||
| 523 | # | ||
| 524 | CONFIG_PHYLIB=m | ||
| 525 | 552 | ||
| 526 | # | 553 | # |
| 527 | # MII PHY device drivers | 554 | # MII PHY device drivers |
| 528 | # | 555 | # |
| 529 | CONFIG_MARVELL_PHY=m | 556 | # CONFIG_MARVELL_PHY is not set |
| 530 | CONFIG_DAVICOM_PHY=m | 557 | # CONFIG_DAVICOM_PHY is not set |
| 531 | CONFIG_QSEMI_PHY=m | 558 | # CONFIG_QSEMI_PHY is not set |
| 532 | CONFIG_LXT_PHY=m | 559 | # CONFIG_LXT_PHY is not set |
| 533 | CONFIG_CICADA_PHY=m | 560 | # CONFIG_CICADA_PHY is not set |
| 534 | CONFIG_VITESSE_PHY=m | 561 | # CONFIG_VITESSE_PHY is not set |
| 535 | CONFIG_SMSC_PHY=m | 562 | # CONFIG_SMSC_PHY is not set |
| 536 | # CONFIG_BROADCOM_PHY is not set | 563 | CONFIG_BROADCOM_PHY=y |
| 564 | # CONFIG_ICPLUS_PHY is not set | ||
| 565 | # CONFIG_REALTEK_PHY is not set | ||
| 537 | # CONFIG_FIXED_PHY is not set | 566 | # CONFIG_FIXED_PHY is not set |
| 538 | 567 | # CONFIG_MDIO_BITBANG is not set | |
| 539 | # | ||
| 540 | # Ethernet (10 or 100Mbit) | ||
| 541 | # | ||
| 542 | CONFIG_NET_ETHERNET=y | 568 | CONFIG_NET_ETHERNET=y |
| 543 | CONFIG_MII=y | 569 | CONFIG_MII=y |
| 570 | # CONFIG_AX88796 is not set | ||
| 544 | # CONFIG_HAPPYMEAL is not set | 571 | # CONFIG_HAPPYMEAL is not set |
| 545 | # CONFIG_SUNGEM is not set | 572 | # CONFIG_SUNGEM is not set |
| 546 | # CONFIG_CASSINI is not set | 573 | # CONFIG_CASSINI is not set |
| 547 | # CONFIG_NET_VENDOR_3COM is not set | 574 | # CONFIG_NET_VENDOR_3COM is not set |
| 548 | # CONFIG_DM9000 is not set | 575 | # CONFIG_DM9000 is not set |
| 549 | |||
| 550 | # | ||
| 551 | # Tulip family network device support | ||
| 552 | # | ||
| 553 | # CONFIG_NET_TULIP is not set | 576 | # CONFIG_NET_TULIP is not set |
| 554 | # CONFIG_HP100 is not set | 577 | # CONFIG_HP100 is not set |
| 578 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 579 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 580 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 581 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 555 | # CONFIG_NET_PCI is not set | 582 | # CONFIG_NET_PCI is not set |
| 556 | 583 | # CONFIG_B44 is not set | |
| 557 | # | 584 | CONFIG_NETDEV_1000=y |
| 558 | # Ethernet (1000 Mbit) | ||
| 559 | # | ||
| 560 | # CONFIG_ACENIC is not set | 585 | # CONFIG_ACENIC is not set |
| 561 | # CONFIG_DL2K is not set | 586 | # CONFIG_DL2K is not set |
| 562 | # CONFIG_E1000 is not set | 587 | # CONFIG_E1000 is not set |
| 588 | # CONFIG_E1000E is not set | ||
| 589 | # CONFIG_E1000E_ENABLED is not set | ||
| 590 | # CONFIG_IP1000 is not set | ||
| 591 | # CONFIG_IGB is not set | ||
| 563 | # CONFIG_NS83820 is not set | 592 | # CONFIG_NS83820 is not set |
| 564 | # CONFIG_HAMACHI is not set | 593 | # CONFIG_HAMACHI is not set |
| 565 | # CONFIG_YELLOWFIN is not set | 594 | # CONFIG_YELLOWFIN is not set |
| @@ -568,53 +597,70 @@ CONFIG_SB1250_MAC=y | |||
| 568 | # CONFIG_SIS190 is not set | 597 | # CONFIG_SIS190 is not set |
| 569 | # CONFIG_SKGE is not set | 598 | # CONFIG_SKGE is not set |
| 570 | # CONFIG_SKY2 is not set | 599 | # CONFIG_SKY2 is not set |
| 571 | # CONFIG_SK98LIN is not set | 600 | # CONFIG_VIA_VELOCITY is not set |
| 572 | # CONFIG_TIGON3 is not set | 601 | # CONFIG_TIGON3 is not set |
| 573 | # CONFIG_BNX2 is not set | 602 | # CONFIG_BNX2 is not set |
| 574 | CONFIG_QLA3XXX=m | 603 | # CONFIG_QLA3XXX is not set |
| 575 | # CONFIG_ATL1 is not set | 604 | # CONFIG_ATL1 is not set |
| 576 | 605 | CONFIG_NETDEV_10000=y | |
| 577 | # | ||
| 578 | # Ethernet (10000 Mbit) | ||
| 579 | # | ||
| 580 | # CONFIG_CHELSIO_T1 is not set | 606 | # CONFIG_CHELSIO_T1 is not set |
| 581 | CONFIG_CHELSIO_T3=m | 607 | # CONFIG_CHELSIO_T3 is not set |
| 608 | # CONFIG_IXGBE is not set | ||
| 582 | # CONFIG_IXGB is not set | 609 | # CONFIG_IXGB is not set |
| 583 | # CONFIG_S2IO is not set | 610 | # CONFIG_S2IO is not set |
| 584 | # CONFIG_MYRI10GE is not set | 611 | # CONFIG_MYRI10GE is not set |
| 585 | CONFIG_NETXEN_NIC=m | 612 | # CONFIG_NETXEN_NIC is not set |
| 586 | 613 | # CONFIG_NIU is not set | |
| 587 | # | 614 | # CONFIG_MLX4_CORE is not set |
| 588 | # Token Ring devices | 615 | # CONFIG_TEHUTI is not set |
| 589 | # | 616 | # CONFIG_BNX2X is not set |
| 590 | # CONFIG_TR is not set | 617 | # CONFIG_TR is not set |
| 591 | 618 | ||
| 592 | # | 619 | # |
| 593 | # Wireless LAN (non-hamradio) | 620 | # Wireless LAN |
| 594 | # | 621 | # |
| 595 | # CONFIG_NET_RADIO is not set | 622 | # CONFIG_WLAN_PRE80211 is not set |
| 596 | 623 | CONFIG_WLAN_80211=y | |
| 597 | # | 624 | # CONFIG_IPW2100 is not set |
| 598 | # Wan interfaces | 625 | # CONFIG_IPW2200 is not set |
| 599 | # | 626 | # CONFIG_LIBERTAS is not set |
| 627 | # CONFIG_HERMES is not set | ||
| 628 | # CONFIG_ATMEL is not set | ||
| 629 | # CONFIG_PRISM54 is not set | ||
| 630 | # CONFIG_USB_ZD1201 is not set | ||
| 631 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 632 | # CONFIG_RTL8180 is not set | ||
| 633 | # CONFIG_RTL8187 is not set | ||
| 634 | # CONFIG_ADM8211 is not set | ||
| 635 | # CONFIG_P54_COMMON is not set | ||
| 636 | # CONFIG_ATH5K is not set | ||
| 637 | # CONFIG_IWLCORE is not set | ||
| 638 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 639 | # CONFIG_IWL4965 is not set | ||
| 640 | # CONFIG_IWL3945 is not set | ||
| 641 | # CONFIG_HOSTAP is not set | ||
| 642 | # CONFIG_B43 is not set | ||
| 643 | # CONFIG_B43LEGACY is not set | ||
| 644 | # CONFIG_ZD1211RW is not set | ||
| 645 | # CONFIG_RT2X00 is not set | ||
| 646 | |||
| 647 | # | ||
| 648 | # USB Network Adapters | ||
| 649 | # | ||
| 650 | # CONFIG_USB_CATC is not set | ||
| 651 | # CONFIG_USB_KAWETH is not set | ||
| 652 | # CONFIG_USB_PEGASUS is not set | ||
| 653 | # CONFIG_USB_RTL8150 is not set | ||
| 654 | # CONFIG_USB_USBNET is not set | ||
| 600 | # CONFIG_WAN is not set | 655 | # CONFIG_WAN is not set |
| 601 | # CONFIG_FDDI is not set | 656 | # CONFIG_FDDI is not set |
| 602 | # CONFIG_HIPPI is not set | 657 | # CONFIG_HIPPI is not set |
| 603 | # CONFIG_PPP is not set | 658 | # CONFIG_PPP is not set |
| 604 | # CONFIG_SLIP is not set | 659 | # CONFIG_SLIP is not set |
| 605 | # CONFIG_SHAPER is not set | ||
| 606 | # CONFIG_NETCONSOLE is not set | 660 | # CONFIG_NETCONSOLE is not set |
| 607 | # CONFIG_NETPOLL is not set | 661 | # CONFIG_NETPOLL is not set |
| 608 | # CONFIG_NET_POLL_CONTROLLER is not set | 662 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 609 | |||
| 610 | # | ||
| 611 | # ISDN subsystem | ||
| 612 | # | ||
| 613 | # CONFIG_ISDN is not set | 663 | # CONFIG_ISDN is not set |
| 614 | |||
| 615 | # | ||
| 616 | # Telephony Support | ||
| 617 | # | ||
| 618 | # CONFIG_PHONE is not set | 664 | # CONFIG_PHONE is not set |
| 619 | 665 | ||
| 620 | # | 666 | # |
| @@ -637,24 +683,8 @@ CONFIG_SERIO_RAW=m | |||
| 637 | # Character devices | 683 | # Character devices |
| 638 | # | 684 | # |
| 639 | # CONFIG_VT is not set | 685 | # CONFIG_VT is not set |
| 640 | CONFIG_SERIAL_NONSTANDARD=y | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 641 | # CONFIG_COMPUTONE is not set | 687 | # CONFIG_NOZOMI is not set |
| 642 | # CONFIG_ROCKETPORT is not set | ||
| 643 | # CONFIG_CYCLADES is not set | ||
| 644 | # CONFIG_DIGIEPCA is not set | ||
| 645 | # CONFIG_MOXA_INTELLIO is not set | ||
| 646 | # CONFIG_MOXA_SMARTIO is not set | ||
| 647 | CONFIG_MOXA_SMARTIO_NEW=m | ||
| 648 | # CONFIG_ISI is not set | ||
| 649 | # CONFIG_SYNCLINKMP is not set | ||
| 650 | # CONFIG_SYNCLINK_GT is not set | ||
| 651 | # CONFIG_N_HDLC is not set | ||
| 652 | # CONFIG_SPECIALIX is not set | ||
| 653 | # CONFIG_SX is not set | ||
| 654 | # CONFIG_RIO is not set | ||
| 655 | # CONFIG_STALDRV is not set | ||
| 656 | CONFIG_SERIAL_SB1250_DUART=y | ||
| 657 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
| 658 | 688 | ||
| 659 | # | 689 | # |
| 660 | # Serial drivers | 690 | # Serial drivers |
| @@ -664,37 +694,22 @@ CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | |||
| 664 | # | 694 | # |
| 665 | # Non-8250 serial port support | 695 | # Non-8250 serial port support |
| 666 | # | 696 | # |
| 697 | CONFIG_SERIAL_SB1250_DUART=y | ||
| 698 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
| 699 | CONFIG_SERIAL_CORE=y | ||
| 700 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 667 | # CONFIG_SERIAL_JSM is not set | 701 | # CONFIG_SERIAL_JSM is not set |
| 668 | CONFIG_UNIX98_PTYS=y | 702 | CONFIG_UNIX98_PTYS=y |
| 669 | CONFIG_LEGACY_PTYS=y | 703 | CONFIG_LEGACY_PTYS=y |
| 670 | CONFIG_LEGACY_PTY_COUNT=256 | 704 | CONFIG_LEGACY_PTY_COUNT=256 |
| 671 | |||
| 672 | # | ||
| 673 | # IPMI | ||
| 674 | # | ||
| 675 | # CONFIG_IPMI_HANDLER is not set | 705 | # CONFIG_IPMI_HANDLER is not set |
| 676 | |||
| 677 | # | ||
| 678 | # Watchdog Cards | ||
| 679 | # | ||
| 680 | # CONFIG_WATCHDOG is not set | ||
| 681 | # CONFIG_HW_RANDOM is not set | 706 | # CONFIG_HW_RANDOM is not set |
| 682 | # CONFIG_RTC is not set | 707 | # CONFIG_RTC is not set |
| 683 | # CONFIG_GEN_RTC is not set | ||
| 684 | # CONFIG_DTLK is not set | ||
| 685 | # CONFIG_R3964 is not set | 708 | # CONFIG_R3964 is not set |
| 686 | # CONFIG_APPLICOM is not set | 709 | # CONFIG_APPLICOM is not set |
| 687 | # CONFIG_DRM is not set | ||
| 688 | # CONFIG_RAW_DRIVER is not set | 710 | # CONFIG_RAW_DRIVER is not set |
| 689 | |||
| 690 | # | ||
| 691 | # TPM devices | ||
| 692 | # | ||
| 693 | # CONFIG_TCG_TPM is not set | 711 | # CONFIG_TCG_TPM is not set |
| 694 | 712 | CONFIG_DEVPORT=y | |
| 695 | # | ||
| 696 | # I2C support | ||
| 697 | # | ||
| 698 | # CONFIG_I2C is not set | 713 | # CONFIG_I2C is not set |
| 699 | 714 | ||
| 700 | # | 715 | # |
| @@ -702,109 +717,139 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 702 | # | 717 | # |
| 703 | # CONFIG_SPI is not set | 718 | # CONFIG_SPI is not set |
| 704 | # CONFIG_SPI_MASTER is not set | 719 | # CONFIG_SPI_MASTER is not set |
| 720 | # CONFIG_W1 is not set | ||
| 721 | # CONFIG_POWER_SUPPLY is not set | ||
| 722 | # CONFIG_HWMON is not set | ||
| 723 | # CONFIG_THERMAL is not set | ||
| 724 | # CONFIG_WATCHDOG is not set | ||
| 705 | 725 | ||
| 706 | # | 726 | # |
| 707 | # Dallas's 1-wire bus | 727 | # Sonics Silicon Backplane |
| 708 | # | 728 | # |
| 709 | # CONFIG_W1 is not set | 729 | CONFIG_SSB_POSSIBLE=y |
| 730 | # CONFIG_SSB is not set | ||
| 710 | 731 | ||
| 711 | # | 732 | # |
| 712 | # Hardware Monitoring support | 733 | # Multifunction device drivers |
| 713 | # | 734 | # |
| 714 | # CONFIG_HWMON is not set | 735 | # CONFIG_MFD_SM501 is not set |
| 715 | # CONFIG_HWMON_VID is not set | ||
| 716 | 736 | ||
| 717 | # | 737 | # |
| 718 | # Multimedia devices | 738 | # Multimedia devices |
| 719 | # | 739 | # |
| 720 | # CONFIG_VIDEO_DEV is not set | 740 | # CONFIG_VIDEO_DEV is not set |
| 721 | 741 | # CONFIG_DVB_CORE is not set | |
| 722 | # | 742 | # CONFIG_DAB is not set |
| 723 | # Digital Video Broadcasting Devices | ||
| 724 | # | ||
| 725 | # CONFIG_DVB is not set | ||
| 726 | 743 | ||
| 727 | # | 744 | # |
| 728 | # Graphics support | 745 | # Graphics support |
| 729 | # | 746 | # |
| 730 | # CONFIG_FIRMWARE_EDID is not set | 747 | # CONFIG_DRM is not set |
| 748 | # CONFIG_VGASTATE is not set | ||
| 749 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 731 | # CONFIG_FB is not set | 750 | # CONFIG_FB is not set |
| 732 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 751 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 733 | 752 | ||
| 734 | # | 753 | # |
| 735 | # Sound | 754 | # Display device support |
| 736 | # | 755 | # |
| 737 | # CONFIG_SOUND is not set | 756 | # CONFIG_DISPLAY_SUPPORT is not set |
| 738 | 757 | ||
| 739 | # | 758 | # |
| 740 | # USB support | 759 | # Sound |
| 741 | # | 760 | # |
| 761 | # CONFIG_SOUND is not set | ||
| 762 | CONFIG_USB_SUPPORT=y | ||
| 742 | CONFIG_USB_ARCH_HAS_HCD=y | 763 | CONFIG_USB_ARCH_HAS_HCD=y |
| 743 | CONFIG_USB_ARCH_HAS_OHCI=y | 764 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 744 | CONFIG_USB_ARCH_HAS_EHCI=y | 765 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 745 | # CONFIG_USB is not set | 766 | CONFIG_USB=y |
| 746 | 767 | # CONFIG_USB_DEBUG is not set | |
| 747 | # | 768 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set |
| 748 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 749 | # | ||
| 750 | 769 | ||
| 751 | # | 770 | # |
| 752 | # USB Gadget Support | 771 | # Miscellaneous USB options |
| 753 | # | 772 | # |
| 754 | # CONFIG_USB_GADGET is not set | 773 | CONFIG_USB_DEVICEFS=y |
| 774 | CONFIG_USB_DEVICE_CLASS=y | ||
| 775 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
| 776 | # CONFIG_USB_SUSPEND is not set | ||
| 777 | # CONFIG_USB_PERSIST is not set | ||
| 778 | # CONFIG_USB_OTG is not set | ||
| 755 | 779 | ||
| 756 | # | 780 | # |
| 757 | # MMC/SD Card support | 781 | # USB Host Controller Drivers |
| 758 | # | 782 | # |
| 759 | # CONFIG_MMC is not set | 783 | # CONFIG_USB_EHCI_HCD is not set |
| 784 | # CONFIG_USB_ISP116X_HCD is not set | ||
| 785 | CONFIG_USB_OHCI_HCD=y | ||
| 786 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
| 787 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
| 788 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
| 789 | # CONFIG_USB_UHCI_HCD is not set | ||
| 790 | # CONFIG_USB_SL811_HCD is not set | ||
| 791 | # CONFIG_USB_R8A66597_HCD is not set | ||
| 760 | 792 | ||
| 761 | # | 793 | # |
| 762 | # LED devices | 794 | # USB Device Class drivers |
| 763 | # | 795 | # |
| 764 | # CONFIG_NEW_LEDS is not set | 796 | # CONFIG_USB_ACM is not set |
| 797 | # CONFIG_USB_PRINTER is not set | ||
| 765 | 798 | ||
| 766 | # | 799 | # |
| 767 | # LED drivers | 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 768 | # | 801 | # |
| 769 | 802 | ||
| 770 | # | 803 | # |
| 771 | # LED Triggers | 804 | # may also be needed; see USB_STORAGE Help for more information |
| 772 | # | 805 | # |
| 806 | # CONFIG_USB_LIBUSUAL is not set | ||
| 773 | 807 | ||
| 774 | # | 808 | # |
| 775 | # InfiniBand support | 809 | # USB Imaging devices |
| 776 | # | 810 | # |
| 777 | # CONFIG_INFINIBAND is not set | 811 | # CONFIG_USB_MDC800 is not set |
| 812 | CONFIG_USB_MON=y | ||
| 778 | 813 | ||
| 779 | # | 814 | # |
| 780 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 815 | # USB port drivers |
| 781 | # | 816 | # |
| 817 | # CONFIG_USB_SERIAL is not set | ||
| 782 | 818 | ||
| 783 | # | 819 | # |
| 784 | # Real Time Clock | 820 | # USB Miscellaneous drivers |
| 785 | # | 821 | # |
| 822 | # CONFIG_USB_EMI62 is not set | ||
| 823 | # CONFIG_USB_EMI26 is not set | ||
| 824 | # CONFIG_USB_ADUTUX is not set | ||
| 825 | # CONFIG_USB_AUERSWALD is not set | ||
| 826 | # CONFIG_USB_RIO500 is not set | ||
| 827 | # CONFIG_USB_LEGOTOWER is not set | ||
| 828 | # CONFIG_USB_LCD is not set | ||
| 829 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 830 | # CONFIG_USB_LED is not set | ||
| 831 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 832 | # CONFIG_USB_CYTHERM is not set | ||
| 833 | # CONFIG_USB_PHIDGET is not set | ||
| 834 | # CONFIG_USB_IDMOUSE is not set | ||
| 835 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 836 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 837 | # CONFIG_USB_LD is not set | ||
| 838 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 839 | # CONFIG_USB_IOWARRIOR is not set | ||
| 840 | # CONFIG_USB_TEST is not set | ||
| 841 | # CONFIG_USB_GADGET is not set | ||
| 842 | # CONFIG_MMC is not set | ||
| 843 | # CONFIG_MEMSTICK is not set | ||
| 844 | # CONFIG_NEW_LEDS is not set | ||
| 845 | # CONFIG_INFINIBAND is not set | ||
| 846 | CONFIG_RTC_LIB=y | ||
| 786 | # CONFIG_RTC_CLASS is not set | 847 | # CONFIG_RTC_CLASS is not set |
| 787 | 848 | ||
| 788 | # | 849 | # |
| 789 | # DMA Engine support | 850 | # Userspace I/O |
| 790 | # | ||
| 791 | # CONFIG_DMA_ENGINE is not set | ||
| 792 | |||
| 793 | # | ||
| 794 | # DMA Clients | ||
| 795 | # | ||
| 796 | |||
| 797 | # | ||
| 798 | # DMA Devices | ||
| 799 | # | ||
| 800 | |||
| 801 | # | ||
| 802 | # Auxiliary Display support | ||
| 803 | # | ||
| 804 | |||
| 805 | # | ||
| 806 | # Virtualization | ||
| 807 | # | 851 | # |
| 852 | # CONFIG_UIO is not set | ||
| 808 | 853 | ||
| 809 | # | 854 | # |
| 810 | # File systems | 855 | # File systems |
| @@ -823,15 +868,14 @@ CONFIG_FS_POSIX_ACL=y | |||
| 823 | # CONFIG_XFS_FS is not set | 868 | # CONFIG_XFS_FS is not set |
| 824 | # CONFIG_GFS2_FS is not set | 869 | # CONFIG_GFS2_FS is not set |
| 825 | # CONFIG_OCFS2_FS is not set | 870 | # CONFIG_OCFS2_FS is not set |
| 826 | # CONFIG_MINIX_FS is not set | 871 | CONFIG_DNOTIFY=y |
| 827 | # CONFIG_ROMFS_FS is not set | ||
| 828 | CONFIG_INOTIFY=y | 872 | CONFIG_INOTIFY=y |
| 829 | CONFIG_INOTIFY_USER=y | 873 | CONFIG_INOTIFY_USER=y |
| 830 | # CONFIG_QUOTA is not set | 874 | # CONFIG_QUOTA is not set |
| 831 | CONFIG_DNOTIFY=y | ||
| 832 | # CONFIG_AUTOFS_FS is not set | 875 | # CONFIG_AUTOFS_FS is not set |
| 833 | # CONFIG_AUTOFS4_FS is not set | 876 | # CONFIG_AUTOFS4_FS is not set |
| 834 | CONFIG_FUSE_FS=m | 877 | CONFIG_FUSE_FS=m |
| 878 | CONFIG_GENERIC_ACL=y | ||
| 835 | 879 | ||
| 836 | # | 880 | # |
| 837 | # CD-ROM/DVD Filesystems | 881 | # CD-ROM/DVD Filesystems |
| @@ -853,9 +897,9 @@ CONFIG_PROC_FS=y | |||
| 853 | CONFIG_PROC_KCORE=y | 897 | CONFIG_PROC_KCORE=y |
| 854 | CONFIG_PROC_SYSCTL=y | 898 | CONFIG_PROC_SYSCTL=y |
| 855 | CONFIG_SYSFS=y | 899 | CONFIG_SYSFS=y |
| 856 | # CONFIG_TMPFS is not set | 900 | CONFIG_TMPFS=y |
| 901 | CONFIG_TMPFS_POSIX_ACL=y | ||
| 857 | # CONFIG_HUGETLB_PAGE is not set | 902 | # CONFIG_HUGETLB_PAGE is not set |
| 858 | CONFIG_RAMFS=y | ||
| 859 | CONFIG_CONFIGFS_FS=m | 903 | CONFIG_CONFIGFS_FS=m |
| 860 | 904 | ||
| 861 | # | 905 | # |
| @@ -871,14 +915,13 @@ CONFIG_CONFIGFS_FS=m | |||
| 871 | # CONFIG_EFS_FS is not set | 915 | # CONFIG_EFS_FS is not set |
| 872 | # CONFIG_CRAMFS is not set | 916 | # CONFIG_CRAMFS is not set |
| 873 | # CONFIG_VXFS_FS is not set | 917 | # CONFIG_VXFS_FS is not set |
| 918 | # CONFIG_MINIX_FS is not set | ||
| 874 | # CONFIG_HPFS_FS is not set | 919 | # CONFIG_HPFS_FS is not set |
| 875 | # CONFIG_QNX4FS_FS is not set | 920 | # CONFIG_QNX4FS_FS is not set |
| 921 | # CONFIG_ROMFS_FS is not set | ||
| 876 | # CONFIG_SYSV_FS is not set | 922 | # CONFIG_SYSV_FS is not set |
| 877 | # CONFIG_UFS_FS is not set | 923 | # CONFIG_UFS_FS is not set |
| 878 | 924 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 879 | # | ||
| 880 | # Network File Systems | ||
| 881 | # | ||
| 882 | CONFIG_NFS_FS=y | 925 | CONFIG_NFS_FS=y |
| 883 | CONFIG_NFS_V3=y | 926 | CONFIG_NFS_V3=y |
| 884 | # CONFIG_NFS_V3_ACL is not set | 927 | # CONFIG_NFS_V3_ACL is not set |
| @@ -890,6 +933,7 @@ CONFIG_LOCKD=y | |||
| 890 | CONFIG_LOCKD_V4=y | 933 | CONFIG_LOCKD_V4=y |
| 891 | CONFIG_NFS_COMMON=y | 934 | CONFIG_NFS_COMMON=y |
| 892 | CONFIG_SUNRPC=y | 935 | CONFIG_SUNRPC=y |
| 936 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 893 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 937 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 894 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 938 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| 895 | # CONFIG_SMB_FS is not set | 939 | # CONFIG_SMB_FS is not set |
| @@ -897,45 +941,29 @@ CONFIG_SUNRPC=y | |||
| 897 | # CONFIG_NCP_FS is not set | 941 | # CONFIG_NCP_FS is not set |
| 898 | # CONFIG_CODA_FS is not set | 942 | # CONFIG_CODA_FS is not set |
| 899 | # CONFIG_AFS_FS is not set | 943 | # CONFIG_AFS_FS is not set |
| 900 | # CONFIG_9P_FS is not set | ||
| 901 | 944 | ||
| 902 | # | 945 | # |
| 903 | # Partition Types | 946 | # Partition Types |
| 904 | # | 947 | # |
| 905 | # CONFIG_PARTITION_ADVANCED is not set | 948 | # CONFIG_PARTITION_ADVANCED is not set |
| 906 | CONFIG_MSDOS_PARTITION=y | 949 | CONFIG_MSDOS_PARTITION=y |
| 907 | |||
| 908 | # | ||
| 909 | # Native Language Support | ||
| 910 | # | ||
| 911 | # CONFIG_NLS is not set | 950 | # CONFIG_NLS is not set |
| 912 | |||
| 913 | # | ||
| 914 | # Distributed Lock Manager | ||
| 915 | # | ||
| 916 | CONFIG_DLM=m | 951 | CONFIG_DLM=m |
| 917 | CONFIG_DLM_TCP=y | ||
| 918 | # CONFIG_DLM_SCTP is not set | ||
| 919 | # CONFIG_DLM_DEBUG is not set | 952 | # CONFIG_DLM_DEBUG is not set |
| 920 | 953 | ||
| 921 | # | 954 | # |
| 922 | # Profiling support | ||
| 923 | # | ||
| 924 | # CONFIG_PROFILING is not set | ||
| 925 | |||
| 926 | # | ||
| 927 | # Kernel hacking | 955 | # Kernel hacking |
| 928 | # | 956 | # |
| 929 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 957 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 930 | # CONFIG_PRINTK_TIME is not set | 958 | # CONFIG_PRINTK_TIME is not set |
| 959 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 931 | CONFIG_ENABLE_MUST_CHECK=y | 960 | CONFIG_ENABLE_MUST_CHECK=y |
| 932 | # CONFIG_MAGIC_SYSRQ is not set | 961 | # CONFIG_MAGIC_SYSRQ is not set |
| 933 | # CONFIG_UNUSED_SYMBOLS is not set | 962 | # CONFIG_UNUSED_SYMBOLS is not set |
| 934 | # CONFIG_DEBUG_FS is not set | 963 | # CONFIG_DEBUG_FS is not set |
| 935 | # CONFIG_HEADERS_CHECK is not set | 964 | # CONFIG_HEADERS_CHECK is not set |
| 936 | # CONFIG_DEBUG_KERNEL is not set | 965 | # CONFIG_DEBUG_KERNEL is not set |
| 937 | CONFIG_LOG_BUF_SHIFT=15 | 966 | # CONFIG_SAMPLES is not set |
| 938 | CONFIG_CROSSCOMPILE=y | ||
| 939 | CONFIG_CMDLINE="" | 967 | CONFIG_CMDLINE="" |
| 940 | CONFIG_SYS_SUPPORTS_KGDB=y | 968 | CONFIG_SYS_SUPPORTS_KGDB=y |
| 941 | # CONFIG_SB1XXX_CORELIS is not set | 969 | # CONFIG_SB1XXX_CORELIS is not set |
| @@ -946,13 +974,12 @@ CONFIG_SYS_SUPPORTS_KGDB=y | |||
| 946 | CONFIG_KEYS=y | 974 | CONFIG_KEYS=y |
| 947 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 975 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 948 | # CONFIG_SECURITY is not set | 976 | # CONFIG_SECURITY is not set |
| 949 | 977 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
| 950 | # | ||
| 951 | # Cryptographic options | ||
| 952 | # | ||
| 953 | CONFIG_CRYPTO=y | 978 | CONFIG_CRYPTO=y |
| 954 | CONFIG_CRYPTO_ALGAPI=y | 979 | CONFIG_CRYPTO_ALGAPI=y |
| 980 | CONFIG_CRYPTO_AEAD=m | ||
| 955 | CONFIG_CRYPTO_BLKCIPHER=m | 981 | CONFIG_CRYPTO_BLKCIPHER=m |
| 982 | CONFIG_CRYPTO_SEQIV=m | ||
| 956 | CONFIG_CRYPTO_HASH=y | 983 | CONFIG_CRYPTO_HASH=y |
| 957 | CONFIG_CRYPTO_MANAGER=y | 984 | CONFIG_CRYPTO_MANAGER=y |
| 958 | CONFIG_CRYPTO_HMAC=y | 985 | CONFIG_CRYPTO_HMAC=y |
| @@ -970,6 +997,11 @@ CONFIG_CRYPTO_ECB=m | |||
| 970 | CONFIG_CRYPTO_CBC=m | 997 | CONFIG_CRYPTO_CBC=m |
| 971 | CONFIG_CRYPTO_PCBC=m | 998 | CONFIG_CRYPTO_PCBC=m |
| 972 | CONFIG_CRYPTO_LRW=m | 999 | CONFIG_CRYPTO_LRW=m |
| 1000 | CONFIG_CRYPTO_XTS=m | ||
| 1001 | CONFIG_CRYPTO_CTR=m | ||
| 1002 | CONFIG_CRYPTO_GCM=m | ||
| 1003 | CONFIG_CRYPTO_CCM=m | ||
| 1004 | CONFIG_CRYPTO_CRYPTD=m | ||
| 973 | CONFIG_CRYPTO_DES=m | 1005 | CONFIG_CRYPTO_DES=m |
| 974 | CONFIG_CRYPTO_FCRYPT=m | 1006 | CONFIG_CRYPTO_FCRYPT=m |
| 975 | CONFIG_CRYPTO_BLOWFISH=m | 1007 | CONFIG_CRYPTO_BLOWFISH=m |
| @@ -983,15 +1015,16 @@ CONFIG_CRYPTO_TEA=m | |||
| 983 | CONFIG_CRYPTO_ARC4=m | 1015 | CONFIG_CRYPTO_ARC4=m |
| 984 | CONFIG_CRYPTO_KHAZAD=m | 1016 | CONFIG_CRYPTO_KHAZAD=m |
| 985 | CONFIG_CRYPTO_ANUBIS=m | 1017 | CONFIG_CRYPTO_ANUBIS=m |
| 1018 | CONFIG_CRYPTO_SEED=m | ||
| 1019 | CONFIG_CRYPTO_SALSA20=m | ||
| 986 | CONFIG_CRYPTO_DEFLATE=m | 1020 | CONFIG_CRYPTO_DEFLATE=m |
| 987 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1021 | CONFIG_CRYPTO_MICHAEL_MIC=m |
| 988 | CONFIG_CRYPTO_CRC32C=m | 1022 | CONFIG_CRYPTO_CRC32C=m |
| 989 | CONFIG_CRYPTO_CAMELLIA=m | 1023 | CONFIG_CRYPTO_CAMELLIA=m |
| 990 | # CONFIG_CRYPTO_TEST is not set | 1024 | # CONFIG_CRYPTO_TEST is not set |
| 991 | 1025 | CONFIG_CRYPTO_AUTHENC=m | |
| 992 | # | 1026 | CONFIG_CRYPTO_LZO=m |
| 993 | # Hardware crypto devices | 1027 | # CONFIG_CRYPTO_HW is not set |
| 994 | # | ||
| 995 | 1028 | ||
| 996 | # | 1029 | # |
| 997 | # Library routines | 1030 | # Library routines |
| @@ -999,10 +1032,15 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
| 999 | CONFIG_BITREVERSE=y | 1032 | CONFIG_BITREVERSE=y |
| 1000 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1001 | CONFIG_CRC16=m | 1034 | CONFIG_CRC16=m |
| 1035 | # CONFIG_CRC_ITU_T is not set | ||
| 1002 | CONFIG_CRC32=y | 1036 | CONFIG_CRC32=y |
| 1037 | # CONFIG_CRC7 is not set | ||
| 1003 | CONFIG_LIBCRC32C=m | 1038 | CONFIG_LIBCRC32C=m |
| 1004 | CONFIG_ZLIB_INFLATE=m | 1039 | CONFIG_ZLIB_INFLATE=m |
| 1005 | CONFIG_ZLIB_DEFLATE=m | 1040 | CONFIG_ZLIB_DEFLATE=m |
| 1041 | CONFIG_LZO_COMPRESS=m | ||
| 1042 | CONFIG_LZO_DECOMPRESS=m | ||
| 1006 | CONFIG_PLIST=y | 1043 | CONFIG_PLIST=y |
| 1007 | CONFIG_HAS_IOMEM=y | 1044 | CONFIG_HAS_IOMEM=y |
| 1008 | CONFIG_HAS_IOPORT=y | 1045 | CONFIG_HAS_IOPORT=y |
| 1046 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig index af82e1a1823c..8dd3ae39bcad 100644 --- a/arch/mips/configs/tb0219_defconfig +++ b/arch/mips/configs/tb0219_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.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Wed Aug 8 16:11:47 2007 | 4 | # Mon May 12 11:54:51 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,23 +171,29 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| 168 | CONFIG_EMBEDDED=y | 186 | CONFIG_EMBEDDED=y |
| 169 | CONFIG_SYSCTL_SYSCALL=y | 187 | CONFIG_SYSCTL_SYSCALL=y |
| 188 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 170 | CONFIG_KALLSYMS=y | 189 | CONFIG_KALLSYMS=y |
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 190 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 172 | CONFIG_HOTPLUG=y | 191 | CONFIG_HOTPLUG=y |
| 173 | CONFIG_PRINTK=y | 192 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 193 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 194 | CONFIG_ELF_CORE=y |
| 195 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 196 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 197 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 198 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 199 | CONFIG_ANON_INODES=y |
| @@ -185,10 +206,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 206 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 207 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 208 | # CONFIG_SLOB is not set |
| 209 | # CONFIG_PROFILING is not set | ||
| 210 | # CONFIG_MARKERS is not set | ||
| 211 | CONFIG_HAVE_OPROFILE=y | ||
| 212 | # CONFIG_HAVE_KPROBES is not set | ||
| 213 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 214 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 215 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 216 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 217 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 218 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 219 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 220 | CONFIG_MODULES=y |
| 221 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 222 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 223 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 224 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +242,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 242 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 243 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 244 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 245 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 246 | ||
| 216 | # | 247 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 248 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 249 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 250 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 251 | CONFIG_PCI=y |
| 252 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 253 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 254 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 256 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 257 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 258 | ||
| @@ -237,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 266 | # |
| 238 | # Power management options | 267 | # Power management options |
| 239 | # | 268 | # |
| 269 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 270 | # CONFIG_PM is not set |
| 241 | 271 | ||
| 242 | # | 272 | # |
| @@ -278,6 +308,7 @@ CONFIG_INET_TUNNEL=m | |||
| 278 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 308 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 279 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 309 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 280 | # CONFIG_INET_XFRM_MODE_BEET is not set | 310 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 311 | # CONFIG_INET_LRO is not set | ||
| 281 | CONFIG_INET_DIAG=y | 312 | CONFIG_INET_DIAG=y |
| 282 | CONFIG_INET_TCP_DIAG=y | 313 | CONFIG_INET_TCP_DIAG=y |
| 283 | # CONFIG_TCP_CONG_ADVANCED is not set | 314 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -285,15 +316,10 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 285 | CONFIG_DEFAULT_TCP_CONG="cubic" | 316 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 286 | # CONFIG_TCP_MD5SIG is not set | 317 | # CONFIG_TCP_MD5SIG is not set |
| 287 | # CONFIG_IPV6 is not set | 318 | # CONFIG_IPV6 is not set |
| 288 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 289 | # CONFIG_INET6_TUNNEL is not set | ||
| 290 | CONFIG_NETWORK_SECMARK=y | 319 | CONFIG_NETWORK_SECMARK=y |
| 291 | # CONFIG_NETFILTER is not set | 320 | # CONFIG_NETFILTER is not set |
| 292 | # CONFIG_IP_DCCP is not set | 321 | # CONFIG_IP_DCCP is not set |
| 293 | # CONFIG_IP_SCTP is not set | 322 | # CONFIG_IP_SCTP is not set |
| 294 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 295 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 296 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
| 297 | # CONFIG_TIPC is not set | 323 | # CONFIG_TIPC is not set |
| 298 | # CONFIG_ATM is not set | 324 | # CONFIG_ATM is not set |
| 299 | # CONFIG_BRIDGE is not set | 325 | # CONFIG_BRIDGE is not set |
| @@ -306,10 +332,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 306 | # CONFIG_LAPB is not set | 332 | # CONFIG_LAPB is not set |
| 307 | # CONFIG_ECONET is not set | 333 | # CONFIG_ECONET is not set |
| 308 | # CONFIG_WAN_ROUTER is not set | 334 | # CONFIG_WAN_ROUTER is not set |
| 309 | |||
| 310 | # | ||
| 311 | # QoS and/or fair queueing | ||
| 312 | # | ||
| 313 | # CONFIG_NET_SCHED is not set | 335 | # CONFIG_NET_SCHED is not set |
| 314 | 336 | ||
| 315 | # | 337 | # |
| @@ -317,6 +339,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 317 | # | 339 | # |
| 318 | # CONFIG_NET_PKTGEN is not set | 340 | # CONFIG_NET_PKTGEN is not set |
| 319 | # CONFIG_HAMRADIO is not set | 341 | # CONFIG_HAMRADIO is not set |
| 342 | # CONFIG_CAN is not set | ||
| 320 | # CONFIG_IRDA is not set | 343 | # CONFIG_IRDA is not set |
| 321 | # CONFIG_BT is not set | 344 | # CONFIG_BT is not set |
| 322 | # CONFIG_AF_RXRPC is not set | 345 | # CONFIG_AF_RXRPC is not set |
| @@ -339,6 +362,7 @@ CONFIG_FIB_RULES=y | |||
| 339 | # | 362 | # |
| 340 | # Generic Driver Options | 363 | # Generic Driver Options |
| 341 | # | 364 | # |
| 365 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 342 | CONFIG_STANDALONE=y | 366 | CONFIG_STANDALONE=y |
| 343 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 367 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 344 | CONFIG_FW_LOADER=m | 368 | CONFIG_FW_LOADER=m |
| @@ -360,10 +384,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 360 | CONFIG_BLK_DEV_RAM=y | 384 | CONFIG_BLK_DEV_RAM=y |
| 361 | CONFIG_BLK_DEV_RAM_COUNT=16 | 385 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 362 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 386 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 363 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 387 | CONFIG_BLK_DEV_XIP=y |
| 364 | # CONFIG_CDROM_PKTCDVD is not set | 388 | # CONFIG_CDROM_PKTCDVD is not set |
| 365 | # CONFIG_ATA_OVER_ETH is not set | 389 | # CONFIG_ATA_OVER_ETH is not set |
| 366 | # CONFIG_MISC_DEVICES is not set | 390 | # CONFIG_MISC_DEVICES is not set |
| 391 | CONFIG_HAVE_IDE=y | ||
| 367 | # CONFIG_IDE is not set | 392 | # CONFIG_IDE is not set |
| 368 | 393 | ||
| 369 | # | 394 | # |
| @@ -375,10 +400,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
| 375 | # CONFIG_SCSI_NETLINK is not set | 400 | # CONFIG_SCSI_NETLINK is not set |
| 376 | # CONFIG_ATA is not set | 401 | # CONFIG_ATA is not set |
| 377 | # CONFIG_MD is not set | 402 | # CONFIG_MD is not set |
| 378 | |||
| 379 | # | ||
| 380 | # Fusion MPT device support | ||
| 381 | # | ||
| 382 | # CONFIG_FUSION is not set | 403 | # CONFIG_FUSION is not set |
| 383 | 404 | ||
| 384 | # | 405 | # |
| @@ -394,6 +415,7 @@ CONFIG_NETDEVICES=y | |||
| 394 | # CONFIG_MACVLAN is not set | 415 | # CONFIG_MACVLAN is not set |
| 395 | # CONFIG_EQUALIZER is not set | 416 | # CONFIG_EQUALIZER is not set |
| 396 | # CONFIG_TUN is not set | 417 | # CONFIG_TUN is not set |
| 418 | # CONFIG_VETH is not set | ||
| 397 | # CONFIG_ARCNET is not set | 419 | # CONFIG_ARCNET is not set |
| 398 | CONFIG_PHYLIB=m | 420 | CONFIG_PHYLIB=m |
| 399 | 421 | ||
| @@ -409,7 +431,8 @@ CONFIG_VITESSE_PHY=m | |||
| 409 | CONFIG_SMSC_PHY=m | 431 | CONFIG_SMSC_PHY=m |
| 410 | # CONFIG_BROADCOM_PHY is not set | 432 | # CONFIG_BROADCOM_PHY is not set |
| 411 | # CONFIG_ICPLUS_PHY is not set | 433 | # CONFIG_ICPLUS_PHY is not set |
| 412 | # CONFIG_FIXED_PHY is not set | 434 | # CONFIG_REALTEK_PHY is not set |
| 435 | # CONFIG_MDIO_BITBANG is not set | ||
| 413 | CONFIG_NET_ETHERNET=y | 436 | CONFIG_NET_ETHERNET=y |
| 414 | CONFIG_MII=y | 437 | CONFIG_MII=y |
| 415 | # CONFIG_AX88796 is not set | 438 | # CONFIG_AX88796 is not set |
| @@ -420,6 +443,10 @@ CONFIG_MII=y | |||
| 420 | # CONFIG_DM9000 is not set | 443 | # CONFIG_DM9000 is not set |
| 421 | # CONFIG_NET_TULIP is not set | 444 | # CONFIG_NET_TULIP is not set |
| 422 | # CONFIG_HP100 is not set | 445 | # CONFIG_HP100 is not set |
| 446 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 447 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 448 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 449 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 423 | CONFIG_NET_PCI=y | 450 | CONFIG_NET_PCI=y |
| 424 | # CONFIG_PCNET32 is not set | 451 | # CONFIG_PCNET32 is not set |
| 425 | # CONFIG_AMD8111_ETH is not set | 452 | # CONFIG_AMD8111_ETH is not set |
| @@ -427,7 +454,6 @@ CONFIG_NET_PCI=y | |||
| 427 | # CONFIG_B44 is not set | 454 | # CONFIG_B44 is not set |
| 428 | # CONFIG_FORCEDETH is not set | 455 | # CONFIG_FORCEDETH is not set |
| 429 | # CONFIG_TC35815 is not set | 456 | # CONFIG_TC35815 is not set |
| 430 | # CONFIG_DGRS is not set | ||
| 431 | # CONFIG_EEPRO100 is not set | 457 | # CONFIG_EEPRO100 is not set |
| 432 | # CONFIG_E100 is not set | 458 | # CONFIG_E100 is not set |
| 433 | # CONFIG_FEALNX is not set | 459 | # CONFIG_FEALNX is not set |
| @@ -439,6 +465,7 @@ CONFIG_8139TOO_PIO=y | |||
| 439 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 465 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 440 | # CONFIG_8139TOO_8129 is not set | 466 | # CONFIG_8139TOO_8129 is not set |
| 441 | # CONFIG_8139_OLD_RX_RESET is not set | 467 | # CONFIG_8139_OLD_RX_RESET is not set |
| 468 | # CONFIG_R6040 is not set | ||
| 442 | # CONFIG_SIS900 is not set | 469 | # CONFIG_SIS900 is not set |
| 443 | # CONFIG_EPIC100 is not set | 470 | # CONFIG_EPIC100 is not set |
| 444 | # CONFIG_SUNDANCE is not set | 471 | # CONFIG_SUNDANCE is not set |
| @@ -451,6 +478,10 @@ CONFIG_NETDEV_1000=y | |||
| 451 | # CONFIG_ACENIC is not set | 478 | # CONFIG_ACENIC is not set |
| 452 | # CONFIG_DL2K is not set | 479 | # CONFIG_DL2K is not set |
| 453 | # CONFIG_E1000 is not set | 480 | # CONFIG_E1000 is not set |
| 481 | # CONFIG_E1000E is not set | ||
| 482 | # CONFIG_E1000E_ENABLED is not set | ||
| 483 | # CONFIG_IP1000 is not set | ||
| 484 | # CONFIG_IGB is not set | ||
| 454 | # CONFIG_NS83820 is not set | 485 | # CONFIG_NS83820 is not set |
| 455 | # CONFIG_HAMACHI is not set | 486 | # CONFIG_HAMACHI is not set |
| 456 | # CONFIG_YELLOWFIN is not set | 487 | # CONFIG_YELLOWFIN is not set |
| @@ -472,6 +503,7 @@ CONFIG_VIA_VELOCITY=y | |||
| 472 | # | 503 | # |
| 473 | # CONFIG_WLAN_PRE80211 is not set | 504 | # CONFIG_WLAN_PRE80211 is not set |
| 474 | # CONFIG_WLAN_80211 is not set | 505 | # CONFIG_WLAN_80211 is not set |
| 506 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 475 | 507 | ||
| 476 | # | 508 | # |
| 477 | # USB Network Adapters | 509 | # USB Network Adapters |
| @@ -480,14 +512,12 @@ CONFIG_VIA_VELOCITY=y | |||
| 480 | # CONFIG_USB_KAWETH is not set | 512 | # CONFIG_USB_KAWETH is not set |
| 481 | # CONFIG_USB_PEGASUS is not set | 513 | # CONFIG_USB_PEGASUS is not set |
| 482 | # CONFIG_USB_RTL8150 is not set | 514 | # CONFIG_USB_RTL8150 is not set |
| 483 | # CONFIG_USB_USBNET_MII is not set | ||
| 484 | # CONFIG_USB_USBNET is not set | 515 | # CONFIG_USB_USBNET is not set |
| 485 | # CONFIG_WAN is not set | 516 | # CONFIG_WAN is not set |
| 486 | # CONFIG_FDDI is not set | 517 | # CONFIG_FDDI is not set |
| 487 | # CONFIG_HIPPI is not set | 518 | # CONFIG_HIPPI is not set |
| 488 | # CONFIG_PPP is not set | 519 | # CONFIG_PPP is not set |
| 489 | # CONFIG_SLIP is not set | 520 | # CONFIG_SLIP is not set |
| 490 | # CONFIG_SHAPER is not set | ||
| 491 | # CONFIG_NETCONSOLE is not set | 521 | # CONFIG_NETCONSOLE is not set |
| 492 | # CONFIG_NETPOLL is not set | 522 | # CONFIG_NETPOLL is not set |
| 493 | # CONFIG_NET_POLL_CONTROLLER is not set | 523 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -506,7 +536,6 @@ CONFIG_INPUT=y | |||
| 506 | # | 536 | # |
| 507 | # CONFIG_INPUT_MOUSEDEV is not set | 537 | # CONFIG_INPUT_MOUSEDEV is not set |
| 508 | # CONFIG_INPUT_JOYDEV is not set | 538 | # CONFIG_INPUT_JOYDEV is not set |
| 509 | # CONFIG_INPUT_TSDEV is not set | ||
| 510 | # CONFIG_INPUT_EVDEV is not set | 539 | # CONFIG_INPUT_EVDEV is not set |
| 511 | # CONFIG_INPUT_EVBUG is not set | 540 | # CONFIG_INPUT_EVBUG is not set |
| 512 | 541 | ||
| @@ -533,7 +562,9 @@ CONFIG_VT=y | |||
| 533 | CONFIG_VT_CONSOLE=y | 562 | CONFIG_VT_CONSOLE=y |
| 534 | CONFIG_HW_CONSOLE=y | 563 | CONFIG_HW_CONSOLE=y |
| 535 | CONFIG_VT_HW_CONSOLE_BINDING=y | 564 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 565 | # CONFIG_DEVKMEM is not set | ||
| 536 | # CONFIG_SERIAL_NONSTANDARD is not set | 566 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 567 | # CONFIG_NOZOMI is not set | ||
| 537 | 568 | ||
| 538 | # | 569 | # |
| 539 | # Serial drivers | 570 | # Serial drivers |
| @@ -552,52 +583,62 @@ CONFIG_UNIX98_PTYS=y | |||
| 552 | CONFIG_LEGACY_PTYS=y | 583 | CONFIG_LEGACY_PTYS=y |
| 553 | CONFIG_LEGACY_PTY_COUNT=256 | 584 | CONFIG_LEGACY_PTY_COUNT=256 |
| 554 | # CONFIG_IPMI_HANDLER is not set | 585 | # CONFIG_IPMI_HANDLER is not set |
| 555 | # CONFIG_WATCHDOG is not set | ||
| 556 | # CONFIG_HW_RANDOM is not set | 586 | # CONFIG_HW_RANDOM is not set |
| 557 | # CONFIG_RTC is not set | ||
| 558 | # CONFIG_R3964 is not set | 587 | # CONFIG_R3964 is not set |
| 559 | # CONFIG_APPLICOM is not set | 588 | # CONFIG_APPLICOM is not set |
| 560 | CONFIG_GPIO_TB0219=y | 589 | CONFIG_GPIO_TB0219=y |
| 561 | # CONFIG_DRM is not set | ||
| 562 | CONFIG_GPIO_VR41XX=y | 590 | CONFIG_GPIO_VR41XX=y |
| 563 | # CONFIG_RAW_DRIVER is not set | 591 | # CONFIG_RAW_DRIVER is not set |
| 564 | # CONFIG_TCG_TPM is not set | 592 | # CONFIG_TCG_TPM is not set |
| 565 | CONFIG_DEVPORT=y | 593 | CONFIG_DEVPORT=y |
| 566 | # CONFIG_I2C is not set | 594 | # CONFIG_I2C is not set |
| 567 | |||
| 568 | # | ||
| 569 | # SPI support | ||
| 570 | # | ||
| 571 | # CONFIG_SPI is not set | 595 | # CONFIG_SPI is not set |
| 572 | # CONFIG_SPI_MASTER is not set | ||
| 573 | # CONFIG_W1 is not set | 596 | # CONFIG_W1 is not set |
| 574 | # CONFIG_POWER_SUPPLY is not set | 597 | # CONFIG_POWER_SUPPLY is not set |
| 575 | # CONFIG_HWMON is not set | 598 | # CONFIG_HWMON is not set |
| 599 | # CONFIG_THERMAL is not set | ||
| 600 | # CONFIG_WATCHDOG is not set | ||
| 601 | |||
| 602 | # | ||
| 603 | # Sonics Silicon Backplane | ||
| 604 | # | ||
| 605 | CONFIG_SSB_POSSIBLE=y | ||
| 606 | # CONFIG_SSB is not set | ||
| 576 | 607 | ||
| 577 | # | 608 | # |
| 578 | # Multifunction device drivers | 609 | # Multifunction device drivers |
| 579 | # | 610 | # |
| 580 | # CONFIG_MFD_SM501 is not set | 611 | # CONFIG_MFD_SM501 is not set |
| 612 | # CONFIG_HTC_PASIC3 is not set | ||
| 581 | 613 | ||
| 582 | # | 614 | # |
| 583 | # Multimedia devices | 615 | # Multimedia devices |
| 584 | # | 616 | # |
| 617 | |||
| 618 | # | ||
| 619 | # Multimedia core support | ||
| 620 | # | ||
| 585 | # CONFIG_VIDEO_DEV is not set | 621 | # CONFIG_VIDEO_DEV is not set |
| 586 | # CONFIG_DVB_CORE is not set | 622 | # CONFIG_DVB_CORE is not set |
| 623 | |||
| 624 | # | ||
| 625 | # Multimedia drivers | ||
| 626 | # | ||
| 587 | # CONFIG_DAB is not set | 627 | # CONFIG_DAB is not set |
| 588 | 628 | ||
| 589 | # | 629 | # |
| 590 | # Graphics support | 630 | # Graphics support |
| 591 | # | 631 | # |
| 632 | # CONFIG_DRM is not set | ||
| 633 | # CONFIG_VGASTATE is not set | ||
| 634 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 635 | # CONFIG_FB is not set | ||
| 592 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 636 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 593 | 637 | ||
| 594 | # | 638 | # |
| 595 | # Display device support | 639 | # Display device support |
| 596 | # | 640 | # |
| 597 | # CONFIG_DISPLAY_SUPPORT is not set | 641 | # CONFIG_DISPLAY_SUPPORT is not set |
| 598 | # CONFIG_VGASTATE is not set | ||
| 599 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 600 | # CONFIG_FB is not set | ||
| 601 | 642 | ||
| 602 | # | 643 | # |
| 603 | # Console display driver support | 644 | # Console display driver support |
| @@ -616,6 +657,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 616 | CONFIG_USB_ARCH_HAS_EHCI=y | 657 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 617 | CONFIG_USB=m | 658 | CONFIG_USB=m |
| 618 | # CONFIG_USB_DEBUG is not set | 659 | # CONFIG_USB_DEBUG is not set |
| 660 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 619 | 661 | ||
| 620 | # | 662 | # |
| 621 | # Miscellaneous USB options | 663 | # Miscellaneous USB options |
| @@ -624,15 +666,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 624 | CONFIG_USB_DEVICE_CLASS=y | 666 | CONFIG_USB_DEVICE_CLASS=y |
| 625 | # CONFIG_USB_DYNAMIC_MINORS is not set | 667 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 626 | # CONFIG_USB_OTG is not set | 668 | # CONFIG_USB_OTG is not set |
| 669 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 670 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 627 | 671 | ||
| 628 | # | 672 | # |
| 629 | # USB Host Controller Drivers | 673 | # USB Host Controller Drivers |
| 630 | # | 674 | # |
| 675 | # CONFIG_USB_C67X00_HCD is not set | ||
| 631 | CONFIG_USB_EHCI_HCD=m | 676 | CONFIG_USB_EHCI_HCD=m |
| 632 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 633 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 677 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 634 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 678 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 635 | # CONFIG_USB_ISP116X_HCD is not set | 679 | # CONFIG_USB_ISP116X_HCD is not set |
| 680 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 636 | CONFIG_USB_OHCI_HCD=m | 681 | CONFIG_USB_OHCI_HCD=m |
| 637 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 682 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 638 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 683 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -665,10 +710,6 @@ CONFIG_USB_MON=y | |||
| 665 | # | 710 | # |
| 666 | # USB port drivers | 711 | # USB port drivers |
| 667 | # | 712 | # |
| 668 | |||
| 669 | # | ||
| 670 | # USB Serial Converter support | ||
| 671 | # | ||
| 672 | # CONFIG_USB_SERIAL is not set | 713 | # CONFIG_USB_SERIAL is not set |
| 673 | 714 | ||
| 674 | # | 715 | # |
| @@ -694,17 +735,11 @@ CONFIG_USB_MON=y | |||
| 694 | # CONFIG_USB_TRANCEVIBRATOR is not set | 735 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 695 | # CONFIG_USB_IOWARRIOR is not set | 736 | # CONFIG_USB_IOWARRIOR is not set |
| 696 | # CONFIG_USB_TEST is not set | 737 | # CONFIG_USB_TEST is not set |
| 697 | |||
| 698 | # | ||
| 699 | # USB DSL modem support | ||
| 700 | # | ||
| 701 | |||
| 702 | # | ||
| 703 | # USB Gadget Support | ||
| 704 | # | ||
| 705 | # CONFIG_USB_GADGET is not set | 738 | # CONFIG_USB_GADGET is not set |
| 706 | # CONFIG_MMC is not set | 739 | # CONFIG_MMC is not set |
| 740 | # CONFIG_MEMSTICK is not set | ||
| 707 | # CONFIG_NEW_LEDS is not set | 741 | # CONFIG_NEW_LEDS is not set |
| 742 | # CONFIG_ACCESSIBILITY is not set | ||
| 708 | # CONFIG_INFINIBAND is not set | 743 | # CONFIG_INFINIBAND is not set |
| 709 | CONFIG_RTC_LIB=y | 744 | CONFIG_RTC_LIB=y |
| 710 | CONFIG_RTC_CLASS=y | 745 | CONFIG_RTC_CLASS=y |
| @@ -729,9 +764,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 729 | # Platform RTC drivers | 764 | # Platform RTC drivers |
| 730 | # | 765 | # |
| 731 | # CONFIG_RTC_DRV_CMOS is not set | 766 | # CONFIG_RTC_DRV_CMOS is not set |
| 767 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 732 | # CONFIG_RTC_DRV_DS1553 is not set | 768 | # CONFIG_RTC_DRV_DS1553 is not set |
| 733 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 734 | # CONFIG_RTC_DRV_DS1742 is not set | 769 | # CONFIG_RTC_DRV_DS1742 is not set |
| 770 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 735 | # CONFIG_RTC_DRV_M48T86 is not set | 771 | # CONFIG_RTC_DRV_M48T86 is not set |
| 736 | # CONFIG_RTC_DRV_M48T59 is not set | 772 | # CONFIG_RTC_DRV_M48T59 is not set |
| 737 | # CONFIG_RTC_DRV_V3020 is not set | 773 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -740,23 +776,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 740 | # on-CPU RTC drivers | 776 | # on-CPU RTC drivers |
| 741 | # | 777 | # |
| 742 | CONFIG_RTC_DRV_VR41XX=y | 778 | CONFIG_RTC_DRV_VR41XX=y |
| 743 | |||
| 744 | # | ||
| 745 | # DMA Engine support | ||
| 746 | # | ||
| 747 | # CONFIG_DMA_ENGINE is not set | ||
| 748 | |||
| 749 | # | ||
| 750 | # DMA Clients | ||
| 751 | # | ||
| 752 | |||
| 753 | # | ||
| 754 | # DMA Devices | ||
| 755 | # | ||
| 756 | |||
| 757 | # | ||
| 758 | # Userspace I/O | ||
| 759 | # | ||
| 760 | # CONFIG_UIO is not set | 779 | # CONFIG_UIO is not set |
| 761 | 780 | ||
| 762 | # | 781 | # |
| @@ -771,20 +790,16 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 771 | # CONFIG_EXT3_FS_SECURITY is not set | 790 | # CONFIG_EXT3_FS_SECURITY is not set |
| 772 | # CONFIG_EXT4DEV_FS is not set | 791 | # CONFIG_EXT4DEV_FS is not set |
| 773 | CONFIG_JBD=y | 792 | CONFIG_JBD=y |
| 774 | # CONFIG_JBD_DEBUG is not set | ||
| 775 | CONFIG_FS_MBCACHE=y | 793 | CONFIG_FS_MBCACHE=y |
| 776 | # CONFIG_REISERFS_FS is not set | 794 | # CONFIG_REISERFS_FS is not set |
| 777 | # CONFIG_JFS_FS is not set | 795 | # CONFIG_JFS_FS is not set |
| 778 | CONFIG_FS_POSIX_ACL=y | 796 | CONFIG_FS_POSIX_ACL=y |
| 779 | # CONFIG_XFS_FS is not set | 797 | # CONFIG_XFS_FS is not set |
| 780 | # CONFIG_GFS2_FS is not set | ||
| 781 | # CONFIG_OCFS2_FS is not set | 798 | # CONFIG_OCFS2_FS is not set |
| 782 | # CONFIG_MINIX_FS is not set | 799 | CONFIG_DNOTIFY=y |
| 783 | CONFIG_ROMFS_FS=m | ||
| 784 | CONFIG_INOTIFY=y | 800 | CONFIG_INOTIFY=y |
| 785 | CONFIG_INOTIFY_USER=y | 801 | CONFIG_INOTIFY_USER=y |
| 786 | # CONFIG_QUOTA is not set | 802 | # CONFIG_QUOTA is not set |
| 787 | CONFIG_DNOTIFY=y | ||
| 788 | # CONFIG_AUTOFS_FS is not set | 803 | # CONFIG_AUTOFS_FS is not set |
| 789 | CONFIG_AUTOFS4_FS=y | 804 | CONFIG_AUTOFS4_FS=y |
| 790 | # CONFIG_FUSE_FS is not set | 805 | # CONFIG_FUSE_FS is not set |
| @@ -813,7 +828,6 @@ CONFIG_SYSFS=y | |||
| 813 | CONFIG_TMPFS=y | 828 | CONFIG_TMPFS=y |
| 814 | CONFIG_TMPFS_POSIX_ACL=y | 829 | CONFIG_TMPFS_POSIX_ACL=y |
| 815 | # CONFIG_HUGETLB_PAGE is not set | 830 | # CONFIG_HUGETLB_PAGE is not set |
| 816 | CONFIG_RAMFS=y | ||
| 817 | # CONFIG_CONFIGFS_FS is not set | 831 | # CONFIG_CONFIGFS_FS is not set |
| 818 | 832 | ||
| 819 | # | 833 | # |
| @@ -828,24 +842,21 @@ CONFIG_RAMFS=y | |||
| 828 | # CONFIG_EFS_FS is not set | 842 | # CONFIG_EFS_FS is not set |
| 829 | CONFIG_CRAMFS=m | 843 | CONFIG_CRAMFS=m |
| 830 | # CONFIG_VXFS_FS is not set | 844 | # CONFIG_VXFS_FS is not set |
| 845 | # CONFIG_MINIX_FS is not set | ||
| 831 | # CONFIG_HPFS_FS is not set | 846 | # CONFIG_HPFS_FS is not set |
| 832 | # CONFIG_QNX4FS_FS is not set | 847 | # CONFIG_QNX4FS_FS is not set |
| 848 | CONFIG_ROMFS_FS=m | ||
| 833 | # CONFIG_SYSV_FS is not set | 849 | # CONFIG_SYSV_FS is not set |
| 834 | # CONFIG_UFS_FS is not set | 850 | # CONFIG_UFS_FS is not set |
| 835 | 851 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 836 | # | ||
| 837 | # Network File Systems | ||
| 838 | # | ||
| 839 | CONFIG_NFS_FS=y | 852 | CONFIG_NFS_FS=y |
| 840 | CONFIG_NFS_V3=y | 853 | CONFIG_NFS_V3=y |
| 841 | # CONFIG_NFS_V3_ACL is not set | 854 | # CONFIG_NFS_V3_ACL is not set |
| 842 | # CONFIG_NFS_V4 is not set | 855 | # CONFIG_NFS_V4 is not set |
| 843 | # CONFIG_NFS_DIRECTIO is not set | ||
| 844 | CONFIG_NFSD=y | 856 | CONFIG_NFSD=y |
| 845 | CONFIG_NFSD_V3=y | 857 | CONFIG_NFSD_V3=y |
| 846 | # CONFIG_NFSD_V3_ACL is not set | 858 | # CONFIG_NFSD_V3_ACL is not set |
| 847 | # CONFIG_NFSD_V4 is not set | 859 | # CONFIG_NFSD_V4 is not set |
| 848 | CONFIG_NFSD_TCP=y | ||
| 849 | CONFIG_ROOT_NFS=y | 860 | CONFIG_ROOT_NFS=y |
| 850 | CONFIG_LOCKD=y | 861 | CONFIG_LOCKD=y |
| 851 | CONFIG_LOCKD_V4=y | 862 | CONFIG_LOCKD_V4=y |
| @@ -866,47 +877,38 @@ CONFIG_SUNRPC=y | |||
| 866 | # | 877 | # |
| 867 | # CONFIG_PARTITION_ADVANCED is not set | 878 | # CONFIG_PARTITION_ADVANCED is not set |
| 868 | CONFIG_MSDOS_PARTITION=y | 879 | CONFIG_MSDOS_PARTITION=y |
| 869 | |||
| 870 | # | ||
| 871 | # Native Language Support | ||
| 872 | # | ||
| 873 | # CONFIG_NLS is not set | 880 | # CONFIG_NLS is not set |
| 874 | |||
| 875 | # | ||
| 876 | # Distributed Lock Manager | ||
| 877 | # | ||
| 878 | # CONFIG_DLM is not set | 881 | # CONFIG_DLM is not set |
| 879 | 882 | ||
| 880 | # | 883 | # |
| 881 | # Profiling support | ||
| 882 | # | ||
| 883 | # CONFIG_PROFILING is not set | ||
| 884 | |||
| 885 | # | ||
| 886 | # Kernel hacking | 884 | # Kernel hacking |
| 887 | # | 885 | # |
| 888 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 886 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 889 | # CONFIG_PRINTK_TIME is not set | 887 | # CONFIG_PRINTK_TIME is not set |
| 888 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 890 | CONFIG_ENABLE_MUST_CHECK=y | 889 | CONFIG_ENABLE_MUST_CHECK=y |
| 890 | CONFIG_FRAME_WARN=1024 | ||
| 891 | # CONFIG_MAGIC_SYSRQ is not set | 891 | # CONFIG_MAGIC_SYSRQ is not set |
| 892 | # CONFIG_UNUSED_SYMBOLS is not set | 892 | # CONFIG_UNUSED_SYMBOLS is not set |
| 893 | # CONFIG_DEBUG_FS is not set | 893 | # CONFIG_DEBUG_FS is not set |
| 894 | # CONFIG_HEADERS_CHECK is not set | 894 | # CONFIG_HEADERS_CHECK is not set |
| 895 | # CONFIG_DEBUG_KERNEL is not set | 895 | # CONFIG_DEBUG_KERNEL is not set |
| 896 | CONFIG_CROSSCOMPILE=y | 896 | # CONFIG_SAMPLES is not set |
| 897 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 897 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 898 | 898 | ||
| 899 | # | 899 | # |
| 900 | # Security options | 900 | # Security options |
| 901 | # | 901 | # |
| 902 | # CONFIG_KEYS is not set | 902 | # CONFIG_KEYS is not set |
| 903 | # CONFIG_SECURITY is not set | 903 | # CONFIG_SECURITY is not set |
| 904 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 904 | # CONFIG_CRYPTO is not set | 905 | # CONFIG_CRYPTO is not set |
| 905 | 906 | ||
| 906 | # | 907 | # |
| 907 | # Library routines | 908 | # Library routines |
| 908 | # | 909 | # |
| 909 | CONFIG_BITREVERSE=y | 910 | CONFIG_BITREVERSE=y |
| 911 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 910 | CONFIG_CRC_CCITT=y | 912 | CONFIG_CRC_CCITT=y |
| 911 | # CONFIG_CRC16 is not set | 913 | # CONFIG_CRC16 is not set |
| 912 | # CONFIG_CRC_ITU_T is not set | 914 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index a95385b24546..2ba240e897c6 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_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.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Thu Aug 9 11:16:55 2007 | 4 | # Mon May 12 11:53:54 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,23 +171,29 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| 168 | CONFIG_EMBEDDED=y | 186 | CONFIG_EMBEDDED=y |
| 169 | CONFIG_SYSCTL_SYSCALL=y | 187 | CONFIG_SYSCTL_SYSCALL=y |
| 188 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 170 | CONFIG_KALLSYMS=y | 189 | CONFIG_KALLSYMS=y |
| 171 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 190 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 172 | CONFIG_HOTPLUG=y | 191 | CONFIG_HOTPLUG=y |
| 173 | CONFIG_PRINTK=y | 192 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 193 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 194 | CONFIG_ELF_CORE=y |
| 195 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 196 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 197 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 198 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 199 | CONFIG_ANON_INODES=y |
| @@ -185,10 +206,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 206 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 207 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 208 | # CONFIG_SLOB is not set |
| 209 | # CONFIG_PROFILING is not set | ||
| 210 | # CONFIG_MARKERS is not set | ||
| 211 | CONFIG_HAVE_OPROFILE=y | ||
| 212 | # CONFIG_HAVE_KPROBES is not set | ||
| 213 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 214 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 215 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 216 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 217 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 218 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 219 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 220 | CONFIG_MODULES=y |
| 221 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 222 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 223 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 224 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +242,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 242 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 243 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 244 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 245 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 246 | ||
| 216 | # | 247 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 248 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 249 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 250 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 251 | CONFIG_PCI=y |
| 252 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 253 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 254 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 256 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 257 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 258 | ||
| @@ -237,6 +266,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 266 | # |
| 238 | # Power management options | 267 | # Power management options |
| 239 | # | 268 | # |
| 269 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 270 | # CONFIG_PM is not set |
| 241 | 271 | ||
| 242 | # | 272 | # |
| @@ -277,6 +307,7 @@ CONFIG_SYN_COOKIES=y | |||
| 277 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 307 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 278 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 308 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 279 | # CONFIG_INET_XFRM_MODE_BEET is not set | 309 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 310 | # CONFIG_INET_LRO is not set | ||
| 280 | CONFIG_INET_DIAG=y | 311 | CONFIG_INET_DIAG=y |
| 281 | CONFIG_INET_TCP_DIAG=y | 312 | CONFIG_INET_TCP_DIAG=y |
| 282 | # CONFIG_TCP_CONG_ADVANCED is not set | 313 | # CONFIG_TCP_CONG_ADVANCED is not set |
| @@ -284,15 +315,10 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 284 | CONFIG_DEFAULT_TCP_CONG="cubic" | 315 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 285 | # CONFIG_TCP_MD5SIG is not set | 316 | # CONFIG_TCP_MD5SIG is not set |
| 286 | # CONFIG_IPV6 is not set | 317 | # CONFIG_IPV6 is not set |
| 287 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 288 | # CONFIG_INET6_TUNNEL is not set | ||
| 289 | CONFIG_NETWORK_SECMARK=y | 318 | CONFIG_NETWORK_SECMARK=y |
| 290 | # CONFIG_NETFILTER is not set | 319 | # CONFIG_NETFILTER is not set |
| 291 | # CONFIG_IP_DCCP is not set | 320 | # CONFIG_IP_DCCP is not set |
| 292 | # CONFIG_IP_SCTP is not set | 321 | # CONFIG_IP_SCTP is not set |
| 293 | # CONFIG_SCTP_HMAC_NONE is not set | ||
| 294 | # CONFIG_SCTP_HMAC_SHA1 is not set | ||
| 295 | # CONFIG_SCTP_HMAC_MD5 is not set | ||
| 296 | # CONFIG_TIPC is not set | 322 | # CONFIG_TIPC is not set |
| 297 | # CONFIG_ATM is not set | 323 | # CONFIG_ATM is not set |
| 298 | # CONFIG_BRIDGE is not set | 324 | # CONFIG_BRIDGE is not set |
| @@ -305,10 +331,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 305 | # CONFIG_LAPB is not set | 331 | # CONFIG_LAPB is not set |
| 306 | # CONFIG_ECONET is not set | 332 | # CONFIG_ECONET is not set |
| 307 | # CONFIG_WAN_ROUTER is not set | 333 | # CONFIG_WAN_ROUTER is not set |
| 308 | |||
| 309 | # | ||
| 310 | # QoS and/or fair queueing | ||
| 311 | # | ||
| 312 | # CONFIG_NET_SCHED is not set | 334 | # CONFIG_NET_SCHED is not set |
| 313 | 335 | ||
| 314 | # | 336 | # |
| @@ -316,6 +338,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 316 | # | 338 | # |
| 317 | # CONFIG_NET_PKTGEN is not set | 339 | # CONFIG_NET_PKTGEN is not set |
| 318 | # CONFIG_HAMRADIO is not set | 340 | # CONFIG_HAMRADIO is not set |
| 341 | # CONFIG_CAN is not set | ||
| 319 | # CONFIG_IRDA is not set | 342 | # CONFIG_IRDA is not set |
| 320 | # CONFIG_BT is not set | 343 | # CONFIG_BT is not set |
| 321 | # CONFIG_AF_RXRPC is not set | 344 | # CONFIG_AF_RXRPC is not set |
| @@ -338,6 +361,7 @@ CONFIG_FIB_RULES=y | |||
| 338 | # | 361 | # |
| 339 | # Generic Driver Options | 362 | # Generic Driver Options |
| 340 | # | 363 | # |
| 364 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 341 | CONFIG_STANDALONE=y | 365 | CONFIG_STANDALONE=y |
| 342 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 366 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 343 | CONFIG_FW_LOADER=y | 367 | CONFIG_FW_LOADER=y |
| @@ -359,10 +383,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 359 | CONFIG_BLK_DEV_RAM=y | 383 | CONFIG_BLK_DEV_RAM=y |
| 360 | CONFIG_BLK_DEV_RAM_COUNT=16 | 384 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 361 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 385 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 362 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 386 | CONFIG_BLK_DEV_XIP=y |
| 363 | # CONFIG_CDROM_PKTCDVD is not set | 387 | # CONFIG_CDROM_PKTCDVD is not set |
| 364 | # CONFIG_ATA_OVER_ETH is not set | 388 | # CONFIG_ATA_OVER_ETH is not set |
| 365 | # CONFIG_MISC_DEVICES is not set | 389 | # CONFIG_MISC_DEVICES is not set |
| 390 | CONFIG_HAVE_IDE=y | ||
| 366 | # CONFIG_IDE is not set | 391 | # CONFIG_IDE is not set |
| 367 | 392 | ||
| 368 | # | 393 | # |
| @@ -402,18 +427,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 402 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 427 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 403 | CONFIG_SCSI_SAS_ATTRS=m | 428 | CONFIG_SCSI_SAS_ATTRS=m |
| 404 | CONFIG_SCSI_SAS_LIBSAS=m | 429 | CONFIG_SCSI_SAS_LIBSAS=m |
| 430 | CONFIG_SCSI_SAS_HOST_SMP=y | ||
| 405 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 431 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
| 432 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 406 | # CONFIG_SCSI_LOWLEVEL is not set | 433 | # CONFIG_SCSI_LOWLEVEL is not set |
| 407 | # CONFIG_ATA is not set | 434 | # CONFIG_ATA is not set |
| 408 | # CONFIG_MD is not set | 435 | # CONFIG_MD is not set |
| 409 | |||
| 410 | # | ||
| 411 | # Fusion MPT device support | ||
| 412 | # | ||
| 413 | # CONFIG_FUSION is not set | 436 | # CONFIG_FUSION is not set |
| 414 | # CONFIG_FUSION_SPI is not set | ||
| 415 | # CONFIG_FUSION_FC is not set | ||
| 416 | # CONFIG_FUSION_SAS is not set | ||
| 417 | 437 | ||
| 418 | # | 438 | # |
| 419 | # IEEE 1394 (FireWire) support | 439 | # IEEE 1394 (FireWire) support |
| @@ -428,6 +448,7 @@ CONFIG_NETDEVICES=y | |||
| 428 | # CONFIG_MACVLAN is not set | 448 | # CONFIG_MACVLAN is not set |
| 429 | # CONFIG_EQUALIZER is not set | 449 | # CONFIG_EQUALIZER is not set |
| 430 | # CONFIG_TUN is not set | 450 | # CONFIG_TUN is not set |
| 451 | # CONFIG_VETH is not set | ||
| 431 | # CONFIG_ARCNET is not set | 452 | # CONFIG_ARCNET is not set |
| 432 | # CONFIG_PHYLIB is not set | 453 | # CONFIG_PHYLIB is not set |
| 433 | CONFIG_NET_ETHERNET=y | 454 | CONFIG_NET_ETHERNET=y |
| @@ -440,6 +461,10 @@ CONFIG_MII=y | |||
| 440 | # CONFIG_DM9000 is not set | 461 | # CONFIG_DM9000 is not set |
| 441 | # CONFIG_NET_TULIP is not set | 462 | # CONFIG_NET_TULIP is not set |
| 442 | # CONFIG_HP100 is not set | 463 | # CONFIG_HP100 is not set |
| 464 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 465 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 466 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 467 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 443 | CONFIG_NET_PCI=y | 468 | CONFIG_NET_PCI=y |
| 444 | # CONFIG_PCNET32 is not set | 469 | # CONFIG_PCNET32 is not set |
| 445 | # CONFIG_AMD8111_ETH is not set | 470 | # CONFIG_AMD8111_ETH is not set |
| @@ -447,7 +472,6 @@ CONFIG_NET_PCI=y | |||
| 447 | # CONFIG_B44 is not set | 472 | # CONFIG_B44 is not set |
| 448 | # CONFIG_FORCEDETH is not set | 473 | # CONFIG_FORCEDETH is not set |
| 449 | # CONFIG_TC35815 is not set | 474 | # CONFIG_TC35815 is not set |
| 450 | # CONFIG_DGRS is not set | ||
| 451 | # CONFIG_EEPRO100 is not set | 475 | # CONFIG_EEPRO100 is not set |
| 452 | CONFIG_E100=y | 476 | CONFIG_E100=y |
| 453 | # CONFIG_FEALNX is not set | 477 | # CONFIG_FEALNX is not set |
| @@ -455,6 +479,7 @@ CONFIG_E100=y | |||
| 455 | # CONFIG_NE2K_PCI is not set | 479 | # CONFIG_NE2K_PCI is not set |
| 456 | # CONFIG_8139CP is not set | 480 | # CONFIG_8139CP is not set |
| 457 | # CONFIG_8139TOO is not set | 481 | # CONFIG_8139TOO is not set |
| 482 | # CONFIG_R6040 is not set | ||
| 458 | # CONFIG_SIS900 is not set | 483 | # CONFIG_SIS900 is not set |
| 459 | # CONFIG_EPIC100 is not set | 484 | # CONFIG_EPIC100 is not set |
| 460 | # CONFIG_SUNDANCE is not set | 485 | # CONFIG_SUNDANCE is not set |
| @@ -470,6 +495,7 @@ CONFIG_E100=y | |||
| 470 | # | 495 | # |
| 471 | # CONFIG_WLAN_PRE80211 is not set | 496 | # CONFIG_WLAN_PRE80211 is not set |
| 472 | # CONFIG_WLAN_80211 is not set | 497 | # CONFIG_WLAN_80211 is not set |
| 498 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 473 | 499 | ||
| 474 | # | 500 | # |
| 475 | # USB Network Adapters | 501 | # USB Network Adapters |
| @@ -478,7 +504,6 @@ CONFIG_USB_CATC=m | |||
| 478 | CONFIG_USB_KAWETH=m | 504 | CONFIG_USB_KAWETH=m |
| 479 | CONFIG_USB_PEGASUS=m | 505 | CONFIG_USB_PEGASUS=m |
| 480 | CONFIG_USB_RTL8150=m | 506 | CONFIG_USB_RTL8150=m |
| 481 | # CONFIG_USB_USBNET_MII is not set | ||
| 482 | # CONFIG_USB_USBNET is not set | 507 | # CONFIG_USB_USBNET is not set |
| 483 | # CONFIG_WAN is not set | 508 | # CONFIG_WAN is not set |
| 484 | # CONFIG_FDDI is not set | 509 | # CONFIG_FDDI is not set |
| @@ -486,7 +511,6 @@ CONFIG_USB_RTL8150=m | |||
| 486 | # CONFIG_PPP is not set | 511 | # CONFIG_PPP is not set |
| 487 | # CONFIG_SLIP is not set | 512 | # CONFIG_SLIP is not set |
| 488 | # CONFIG_NET_FC is not set | 513 | # CONFIG_NET_FC is not set |
| 489 | # CONFIG_SHAPER is not set | ||
| 490 | # CONFIG_NETCONSOLE is not set | 514 | # CONFIG_NETCONSOLE is not set |
| 491 | # CONFIG_NETPOLL is not set | 515 | # CONFIG_NETPOLL is not set |
| 492 | # CONFIG_NET_POLL_CONTROLLER is not set | 516 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -505,7 +529,6 @@ CONFIG_INPUT=y | |||
| 505 | # | 529 | # |
| 506 | # CONFIG_INPUT_MOUSEDEV is not set | 530 | # CONFIG_INPUT_MOUSEDEV is not set |
| 507 | # CONFIG_INPUT_JOYDEV is not set | 531 | # CONFIG_INPUT_JOYDEV is not set |
| 508 | # CONFIG_INPUT_TSDEV is not set | ||
| 509 | # CONFIG_INPUT_EVDEV is not set | 532 | # CONFIG_INPUT_EVDEV is not set |
| 510 | # CONFIG_INPUT_EVBUG is not set | 533 | # CONFIG_INPUT_EVBUG is not set |
| 511 | 534 | ||
| @@ -532,7 +555,9 @@ CONFIG_VT=y | |||
| 532 | CONFIG_VT_CONSOLE=y | 555 | CONFIG_VT_CONSOLE=y |
| 533 | CONFIG_HW_CONSOLE=y | 556 | CONFIG_HW_CONSOLE=y |
| 534 | CONFIG_VT_HW_CONSOLE_BINDING=y | 557 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 558 | # CONFIG_DEVKMEM is not set | ||
| 535 | # CONFIG_SERIAL_NONSTANDARD is not set | 559 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 560 | # CONFIG_NOZOMI is not set | ||
| 536 | 561 | ||
| 537 | # | 562 | # |
| 538 | # Serial drivers | 563 | # Serial drivers |
| @@ -551,52 +576,62 @@ CONFIG_UNIX98_PTYS=y | |||
| 551 | CONFIG_LEGACY_PTYS=y | 576 | CONFIG_LEGACY_PTYS=y |
| 552 | CONFIG_LEGACY_PTY_COUNT=256 | 577 | CONFIG_LEGACY_PTY_COUNT=256 |
| 553 | # CONFIG_IPMI_HANDLER is not set | 578 | # CONFIG_IPMI_HANDLER is not set |
| 554 | # CONFIG_WATCHDOG is not set | ||
| 555 | # CONFIG_HW_RANDOM is not set | 579 | # CONFIG_HW_RANDOM is not set |
| 556 | # CONFIG_RTC is not set | ||
| 557 | # CONFIG_R3964 is not set | 580 | # CONFIG_R3964 is not set |
| 558 | # CONFIG_APPLICOM is not set | 581 | # CONFIG_APPLICOM is not set |
| 559 | # CONFIG_GPIO_TB0219 is not set | 582 | # CONFIG_GPIO_TB0219 is not set |
| 560 | # CONFIG_DRM is not set | ||
| 561 | CONFIG_GPIO_VR41XX=y | 583 | CONFIG_GPIO_VR41XX=y |
| 562 | # CONFIG_RAW_DRIVER is not set | 584 | # CONFIG_RAW_DRIVER is not set |
| 563 | # CONFIG_TCG_TPM is not set | 585 | # CONFIG_TCG_TPM is not set |
| 564 | CONFIG_DEVPORT=y | 586 | CONFIG_DEVPORT=y |
| 565 | # CONFIG_I2C is not set | 587 | # CONFIG_I2C is not set |
| 566 | |||
| 567 | # | ||
| 568 | # SPI support | ||
| 569 | # | ||
| 570 | # CONFIG_SPI is not set | 588 | # CONFIG_SPI is not set |
| 571 | # CONFIG_SPI_MASTER is not set | ||
| 572 | # CONFIG_W1 is not set | 589 | # CONFIG_W1 is not set |
| 573 | # CONFIG_POWER_SUPPLY is not set | 590 | # CONFIG_POWER_SUPPLY is not set |
| 574 | # CONFIG_HWMON is not set | 591 | # CONFIG_HWMON is not set |
| 592 | # CONFIG_THERMAL is not set | ||
| 593 | # CONFIG_WATCHDOG is not set | ||
| 594 | |||
| 595 | # | ||
| 596 | # Sonics Silicon Backplane | ||
| 597 | # | ||
| 598 | CONFIG_SSB_POSSIBLE=y | ||
| 599 | # CONFIG_SSB is not set | ||
| 575 | 600 | ||
| 576 | # | 601 | # |
| 577 | # Multifunction device drivers | 602 | # Multifunction device drivers |
| 578 | # | 603 | # |
| 579 | # CONFIG_MFD_SM501 is not set | 604 | # CONFIG_MFD_SM501 is not set |
| 605 | # CONFIG_HTC_PASIC3 is not set | ||
| 580 | 606 | ||
| 581 | # | 607 | # |
| 582 | # Multimedia devices | 608 | # Multimedia devices |
| 583 | # | 609 | # |
| 610 | |||
| 611 | # | ||
| 612 | # Multimedia core support | ||
| 613 | # | ||
| 584 | # CONFIG_VIDEO_DEV is not set | 614 | # CONFIG_VIDEO_DEV is not set |
| 585 | # CONFIG_DVB_CORE is not set | 615 | # CONFIG_DVB_CORE is not set |
| 616 | |||
| 617 | # | ||
| 618 | # Multimedia drivers | ||
| 619 | # | ||
| 586 | # CONFIG_DAB is not set | 620 | # CONFIG_DAB is not set |
| 587 | 621 | ||
| 588 | # | 622 | # |
| 589 | # Graphics support | 623 | # Graphics support |
| 590 | # | 624 | # |
| 625 | # CONFIG_DRM is not set | ||
| 626 | # CONFIG_VGASTATE is not set | ||
| 627 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 628 | # CONFIG_FB is not set | ||
| 591 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 629 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 592 | 630 | ||
| 593 | # | 631 | # |
| 594 | # Display device support | 632 | # Display device support |
| 595 | # | 633 | # |
| 596 | # CONFIG_DISPLAY_SUPPORT is not set | 634 | # CONFIG_DISPLAY_SUPPORT is not set |
| 597 | # CONFIG_VGASTATE is not set | ||
| 598 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 599 | # CONFIG_FB is not set | ||
| 600 | 635 | ||
| 601 | # | 636 | # |
| 602 | # Console display driver support | 637 | # Console display driver support |
| @@ -615,6 +650,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 615 | CONFIG_USB_ARCH_HAS_EHCI=y | 650 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 616 | CONFIG_USB=y | 651 | CONFIG_USB=y |
| 617 | # CONFIG_USB_DEBUG is not set | 652 | # CONFIG_USB_DEBUG is not set |
| 653 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 618 | 654 | ||
| 619 | # | 655 | # |
| 620 | # Miscellaneous USB options | 656 | # Miscellaneous USB options |
| @@ -623,15 +659,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 623 | CONFIG_USB_DEVICE_CLASS=y | 659 | CONFIG_USB_DEVICE_CLASS=y |
| 624 | # CONFIG_USB_DYNAMIC_MINORS is not set | 660 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 625 | # CONFIG_USB_OTG is not set | 661 | # CONFIG_USB_OTG is not set |
| 662 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 663 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 626 | 664 | ||
| 627 | # | 665 | # |
| 628 | # USB Host Controller Drivers | 666 | # USB Host Controller Drivers |
| 629 | # | 667 | # |
| 668 | # CONFIG_USB_C67X00_HCD is not set | ||
| 630 | CONFIG_USB_EHCI_HCD=y | 669 | CONFIG_USB_EHCI_HCD=y |
| 631 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 632 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 670 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 633 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 671 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 634 | # CONFIG_USB_ISP116X_HCD is not set | 672 | # CONFIG_USB_ISP116X_HCD is not set |
| 673 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 635 | CONFIG_USB_OHCI_HCD=y | 674 | CONFIG_USB_OHCI_HCD=y |
| 636 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 675 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 637 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 676 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -657,13 +696,16 @@ CONFIG_USB_STORAGE=y | |||
| 657 | # CONFIG_USB_STORAGE_DEBUG is not set | 696 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 658 | # CONFIG_USB_STORAGE_DATAFAB is not set | 697 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 659 | # CONFIG_USB_STORAGE_FREECOM is not set | 698 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 699 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 660 | # CONFIG_USB_STORAGE_DPCM is not set | 700 | # CONFIG_USB_STORAGE_DPCM is not set |
| 661 | # CONFIG_USB_STORAGE_USBAT is not set | 701 | # CONFIG_USB_STORAGE_USBAT is not set |
| 662 | # CONFIG_USB_STORAGE_SDDR09 is not set | 702 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 663 | # CONFIG_USB_STORAGE_SDDR55 is not set | 703 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 664 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 704 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 665 | # CONFIG_USB_STORAGE_ALAUDA is not set | 705 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 706 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 666 | # CONFIG_USB_STORAGE_KARMA is not set | 707 | # CONFIG_USB_STORAGE_KARMA is not set |
| 708 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 667 | # CONFIG_USB_LIBUSUAL is not set | 709 | # CONFIG_USB_LIBUSUAL is not set |
| 668 | 710 | ||
| 669 | # | 711 | # |
| @@ -676,10 +718,6 @@ CONFIG_USB_STORAGE=y | |||
| 676 | # | 718 | # |
| 677 | # USB port drivers | 719 | # USB port drivers |
| 678 | # | 720 | # |
| 679 | |||
| 680 | # | ||
| 681 | # USB Serial Converter support | ||
| 682 | # | ||
| 683 | # CONFIG_USB_SERIAL is not set | 721 | # CONFIG_USB_SERIAL is not set |
| 684 | 722 | ||
| 685 | # | 723 | # |
| @@ -705,17 +743,11 @@ CONFIG_USB_STORAGE=y | |||
| 705 | # CONFIG_USB_TRANCEVIBRATOR is not set | 743 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 706 | # CONFIG_USB_IOWARRIOR is not set | 744 | # CONFIG_USB_IOWARRIOR is not set |
| 707 | # CONFIG_USB_TEST is not set | 745 | # CONFIG_USB_TEST is not set |
| 708 | |||
| 709 | # | ||
| 710 | # USB DSL modem support | ||
| 711 | # | ||
| 712 | |||
| 713 | # | ||
| 714 | # USB Gadget Support | ||
| 715 | # | ||
| 716 | # CONFIG_USB_GADGET is not set | 746 | # CONFIG_USB_GADGET is not set |
| 717 | # CONFIG_MMC is not set | 747 | # CONFIG_MMC is not set |
| 748 | # CONFIG_MEMSTICK is not set | ||
| 718 | # CONFIG_NEW_LEDS is not set | 749 | # CONFIG_NEW_LEDS is not set |
| 750 | # CONFIG_ACCESSIBILITY is not set | ||
| 719 | # CONFIG_INFINIBAND is not set | 751 | # CONFIG_INFINIBAND is not set |
| 720 | CONFIG_RTC_LIB=y | 752 | CONFIG_RTC_LIB=y |
| 721 | CONFIG_RTC_CLASS=y | 753 | CONFIG_RTC_CLASS=y |
| @@ -740,9 +772,10 @@ CONFIG_RTC_INTF_DEV=y | |||
| 740 | # Platform RTC drivers | 772 | # Platform RTC drivers |
| 741 | # | 773 | # |
| 742 | # CONFIG_RTC_DRV_CMOS is not set | 774 | # CONFIG_RTC_DRV_CMOS is not set |
| 775 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 743 | # CONFIG_RTC_DRV_DS1553 is not set | 776 | # CONFIG_RTC_DRV_DS1553 is not set |
| 744 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 745 | # CONFIG_RTC_DRV_DS1742 is not set | 777 | # CONFIG_RTC_DRV_DS1742 is not set |
| 778 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 746 | # CONFIG_RTC_DRV_M48T86 is not set | 779 | # CONFIG_RTC_DRV_M48T86 is not set |
| 747 | # CONFIG_RTC_DRV_M48T59 is not set | 780 | # CONFIG_RTC_DRV_M48T59 is not set |
| 748 | # CONFIG_RTC_DRV_V3020 is not set | 781 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -751,23 +784,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 751 | # on-CPU RTC drivers | 784 | # on-CPU RTC drivers |
| 752 | # | 785 | # |
| 753 | CONFIG_RTC_DRV_VR41XX=y | 786 | CONFIG_RTC_DRV_VR41XX=y |
| 754 | |||
| 755 | # | ||
| 756 | # DMA Engine support | ||
| 757 | # | ||
| 758 | # CONFIG_DMA_ENGINE is not set | ||
| 759 | |||
| 760 | # | ||
| 761 | # DMA Clients | ||
| 762 | # | ||
| 763 | |||
| 764 | # | ||
| 765 | # DMA Devices | ||
| 766 | # | ||
| 767 | |||
| 768 | # | ||
| 769 | # Userspace I/O | ||
| 770 | # | ||
| 771 | # CONFIG_UIO is not set | 787 | # CONFIG_UIO is not set |
| 772 | 788 | ||
| 773 | # | 789 | # |
| @@ -782,14 +798,11 @@ CONFIG_EXT2_FS=y | |||
| 782 | # CONFIG_JFS_FS is not set | 798 | # CONFIG_JFS_FS is not set |
| 783 | CONFIG_FS_POSIX_ACL=y | 799 | CONFIG_FS_POSIX_ACL=y |
| 784 | # CONFIG_XFS_FS is not set | 800 | # CONFIG_XFS_FS is not set |
| 785 | # CONFIG_GFS2_FS is not set | ||
| 786 | # CONFIG_OCFS2_FS is not set | 801 | # CONFIG_OCFS2_FS is not set |
| 787 | # CONFIG_MINIX_FS is not set | 802 | CONFIG_DNOTIFY=y |
| 788 | CONFIG_ROMFS_FS=m | ||
| 789 | CONFIG_INOTIFY=y | 803 | CONFIG_INOTIFY=y |
| 790 | CONFIG_INOTIFY_USER=y | 804 | CONFIG_INOTIFY_USER=y |
| 791 | # CONFIG_QUOTA is not set | 805 | # CONFIG_QUOTA is not set |
| 792 | CONFIG_DNOTIFY=y | ||
| 793 | # CONFIG_AUTOFS_FS is not set | 806 | # CONFIG_AUTOFS_FS is not set |
| 794 | CONFIG_AUTOFS4_FS=y | 807 | CONFIG_AUTOFS4_FS=y |
| 795 | # CONFIG_FUSE_FS is not set | 808 | # CONFIG_FUSE_FS is not set |
| @@ -818,7 +831,6 @@ CONFIG_SYSFS=y | |||
| 818 | CONFIG_TMPFS=y | 831 | CONFIG_TMPFS=y |
| 819 | CONFIG_TMPFS_POSIX_ACL=y | 832 | CONFIG_TMPFS_POSIX_ACL=y |
| 820 | # CONFIG_HUGETLB_PAGE is not set | 833 | # CONFIG_HUGETLB_PAGE is not set |
| 821 | CONFIG_RAMFS=y | ||
| 822 | # CONFIG_CONFIGFS_FS is not set | 834 | # CONFIG_CONFIGFS_FS is not set |
| 823 | 835 | ||
| 824 | # | 836 | # |
| @@ -833,24 +845,21 @@ CONFIG_RAMFS=y | |||
| 833 | # CONFIG_EFS_FS is not set | 845 | # CONFIG_EFS_FS is not set |
| 834 | CONFIG_CRAMFS=m | 846 | CONFIG_CRAMFS=m |
| 835 | # CONFIG_VXFS_FS is not set | 847 | # CONFIG_VXFS_FS is not set |
| 848 | # CONFIG_MINIX_FS is not set | ||
| 836 | # CONFIG_HPFS_FS is not set | 849 | # CONFIG_HPFS_FS is not set |
| 837 | # CONFIG_QNX4FS_FS is not set | 850 | # CONFIG_QNX4FS_FS is not set |
| 851 | CONFIG_ROMFS_FS=m | ||
| 838 | # CONFIG_SYSV_FS is not set | 852 | # CONFIG_SYSV_FS is not set |
| 839 | # CONFIG_UFS_FS is not set | 853 | # CONFIG_UFS_FS is not set |
| 840 | 854 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 841 | # | ||
| 842 | # Network File Systems | ||
| 843 | # | ||
| 844 | CONFIG_NFS_FS=y | 855 | CONFIG_NFS_FS=y |
| 845 | CONFIG_NFS_V3=y | 856 | CONFIG_NFS_V3=y |
| 846 | # CONFIG_NFS_V3_ACL is not set | 857 | # CONFIG_NFS_V3_ACL is not set |
| 847 | # CONFIG_NFS_V4 is not set | 858 | # CONFIG_NFS_V4 is not set |
| 848 | # CONFIG_NFS_DIRECTIO is not set | ||
| 849 | CONFIG_NFSD=m | 859 | CONFIG_NFSD=m |
| 850 | CONFIG_NFSD_V3=y | 860 | CONFIG_NFSD_V3=y |
| 851 | # CONFIG_NFSD_V3_ACL is not set | 861 | # CONFIG_NFSD_V3_ACL is not set |
| 852 | # CONFIG_NFSD_V4 is not set | 862 | # CONFIG_NFSD_V4 is not set |
| 853 | # CONFIG_NFSD_TCP is not set | ||
| 854 | CONFIG_ROOT_NFS=y | 863 | CONFIG_ROOT_NFS=y |
| 855 | CONFIG_LOCKD=y | 864 | CONFIG_LOCKD=y |
| 856 | CONFIG_LOCKD_V4=y | 865 | CONFIG_LOCKD_V4=y |
| @@ -871,47 +880,38 @@ CONFIG_SUNRPC=y | |||
| 871 | # | 880 | # |
| 872 | # CONFIG_PARTITION_ADVANCED is not set | 881 | # CONFIG_PARTITION_ADVANCED is not set |
| 873 | CONFIG_MSDOS_PARTITION=y | 882 | CONFIG_MSDOS_PARTITION=y |
| 874 | |||
| 875 | # | ||
| 876 | # Native Language Support | ||
| 877 | # | ||
| 878 | # CONFIG_NLS is not set | 883 | # CONFIG_NLS is not set |
| 879 | |||
| 880 | # | ||
| 881 | # Distributed Lock Manager | ||
| 882 | # | ||
| 883 | # CONFIG_DLM is not set | 884 | # CONFIG_DLM is not set |
| 884 | 885 | ||
| 885 | # | 886 | # |
| 886 | # Profiling support | ||
| 887 | # | ||
| 888 | # CONFIG_PROFILING is not set | ||
| 889 | |||
| 890 | # | ||
| 891 | # Kernel hacking | 887 | # Kernel hacking |
| 892 | # | 888 | # |
| 893 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 889 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 894 | # CONFIG_PRINTK_TIME is not set | 890 | # CONFIG_PRINTK_TIME is not set |
| 891 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 895 | CONFIG_ENABLE_MUST_CHECK=y | 892 | CONFIG_ENABLE_MUST_CHECK=y |
| 893 | CONFIG_FRAME_WARN=1024 | ||
| 896 | # CONFIG_MAGIC_SYSRQ is not set | 894 | # CONFIG_MAGIC_SYSRQ is not set |
| 897 | # CONFIG_UNUSED_SYMBOLS is not set | 895 | # CONFIG_UNUSED_SYMBOLS is not set |
| 898 | # CONFIG_DEBUG_FS is not set | 896 | # CONFIG_DEBUG_FS is not set |
| 899 | # CONFIG_HEADERS_CHECK is not set | 897 | # CONFIG_HEADERS_CHECK is not set |
| 900 | # CONFIG_DEBUG_KERNEL is not set | 898 | # CONFIG_DEBUG_KERNEL is not set |
| 901 | CONFIG_CROSSCOMPILE=y | 899 | # CONFIG_SAMPLES is not set |
| 902 | CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" | 900 | CONFIG_CMDLINE="cca=3 mem=32M console=ttyVR0,115200" |
| 903 | 901 | ||
| 904 | # | 902 | # |
| 905 | # Security options | 903 | # Security options |
| 906 | # | 904 | # |
| 907 | # CONFIG_KEYS is not set | 905 | # CONFIG_KEYS is not set |
| 908 | # CONFIG_SECURITY is not set | 906 | # CONFIG_SECURITY is not set |
| 907 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 909 | # CONFIG_CRYPTO is not set | 908 | # CONFIG_CRYPTO is not set |
| 910 | 909 | ||
| 911 | # | 910 | # |
| 912 | # Library routines | 911 | # Library routines |
| 913 | # | 912 | # |
| 914 | CONFIG_BITREVERSE=m | 913 | CONFIG_BITREVERSE=m |
| 914 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 915 | # CONFIG_CRC_CCITT is not set | 915 | # CONFIG_CRC_CCITT is not set |
| 916 | # CONFIG_CRC16 is not set | 916 | # CONFIG_CRC16 is not set |
| 917 | # CONFIG_CRC_ITU_T is not set | 917 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 40d4a40a970e..a5d0f3c55ed1 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_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.23-rc2 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Thu Aug 9 14:03:54 2007 | 4 | # Mon May 12 11:55:55 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
| 7 | 7 | ||
| @@ -10,9 +10,11 @@ CONFIG_MIPS=y | |||
| 10 | # | 10 | # |
| 11 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
| 12 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
| 13 | # CONFIG_BCM47XX is not set | ||
| 13 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
| 14 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
| 15 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
| 17 | # CONFIG_LASAT is not set | ||
| 16 | # CONFIG_LEMOTE_FULONG is not set | 18 | # CONFIG_LEMOTE_FULONG is not set |
| 17 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
| 18 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
| @@ -26,6 +28,7 @@ CONFIG_MACH_VR41XX=y | |||
| 26 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
| 27 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
| 28 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
| 31 | # CONFIG_SGI_IP28 is not set | ||
| 29 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
| 30 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
| 31 | # CONFIG_SIBYTE_CARMEL is not set | 34 | # CONFIG_SIBYTE_CARMEL is not set |
| @@ -53,12 +56,17 @@ CONFIG_PCI_VR41XX=y | |||
| 53 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 56 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 54 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 57 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 55 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 58 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 59 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
| 56 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 60 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 57 | CONFIG_GENERIC_HWEIGHT=y | 61 | CONFIG_GENERIC_HWEIGHT=y |
| 58 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 62 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 63 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 59 | CONFIG_GENERIC_TIME=y | 64 | CONFIG_GENERIC_TIME=y |
| 65 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 60 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 66 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
| 61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 67 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
| 68 | CONFIG_CEVT_R4K=y | ||
| 69 | CONFIG_CSRC_R4K=y | ||
| 62 | CONFIG_DMA_NONCOHERENT=y | 70 | CONFIG_DMA_NONCOHERENT=y |
| 63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 71 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
| 64 | # CONFIG_HOTPLUG_CPU is not set | 72 | # CONFIG_HOTPLUG_CPU is not set |
| @@ -113,6 +121,7 @@ CONFIG_CPU_HAS_SYNC=y | |||
| 113 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
| 114 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
| 115 | CONFIG_ARCH_FLATMEM_ENABLE=y | 123 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 124 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 116 | CONFIG_SELECT_MEMORY_MODEL=y | 125 | CONFIG_SELECT_MEMORY_MODEL=y |
| 117 | CONFIG_FLATMEM_MANUAL=y | 126 | CONFIG_FLATMEM_MANUAL=y |
| 118 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 127 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -120,10 +129,16 @@ CONFIG_FLATMEM_MANUAL=y | |||
| 120 | CONFIG_FLATMEM=y | 129 | CONFIG_FLATMEM=y |
| 121 | CONFIG_FLAT_NODE_MEM_MAP=y | 130 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 122 | # CONFIG_SPARSEMEM_STATIC is not set | 131 | # CONFIG_SPARSEMEM_STATIC is not set |
| 132 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 133 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 134 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 124 | # CONFIG_RESOURCES_64BIT is not set | 135 | # CONFIG_RESOURCES_64BIT is not set |
| 125 | CONFIG_ZONE_DMA_FLAG=0 | 136 | CONFIG_ZONE_DMA_FLAG=0 |
| 126 | CONFIG_VIRT_TO_BUS=y | 137 | CONFIG_VIRT_TO_BUS=y |
| 138 | # CONFIG_TICK_ONESHOT is not set | ||
| 139 | # CONFIG_NO_HZ is not set | ||
| 140 | # CONFIG_HIGH_RES_TIMERS is not set | ||
| 141 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 127 | # CONFIG_HZ_48 is not set | 142 | # CONFIG_HZ_48 is not set |
| 128 | # CONFIG_HZ_100 is not set | 143 | # CONFIG_HZ_100 is not set |
| 129 | # CONFIG_HZ_128 is not set | 144 | # CONFIG_HZ_128 is not set |
| @@ -156,12 +171,15 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 156 | # CONFIG_POSIX_MQUEUE is not set | 171 | # CONFIG_POSIX_MQUEUE is not set |
| 157 | # CONFIG_BSD_PROCESS_ACCT is not set | 172 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 158 | # CONFIG_TASKSTATS is not set | 173 | # CONFIG_TASKSTATS is not set |
| 159 | # CONFIG_USER_NS is not set | ||
| 160 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
| 161 | # CONFIG_IKCONFIG is not set | 175 | # CONFIG_IKCONFIG is not set |
| 162 | CONFIG_LOG_BUF_SHIFT=14 | 176 | CONFIG_LOG_BUF_SHIFT=14 |
| 177 | # CONFIG_CGROUPS is not set | ||
| 178 | # CONFIG_GROUP_SCHED is not set | ||
| 163 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
| 180 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 164 | # CONFIG_RELAY is not set | 181 | # CONFIG_RELAY is not set |
| 182 | # CONFIG_NAMESPACES is not set | ||
| 165 | # CONFIG_BLK_DEV_INITRD is not set | 183 | # CONFIG_BLK_DEV_INITRD is not set |
| 166 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 167 | CONFIG_SYSCTL=y | 185 | CONFIG_SYSCTL=y |
| @@ -173,6 +191,8 @@ CONFIG_HOTPLUG=y | |||
| 173 | CONFIG_PRINTK=y | 191 | CONFIG_PRINTK=y |
| 174 | CONFIG_BUG=y | 192 | CONFIG_BUG=y |
| 175 | CONFIG_ELF_CORE=y | 193 | CONFIG_ELF_CORE=y |
| 194 | # CONFIG_PCSPKR_PLATFORM is not set | ||
| 195 | CONFIG_COMPAT_BRK=y | ||
| 176 | CONFIG_BASE_FULL=y | 196 | CONFIG_BASE_FULL=y |
| 177 | CONFIG_FUTEX=y | 197 | CONFIG_FUTEX=y |
| 178 | CONFIG_ANON_INODES=y | 198 | CONFIG_ANON_INODES=y |
| @@ -185,10 +205,19 @@ CONFIG_VM_EVENT_COUNTERS=y | |||
| 185 | CONFIG_SLAB=y | 205 | CONFIG_SLAB=y |
| 186 | # CONFIG_SLUB is not set | 206 | # CONFIG_SLUB is not set |
| 187 | # CONFIG_SLOB is not set | 207 | # CONFIG_SLOB is not set |
| 208 | # CONFIG_PROFILING is not set | ||
| 209 | # CONFIG_MARKERS is not set | ||
| 210 | CONFIG_HAVE_OPROFILE=y | ||
| 211 | # CONFIG_HAVE_KPROBES is not set | ||
| 212 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 213 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 214 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 215 | CONFIG_SLABINFO=y | ||
| 188 | CONFIG_RT_MUTEXES=y | 216 | CONFIG_RT_MUTEXES=y |
| 189 | # CONFIG_TINY_SHMEM is not set | 217 | # CONFIG_TINY_SHMEM is not set |
| 190 | CONFIG_BASE_SMALL=0 | 218 | CONFIG_BASE_SMALL=0 |
| 191 | CONFIG_MODULES=y | 219 | CONFIG_MODULES=y |
| 220 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 192 | CONFIG_MODULE_UNLOAD=y | 221 | CONFIG_MODULE_UNLOAD=y |
| 193 | CONFIG_MODULE_FORCE_UNLOAD=y | 222 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 194 | CONFIG_MODVERSIONS=y | 223 | CONFIG_MODVERSIONS=y |
| @@ -212,18 +241,17 @@ CONFIG_DEFAULT_AS=y | |||
| 212 | # CONFIG_DEFAULT_CFQ is not set | 241 | # CONFIG_DEFAULT_CFQ is not set |
| 213 | # CONFIG_DEFAULT_NOOP is not set | 242 | # CONFIG_DEFAULT_NOOP is not set |
| 214 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 243 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 244 | CONFIG_CLASSIC_RCU=y | ||
| 215 | 245 | ||
| 216 | # | 246 | # |
| 217 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 247 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
| 218 | # | 248 | # |
| 219 | CONFIG_HW_HAS_PCI=y | 249 | CONFIG_HW_HAS_PCI=y |
| 220 | CONFIG_PCI=y | 250 | CONFIG_PCI=y |
| 251 | CONFIG_PCI_DOMAINS=y | ||
| 221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 252 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 253 | CONFIG_PCI_LEGACY=y | ||
| 222 | CONFIG_MMU=y | 254 | CONFIG_MMU=y |
| 223 | |||
| 224 | # | ||
| 225 | # PCCARD (PCMCIA/CardBus) support | ||
| 226 | # | ||
| 227 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 228 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 229 | 257 | ||
| @@ -237,6 +265,7 @@ CONFIG_TRAD_SIGNALS=y | |||
| 237 | # | 265 | # |
| 238 | # Power management options | 266 | # Power management options |
| 239 | # | 267 | # |
| 268 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 240 | # CONFIG_PM is not set | 269 | # CONFIG_PM is not set |
| 241 | 270 | ||
| 242 | # | 271 | # |
| @@ -278,6 +307,7 @@ CONFIG_INET_TUNNEL=m | |||
| 278 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 307 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 279 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 308 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 280 | # CONFIG_INET_XFRM_MODE_BEET is not set | 309 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 310 | # CONFIG_INET_LRO is not set | ||
| 281 | CONFIG_INET_DIAG=y | 311 | CONFIG_INET_DIAG=y |
| 282 | CONFIG_INET_TCP_DIAG=y | 312 | CONFIG_INET_TCP_DIAG=y |
| 283 | CONFIG_TCP_CONG_ADVANCED=y | 313 | CONFIG_TCP_CONG_ADVANCED=y |
| @@ -302,8 +332,6 @@ CONFIG_DEFAULT_BIC=y | |||
| 302 | CONFIG_DEFAULT_TCP_CONG="bic" | 332 | CONFIG_DEFAULT_TCP_CONG="bic" |
| 303 | # CONFIG_TCP_MD5SIG is not set | 333 | # CONFIG_TCP_MD5SIG is not set |
| 304 | # CONFIG_IPV6 is not set | 334 | # CONFIG_IPV6 is not set |
| 305 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 306 | # CONFIG_INET6_TUNNEL is not set | ||
| 307 | CONFIG_NETWORK_SECMARK=y | 335 | CONFIG_NETWORK_SECMARK=y |
| 308 | # CONFIG_NETFILTER is not set | 336 | # CONFIG_NETFILTER is not set |
| 309 | # CONFIG_IP_DCCP is not set | 337 | # CONFIG_IP_DCCP is not set |
| @@ -320,10 +348,6 @@ CONFIG_NETWORK_SECMARK=y | |||
| 320 | # CONFIG_LAPB is not set | 348 | # CONFIG_LAPB is not set |
| 321 | # CONFIG_ECONET is not set | 349 | # CONFIG_ECONET is not set |
| 322 | # CONFIG_WAN_ROUTER is not set | 350 | # CONFIG_WAN_ROUTER is not set |
| 323 | |||
| 324 | # | ||
| 325 | # QoS and/or fair queueing | ||
| 326 | # | ||
| 327 | # CONFIG_NET_SCHED is not set | 351 | # CONFIG_NET_SCHED is not set |
| 328 | 352 | ||
| 329 | # | 353 | # |
| @@ -331,6 +355,7 @@ CONFIG_NETWORK_SECMARK=y | |||
| 331 | # | 355 | # |
| 332 | # CONFIG_NET_PKTGEN is not set | 356 | # CONFIG_NET_PKTGEN is not set |
| 333 | # CONFIG_HAMRADIO is not set | 357 | # CONFIG_HAMRADIO is not set |
| 358 | # CONFIG_CAN is not set | ||
| 334 | # CONFIG_IRDA is not set | 359 | # CONFIG_IRDA is not set |
| 335 | # CONFIG_BT is not set | 360 | # CONFIG_BT is not set |
| 336 | # CONFIG_AF_RXRPC is not set | 361 | # CONFIG_AF_RXRPC is not set |
| @@ -353,6 +378,7 @@ CONFIG_FIB_RULES=y | |||
| 353 | # | 378 | # |
| 354 | # Generic Driver Options | 379 | # Generic Driver Options |
| 355 | # | 380 | # |
| 381 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 356 | CONFIG_STANDALONE=y | 382 | CONFIG_STANDALONE=y |
| 357 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 383 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 358 | CONFIG_FW_LOADER=m | 384 | CONFIG_FW_LOADER=m |
| @@ -374,10 +400,11 @@ CONFIG_BLK_DEV_NBD=m | |||
| 374 | CONFIG_BLK_DEV_RAM=y | 400 | CONFIG_BLK_DEV_RAM=y |
| 375 | CONFIG_BLK_DEV_RAM_COUNT=16 | 401 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 376 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 402 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 377 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 403 | CONFIG_BLK_DEV_XIP=y |
| 378 | # CONFIG_CDROM_PKTCDVD is not set | 404 | # CONFIG_CDROM_PKTCDVD is not set |
| 379 | # CONFIG_ATA_OVER_ETH is not set | 405 | # CONFIG_ATA_OVER_ETH is not set |
| 380 | # CONFIG_MISC_DEVICES is not set | 406 | # CONFIG_MISC_DEVICES is not set |
| 407 | CONFIG_HAVE_IDE=y | ||
| 381 | # CONFIG_IDE is not set | 408 | # CONFIG_IDE is not set |
| 382 | 409 | ||
| 383 | # | 410 | # |
| @@ -416,10 +443,14 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 416 | # CONFIG_SCSI_FC_ATTRS is not set | 443 | # CONFIG_SCSI_FC_ATTRS is not set |
| 417 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 444 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 418 | # CONFIG_SCSI_SAS_LIBSAS is not set | 445 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 446 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
| 419 | # CONFIG_SCSI_LOWLEVEL is not set | 447 | # CONFIG_SCSI_LOWLEVEL is not set |
| 420 | CONFIG_ATA=y | 448 | CONFIG_ATA=y |
| 421 | # CONFIG_ATA_NONSTANDARD is not set | 449 | # CONFIG_ATA_NONSTANDARD is not set |
| 450 | CONFIG_SATA_PMP=y | ||
| 422 | # CONFIG_SATA_AHCI is not set | 451 | # CONFIG_SATA_AHCI is not set |
| 452 | # CONFIG_SATA_SIL24 is not set | ||
| 453 | CONFIG_ATA_SFF=y | ||
| 423 | # CONFIG_SATA_SVW is not set | 454 | # CONFIG_SATA_SVW is not set |
| 424 | # CONFIG_ATA_PIIX is not set | 455 | # CONFIG_ATA_PIIX is not set |
| 425 | # CONFIG_SATA_MV is not set | 456 | # CONFIG_SATA_MV is not set |
| @@ -429,7 +460,6 @@ CONFIG_ATA=y | |||
| 429 | # CONFIG_SATA_PROMISE is not set | 460 | # CONFIG_SATA_PROMISE is not set |
| 430 | # CONFIG_SATA_SX4 is not set | 461 | # CONFIG_SATA_SX4 is not set |
| 431 | # CONFIG_SATA_SIL is not set | 462 | # CONFIG_SATA_SIL is not set |
| 432 | # CONFIG_SATA_SIL24 is not set | ||
| 433 | # CONFIG_SATA_SIS is not set | 463 | # CONFIG_SATA_SIS is not set |
| 434 | # CONFIG_SATA_ULI is not set | 464 | # CONFIG_SATA_ULI is not set |
| 435 | # CONFIG_SATA_VIA is not set | 465 | # CONFIG_SATA_VIA is not set |
| @@ -458,7 +488,9 @@ CONFIG_ATA=y | |||
| 458 | # CONFIG_PATA_MPIIX is not set | 488 | # CONFIG_PATA_MPIIX is not set |
| 459 | # CONFIG_PATA_OLDPIIX is not set | 489 | # CONFIG_PATA_OLDPIIX is not set |
| 460 | # CONFIG_PATA_NETCELL is not set | 490 | # CONFIG_PATA_NETCELL is not set |
| 491 | # CONFIG_PATA_NINJA32 is not set | ||
| 461 | # CONFIG_PATA_NS87410 is not set | 492 | # CONFIG_PATA_NS87410 is not set |
| 493 | # CONFIG_PATA_NS87415 is not set | ||
| 462 | # CONFIG_PATA_OPTI is not set | 494 | # CONFIG_PATA_OPTI is not set |
| 463 | # CONFIG_PATA_OPTIDMA is not set | 495 | # CONFIG_PATA_OPTIDMA is not set |
| 464 | # CONFIG_PATA_PDC_OLD is not set | 496 | # CONFIG_PATA_PDC_OLD is not set |
| @@ -472,15 +504,9 @@ CONFIG_PATA_SIL680=y | |||
| 472 | # CONFIG_PATA_VIA is not set | 504 | # CONFIG_PATA_VIA is not set |
| 473 | # CONFIG_PATA_WINBOND is not set | 505 | # CONFIG_PATA_WINBOND is not set |
| 474 | # CONFIG_PATA_PLATFORM is not set | 506 | # CONFIG_PATA_PLATFORM is not set |
| 507 | # CONFIG_PATA_SCH is not set | ||
| 475 | # CONFIG_MD is not set | 508 | # CONFIG_MD is not set |
| 476 | |||
| 477 | # | ||
| 478 | # Fusion MPT device support | ||
| 479 | # | ||
| 480 | # CONFIG_FUSION is not set | 509 | # CONFIG_FUSION is not set |
| 481 | # CONFIG_FUSION_SPI is not set | ||
| 482 | # CONFIG_FUSION_FC is not set | ||
| 483 | # CONFIG_FUSION_SAS is not set | ||
| 484 | 510 | ||
| 485 | # | 511 | # |
| 486 | # IEEE 1394 (FireWire) support | 512 | # IEEE 1394 (FireWire) support |
| @@ -520,6 +546,7 @@ CONFIG_NETDEVICES=y | |||
| 520 | # CONFIG_MACVLAN is not set | 546 | # CONFIG_MACVLAN is not set |
| 521 | # CONFIG_EQUALIZER is not set | 547 | # CONFIG_EQUALIZER is not set |
| 522 | # CONFIG_TUN is not set | 548 | # CONFIG_TUN is not set |
| 549 | # CONFIG_VETH is not set | ||
| 523 | # CONFIG_ARCNET is not set | 550 | # CONFIG_ARCNET is not set |
| 524 | # CONFIG_PHYLIB is not set | 551 | # CONFIG_PHYLIB is not set |
| 525 | CONFIG_NET_ETHERNET=y | 552 | CONFIG_NET_ETHERNET=y |
| @@ -532,6 +559,10 @@ CONFIG_MII=y | |||
| 532 | # CONFIG_DM9000 is not set | 559 | # CONFIG_DM9000 is not set |
| 533 | # CONFIG_NET_TULIP is not set | 560 | # CONFIG_NET_TULIP is not set |
| 534 | # CONFIG_HP100 is not set | 561 | # CONFIG_HP100 is not set |
| 562 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 563 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 564 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 565 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 535 | CONFIG_NET_PCI=y | 566 | CONFIG_NET_PCI=y |
| 536 | # CONFIG_PCNET32 is not set | 567 | # CONFIG_PCNET32 is not set |
| 537 | # CONFIG_AMD8111_ETH is not set | 568 | # CONFIG_AMD8111_ETH is not set |
| @@ -539,7 +570,6 @@ CONFIG_NET_PCI=y | |||
| 539 | # CONFIG_B44 is not set | 570 | # CONFIG_B44 is not set |
| 540 | # CONFIG_FORCEDETH is not set | 571 | # CONFIG_FORCEDETH is not set |
| 541 | # CONFIG_TC35815 is not set | 572 | # CONFIG_TC35815 is not set |
| 542 | # CONFIG_DGRS is not set | ||
| 543 | # CONFIG_EEPRO100 is not set | 573 | # CONFIG_EEPRO100 is not set |
| 544 | # CONFIG_E100 is not set | 574 | # CONFIG_E100 is not set |
| 545 | # CONFIG_FEALNX is not set | 575 | # CONFIG_FEALNX is not set |
| @@ -551,6 +581,7 @@ CONFIG_8139TOO_PIO=y | |||
| 551 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 581 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 552 | # CONFIG_8139TOO_8129 is not set | 582 | # CONFIG_8139TOO_8129 is not set |
| 553 | # CONFIG_8139_OLD_RX_RESET is not set | 583 | # CONFIG_8139_OLD_RX_RESET is not set |
| 584 | # CONFIG_R6040 is not set | ||
| 554 | # CONFIG_SIS900 is not set | 585 | # CONFIG_SIS900 is not set |
| 555 | # CONFIG_EPIC100 is not set | 586 | # CONFIG_EPIC100 is not set |
| 556 | # CONFIG_SUNDANCE is not set | 587 | # CONFIG_SUNDANCE is not set |
| @@ -563,6 +594,10 @@ CONFIG_NETDEV_1000=y | |||
| 563 | # CONFIG_ACENIC is not set | 594 | # CONFIG_ACENIC is not set |
| 564 | # CONFIG_DL2K is not set | 595 | # CONFIG_DL2K is not set |
| 565 | # CONFIG_E1000 is not set | 596 | # CONFIG_E1000 is not set |
| 597 | # CONFIG_E1000E is not set | ||
| 598 | # CONFIG_E1000E_ENABLED is not set | ||
| 599 | # CONFIG_IP1000 is not set | ||
| 600 | # CONFIG_IGB is not set | ||
| 566 | # CONFIG_NS83820 is not set | 601 | # CONFIG_NS83820 is not set |
| 567 | # CONFIG_HAMACHI is not set | 602 | # CONFIG_HAMACHI is not set |
| 568 | # CONFIG_YELLOWFIN is not set | 603 | # CONFIG_YELLOWFIN is not set |
| @@ -584,6 +619,7 @@ CONFIG_VIA_VELOCITY=y | |||
| 584 | # | 619 | # |
| 585 | # CONFIG_WLAN_PRE80211 is not set | 620 | # CONFIG_WLAN_PRE80211 is not set |
| 586 | # CONFIG_WLAN_80211 is not set | 621 | # CONFIG_WLAN_80211 is not set |
| 622 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 587 | 623 | ||
| 588 | # | 624 | # |
| 589 | # USB Network Adapters | 625 | # USB Network Adapters |
| @@ -592,7 +628,6 @@ CONFIG_VIA_VELOCITY=y | |||
| 592 | # CONFIG_USB_KAWETH is not set | 628 | # CONFIG_USB_KAWETH is not set |
| 593 | # CONFIG_USB_PEGASUS is not set | 629 | # CONFIG_USB_PEGASUS is not set |
| 594 | # CONFIG_USB_RTL8150 is not set | 630 | # CONFIG_USB_RTL8150 is not set |
| 595 | # CONFIG_USB_USBNET_MII is not set | ||
| 596 | # CONFIG_USB_USBNET is not set | 631 | # CONFIG_USB_USBNET is not set |
| 597 | # CONFIG_WAN is not set | 632 | # CONFIG_WAN is not set |
| 598 | # CONFIG_FDDI is not set | 633 | # CONFIG_FDDI is not set |
| @@ -600,7 +635,6 @@ CONFIG_VIA_VELOCITY=y | |||
| 600 | # CONFIG_PPP is not set | 635 | # CONFIG_PPP is not set |
| 601 | # CONFIG_SLIP is not set | 636 | # CONFIG_SLIP is not set |
| 602 | # CONFIG_NET_FC is not set | 637 | # CONFIG_NET_FC is not set |
| 603 | # CONFIG_SHAPER is not set | ||
| 604 | # CONFIG_NETCONSOLE is not set | 638 | # CONFIG_NETCONSOLE is not set |
| 605 | # CONFIG_NETPOLL is not set | 639 | # CONFIG_NETPOLL is not set |
| 606 | # CONFIG_NET_POLL_CONTROLLER is not set | 640 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -622,7 +656,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
| 622 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 656 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 623 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 657 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 624 | # CONFIG_INPUT_JOYDEV is not set | 658 | # CONFIG_INPUT_JOYDEV is not set |
| 625 | # CONFIG_INPUT_TSDEV is not set | ||
| 626 | # CONFIG_INPUT_EVDEV is not set | 659 | # CONFIG_INPUT_EVDEV is not set |
| 627 | # CONFIG_INPUT_EVBUG is not set | 660 | # CONFIG_INPUT_EVBUG is not set |
| 628 | 661 | ||
| @@ -649,7 +682,9 @@ CONFIG_VT=y | |||
| 649 | CONFIG_VT_CONSOLE=y | 682 | CONFIG_VT_CONSOLE=y |
| 650 | CONFIG_HW_CONSOLE=y | 683 | CONFIG_HW_CONSOLE=y |
| 651 | CONFIG_VT_HW_CONSOLE_BINDING=y | 684 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 685 | # CONFIG_DEVKMEM is not set | ||
| 652 | # CONFIG_SERIAL_NONSTANDARD is not set | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 687 | # CONFIG_NOZOMI is not set | ||
| 653 | 688 | ||
| 654 | # | 689 | # |
| 655 | # Serial drivers | 690 | # Serial drivers |
| @@ -668,49 +703,53 @@ CONFIG_UNIX98_PTYS=y | |||
| 668 | CONFIG_LEGACY_PTYS=y | 703 | CONFIG_LEGACY_PTYS=y |
| 669 | CONFIG_LEGACY_PTY_COUNT=256 | 704 | CONFIG_LEGACY_PTY_COUNT=256 |
| 670 | # CONFIG_IPMI_HANDLER is not set | 705 | # CONFIG_IPMI_HANDLER is not set |
| 671 | # CONFIG_WATCHDOG is not set | ||
| 672 | # CONFIG_HW_RANDOM is not set | 706 | # CONFIG_HW_RANDOM is not set |
| 673 | # CONFIG_RTC is not set | ||
| 674 | # CONFIG_R3964 is not set | 707 | # CONFIG_R3964 is not set |
| 675 | # CONFIG_APPLICOM is not set | 708 | # CONFIG_APPLICOM is not set |
| 676 | # CONFIG_GPIO_TB0219 is not set | 709 | # CONFIG_GPIO_TB0219 is not set |
| 677 | # CONFIG_DRM is not set | ||
| 678 | CONFIG_GPIO_VR41XX=y | 710 | CONFIG_GPIO_VR41XX=y |
| 679 | # CONFIG_RAW_DRIVER is not set | 711 | # CONFIG_RAW_DRIVER is not set |
| 680 | # CONFIG_TCG_TPM is not set | 712 | # CONFIG_TCG_TPM is not set |
| 681 | CONFIG_DEVPORT=y | 713 | CONFIG_DEVPORT=y |
| 682 | # CONFIG_I2C is not set | 714 | # CONFIG_I2C is not set |
| 683 | |||
| 684 | # | ||
| 685 | # SPI support | ||
| 686 | # | ||
| 687 | # CONFIG_SPI is not set | 715 | # CONFIG_SPI is not set |
| 688 | # CONFIG_SPI_MASTER is not set | ||
| 689 | # CONFIG_W1 is not set | 716 | # CONFIG_W1 is not set |
| 690 | # CONFIG_POWER_SUPPLY is not set | 717 | # CONFIG_POWER_SUPPLY is not set |
| 691 | # CONFIG_HWMON is not set | 718 | # CONFIG_HWMON is not set |
| 719 | # CONFIG_THERMAL is not set | ||
| 720 | # CONFIG_WATCHDOG is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # Sonics Silicon Backplane | ||
| 724 | # | ||
| 725 | CONFIG_SSB_POSSIBLE=y | ||
| 726 | # CONFIG_SSB is not set | ||
| 692 | 727 | ||
| 693 | # | 728 | # |
| 694 | # Multifunction device drivers | 729 | # Multifunction device drivers |
| 695 | # | 730 | # |
| 696 | CONFIG_MFD_SM501=y | 731 | CONFIG_MFD_SM501=y |
| 732 | # CONFIG_HTC_PASIC3 is not set | ||
| 697 | 733 | ||
| 698 | # | 734 | # |
| 699 | # Multimedia devices | 735 | # Multimedia devices |
| 700 | # | 736 | # |
| 737 | |||
| 738 | # | ||
| 739 | # Multimedia core support | ||
| 740 | # | ||
| 701 | # CONFIG_VIDEO_DEV is not set | 741 | # CONFIG_VIDEO_DEV is not set |
| 702 | # CONFIG_DVB_CORE is not set | 742 | # CONFIG_DVB_CORE is not set |
| 703 | # CONFIG_DAB is not set | ||
| 704 | 743 | ||
| 705 | # | 744 | # |
| 706 | # Graphics support | 745 | # Multimedia drivers |
| 707 | # | 746 | # |
| 708 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 747 | # CONFIG_DAB is not set |
| 709 | 748 | ||
| 710 | # | 749 | # |
| 711 | # Display device support | 750 | # Graphics support |
| 712 | # | 751 | # |
| 713 | # CONFIG_DISPLAY_SUPPORT is not set | 752 | # CONFIG_DRM is not set |
| 714 | # CONFIG_VGASTATE is not set | 753 | # CONFIG_VGASTATE is not set |
| 715 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 754 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
| 716 | CONFIG_FB=y | 755 | CONFIG_FB=y |
| @@ -719,9 +758,11 @@ CONFIG_FB=y | |||
| 719 | CONFIG_FB_CFB_FILLRECT=y | 758 | CONFIG_FB_CFB_FILLRECT=y |
| 720 | CONFIG_FB_CFB_COPYAREA=y | 759 | CONFIG_FB_CFB_COPYAREA=y |
| 721 | CONFIG_FB_CFB_IMAGEBLIT=y | 760 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 761 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 722 | # CONFIG_FB_SYS_FILLRECT is not set | 762 | # CONFIG_FB_SYS_FILLRECT is not set |
| 723 | # CONFIG_FB_SYS_COPYAREA is not set | 763 | # CONFIG_FB_SYS_COPYAREA is not set |
| 724 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 764 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 765 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 725 | # CONFIG_FB_SYS_FOPS is not set | 766 | # CONFIG_FB_SYS_FOPS is not set |
| 726 | CONFIG_FB_DEFERRED_IO=y | 767 | CONFIG_FB_DEFERRED_IO=y |
| 727 | # CONFIG_FB_SVGALIB is not set | 768 | # CONFIG_FB_SVGALIB is not set |
| @@ -757,7 +798,14 @@ CONFIG_FB_DEFERRED_IO=y | |||
| 757 | # CONFIG_FB_ARK is not set | 798 | # CONFIG_FB_ARK is not set |
| 758 | # CONFIG_FB_PM3 is not set | 799 | # CONFIG_FB_PM3 is not set |
| 759 | CONFIG_FB_SM501=y | 800 | CONFIG_FB_SM501=y |
| 801 | # CONFIG_FB_COBALT is not set | ||
| 760 | # CONFIG_FB_VIRTUAL is not set | 802 | # CONFIG_FB_VIRTUAL is not set |
| 803 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 804 | |||
| 805 | # | ||
| 806 | # Display device support | ||
| 807 | # | ||
| 808 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 761 | 809 | ||
| 762 | # | 810 | # |
| 763 | # Console display driver support | 811 | # Console display driver support |
| @@ -787,6 +835,7 @@ CONFIG_FONT_8x16=y | |||
| 787 | CONFIG_HID_SUPPORT=y | 835 | CONFIG_HID_SUPPORT=y |
| 788 | CONFIG_HID=y | 836 | CONFIG_HID=y |
| 789 | # CONFIG_HID_DEBUG is not set | 837 | # CONFIG_HID_DEBUG is not set |
| 838 | # CONFIG_HIDRAW is not set | ||
| 790 | 839 | ||
| 791 | # | 840 | # |
| 792 | # USB Input Devices | 841 | # USB Input Devices |
| @@ -807,6 +856,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
| 807 | CONFIG_USB_ARCH_HAS_EHCI=y | 856 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 808 | CONFIG_USB=m | 857 | CONFIG_USB=m |
| 809 | # CONFIG_USB_DEBUG is not set | 858 | # CONFIG_USB_DEBUG is not set |
| 859 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
| 810 | 860 | ||
| 811 | # | 861 | # |
| 812 | # Miscellaneous USB options | 862 | # Miscellaneous USB options |
| @@ -815,15 +865,18 @@ CONFIG_USB=m | |||
| 815 | CONFIG_USB_DEVICE_CLASS=y | 865 | CONFIG_USB_DEVICE_CLASS=y |
| 816 | # CONFIG_USB_DYNAMIC_MINORS is not set | 866 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 817 | # CONFIG_USB_OTG is not set | 867 | # CONFIG_USB_OTG is not set |
| 868 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 869 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 818 | 870 | ||
| 819 | # | 871 | # |
| 820 | # USB Host Controller Drivers | 872 | # USB Host Controller Drivers |
| 821 | # | 873 | # |
| 874 | # CONFIG_USB_C67X00_HCD is not set | ||
| 822 | CONFIG_USB_EHCI_HCD=m | 875 | CONFIG_USB_EHCI_HCD=m |
| 823 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 824 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 876 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 825 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 877 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 826 | # CONFIG_USB_ISP116X_HCD is not set | 878 | # CONFIG_USB_ISP116X_HCD is not set |
| 879 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 827 | CONFIG_USB_OHCI_HCD=m | 880 | CONFIG_USB_OHCI_HCD=m |
| 828 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 881 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 829 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 882 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -849,13 +902,16 @@ CONFIG_USB_STORAGE=m | |||
| 849 | # CONFIG_USB_STORAGE_DEBUG is not set | 902 | # CONFIG_USB_STORAGE_DEBUG is not set |
| 850 | # CONFIG_USB_STORAGE_DATAFAB is not set | 903 | # CONFIG_USB_STORAGE_DATAFAB is not set |
| 851 | # CONFIG_USB_STORAGE_FREECOM is not set | 904 | # CONFIG_USB_STORAGE_FREECOM is not set |
| 905 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
| 852 | # CONFIG_USB_STORAGE_DPCM is not set | 906 | # CONFIG_USB_STORAGE_DPCM is not set |
| 853 | # CONFIG_USB_STORAGE_USBAT is not set | 907 | # CONFIG_USB_STORAGE_USBAT is not set |
| 854 | # CONFIG_USB_STORAGE_SDDR09 is not set | 908 | # CONFIG_USB_STORAGE_SDDR09 is not set |
| 855 | # CONFIG_USB_STORAGE_SDDR55 is not set | 909 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 856 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 910 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 857 | # CONFIG_USB_STORAGE_ALAUDA is not set | 911 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 912 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 858 | # CONFIG_USB_STORAGE_KARMA is not set | 913 | # CONFIG_USB_STORAGE_KARMA is not set |
| 914 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 859 | # CONFIG_USB_LIBUSUAL is not set | 915 | # CONFIG_USB_LIBUSUAL is not set |
| 860 | 916 | ||
| 861 | # | 917 | # |
| @@ -868,10 +924,6 @@ CONFIG_USB_MON=y | |||
| 868 | # | 924 | # |
| 869 | # USB port drivers | 925 | # USB port drivers |
| 870 | # | 926 | # |
| 871 | |||
| 872 | # | ||
| 873 | # USB Serial Converter support | ||
| 874 | # | ||
| 875 | # CONFIG_USB_SERIAL is not set | 927 | # CONFIG_USB_SERIAL is not set |
| 876 | 928 | ||
| 877 | # | 929 | # |
| @@ -896,36 +948,14 @@ CONFIG_USB_MON=y | |||
| 896 | # CONFIG_USB_LD is not set | 948 | # CONFIG_USB_LD is not set |
| 897 | # CONFIG_USB_TRANCEVIBRATOR is not set | 949 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 898 | # CONFIG_USB_IOWARRIOR is not set | 950 | # CONFIG_USB_IOWARRIOR is not set |
| 899 | |||
| 900 | # | ||
| 901 | # USB DSL modem support | ||
| 902 | # | ||
| 903 | |||
| 904 | # | ||
| 905 | # USB Gadget Support | ||
| 906 | # | ||
| 907 | # CONFIG_USB_GADGET is not set | 951 | # CONFIG_USB_GADGET is not set |
| 908 | # CONFIG_MMC is not set | 952 | # CONFIG_MMC is not set |
| 953 | # CONFIG_MEMSTICK is not set | ||
| 909 | # CONFIG_NEW_LEDS is not set | 954 | # CONFIG_NEW_LEDS is not set |
| 955 | # CONFIG_ACCESSIBILITY is not set | ||
| 910 | # CONFIG_INFINIBAND is not set | 956 | # CONFIG_INFINIBAND is not set |
| 957 | CONFIG_RTC_LIB=y | ||
| 911 | # CONFIG_RTC_CLASS is not set | 958 | # CONFIG_RTC_CLASS is not set |
| 912 | |||
| 913 | # | ||
| 914 | # DMA Engine support | ||
| 915 | # | ||
| 916 | # CONFIG_DMA_ENGINE is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # DMA Clients | ||
| 920 | # | ||
| 921 | |||
| 922 | # | ||
| 923 | # DMA Devices | ||
| 924 | # | ||
| 925 | |||
| 926 | # | ||
| 927 | # Userspace I/O | ||
| 928 | # | ||
| 929 | # CONFIG_UIO is not set | 959 | # CONFIG_UIO is not set |
| 930 | 960 | ||
| 931 | # | 961 | # |
| @@ -940,25 +970,21 @@ CONFIG_EXT3_FS_XATTR=y | |||
| 940 | # CONFIG_EXT3_FS_SECURITY is not set | 970 | # CONFIG_EXT3_FS_SECURITY is not set |
| 941 | # CONFIG_EXT4DEV_FS is not set | 971 | # CONFIG_EXT4DEV_FS is not set |
| 942 | CONFIG_JBD=y | 972 | CONFIG_JBD=y |
| 943 | # CONFIG_JBD_DEBUG is not set | ||
| 944 | CONFIG_FS_MBCACHE=y | 973 | CONFIG_FS_MBCACHE=y |
| 945 | # CONFIG_REISERFS_FS is not set | 974 | # CONFIG_REISERFS_FS is not set |
| 946 | # CONFIG_JFS_FS is not set | 975 | # CONFIG_JFS_FS is not set |
| 947 | CONFIG_FS_POSIX_ACL=y | 976 | CONFIG_FS_POSIX_ACL=y |
| 948 | CONFIG_XFS_FS=y | 977 | CONFIG_XFS_FS=y |
| 949 | CONFIG_XFS_QUOTA=y | 978 | CONFIG_XFS_QUOTA=y |
| 950 | # CONFIG_XFS_SECURITY is not set | ||
| 951 | CONFIG_XFS_POSIX_ACL=y | 979 | CONFIG_XFS_POSIX_ACL=y |
| 952 | # CONFIG_XFS_RT is not set | 980 | # CONFIG_XFS_RT is not set |
| 953 | # CONFIG_GFS2_FS is not set | 981 | # CONFIG_XFS_DEBUG is not set |
| 954 | # CONFIG_OCFS2_FS is not set | 982 | # CONFIG_OCFS2_FS is not set |
| 955 | # CONFIG_MINIX_FS is not set | 983 | CONFIG_DNOTIFY=y |
| 956 | CONFIG_ROMFS_FS=m | ||
| 957 | CONFIG_INOTIFY=y | 984 | CONFIG_INOTIFY=y |
| 958 | CONFIG_INOTIFY_USER=y | 985 | CONFIG_INOTIFY_USER=y |
| 959 | # CONFIG_QUOTA is not set | 986 | # CONFIG_QUOTA is not set |
| 960 | CONFIG_QUOTACTL=y | 987 | CONFIG_QUOTACTL=y |
| 961 | CONFIG_DNOTIFY=y | ||
| 962 | # CONFIG_AUTOFS_FS is not set | 988 | # CONFIG_AUTOFS_FS is not set |
| 963 | CONFIG_AUTOFS4_FS=y | 989 | CONFIG_AUTOFS4_FS=y |
| 964 | # CONFIG_FUSE_FS is not set | 990 | # CONFIG_FUSE_FS is not set |
| @@ -987,7 +1013,6 @@ CONFIG_SYSFS=y | |||
| 987 | CONFIG_TMPFS=y | 1013 | CONFIG_TMPFS=y |
| 988 | CONFIG_TMPFS_POSIX_ACL=y | 1014 | CONFIG_TMPFS_POSIX_ACL=y |
| 989 | # CONFIG_HUGETLB_PAGE is not set | 1015 | # CONFIG_HUGETLB_PAGE is not set |
| 990 | CONFIG_RAMFS=y | ||
| 991 | # CONFIG_CONFIGFS_FS is not set | 1016 | # CONFIG_CONFIGFS_FS is not set |
| 992 | 1017 | ||
| 993 | # | 1018 | # |
| @@ -1002,24 +1027,21 @@ CONFIG_RAMFS=y | |||
| 1002 | # CONFIG_EFS_FS is not set | 1027 | # CONFIG_EFS_FS is not set |
| 1003 | CONFIG_CRAMFS=m | 1028 | CONFIG_CRAMFS=m |
| 1004 | # CONFIG_VXFS_FS is not set | 1029 | # CONFIG_VXFS_FS is not set |
| 1030 | # CONFIG_MINIX_FS is not set | ||
| 1005 | # CONFIG_HPFS_FS is not set | 1031 | # CONFIG_HPFS_FS is not set |
| 1006 | # CONFIG_QNX4FS_FS is not set | 1032 | # CONFIG_QNX4FS_FS is not set |
| 1033 | CONFIG_ROMFS_FS=m | ||
| 1007 | # CONFIG_SYSV_FS is not set | 1034 | # CONFIG_SYSV_FS is not set |
| 1008 | # CONFIG_UFS_FS is not set | 1035 | # CONFIG_UFS_FS is not set |
| 1009 | 1036 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1010 | # | ||
| 1011 | # Network File Systems | ||
| 1012 | # | ||
| 1013 | CONFIG_NFS_FS=y | 1037 | CONFIG_NFS_FS=y |
| 1014 | CONFIG_NFS_V3=y | 1038 | CONFIG_NFS_V3=y |
| 1015 | # CONFIG_NFS_V3_ACL is not set | 1039 | # CONFIG_NFS_V3_ACL is not set |
| 1016 | # CONFIG_NFS_V4 is not set | 1040 | # CONFIG_NFS_V4 is not set |
| 1017 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1018 | CONFIG_NFSD=m | 1041 | CONFIG_NFSD=m |
| 1019 | CONFIG_NFSD_V3=y | 1042 | CONFIG_NFSD_V3=y |
| 1020 | # CONFIG_NFSD_V3_ACL is not set | 1043 | # CONFIG_NFSD_V3_ACL is not set |
| 1021 | # CONFIG_NFSD_V4 is not set | 1044 | # CONFIG_NFSD_V4 is not set |
| 1022 | CONFIG_NFSD_TCP=y | ||
| 1023 | CONFIG_ROOT_NFS=y | 1045 | CONFIG_ROOT_NFS=y |
| 1024 | CONFIG_LOCKD=y | 1046 | CONFIG_LOCKD=y |
| 1025 | CONFIG_LOCKD_V4=y | 1047 | CONFIG_LOCKD_V4=y |
| @@ -1040,47 +1062,38 @@ CONFIG_SUNRPC=y | |||
| 1040 | # | 1062 | # |
| 1041 | # CONFIG_PARTITION_ADVANCED is not set | 1063 | # CONFIG_PARTITION_ADVANCED is not set |
| 1042 | CONFIG_MSDOS_PARTITION=y | 1064 | CONFIG_MSDOS_PARTITION=y |
| 1043 | |||
| 1044 | # | ||
| 1045 | # Native Language Support | ||
| 1046 | # | ||
| 1047 | # CONFIG_NLS is not set | 1065 | # CONFIG_NLS is not set |
| 1048 | |||
| 1049 | # | ||
| 1050 | # Distributed Lock Manager | ||
| 1051 | # | ||
| 1052 | # CONFIG_DLM is not set | 1066 | # CONFIG_DLM is not set |
| 1053 | 1067 | ||
| 1054 | # | 1068 | # |
| 1055 | # Profiling support | ||
| 1056 | # | ||
| 1057 | # CONFIG_PROFILING is not set | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # Kernel hacking | 1069 | # Kernel hacking |
| 1061 | # | 1070 | # |
| 1062 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1071 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1063 | # CONFIG_PRINTK_TIME is not set | 1072 | # CONFIG_PRINTK_TIME is not set |
| 1073 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 1064 | CONFIG_ENABLE_MUST_CHECK=y | 1074 | CONFIG_ENABLE_MUST_CHECK=y |
| 1075 | CONFIG_FRAME_WARN=1024 | ||
| 1065 | # CONFIG_MAGIC_SYSRQ is not set | 1076 | # CONFIG_MAGIC_SYSRQ is not set |
| 1066 | # CONFIG_UNUSED_SYMBOLS is not set | 1077 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1067 | # CONFIG_DEBUG_FS is not set | 1078 | # CONFIG_DEBUG_FS is not set |
| 1068 | # CONFIG_HEADERS_CHECK is not set | 1079 | # CONFIG_HEADERS_CHECK is not set |
| 1069 | # CONFIG_DEBUG_KERNEL is not set | 1080 | # CONFIG_DEBUG_KERNEL is not set |
| 1070 | CONFIG_CROSSCOMPILE=y | 1081 | # CONFIG_SAMPLES is not set |
| 1071 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 1082 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
| 1072 | 1083 | ||
| 1073 | # | 1084 | # |
| 1074 | # Security options | 1085 | # Security options |
| 1075 | # | 1086 | # |
| 1076 | # CONFIG_KEYS is not set | 1087 | # CONFIG_KEYS is not set |
| 1077 | # CONFIG_SECURITY is not set | 1088 | # CONFIG_SECURITY is not set |
| 1089 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 1078 | # CONFIG_CRYPTO is not set | 1090 | # CONFIG_CRYPTO is not set |
| 1079 | 1091 | ||
| 1080 | # | 1092 | # |
| 1081 | # Library routines | 1093 | # Library routines |
| 1082 | # | 1094 | # |
| 1083 | CONFIG_BITREVERSE=y | 1095 | CONFIG_BITREVERSE=y |
| 1096 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1084 | CONFIG_CRC_CCITT=y | 1097 | CONFIG_CRC_CCITT=y |
| 1085 | # CONFIG_CRC16 is not set | 1098 | # CONFIG_CRC16 is not set |
| 1086 | # CONFIG_CRC_ITU_T is not set | 1099 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c index 28dfd2e2989a..23066985a734 100644 --- a/arch/mips/fw/arc/identify.c +++ b/arch/mips/fw/arc/identify.c | |||
| @@ -67,6 +67,11 @@ static struct smatch mach_table[] = { | |||
| 67 | .liname = "SNI RM200_PCI", | 67 | .liname = "SNI RM200_PCI", |
| 68 | .type = MACH_SNI_RM200_PCI, | 68 | .type = MACH_SNI_RM200_PCI, |
| 69 | .flags = PROM_FLAG_DONT_FREE_TEMP, | 69 | .flags = PROM_FLAG_DONT_FREE_TEMP, |
| 70 | }, { | ||
| 71 | .arcname = "RM200PCI-R5K", | ||
| 72 | .liname = "SNI RM200_PCI-R5K", | ||
| 73 | .type = MACH_SNI_RM200_PCI, | ||
| 74 | .flags = PROM_FLAG_DONT_FREE_TEMP, | ||
| 70 | } | 75 | } |
| 71 | }; | 76 | }; |
| 72 | 77 | ||
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index cc0244036aec..65e46a6d4178 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
| @@ -30,7 +30,6 @@ obj-$(CONFIG_CPU_LOONGSON2) += r4k_fpu.o r4k_switch.o | |||
| 30 | obj-$(CONFIG_CPU_MIPS32) += r4k_fpu.o r4k_switch.o | 30 | obj-$(CONFIG_CPU_MIPS32) += r4k_fpu.o r4k_switch.o |
| 31 | obj-$(CONFIG_CPU_MIPS64) += r4k_fpu.o r4k_switch.o | 31 | obj-$(CONFIG_CPU_MIPS64) += r4k_fpu.o r4k_switch.o |
| 32 | obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o | 32 | obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o |
| 33 | obj-$(CONFIG_CPU_R4000) += r4k_fpu.o r4k_switch.o | ||
| 34 | obj-$(CONFIG_CPU_R4300) += r4k_fpu.o r4k_switch.o | 33 | obj-$(CONFIG_CPU_R4300) += r4k_fpu.o r4k_switch.o |
| 35 | obj-$(CONFIG_CPU_R4X00) += r4k_fpu.o r4k_switch.o | 34 | obj-$(CONFIG_CPU_R4X00) += r4k_fpu.o r4k_switch.o |
| 36 | obj-$(CONFIG_CPU_R5000) += r4k_fpu.o r4k_switch.o | 35 | obj-$(CONFIG_CPU_R5000) += r4k_fpu.o r4k_switch.o |
diff --git a/arch/mips/kernel/init_task.c b/arch/mips/kernel/init_task.c index aeda7f58391b..d72487ad7c15 100644 --- a/arch/mips/kernel/init_task.c +++ b/arch/mips/kernel/init_task.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <asm/pgtable.h> | 10 | #include <asm/pgtable.h> |
| 11 | 11 | ||
| 12 | static struct fs_struct init_fs = INIT_FS; | 12 | static struct fs_struct init_fs = INIT_FS; |
| 13 | static struct files_struct init_files = INIT_FILES; | ||
| 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 16 | struct mm_struct init_mm = INIT_MM(init_mm); | 15 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 63370cdd3c90..cdf87a9dd4ba 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
| @@ -216,6 +216,7 @@ int smp_call_function(void (*func) (void *info), void *info, int retry, | |||
| 216 | { | 216 | { |
| 217 | return smp_call_function_mask(cpu_online_map, func, info, retry, wait); | 217 | return smp_call_function_mask(cpu_online_map, func, info, retry, wait); |
| 218 | } | 218 | } |
| 219 | EXPORT_SYMBOL(smp_call_function); | ||
| 219 | 220 | ||
| 220 | void smp_call_function_interrupt(void) | 221 | void smp_call_function_interrupt(void) |
| 221 | { | 222 | { |
| @@ -271,6 +272,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
| 271 | put_cpu(); | 272 | put_cpu(); |
| 272 | return 0; | 273 | return 0; |
| 273 | } | 274 | } |
| 275 | EXPORT_SYMBOL(smp_call_function_single); | ||
| 274 | 276 | ||
| 275 | static void stop_this_cpu(void *dummy) | 277 | static void stop_this_cpu(void *dummy) |
| 276 | { | 278 | { |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index cb8b0e2c7954..f9165d1a17bf 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
| @@ -88,15 +88,17 @@ static void show_raw_backtrace(unsigned long reg29) | |||
| 88 | #ifdef CONFIG_KALLSYMS | 88 | #ifdef CONFIG_KALLSYMS |
| 89 | printk("\n"); | 89 | printk("\n"); |
| 90 | #endif | 90 | #endif |
| 91 | #define IS_KVA01(a) ((((unsigned int)a) & 0xc0000000) == 0x80000000) | 91 | while (!kstack_end(sp)) { |
| 92 | if (IS_KVA01(sp)) { | 92 | unsigned long __user *p = |
| 93 | while (!kstack_end(sp)) { | 93 | (unsigned long __user *)(unsigned long)sp++; |
| 94 | addr = *sp++; | 94 | if (__get_user(addr, p)) { |
| 95 | if (__kernel_text_address(addr)) | 95 | printk(" (Bad stack address)"); |
| 96 | print_ip_sym(addr); | 96 | break; |
| 97 | } | 97 | } |
| 98 | printk("\n"); | 98 | if (__kernel_text_address(addr)) |
| 99 | print_ip_sym(addr); | ||
| 99 | } | 100 | } |
| 101 | printk("\n"); | ||
| 100 | } | 102 | } |
| 101 | 103 | ||
| 102 | #ifdef CONFIG_KALLSYMS | 104 | #ifdef CONFIG_KALLSYMS |
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index cfeab669782f..a56c15026965 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
| @@ -34,11 +34,13 @@ static volatile int lasat_int_mask_shift; | |||
| 34 | 34 | ||
| 35 | void disable_lasat_irq(unsigned int irq_nr) | 35 | void disable_lasat_irq(unsigned int irq_nr) |
| 36 | { | 36 | { |
| 37 | irq_nr -= LASAT_IRQ_BASE; | ||
| 37 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; | 38 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; |
| 38 | } | 39 | } |
| 39 | 40 | ||
| 40 | void enable_lasat_irq(unsigned int irq_nr) | 41 | void enable_lasat_irq(unsigned int irq_nr) |
| 41 | { | 42 | { |
| 43 | irq_nr -= LASAT_IRQ_BASE; | ||
| 42 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; | 44 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; |
| 43 | } | 45 | } |
| 44 | 46 | ||
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c index ec2f658c3709..31e328b3814d 100644 --- a/arch/mips/lasat/lasat_board.c +++ b/arch/mips/lasat/lasat_board.c | |||
| @@ -23,18 +23,19 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/string.h> | 24 | #include <linux/string.h> |
| 25 | #include <linux/ctype.h> | 25 | #include <linux/ctype.h> |
| 26 | #include <linux/mutex.h> | ||
| 26 | #include <asm/bootinfo.h> | 27 | #include <asm/bootinfo.h> |
| 27 | #include <asm/addrspace.h> | 28 | #include <asm/addrspace.h> |
| 28 | #include "at93c.h" | 29 | #include "at93c.h" |
| 29 | /* New model description table */ | 30 | /* New model description table */ |
| 30 | #include "lasat_models.h" | 31 | #include "lasat_models.h" |
| 31 | 32 | ||
| 33 | static DEFINE_MUTEX(lasat_eeprom_mutex); | ||
| 34 | |||
| 32 | #define EEPROM_CRC(data, len) (~crc32(~0, data, len)) | 35 | #define EEPROM_CRC(data, len) (~crc32(~0, data, len)) |
| 33 | 36 | ||
| 34 | struct lasat_info lasat_board_info; | 37 | struct lasat_info lasat_board_info; |
| 35 | 38 | ||
| 36 | void update_bcastaddr(void); | ||
| 37 | |||
| 38 | int EEPROMRead(unsigned int pos, unsigned char *data, int len) | 39 | int EEPROMRead(unsigned int pos, unsigned char *data, int len) |
| 39 | { | 40 | { |
| 40 | int i; | 41 | int i; |
| @@ -258,10 +259,6 @@ int lasat_init_board_info(void) | |||
| 258 | sprintf(lasat_board_info.li_typestr, "%d", 10 * c); | 259 | sprintf(lasat_board_info.li_typestr, "%d", 10 * c); |
| 259 | } | 260 | } |
| 260 | 261 | ||
| 261 | #if defined(CONFIG_INET) && defined(CONFIG_SYSCTL) | ||
| 262 | update_bcastaddr(); | ||
| 263 | #endif | ||
| 264 | |||
| 265 | return 0; | 262 | return 0; |
| 266 | } | 263 | } |
| 267 | 264 | ||
| @@ -269,6 +266,8 @@ void lasat_write_eeprom_info(void) | |||
| 269 | { | 266 | { |
| 270 | unsigned long crc; | 267 | unsigned long crc; |
| 271 | 268 | ||
| 269 | mutex_lock(&lasat_eeprom_mutex); | ||
| 270 | |||
| 272 | /* Generate the CRC */ | 271 | /* Generate the CRC */ |
| 273 | crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info), | 272 | crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info), |
| 274 | sizeof(struct lasat_eeprom_struct) - 4); | 273 | sizeof(struct lasat_eeprom_struct) - 4); |
| @@ -277,4 +276,6 @@ void lasat_write_eeprom_info(void) | |||
| 277 | /* Write the EEPROM info */ | 276 | /* Write the EEPROM info */ |
| 278 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, | 277 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, |
| 279 | sizeof(struct lasat_eeprom_struct)); | 278 | sizeof(struct lasat_eeprom_struct)); |
| 279 | |||
| 280 | mutex_unlock(&lasat_eeprom_mutex); | ||
| 280 | } | 281 | } |
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 389336c4ecc5..866881ec0cf8 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
| @@ -29,15 +29,13 @@ | |||
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/net.h> | 30 | #include <linux/net.h> |
| 31 | #include <linux/inet.h> | 31 | #include <linux/inet.h> |
| 32 | #include <linux/mutex.h> | ||
| 33 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
| 34 | 33 | ||
| 35 | #include <asm/time.h> | 34 | #include <asm/time.h> |
| 36 | 35 | ||
| 37 | #include "sysctl.h" | 36 | #ifdef CONFIG_DS1603 |
| 38 | #include "ds1603.h" | 37 | #include "ds1603.h" |
| 39 | 38 | #endif | |
| 40 | static DEFINE_MUTEX(lasat_info_mutex); | ||
| 41 | 39 | ||
| 42 | /* Strategy function to write EEPROM after changing string entry */ | 40 | /* Strategy function to write EEPROM after changing string entry */ |
| 43 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | 41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, |
| @@ -46,18 +44,15 @@ int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | |||
| 46 | { | 44 | { |
| 47 | int r; | 45 | int r; |
| 48 | 46 | ||
| 49 | mutex_lock(&lasat_info_mutex); | ||
| 50 | r = sysctl_string(table, name, | 47 | r = sysctl_string(table, name, |
| 51 | nlen, oldval, oldlenp, newval, newlen); | 48 | nlen, oldval, oldlenp, newval, newlen); |
| 52 | if (r < 0) { | 49 | if (r < 0) |
| 53 | mutex_unlock(&lasat_info_mutex); | ||
| 54 | return r; | 50 | return r; |
| 55 | } | 51 | |
| 56 | if (newval && newlen) | 52 | if (newval && newlen) |
| 57 | lasat_write_eeprom_info(); | 53 | lasat_write_eeprom_info(); |
| 58 | mutex_unlock(&lasat_info_mutex); | ||
| 59 | 54 | ||
| 60 | return 1; | 55 | return 0; |
| 61 | } | 56 | } |
| 62 | 57 | ||
| 63 | 58 | ||
| @@ -67,14 +62,11 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp, | |||
| 67 | { | 62 | { |
| 68 | int r; | 63 | int r; |
| 69 | 64 | ||
| 70 | mutex_lock(&lasat_info_mutex); | ||
| 71 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); | 65 | r = proc_dostring(table, write, filp, buffer, lenp, ppos); |
| 72 | if ((!write) || r) { | 66 | if ((!write) || r) |
| 73 | mutex_unlock(&lasat_info_mutex); | ||
| 74 | return r; | 67 | return r; |
| 75 | } | 68 | |
| 76 | lasat_write_eeprom_info(); | 69 | lasat_write_eeprom_info(); |
| 77 | mutex_unlock(&lasat_info_mutex); | ||
| 78 | 70 | ||
| 79 | return 0; | 71 | return 0; |
| 80 | } | 72 | } |
| @@ -85,28 +77,24 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp, | |||
| 85 | { | 77 | { |
| 86 | int r; | 78 | int r; |
| 87 | 79 | ||
| 88 | mutex_lock(&lasat_info_mutex); | ||
| 89 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 80 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 90 | if ((!write) || r) { | 81 | if ((!write) || r) |
| 91 | mutex_unlock(&lasat_info_mutex); | ||
| 92 | return r; | 82 | return r; |
| 93 | } | 83 | |
| 94 | lasat_write_eeprom_info(); | 84 | lasat_write_eeprom_info(); |
| 95 | mutex_unlock(&lasat_info_mutex); | ||
| 96 | 85 | ||
| 97 | return 0; | 86 | return 0; |
| 98 | } | 87 | } |
| 99 | 88 | ||
| 89 | #ifdef CONFIG_DS1603 | ||
| 100 | static int rtctmp; | 90 | static int rtctmp; |
| 101 | 91 | ||
| 102 | #ifdef CONFIG_DS1603 | ||
| 103 | /* proc function to read/write RealTime Clock */ | 92 | /* proc function to read/write RealTime Clock */ |
| 104 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | 93 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, |
| 105 | void *buffer, size_t *lenp, loff_t *ppos) | 94 | void *buffer, size_t *lenp, loff_t *ppos) |
| 106 | { | 95 | { |
| 107 | int r; | 96 | int r; |
| 108 | 97 | ||
| 109 | mutex_lock(&lasat_info_mutex); | ||
| 110 | if (!write) { | 98 | if (!write) { |
| 111 | rtctmp = read_persistent_clock(); | 99 | rtctmp = read_persistent_clock(); |
| 112 | /* check for time < 0 and set to 0 */ | 100 | /* check for time < 0 and set to 0 */ |
| @@ -114,12 +102,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | |||
| 114 | rtctmp = 0; | 102 | rtctmp = 0; |
| 115 | } | 103 | } |
| 116 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 104 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 117 | if ((!write) || r) { | 105 | if (r) |
| 118 | mutex_unlock(&lasat_info_mutex); | ||
| 119 | return r; | 106 | return r; |
| 120 | } | 107 | |
| 121 | rtc_mips_set_mmss(rtctmp); | 108 | if (write) |
| 122 | mutex_unlock(&lasat_info_mutex); | 109 | rtc_mips_set_mmss(rtctmp); |
| 123 | 110 | ||
| 124 | return 0; | 111 | return 0; |
| 125 | } | 112 | } |
| @@ -132,17 +119,14 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen, | |||
| 132 | { | 119 | { |
| 133 | int r; | 120 | int r; |
| 134 | 121 | ||
| 135 | mutex_lock(&lasat_info_mutex); | ||
| 136 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 122 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 137 | if (r < 0) { | 123 | if (r < 0) |
| 138 | mutex_unlock(&lasat_info_mutex); | ||
| 139 | return r; | 124 | return r; |
| 140 | } | 125 | |
| 141 | if (newval && newlen) | 126 | if (newval && newlen) |
| 142 | lasat_write_eeprom_info(); | 127 | lasat_write_eeprom_info(); |
| 143 | mutex_unlock(&lasat_info_mutex); | ||
| 144 | 128 | ||
| 145 | return 1; | 129 | return 0; |
| 146 | } | 130 | } |
| 147 | 131 | ||
| 148 | #ifdef CONFIG_DS1603 | 132 | #ifdef CONFIG_DS1603 |
| @@ -153,50 +137,27 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen, | |||
| 153 | { | 137 | { |
| 154 | int r; | 138 | int r; |
| 155 | 139 | ||
| 156 | mutex_lock(&lasat_info_mutex); | ||
| 157 | rtctmp = read_persistent_clock(); | 140 | rtctmp = read_persistent_clock(); |
| 158 | if (rtctmp < 0) | 141 | if (rtctmp < 0) |
| 159 | rtctmp = 0; | 142 | rtctmp = 0; |
| 160 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 143 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 161 | if (r < 0) { | 144 | if (r < 0) |
| 162 | mutex_unlock(&lasat_info_mutex); | ||
| 163 | return r; | 145 | return r; |
| 164 | } | ||
| 165 | if (newval && newlen) | 146 | if (newval && newlen) |
| 166 | rtc_mips_set_mmss(rtctmp); | 147 | rtc_mips_set_mmss(rtctmp); |
| 167 | mutex_unlock(&lasat_info_mutex); | ||
| 168 | 148 | ||
| 169 | return 1; | 149 | return r; |
| 170 | } | 150 | } |
| 171 | #endif | 151 | #endif |
| 172 | 152 | ||
| 173 | #ifdef CONFIG_INET | 153 | #ifdef CONFIG_INET |
| 174 | static char lasat_bcastaddr[16]; | ||
| 175 | |||
| 176 | void update_bcastaddr(void) | ||
| 177 | { | ||
| 178 | unsigned int ip; | ||
| 179 | |||
| 180 | ip = (lasat_board_info.li_eeprom_info.ipaddr & | ||
| 181 | lasat_board_info.li_eeprom_info.netmask) | | ||
| 182 | ~lasat_board_info.li_eeprom_info.netmask; | ||
| 183 | |||
| 184 | sprintf(lasat_bcastaddr, "%d.%d.%d.%d", | ||
| 185 | (ip) & 0xff, | ||
| 186 | (ip >> 8) & 0xff, | ||
| 187 | (ip >> 16) & 0xff, | ||
| 188 | (ip >> 24) & 0xff); | ||
| 189 | } | ||
| 190 | |||
| 191 | static char proc_lasat_ipbuf[32]; | ||
| 192 | |||
| 193 | /* Parsing of IP address */ | ||
| 194 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | 154 | int proc_lasat_ip(ctl_table *table, int write, struct file *filp, |
| 195 | void *buffer, size_t *lenp, loff_t *ppos) | 155 | void *buffer, size_t *lenp, loff_t *ppos) |
| 196 | { | 156 | { |
| 197 | unsigned int ip; | 157 | unsigned int ip; |
| 198 | char *p, c; | 158 | char *p, c; |
| 199 | int len; | 159 | int len; |
| 160 | char ipbuf[32]; | ||
| 200 | 161 | ||
| 201 | if (!table->data || !table->maxlen || !*lenp || | 162 | if (!table->data || !table->maxlen || !*lenp || |
| 202 | (*ppos && !write)) { | 163 | (*ppos && !write)) { |
| @@ -204,117 +165,88 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
| 204 | return 0; | 165 | return 0; |
| 205 | } | 166 | } |
| 206 | 167 | ||
| 207 | mutex_lock(&lasat_info_mutex); | ||
| 208 | if (write) { | 168 | if (write) { |
| 209 | len = 0; | 169 | len = 0; |
| 210 | p = buffer; | 170 | p = buffer; |
| 211 | while (len < *lenp) { | 171 | while (len < *lenp) { |
| 212 | if (get_user(c, p++)) { | 172 | if (get_user(c, p++)) |
| 213 | mutex_unlock(&lasat_info_mutex); | ||
| 214 | return -EFAULT; | 173 | return -EFAULT; |
| 215 | } | ||
| 216 | if (c == 0 || c == '\n') | 174 | if (c == 0 || c == '\n') |
| 217 | break; | 175 | break; |
| 218 | len++; | 176 | len++; |
| 219 | } | 177 | } |
| 220 | if (len >= sizeof(proc_lasat_ipbuf)-1) | 178 | if (len >= sizeof(ipbuf)-1) |
| 221 | len = sizeof(proc_lasat_ipbuf) - 1; | 179 | len = sizeof(ipbuf) - 1; |
| 222 | if (copy_from_user(proc_lasat_ipbuf, buffer, len)) { | 180 | if (copy_from_user(ipbuf, buffer, len)) |
| 223 | mutex_unlock(&lasat_info_mutex); | ||
| 224 | return -EFAULT; | 181 | return -EFAULT; |
| 225 | } | 182 | ipbuf[len] = 0; |
| 226 | proc_lasat_ipbuf[len] = 0; | ||
| 227 | *ppos += *lenp; | 183 | *ppos += *lenp; |
| 228 | /* Now see if we can convert it to a valid IP */ | 184 | /* Now see if we can convert it to a valid IP */ |
| 229 | ip = in_aton(proc_lasat_ipbuf); | 185 | ip = in_aton(ipbuf); |
| 230 | *(unsigned int *)(table->data) = ip; | 186 | *(unsigned int *)(table->data) = ip; |
| 231 | lasat_write_eeprom_info(); | 187 | lasat_write_eeprom_info(); |
| 232 | } else { | 188 | } else { |
| 233 | ip = *(unsigned int *)(table->data); | 189 | ip = *(unsigned int *)(table->data); |
| 234 | sprintf(proc_lasat_ipbuf, "%d.%d.%d.%d", | 190 | sprintf(ipbuf, "%d.%d.%d.%d", |
| 235 | (ip) & 0xff, | 191 | (ip) & 0xff, |
| 236 | (ip >> 8) & 0xff, | 192 | (ip >> 8) & 0xff, |
| 237 | (ip >> 16) & 0xff, | 193 | (ip >> 16) & 0xff, |
| 238 | (ip >> 24) & 0xff); | 194 | (ip >> 24) & 0xff); |
| 239 | len = strlen(proc_lasat_ipbuf); | 195 | len = strlen(ipbuf); |
| 240 | if (len > *lenp) | 196 | if (len > *lenp) |
| 241 | len = *lenp; | 197 | len = *lenp; |
| 242 | if (len) | 198 | if (len) |
| 243 | if (copy_to_user(buffer, proc_lasat_ipbuf, len)) { | 199 | if (copy_to_user(buffer, ipbuf, len)) |
| 244 | mutex_unlock(&lasat_info_mutex); | ||
| 245 | return -EFAULT; | 200 | return -EFAULT; |
| 246 | } | ||
| 247 | if (len < *lenp) { | 201 | if (len < *lenp) { |
| 248 | if (put_user('\n', ((char *) buffer) + len)) { | 202 | if (put_user('\n', ((char *) buffer) + len)) |
| 249 | mutex_unlock(&lasat_info_mutex); | ||
| 250 | return -EFAULT; | 203 | return -EFAULT; |
| 251 | } | ||
| 252 | len++; | 204 | len++; |
| 253 | } | 205 | } |
| 254 | *lenp = len; | 206 | *lenp = len; |
| 255 | *ppos += len; | 207 | *ppos += len; |
| 256 | } | 208 | } |
| 257 | update_bcastaddr(); | ||
| 258 | mutex_unlock(&lasat_info_mutex); | ||
| 259 | 209 | ||
| 260 | return 0; | 210 | return 0; |
| 261 | } | 211 | } |
| 262 | #endif /* defined(CONFIG_INET) */ | 212 | #endif |
| 263 | 213 | ||
| 264 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, | 214 | static int sysctl_lasat_prid(ctl_table *table, int *name, int nlen, |
| 265 | void *oldval, size_t *oldlenp, | 215 | void *oldval, size_t *oldlenp, |
| 266 | void *newval, size_t newlen) | 216 | void *newval, size_t newlen) |
| 267 | { | 217 | { |
| 268 | int r; | 218 | int r; |
| 269 | 219 | ||
| 270 | mutex_lock(&lasat_info_mutex); | ||
| 271 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); | 220 | r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen); |
| 272 | if (r < 0) { | 221 | if (r < 0) |
| 273 | mutex_unlock(&lasat_info_mutex); | ||
| 274 | return r; | 222 | return r; |
| 275 | } | ||
| 276 | |||
| 277 | if (newval && newlen) { | 223 | if (newval && newlen) { |
| 278 | if (name && *name == LASAT_PRID) | 224 | lasat_board_info.li_eeprom_info.prid = *(int *)newval; |
| 279 | lasat_board_info.li_eeprom_info.prid = *(int *)newval; | ||
| 280 | |||
| 281 | lasat_write_eeprom_info(); | 225 | lasat_write_eeprom_info(); |
| 282 | lasat_init_board_info(); | 226 | lasat_init_board_info(); |
| 283 | } | 227 | } |
| 284 | mutex_unlock(&lasat_info_mutex); | ||
| 285 | |||
| 286 | return 0; | 228 | return 0; |
| 287 | } | 229 | } |
| 288 | 230 | ||
| 289 | int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp, | 231 | int proc_lasat_prid(ctl_table *table, int write, struct file *filp, |
| 290 | void *buffer, size_t *lenp, loff_t *ppos) | 232 | void *buffer, size_t *lenp, loff_t *ppos) |
| 291 | { | 233 | { |
| 292 | int r; | 234 | int r; |
| 293 | 235 | ||
| 294 | mutex_lock(&lasat_info_mutex); | ||
| 295 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); | 236 | r = proc_dointvec(table, write, filp, buffer, lenp, ppos); |
| 296 | if ((!write) || r) { | 237 | if (r < 0) |
| 297 | mutex_unlock(&lasat_info_mutex); | ||
| 298 | return r; | 238 | return r; |
| 239 | if (write) { | ||
| 240 | lasat_board_info.li_eeprom_info.prid = | ||
| 241 | lasat_board_info.li_prid; | ||
| 242 | lasat_write_eeprom_info(); | ||
| 243 | lasat_init_board_info(); | ||
| 299 | } | 244 | } |
| 300 | if (filp && filp->f_path.dentry) { | ||
| 301 | if (!strcmp(filp->f_path.dentry->d_name.name, "prid")) | ||
| 302 | lasat_board_info.li_eeprom_info.prid = | ||
| 303 | lasat_board_info.li_prid; | ||
| 304 | if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess")) | ||
| 305 | lasat_board_info.li_eeprom_info.debugaccess = | ||
| 306 | lasat_board_info.li_debugaccess; | ||
| 307 | } | ||
| 308 | lasat_write_eeprom_info(); | ||
| 309 | mutex_unlock(&lasat_info_mutex); | ||
| 310 | |||
| 311 | return 0; | 245 | return 0; |
| 312 | } | 246 | } |
| 313 | 247 | ||
| 314 | extern int lasat_boot_to_service; | 248 | extern int lasat_boot_to_service; |
| 315 | 249 | ||
| 316 | #ifdef CONFIG_SYSCTL | ||
| 317 | |||
| 318 | static ctl_table lasat_table[] = { | 250 | static ctl_table lasat_table[] = { |
| 319 | { | 251 | { |
| 320 | .ctl_name = CTL_UNNUMBERED, | 252 | .ctl_name = CTL_UNNUMBERED, |
| @@ -349,8 +281,8 @@ static ctl_table lasat_table[] = { | |||
| 349 | .data = &lasat_board_info.li_prid, | 281 | .data = &lasat_board_info.li_prid, |
| 350 | .maxlen = sizeof(int), | 282 | .maxlen = sizeof(int), |
| 351 | .mode = 0644, | 283 | .mode = 0644, |
| 352 | .proc_handler = &proc_lasat_eeprom_value, | 284 | .proc_handler = &proc_lasat_prid, |
| 353 | .strategy = &sysctl_lasat_eeprom_value | 285 | .strategy = &sysctl_lasat_prid |
| 354 | }, | 286 | }, |
| 355 | #ifdef CONFIG_INET | 287 | #ifdef CONFIG_INET |
| 356 | { | 288 | { |
| @@ -363,7 +295,7 @@ static ctl_table lasat_table[] = { | |||
| 363 | .strategy = &sysctl_lasat_intvec | 295 | .strategy = &sysctl_lasat_intvec |
| 364 | }, | 296 | }, |
| 365 | { | 297 | { |
| 366 | .ctl_name = LASAT_NETMASK, | 298 | .ctl_name = CTL_UNNUMBERED, |
| 367 | .procname = "netmask", | 299 | .procname = "netmask", |
| 368 | .data = &lasat_board_info.li_eeprom_info.netmask, | 300 | .data = &lasat_board_info.li_eeprom_info.netmask, |
| 369 | .maxlen = sizeof(int), | 301 | .maxlen = sizeof(int), |
| @@ -371,15 +303,6 @@ static ctl_table lasat_table[] = { | |||
| 371 | .proc_handler = &proc_lasat_ip, | 303 | .proc_handler = &proc_lasat_ip, |
| 372 | .strategy = &sysctl_lasat_intvec | 304 | .strategy = &sysctl_lasat_intvec |
| 373 | }, | 305 | }, |
| 374 | { | ||
| 375 | .ctl_name = CTL_UNNUMBERED, | ||
| 376 | .procname = "bcastaddr", | ||
| 377 | .data = &lasat_bcastaddr, | ||
| 378 | .maxlen = sizeof(lasat_bcastaddr), | ||
| 379 | .mode = 0600, | ||
| 380 | .proc_handler = &proc_dostring, | ||
| 381 | .strategy = &sysctl_string | ||
| 382 | }, | ||
| 383 | #endif | 306 | #endif |
| 384 | { | 307 | { |
| 385 | .ctl_name = CTL_UNNUMBERED, | 308 | .ctl_name = CTL_UNNUMBERED, |
| @@ -417,7 +340,7 @@ static ctl_table lasat_table[] = { | |||
| 417 | .data = &lasat_board_info.li_namestr, | 340 | .data = &lasat_board_info.li_namestr, |
| 418 | .maxlen = sizeof(lasat_board_info.li_namestr), | 341 | .maxlen = sizeof(lasat_board_info.li_namestr), |
| 419 | .mode = 0444, | 342 | .mode = 0444, |
| 420 | .proc_handler = &proc_dostring, | 343 | .proc_handler = &proc_dostring, |
| 421 | .strategy = &sysctl_string | 344 | .strategy = &sysctl_string |
| 422 | }, | 345 | }, |
| 423 | { | 346 | { |
| @@ -448,9 +371,12 @@ static int __init lasat_register_sysctl(void) | |||
| 448 | 371 | ||
| 449 | lasat_table_header = | 372 | lasat_table_header = |
| 450 | register_sysctl_table(lasat_root_table); | 373 | register_sysctl_table(lasat_root_table); |
| 374 | if (!lasat_table_header) { | ||
| 375 | printk(KERN_ERR "Unable to register LASAT sysctl\n"); | ||
| 376 | return -ENOMEM; | ||
| 377 | } | ||
| 451 | 378 | ||
| 452 | return 0; | 379 | return 0; |
| 453 | } | 380 | } |
| 454 | 381 | ||
| 455 | __initcall(lasat_register_sysctl); | 382 | __initcall(lasat_register_sysctl); |
| 456 | #endif /* CONFIG_SYSCTL */ | ||
diff --git a/arch/mips/lasat/sysctl.h b/arch/mips/lasat/sysctl.h deleted file mode 100644 index 341b97933423..000000000000 --- a/arch/mips/lasat/sysctl.h +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * LASAT sysctl values | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef _LASAT_SYSCTL_H | ||
| 6 | #define _LASAT_SYSCTL_H | ||
| 7 | |||
| 8 | /* /proc/sys/lasat */ | ||
| 9 | enum { | ||
| 10 | LASAT_CPU_HZ = 1, | ||
| 11 | LASAT_BUS_HZ, | ||
| 12 | LASAT_MODEL, | ||
| 13 | LASAT_PRID, | ||
| 14 | LASAT_IPADDR, | ||
| 15 | LASAT_NETMASK, | ||
| 16 | LASAT_BCAST, | ||
| 17 | LASAT_PASSWORD, | ||
| 18 | LASAT_SBOOT, | ||
| 19 | LASAT_RTC, | ||
| 20 | LASAT_NAMESTR, | ||
| 21 | LASAT_TYPESTR, | ||
| 22 | }; | ||
| 23 | |||
| 24 | #endif /* _LASAT_SYSCTL_H */ | ||
diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c index b7633fda4180..96236bf33838 100644 --- a/arch/mips/mips-boards/generic/amon.c +++ b/arch/mips/mips-boards/generic/amon.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | int amon_cpu_avail(int cpu) | 29 | int amon_cpu_avail(int cpu) |
| 30 | { | 30 | { |
| 31 | struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); | 31 | struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); |
| 32 | 32 | ||
| 33 | if (cpu < 0 || cpu >= NCPULAUNCH) { | 33 | if (cpu < 0 || cpu >= NCPULAUNCH) { |
| 34 | pr_debug("avail: cpu%d is out of range\n", cpu); | 34 | pr_debug("avail: cpu%d is out of range\n", cpu); |
| @@ -53,7 +53,7 @@ void amon_cpu_start(int cpu, | |||
| 53 | unsigned long gp, unsigned long a0) | 53 | unsigned long gp, unsigned long a0) |
| 54 | { | 54 | { |
| 55 | volatile struct cpulaunch *launch = | 55 | volatile struct cpulaunch *launch = |
| 56 | (struct cpulaunch *)KSEG0ADDR(CPULAUNCH); | 56 | (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH); |
| 57 | 57 | ||
| 58 | if (!amon_cpu_avail(cpu)) | 58 | if (!amon_cpu_avail(cpu)) |
| 59 | return; | 59 | return; |
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 008fd82b5840..fe2cac1b4514 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
| @@ -58,27 +58,8 @@ static int mips_cpu_timer_irq; | |||
| 58 | static int mips_cpu_perf_irq; | 58 | static int mips_cpu_perf_irq; |
| 59 | extern int cp0_perfcount_irq; | 59 | extern int cp0_perfcount_irq; |
| 60 | 60 | ||
| 61 | DEFINE_PER_CPU(unsigned int, tickcount); | ||
| 62 | #define tickcount_this_cpu __get_cpu_var(tickcount) | ||
| 63 | static unsigned long ledbitmask; | ||
| 64 | |||
| 65 | static void mips_timer_dispatch(void) | 61 | static void mips_timer_dispatch(void) |
| 66 | { | 62 | { |
| 67 | #if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_ATLAS) | ||
| 68 | /* | ||
| 69 | * Yes, this is very tacky, won't work as expected with SMTC and | ||
| 70 | * dyntick will break it, | ||
| 71 | * but it gives me a nice warm feeling during debug | ||
| 72 | */ | ||
| 73 | #define LEDBAR 0xbf000408 | ||
| 74 | if (tickcount_this_cpu++ >= HZ) { | ||
| 75 | tickcount_this_cpu = 0; | ||
| 76 | change_bit(smp_processor_id(), &ledbitmask); | ||
| 77 | smp_wmb(); /* Make sure every one else sees the change */ | ||
| 78 | /* This will pick up any recent changes made by other CPU's */ | ||
| 79 | *(unsigned int *)LEDBAR = ledbitmask; | ||
| 80 | } | ||
| 81 | #endif | ||
| 82 | do_IRQ(mips_cpu_timer_irq); | 63 | do_IRQ(mips_cpu_timer_irq); |
| 83 | } | 64 | } |
| 84 | 65 | ||
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile index 8dc6e2ac4c03..db4ad654a6d3 100644 --- a/arch/mips/mips-boards/malta/Makefile +++ b/arch/mips/mips-boards/malta/Makefile | |||
| @@ -19,9 +19,8 @@ | |||
| 19 | # under Linux. | 19 | # under Linux. |
| 20 | # | 20 | # |
| 21 | 21 | ||
| 22 | obj-y := malta_int.o malta_platform.o malta_setup.o | 22 | obj-y := malta_int.o malta_mtd.o malta_platform.o malta_setup.o |
| 23 | 23 | ||
| 24 | obj-$(CONFIG_MTD) += malta_mtd.o | ||
| 25 | # FIXME FIXME FIXME | 24 | # FIXME FIXME FIXME |
| 26 | obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o | 25 | obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o |
| 27 | 26 | ||
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 643c8bcffff3..27096751ddce 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
| @@ -446,6 +446,7 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 446 | struct page *page = pfn_to_page(fcp_args->pfn); | 446 | struct page *page = pfn_to_page(fcp_args->pfn); |
| 447 | int exec = vma->vm_flags & VM_EXEC; | 447 | int exec = vma->vm_flags & VM_EXEC; |
| 448 | struct mm_struct *mm = vma->vm_mm; | 448 | struct mm_struct *mm = vma->vm_mm; |
| 449 | int map_coherent = 0; | ||
| 449 | pgd_t *pgdp; | 450 | pgd_t *pgdp; |
| 450 | pud_t *pudp; | 451 | pud_t *pudp; |
| 451 | pmd_t *pmdp; | 452 | pmd_t *pmdp; |
| @@ -479,7 +480,9 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 479 | * Use kmap_coherent or kmap_atomic to do flushes for | 480 | * Use kmap_coherent or kmap_atomic to do flushes for |
| 480 | * another ASID than the current one. | 481 | * another ASID than the current one. |
| 481 | */ | 482 | */ |
| 482 | if (cpu_has_dc_aliases) | 483 | map_coherent = (cpu_has_dc_aliases && |
| 484 | page_mapped(page) && !Page_dcache_dirty(page)); | ||
| 485 | if (map_coherent) | ||
| 483 | vaddr = kmap_coherent(page, addr); | 486 | vaddr = kmap_coherent(page, addr); |
| 484 | else | 487 | else |
| 485 | vaddr = kmap_atomic(page, KM_USER0); | 488 | vaddr = kmap_atomic(page, KM_USER0); |
| @@ -502,7 +505,7 @@ static inline void local_r4k_flush_cache_page(void *args) | |||
| 502 | } | 505 | } |
| 503 | 506 | ||
| 504 | if (vaddr) { | 507 | if (vaddr) { |
| 505 | if (cpu_has_dc_aliases) | 508 | if (map_coherent) |
| 506 | kunmap_coherent(); | 509 | kunmap_coherent(); |
| 507 | else | 510 | else |
| 508 | kunmap_atomic(vaddr, KM_USER0); | 511 | kunmap_atomic(vaddr, KM_USER0); |
| @@ -1226,6 +1229,28 @@ void au1x00_fixup_config_od(void) | |||
| 1226 | } | 1229 | } |
| 1227 | } | 1230 | } |
| 1228 | 1231 | ||
| 1232 | /* CP0 hazard avoidance. */ | ||
| 1233 | #define NXP_BARRIER() \ | ||
| 1234 | __asm__ __volatile__( \ | ||
| 1235 | ".set noreorder\n\t" \ | ||
| 1236 | "nop; nop; nop; nop; nop; nop;\n\t" \ | ||
| 1237 | ".set reorder\n\t") | ||
| 1238 | |||
| 1239 | static void nxp_pr4450_fixup_config(void) | ||
| 1240 | { | ||
| 1241 | unsigned long config0; | ||
| 1242 | |||
| 1243 | config0 = read_c0_config(); | ||
| 1244 | |||
| 1245 | /* clear all three cache coherency fields */ | ||
| 1246 | config0 &= ~(0x7 | (7 << 25) | (7 << 28)); | ||
| 1247 | config0 |= (((_page_cachable_default >> _CACHE_SHIFT) << 0) | | ||
| 1248 | ((_page_cachable_default >> _CACHE_SHIFT) << 25) | | ||
| 1249 | ((_page_cachable_default >> _CACHE_SHIFT) << 28)); | ||
| 1250 | write_c0_config(config0); | ||
| 1251 | NXP_BARRIER(); | ||
| 1252 | } | ||
| 1253 | |||
| 1229 | static int __cpuinitdata cca = -1; | 1254 | static int __cpuinitdata cca = -1; |
| 1230 | 1255 | ||
| 1231 | static int __init cca_setup(char *str) | 1256 | static int __init cca_setup(char *str) |
| @@ -1271,6 +1296,10 @@ static void __cpuinit coherency_setup(void) | |||
| 1271 | case CPU_AU1500: /* rev. AB */ | 1296 | case CPU_AU1500: /* rev. AB */ |
| 1272 | au1x00_fixup_config_od(); | 1297 | au1x00_fixup_config_od(); |
| 1273 | break; | 1298 | break; |
| 1299 | |||
| 1300 | case PRID_IMP_PR4450: | ||
| 1301 | nxp_pr4450_fixup_config(); | ||
| 1302 | break; | ||
| 1274 | } | 1303 | } |
| 1275 | } | 1304 | } |
| 1276 | 1305 | ||
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index ecd562d2c348..137c14bafd6b 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
| @@ -71,6 +71,7 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
| 71 | * don't have to care about aliases on other CPUs. | 71 | * don't have to care about aliases on other CPUs. |
| 72 | */ | 72 | */ |
| 73 | unsigned long empty_zero_page, zero_page_mask; | 73 | unsigned long empty_zero_page, zero_page_mask; |
| 74 | EXPORT_SYMBOL_GPL(empty_zero_page); | ||
| 74 | 75 | ||
| 75 | /* | 76 | /* |
| 76 | * Not static inline because used by IP27 special magic initialization code | 77 | * Not static inline because used by IP27 special magic initialization code |
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c index d827d6144369..1edf0cbbeede 100644 --- a/arch/mips/mm/page.c +++ b/arch/mips/mm/page.c | |||
| @@ -310,8 +310,8 @@ void __cpuinit build_clear_page(void) | |||
| 310 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) | 310 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) |
| 311 | uasm_i_lui(&buf, AT, 0xa000); | 311 | uasm_i_lui(&buf, AT, 0xa000); |
| 312 | 312 | ||
| 313 | off = min(8, pref_bias_clear_store / cache_line_size) * | 313 | off = cache_line_size ? min(8, pref_bias_clear_store / cache_line_size) |
| 314 | cache_line_size; | 314 | * cache_line_size : 0; |
| 315 | while (off) { | 315 | while (off) { |
| 316 | build_clear_pref(&buf, -off); | 316 | build_clear_pref(&buf, -off); |
| 317 | off -= cache_line_size; | 317 | off -= cache_line_size; |
| @@ -454,12 +454,14 @@ void __cpuinit build_copy_page(void) | |||
| 454 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) | 454 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) |
| 455 | uasm_i_lui(&buf, AT, 0xa000); | 455 | uasm_i_lui(&buf, AT, 0xa000); |
| 456 | 456 | ||
| 457 | off = min(8, pref_bias_copy_load / cache_line_size) * cache_line_size; | 457 | off = cache_line_size ? min(8, pref_bias_copy_load / cache_line_size) * |
| 458 | cache_line_size : 0; | ||
| 458 | while (off) { | 459 | while (off) { |
| 459 | build_copy_load_pref(&buf, -off); | 460 | build_copy_load_pref(&buf, -off); |
| 460 | off -= cache_line_size; | 461 | off -= cache_line_size; |
| 461 | } | 462 | } |
| 462 | off = min(8, pref_bias_copy_store / cache_line_size) * cache_line_size; | 463 | off = cache_line_size ? min(8, pref_bias_copy_store / cache_line_size) * |
| 464 | cache_line_size : 0; | ||
| 463 | while (off) { | 465 | while (off) { |
| 464 | build_copy_store_pref(&buf, -off); | 466 | build_copy_store_pref(&buf, -off); |
| 465 | off -= cache_line_size; | 467 | off -= cache_line_size; |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 382738ca8a0b..76da73a5ab3c 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
| @@ -224,8 +224,9 @@ static u32 final_handler[64] __cpuinitdata; | |||
| 224 | static void __cpuinit __maybe_unused build_tlb_probe_entry(u32 **p) | 224 | static void __cpuinit __maybe_unused build_tlb_probe_entry(u32 **p) |
| 225 | { | 225 | { |
| 226 | switch (current_cpu_type()) { | 226 | switch (current_cpu_type()) { |
| 227 | /* Found by experiment: R4600 v2.0 needs this, too. */ | 227 | /* Found by experiment: R4600 v2.0/R4700 needs this, too. */ |
| 228 | case CPU_R4600: | 228 | case CPU_R4600: |
| 229 | case CPU_R4700: | ||
| 229 | case CPU_R5000: | 230 | case CPU_R5000: |
| 230 | case CPU_R5000A: | 231 | case CPU_R5000A: |
| 231 | case CPU_NEVADA: | 232 | case CPU_NEVADA: |
diff --git a/arch/mips/nxp/pnx8550/jbs/board_setup.c b/arch/mips/nxp/pnx8550/jbs/board_setup.c index f92826e0096d..57dd903ca408 100644 --- a/arch/mips/nxp/pnx8550/jbs/board_setup.c +++ b/arch/mips/nxp/pnx8550/jbs/board_setup.c | |||
| @@ -47,16 +47,7 @@ | |||
| 47 | 47 | ||
| 48 | void __init board_setup(void) | 48 | void __init board_setup(void) |
| 49 | { | 49 | { |
| 50 | unsigned long config0, configpr; | 50 | unsigned long configpr; |
| 51 | |||
| 52 | config0 = read_c0_config(); | ||
| 53 | |||
| 54 | /* clear all three cache coherency fields */ | ||
| 55 | config0 &= ~(0x7 | (7<<25) | (7<<28)); | ||
| 56 | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) | | ||
| 57 | (CONF_CM_DEFAULT<<28)); | ||
| 58 | write_c0_config(config0); | ||
| 59 | BARRIER; | ||
| 60 | 51 | ||
| 61 | configpr = read_c0_config7(); | 52 | configpr = read_c0_config7(); |
| 62 | configpr |= (1<<19); /* enable tlb */ | 53 | configpr |= (1<<19); /* enable tlb */ |
diff --git a/arch/mips/nxp/pnx8550/stb810/board_setup.c b/arch/mips/nxp/pnx8550/stb810/board_setup.c index 1282c27cfcb7..af2a55e0b4e9 100644 --- a/arch/mips/nxp/pnx8550/stb810/board_setup.c +++ b/arch/mips/nxp/pnx8550/stb810/board_setup.c | |||
| @@ -33,15 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | void __init board_setup(void) | 34 | void __init board_setup(void) |
| 35 | { | 35 | { |
| 36 | unsigned long config0, configpr; | 36 | unsigned long configpr; |
| 37 | |||
| 38 | config0 = read_c0_config(); | ||
| 39 | |||
| 40 | /* clear all three cache coherency fields */ | ||
| 41 | config0 &= ~(0x7 | (7<<25) | (7<<28)); | ||
| 42 | config0 |= (CONF_CM_DEFAULT | (CONF_CM_DEFAULT<<25) | | ||
| 43 | (CONF_CM_DEFAULT<<28)); | ||
| 44 | write_c0_config(config0); | ||
| 45 | 37 | ||
| 46 | configpr = read_c0_config7(); | 38 | configpr = read_c0_config7(); |
| 47 | configpr |= (1<<19); /* enable tlb */ | 39 | configpr |= (1<<19); /* enable tlb */ |
diff --git a/arch/mips/pci/ops-bridge.c b/arch/mips/pci/ops-bridge.c index 1fa09929cd7a..b46b3e211775 100644 --- a/arch/mips/pci/ops-bridge.c +++ b/arch/mips/pci/ops-bridge.c | |||
| @@ -14,6 +14,22 @@ | |||
| 14 | #include <asm/sn/sn0/hub.h> | 14 | #include <asm/sn/sn0/hub.h> |
| 15 | 15 | ||
| 16 | /* | 16 | /* |
| 17 | * Most of the IOC3 PCI config register aren't present | ||
| 18 | * we emulate what is needed for a normal PCI enumeration | ||
| 19 | */ | ||
| 20 | static u32 emulate_ioc3_cfg(int where, int size) | ||
| 21 | { | ||
| 22 | if (size == 1 && where == 0x3d) | ||
| 23 | return 0x01; | ||
| 24 | else if (size == 2 && where == 0x3c) | ||
| 25 | return 0x0100; | ||
| 26 | else if (size == 4 && where == 0x3c) | ||
| 27 | return 0x00000100; | ||
| 28 | |||
| 29 | return 0; | ||
| 30 | } | ||
| 31 | |||
| 32 | /* | ||
| 17 | * The Bridge ASIC supports both type 0 and type 1 access. Type 1 is | 33 | * The Bridge ASIC supports both type 0 and type 1 access. Type 1 is |
| 18 | * not really documented, so right now I can't write code which uses it. | 34 | * not really documented, so right now I can't write code which uses it. |
| 19 | * Therefore we use type 0 accesses for now even though they won't work | 35 | * Therefore we use type 0 accesses for now even though they won't work |
| @@ -64,7 +80,7 @@ oh_my_gawd: | |||
| 64 | * generic PCI code a chance to look at the wrong register. | 80 | * generic PCI code a chance to look at the wrong register. |
| 65 | */ | 81 | */ |
| 66 | if ((where >= 0x14 && where < 0x40) || (where >= 0x48)) { | 82 | if ((where >= 0x14 && where < 0x40) || (where >= 0x48)) { |
| 67 | *value = 0; | 83 | *value = emulate_ioc3_cfg(where, size); |
| 68 | return PCIBIOS_SUCCESSFUL; | 84 | return PCIBIOS_SUCCESSFUL; |
| 69 | } | 85 | } |
| 70 | 86 | ||
| @@ -127,7 +143,7 @@ oh_my_gawd: | |||
| 127 | * generic PCI code a chance to look at the wrong register. | 143 | * generic PCI code a chance to look at the wrong register. |
| 128 | */ | 144 | */ |
| 129 | if ((where >= 0x14 && where < 0x40) || (where >= 0x48)) { | 145 | if ((where >= 0x14 && where < 0x40) || (where >= 0x48)) { |
| 130 | *value = 0; | 146 | *value = emulate_ioc3_cfg(where, size); |
| 131 | return PCIBIOS_SUCCESSFUL; | 147 | return PCIBIOS_SUCCESSFUL; |
| 132 | } | 148 | } |
| 133 | 149 | ||
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index bb64828a92fe..a18516925cdd 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c | |||
| @@ -47,6 +47,9 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid) | |||
| 47 | static int num_bridges = 0; | 47 | static int num_bridges = 0; |
| 48 | bridge_t *bridge; | 48 | bridge_t *bridge; |
| 49 | int slot; | 49 | int slot; |
| 50 | extern int pci_probe_only; | ||
| 51 | |||
| 52 | pci_probe_only = 1; | ||
| 50 | 53 | ||
| 51 | printk("a bridge\n"); | 54 | printk("a bridge\n"); |
| 52 | 55 | ||
| @@ -100,6 +103,11 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid) | |||
| 100 | */ | 103 | */ |
| 101 | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | | 104 | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | |
| 102 | BRIDGE_CTRL_MEM_SWAP; | 105 | BRIDGE_CTRL_MEM_SWAP; |
| 106 | #ifdef CONFIG_PAGE_SIZE_4KB | ||
| 107 | bridge->b_wid_control &= ~BRIDGE_CTRL_PAGE_SIZE; | ||
| 108 | #else /* 16kB or larger */ | ||
| 109 | bridge->b_wid_control |= BRIDGE_CTRL_PAGE_SIZE; | ||
| 110 | #endif | ||
| 103 | 111 | ||
| 104 | /* | 112 | /* |
| 105 | * Hmm... IRIX sets additional bits in the address which | 113 | * Hmm... IRIX sets additional bits in the address which |
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index 42e4d2c800fa..2a09ad91ec8c 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
| @@ -207,6 +207,7 @@ struct pci_controller sb1250_controller = { | |||
| 207 | 207 | ||
| 208 | static int __init sb1250_pcibios_init(void) | 208 | static int __init sb1250_pcibios_init(void) |
| 209 | { | 209 | { |
| 210 | void __iomem *io_map_base; | ||
| 210 | uint32_t cmdreg; | 211 | uint32_t cmdreg; |
| 211 | uint64_t reg; | 212 | uint64_t reg; |
| 212 | extern int pci_probe_only; | 213 | extern int pci_probe_only; |
| @@ -253,12 +254,13 @@ static int __init sb1250_pcibios_init(void) | |||
| 253 | * works correctly with most of Linux's drivers. | 254 | * works correctly with most of Linux's drivers. |
| 254 | * XXX ehs: Should this happen in PCI Device mode? | 255 | * XXX ehs: Should this happen in PCI Device mode? |
| 255 | */ | 256 | */ |
| 256 | |||
| 257 | set_io_port_base((unsigned long) | ||
| 258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 65536)); | ||
| 259 | isa_slot_offset = (unsigned long) | 257 | isa_slot_offset = (unsigned long) |
| 260 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); | 258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); |
| 261 | 259 | ||
| 260 | io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024); | ||
| 261 | sb1250_controller.io_map_base = io_map_base; | ||
| 262 | set_io_port_base((unsigned long)io_map_base); | ||
| 263 | |||
| 262 | #ifdef CONFIG_SIBYTE_HAS_LDT | 264 | #ifdef CONFIG_SIBYTE_HAS_LDT |
| 263 | /* | 265 | /* |
| 264 | * Also check the LDT bridge's enable, just in case we didn't | 266 | * Also check the LDT bridge's enable, just in case we didn't |
diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c index 33c4f683d067..d1e049b55f34 100644 --- a/arch/mips/pci/pci-vr41xx.c +++ b/arch/mips/pci/pci-vr41xx.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2001-2003 MontaVista Software Inc. | 4 | * Copyright (C) 2001-2003 MontaVista Software Inc. |
| 5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> | 5 | * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> |
| 6 | * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 6 | * Copyright (C) 2004-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> |
| 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| @@ -300,6 +300,18 @@ static int __init vr41xx_pciu_init(void) | |||
| 300 | ioport_resource.end = IO_PORT_RESOURCE_END; | 300 | ioport_resource.end = IO_PORT_RESOURCE_END; |
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | if (setup->master_io) { | ||
| 304 | void __iomem *io_map_base; | ||
| 305 | struct resource *res = vr41xx_pci_controller.io_resource; | ||
| 306 | master = setup->master_io; | ||
| 307 | io_map_base = ioremap(master->bus_base_address, | ||
| 308 | res->end - res->start + 1); | ||
| 309 | if (!io_map_base) | ||
| 310 | return -EBUSY; | ||
| 311 | |||
| 312 | vr41xx_pci_controller.io_map_base = (unsigned long)io_map_base; | ||
| 313 | } | ||
| 314 | |||
| 303 | register_pci_controller(&vr41xx_pci_controller); | 315 | register_pci_controller(&vr41xx_pci_controller); |
| 304 | 316 | ||
| 305 | return 0; | 317 | return 0; |
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c index 7093e7c573a4..4a500e8cd3cc 100644 --- a/arch/mips/sgi-ip27/ip27-init.c +++ b/arch/mips/sgi-ip27/ip27-init.c | |||
| @@ -161,27 +161,6 @@ cnodeid_t get_compact_nodeid(void) | |||
| 161 | return NASID_TO_COMPACT_NODEID(get_nasid()); | 161 | return NASID_TO_COMPACT_NODEID(get_nasid()); |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | /* Extracted from the IOC3 meta driver. FIXME. */ | ||
| 165 | static inline void ioc3_sio_init(void) | ||
| 166 | { | ||
| 167 | struct ioc3 *ioc3; | ||
| 168 | nasid_t nid; | ||
| 169 | long loops; | ||
| 170 | |||
| 171 | nid = get_nasid(); | ||
| 172 | ioc3 = (struct ioc3 *) KL_CONFIG_CH_CONS_INFO(nid)->memory_base; | ||
| 173 | |||
| 174 | ioc3->sscr_a = 0; /* PIO mode for uarta. */ | ||
| 175 | ioc3->sscr_b = 0; /* PIO mode for uartb. */ | ||
| 176 | ioc3->sio_iec = ~0; | ||
| 177 | ioc3->sio_ies = (SIO_IR_SA_INT | SIO_IR_SB_INT); | ||
| 178 | |||
| 179 | loops=1000000; while(loops--); | ||
| 180 | ioc3->sregs.uarta.iu_fcr = 0; | ||
| 181 | ioc3->sregs.uartb.iu_fcr = 0; | ||
| 182 | loops=1000000; while(loops--); | ||
| 183 | } | ||
| 184 | |||
| 185 | static inline void ioc3_eth_init(void) | 164 | static inline void ioc3_eth_init(void) |
| 186 | { | 165 | { |
| 187 | struct ioc3 *ioc3; | 166 | struct ioc3 *ioc3; |
| @@ -234,7 +213,6 @@ void __init plat_mem_setup(void) | |||
| 234 | panic("Kernel compiled for N mode."); | 213 | panic("Kernel compiled for N mode."); |
| 235 | #endif | 214 | #endif |
| 236 | 215 | ||
| 237 | ioc3_sio_init(); | ||
| 238 | ioc3_eth_init(); | 216 | ioc3_eth_init(); |
| 239 | per_cpu_init(); | 217 | per_cpu_init(); |
| 240 | 218 | ||
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index bf438d02366e..42cd10956306 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
| @@ -33,10 +33,6 @@ | |||
| 33 | #define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) | 33 | #define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) |
| 34 | #define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) | 34 | #define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) |
| 35 | 35 | ||
| 36 | #define SLOT_IGNORED 0xffff | ||
| 37 | |||
| 38 | static short __initdata slot_lastfilled_cache[MAX_COMPACT_NODES]; | ||
| 39 | static unsigned short __initdata slot_psize_cache[MAX_COMPACT_NODES][MAX_MEM_SLOTS]; | ||
| 40 | static struct bootmem_data __initdata plat_node_bdata[MAX_COMPACT_NODES]; | 36 | static struct bootmem_data __initdata plat_node_bdata[MAX_COMPACT_NODES]; |
| 41 | 37 | ||
| 42 | struct node_data *__node_data[MAX_COMPACT_NODES]; | 38 | struct node_data *__node_data[MAX_COMPACT_NODES]; |
| @@ -267,51 +263,6 @@ static pfn_t __init slot_getbasepfn(cnodeid_t cnode, int slot) | |||
| 267 | return ((pfn_t)nasid << PFN_NASIDSHFT) | (slot << SLOT_PFNSHIFT); | 263 | return ((pfn_t)nasid << PFN_NASIDSHFT) | (slot << SLOT_PFNSHIFT); |
| 268 | } | 264 | } |
| 269 | 265 | ||
| 270 | /* | ||
| 271 | * Return the number of pages of memory provided by the given slot | ||
| 272 | * on the specified node. | ||
| 273 | */ | ||
| 274 | static pfn_t __init slot_getsize(cnodeid_t node, int slot) | ||
| 275 | { | ||
| 276 | return (pfn_t) slot_psize_cache[node][slot]; | ||
| 277 | } | ||
| 278 | |||
| 279 | /* | ||
| 280 | * Return highest slot filled | ||
| 281 | */ | ||
| 282 | static int __init node_getlastslot(cnodeid_t node) | ||
| 283 | { | ||
| 284 | return (int) slot_lastfilled_cache[node]; | ||
| 285 | } | ||
| 286 | |||
| 287 | /* | ||
| 288 | * Return the pfn of the last free page of memory on a node. | ||
| 289 | */ | ||
| 290 | static pfn_t __init node_getmaxclick(cnodeid_t node) | ||
| 291 | { | ||
| 292 | pfn_t slot_psize; | ||
| 293 | int slot; | ||
| 294 | |||
| 295 | /* | ||
| 296 | * Start at the top slot. When we find a slot with memory in it, | ||
| 297 | * that's the winner. | ||
| 298 | */ | ||
| 299 | for (slot = (MAX_MEM_SLOTS - 1); slot >= 0; slot--) { | ||
| 300 | if ((slot_psize = slot_getsize(node, slot))) { | ||
| 301 | if (slot_psize == SLOT_IGNORED) | ||
| 302 | continue; | ||
| 303 | /* Return the basepfn + the slot size, minus 1. */ | ||
| 304 | return slot_getbasepfn(node, slot) + slot_psize - 1; | ||
| 305 | } | ||
| 306 | } | ||
| 307 | |||
| 308 | /* | ||
| 309 | * If there's no memory on the node, return 0. This is likely | ||
| 310 | * to cause problems. | ||
| 311 | */ | ||
| 312 | return 0; | ||
| 313 | } | ||
| 314 | |||
| 315 | static pfn_t __init slot_psize_compute(cnodeid_t node, int slot) | 266 | static pfn_t __init slot_psize_compute(cnodeid_t node, int slot) |
| 316 | { | 267 | { |
| 317 | nasid_t nasid; | 268 | nasid_t nasid; |
| @@ -404,13 +355,13 @@ static void __init mlreset(void) | |||
| 404 | static void __init szmem(void) | 355 | static void __init szmem(void) |
| 405 | { | 356 | { |
| 406 | pfn_t slot_psize, slot0sz = 0, nodebytes; /* Hack to detect problem configs */ | 357 | pfn_t slot_psize, slot0sz = 0, nodebytes; /* Hack to detect problem configs */ |
| 407 | int slot, ignore; | 358 | int slot; |
| 408 | cnodeid_t node; | 359 | cnodeid_t node; |
| 409 | 360 | ||
| 410 | num_physpages = 0; | 361 | num_physpages = 0; |
| 411 | 362 | ||
| 412 | for_each_online_node(node) { | 363 | for_each_online_node(node) { |
| 413 | ignore = nodebytes = 0; | 364 | nodebytes = 0; |
| 414 | for (slot = 0; slot < MAX_MEM_SLOTS; slot++) { | 365 | for (slot = 0; slot < MAX_MEM_SLOTS; slot++) { |
| 415 | slot_psize = slot_psize_compute(node, slot); | 366 | slot_psize = slot_psize_compute(node, slot); |
| 416 | if (slot == 0) | 367 | if (slot == 0) |
| @@ -420,21 +371,20 @@ static void __init szmem(void) | |||
| 420 | * kernel text. | 371 | * kernel text. |
| 421 | */ | 372 | */ |
| 422 | nodebytes += (1LL << SLOT_SHIFT); | 373 | nodebytes += (1LL << SLOT_SHIFT); |
| 374 | |||
| 375 | if (!slot_psize) | ||
| 376 | continue; | ||
| 377 | |||
| 423 | if ((nodebytes >> PAGE_SHIFT) * (sizeof(struct page)) > | 378 | if ((nodebytes >> PAGE_SHIFT) * (sizeof(struct page)) > |
| 424 | (slot0sz << PAGE_SHIFT)) | 379 | (slot0sz << PAGE_SHIFT)) { |
| 425 | ignore = 1; | ||
| 426 | if (ignore && slot_psize) { | ||
| 427 | printk("Ignoring slot %d onwards on node %d\n", | 380 | printk("Ignoring slot %d onwards on node %d\n", |
| 428 | slot, node); | 381 | slot, node); |
| 429 | slot_psize_cache[node][slot] = SLOT_IGNORED; | ||
| 430 | slot = MAX_MEM_SLOTS; | 382 | slot = MAX_MEM_SLOTS; |
| 431 | continue; | 383 | continue; |
| 432 | } | 384 | } |
| 433 | num_physpages += slot_psize; | 385 | num_physpages += slot_psize; |
| 434 | slot_psize_cache[node][slot] = | 386 | add_active_range(node, slot_getbasepfn(node, slot), |
| 435 | (unsigned short) slot_psize; | 387 | slot_getbasepfn(node, slot) + slot_psize); |
| 436 | if (slot_psize) | ||
| 437 | slot_lastfilled_cache[node] = slot; | ||
| 438 | } | 388 | } |
| 439 | } | 389 | } |
| 440 | } | 390 | } |
| @@ -442,18 +392,20 @@ static void __init szmem(void) | |||
| 442 | static void __init node_mem_init(cnodeid_t node) | 392 | static void __init node_mem_init(cnodeid_t node) |
| 443 | { | 393 | { |
| 444 | pfn_t slot_firstpfn = slot_getbasepfn(node, 0); | 394 | pfn_t slot_firstpfn = slot_getbasepfn(node, 0); |
| 445 | pfn_t slot_lastpfn = slot_firstpfn + slot_getsize(node, 0); | ||
| 446 | pfn_t slot_freepfn = node_getfirstfree(node); | 395 | pfn_t slot_freepfn = node_getfirstfree(node); |
| 447 | struct pglist_data *pd; | ||
| 448 | unsigned long bootmap_size; | 396 | unsigned long bootmap_size; |
| 397 | pfn_t start_pfn, end_pfn; | ||
| 398 | |||
| 399 | get_pfn_range_for_nid(node, &start_pfn, &end_pfn); | ||
| 449 | 400 | ||
| 450 | /* | 401 | /* |
| 451 | * Allocate the node data structures on the node first. | 402 | * Allocate the node data structures on the node first. |
| 452 | */ | 403 | */ |
| 453 | __node_data[node] = __va(slot_freepfn << PAGE_SHIFT); | 404 | __node_data[node] = __va(slot_freepfn << PAGE_SHIFT); |
| 454 | 405 | ||
| 455 | pd = NODE_DATA(node); | 406 | NODE_DATA(node)->bdata = &plat_node_bdata[node]; |
| 456 | pd->bdata = &plat_node_bdata[node]; | 407 | NODE_DATA(node)->node_start_pfn = start_pfn; |
| 408 | NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn; | ||
| 457 | 409 | ||
| 458 | cpus_clear(hub_data(node)->h_cpus); | 410 | cpus_clear(hub_data(node)->h_cpus); |
| 459 | 411 | ||
| @@ -461,12 +413,12 @@ static void __init node_mem_init(cnodeid_t node) | |||
| 461 | sizeof(struct hub_data)); | 413 | sizeof(struct hub_data)); |
| 462 | 414 | ||
| 463 | bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn, | 415 | bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn, |
| 464 | slot_firstpfn, slot_lastpfn); | 416 | start_pfn, end_pfn); |
| 465 | free_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, | 417 | free_bootmem_with_active_regions(node, end_pfn); |
| 466 | (slot_lastpfn - slot_firstpfn) << PAGE_SHIFT); | ||
| 467 | reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, | 418 | reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, |
| 468 | ((slot_freepfn - slot_firstpfn) << PAGE_SHIFT) + bootmap_size, | 419 | ((slot_freepfn - slot_firstpfn) << PAGE_SHIFT) + bootmap_size, |
| 469 | BOOTMEM_DEFAULT); | 420 | BOOTMEM_DEFAULT); |
| 421 | sparse_memory_present_with_active_regions(node); | ||
| 470 | } | 422 | } |
| 471 | 423 | ||
| 472 | /* | 424 | /* |
| @@ -515,16 +467,15 @@ void __init paging_init(void) | |||
| 515 | pagetable_init(); | 467 | pagetable_init(); |
| 516 | 468 | ||
| 517 | for_each_online_node(node) { | 469 | for_each_online_node(node) { |
| 518 | pfn_t start_pfn = slot_getbasepfn(node, 0); | 470 | pfn_t start_pfn, end_pfn; |
| 519 | pfn_t end_pfn = node_getmaxclick(node) + 1; | ||
| 520 | 471 | ||
| 521 | zones_size[ZONE_NORMAL] = end_pfn - start_pfn; | 472 | get_pfn_range_for_nid(node, &start_pfn, &end_pfn); |
| 522 | free_area_init_node(node, NODE_DATA(node), | ||
| 523 | zones_size, start_pfn, NULL); | ||
| 524 | 473 | ||
| 525 | if (end_pfn > max_low_pfn) | 474 | if (end_pfn > max_low_pfn) |
| 526 | max_low_pfn = end_pfn; | 475 | max_low_pfn = end_pfn; |
| 527 | } | 476 | } |
| 477 | zones_size[ZONE_NORMAL] = max_low_pfn; | ||
| 478 | free_area_init_nodes(zones_size); | ||
| 528 | } | 479 | } |
| 529 | 480 | ||
| 530 | void __init mem_init(void) | 481 | void __init mem_init(void) |
| @@ -535,34 +486,10 @@ void __init mem_init(void) | |||
| 535 | high_memory = (void *) __va(num_physpages << PAGE_SHIFT); | 486 | high_memory = (void *) __va(num_physpages << PAGE_SHIFT); |
| 536 | 487 | ||
| 537 | for_each_online_node(node) { | 488 | for_each_online_node(node) { |
| 538 | unsigned slot, numslots; | ||
| 539 | struct page *end, *p; | ||
| 540 | |||
| 541 | /* | 489 | /* |
| 542 | * This will free up the bootmem, ie, slot 0 memory. | 490 | * This will free up the bootmem, ie, slot 0 memory. |
| 543 | */ | 491 | */ |
| 544 | totalram_pages += free_all_bootmem_node(NODE_DATA(node)); | 492 | totalram_pages += free_all_bootmem_node(NODE_DATA(node)); |
| 545 | |||
| 546 | /* | ||
| 547 | * We need to manually do the other slots. | ||
| 548 | */ | ||
| 549 | numslots = node_getlastslot(node); | ||
| 550 | for (slot = 1; slot <= numslots; slot++) { | ||
| 551 | p = nid_page_nr(node, slot_getbasepfn(node, slot) - | ||
| 552 | slot_getbasepfn(node, 0)); | ||
| 553 | |||
| 554 | /* | ||
| 555 | * Free valid memory in current slot. | ||
| 556 | */ | ||
| 557 | for (end = p + slot_getsize(node, slot); p < end; p++) { | ||
| 558 | /* if (!page_is_ram(pgnr)) continue; */ | ||
| 559 | /* commented out until page_is_ram works */ | ||
| 560 | ClearPageReserved(p); | ||
| 561 | init_page_count(p); | ||
| 562 | __free_page(p); | ||
| 563 | totalram_pages++; | ||
| 564 | } | ||
| 565 | } | ||
| 566 | } | 493 | } |
| 567 | 494 | ||
| 568 | totalram_pages -= setup_zero_pages(); /* This comes from node 0 */ | 495 | totalram_pages -= setup_zero_pages(); /* This comes from node 0 */ |
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c index f15fc93d6b35..ba5cdebeaf0d 100644 --- a/arch/mips/sgi-ip27/ip27-smp.c +++ b/arch/mips/sgi-ip27/ip27-smp.c | |||
| @@ -176,11 +176,14 @@ static void ip27_send_ipi_mask(cpumask_t mask, unsigned int action) | |||
| 176 | static void __cpuinit ip27_init_secondary(void) | 176 | static void __cpuinit ip27_init_secondary(void) |
| 177 | { | 177 | { |
| 178 | per_cpu_init(); | 178 | per_cpu_init(); |
| 179 | local_irq_enable(); | ||
| 180 | } | 179 | } |
| 181 | 180 | ||
| 182 | static void __cpuinit ip27_smp_finish(void) | 181 | static void __cpuinit ip27_smp_finish(void) |
| 183 | { | 182 | { |
| 183 | extern void hub_rt_clock_event_init(void); | ||
| 184 | |||
| 185 | hub_rt_clock_event_init(); | ||
| 186 | local_irq_enable(); | ||
| 184 | } | 187 | } |
| 185 | 188 | ||
| 186 | static void __init ip27_cpus_done(void) | 189 | static void __init ip27_cpus_done(void) |
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c index 9cebc9e7da63..8b4e854af925 100644 --- a/arch/mips/sgi-ip27/ip27-timer.c +++ b/arch/mips/sgi-ip27/ip27-timer.c | |||
| @@ -160,10 +160,13 @@ static void rt_set_mode(enum clock_event_mode mode, | |||
| 160 | 160 | ||
| 161 | int rt_timer_irq; | 161 | int rt_timer_irq; |
| 162 | 162 | ||
| 163 | static DEFINE_PER_CPU(struct clock_event_device, hub_rt_clockevent); | ||
| 164 | static DEFINE_PER_CPU(char [11], hub_rt_name); | ||
| 165 | |||
| 163 | static irqreturn_t hub_rt_counter_handler(int irq, void *dev_id) | 166 | static irqreturn_t hub_rt_counter_handler(int irq, void *dev_id) |
| 164 | { | 167 | { |
| 165 | struct clock_event_device *cd = dev_id; | ||
| 166 | unsigned int cpu = smp_processor_id(); | 168 | unsigned int cpu = smp_processor_id(); |
| 169 | struct clock_event_device *cd = &per_cpu(hub_rt_clockevent, cpu); | ||
| 167 | int slice = cputoslice(cpu); | 170 | int slice = cputoslice(cpu); |
| 168 | 171 | ||
| 169 | /* | 172 | /* |
| @@ -192,10 +195,7 @@ struct irqaction hub_rt_irqaction = { | |||
| 192 | #define NSEC_PER_CYCLE 800 | 195 | #define NSEC_PER_CYCLE 800 |
| 193 | #define CYCLES_PER_SEC (NSEC_PER_SEC / NSEC_PER_CYCLE) | 196 | #define CYCLES_PER_SEC (NSEC_PER_SEC / NSEC_PER_CYCLE) |
| 194 | 197 | ||
| 195 | static DEFINE_PER_CPU(struct clock_event_device, hub_rt_clockevent); | 198 | void __cpuinit hub_rt_clock_event_init(void) |
| 196 | static DEFINE_PER_CPU(char [11], hub_rt_name); | ||
| 197 | |||
| 198 | static void __cpuinit hub_rt_clock_event_init(void) | ||
| 199 | { | 199 | { |
| 200 | unsigned int cpu = smp_processor_id(); | 200 | unsigned int cpu = smp_processor_id(); |
| 201 | struct clock_event_device *cd = &per_cpu(hub_rt_clockevent, cpu); | 201 | struct clock_event_device *cd = &per_cpu(hub_rt_clockevent, cpu); |
| @@ -203,17 +203,16 @@ static void __cpuinit hub_rt_clock_event_init(void) | |||
| 203 | int irq = rt_timer_irq; | 203 | int irq = rt_timer_irq; |
| 204 | 204 | ||
| 205 | sprintf(name, "hub-rt %d", cpu); | 205 | sprintf(name, "hub-rt %d", cpu); |
| 206 | cd->name = "HUB-RT", | 206 | cd->name = name; |
| 207 | cd->features = CLOCK_EVT_FEAT_ONESHOT, | 207 | cd->features = CLOCK_EVT_FEAT_ONESHOT; |
| 208 | clockevent_set_clock(cd, CYCLES_PER_SEC); | 208 | clockevent_set_clock(cd, CYCLES_PER_SEC); |
| 209 | cd->max_delta_ns = clockevent_delta2ns(0xfffffffffffff, cd); | 209 | cd->max_delta_ns = clockevent_delta2ns(0xfffffffffffff, cd); |
| 210 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); | 210 | cd->min_delta_ns = clockevent_delta2ns(0x300, cd); |
| 211 | cd->rating = 200, | 211 | cd->rating = 200; |
| 212 | cd->irq = irq, | 212 | cd->irq = irq; |
| 213 | cd->cpumask = cpumask_of_cpu(cpu), | 213 | cd->cpumask = cpumask_of_cpu(cpu); |
| 214 | cd->rating = 300, | 214 | cd->set_next_event = rt_next_event; |
| 215 | cd->set_next_event = rt_next_event, | 215 | cd->set_mode = rt_set_mode; |
| 216 | cd->set_mode = rt_set_mode, | ||
| 217 | clockevents_register_device(cd); | 216 | clockevents_register_device(cd); |
| 218 | } | 217 | } |
| 219 | 218 | ||
| @@ -261,6 +260,7 @@ void __init plat_time_init(void) | |||
| 261 | { | 260 | { |
| 262 | hub_rt_clocksource_init(); | 261 | hub_rt_clocksource_init(); |
| 263 | hub_rt_clock_event_global_init(); | 262 | hub_rt_clock_event_global_init(); |
| 263 | hub_rt_clock_event_init(); | ||
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | void __cpuinit cpu_time_init(void) | 266 | void __cpuinit cpu_time_init(void) |
| @@ -281,7 +281,6 @@ void __cpuinit cpu_time_init(void) | |||
| 281 | 281 | ||
| 282 | printk("CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed); | 282 | printk("CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed); |
| 283 | 283 | ||
| 284 | hub_rt_clock_event_init(); | ||
| 285 | set_c0_status(SRB_TIMOCLK); | 284 | set_c0_status(SRB_TIMOCLK); |
| 286 | } | 285 | } |
| 287 | 286 | ||
diff --git a/arch/mips/sibyte/swarm/Makefile b/arch/mips/sibyte/swarm/Makefile index 2d626039195c..1775755a2619 100644 --- a/arch/mips/sibyte/swarm/Makefile +++ b/arch/mips/sibyte/swarm/Makefile | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | lib-y = setup.o rtc_xicor1241.o rtc_m41t81.o | 1 | obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o |
| 2 | 2 | ||
| 3 | lib-$(CONFIG_KGDB) += dbg_io.o | 3 | obj-$(CONFIG_KGDB) += dbg_io.o |
diff --git a/arch/mn10300/kernel/init_task.c b/arch/mn10300/kernel/init_task.c index 39fe6882dd1d..af16f6e5c918 100644 --- a/arch/mn10300/kernel/init_task.c +++ b/arch/mn10300/kernel/init_task.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
| 20 | 20 | ||
| 21 | static struct fs_struct init_fs = INIT_FS; | 21 | static struct fs_struct init_fs = INIT_FS; |
| 22 | static struct files_struct init_files = INIT_FILES; | ||
| 23 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 22 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 24 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 23 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 25 | struct mm_struct init_mm = INIT_MM(init_mm); | 24 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c index 3b0d579fc15d..9c623c88387b 100644 --- a/arch/mn10300/kernel/process.c +++ b/arch/mn10300/kernel/process.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/ptrace.h> | 20 | #include <linux/ptrace.h> |
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/user.h> | 22 | #include <linux/user.h> |
| 23 | #include <linux/a.out.h> | ||
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/reboot.h> | 25 | #include <linux/reboot.h> |
diff --git a/arch/mn10300/kernel/setup.c b/arch/mn10300/kernel/setup.c index 6b7ce2636851..017121ce896f 100644 --- a/arch/mn10300/kernel/setup.c +++ b/arch/mn10300/kernel/setup.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/ptrace.h> | 17 | #include <linux/ptrace.h> |
| 18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
| 19 | #include <linux/user.h> | 19 | #include <linux/user.h> |
| 20 | #include <linux/a.out.h> | ||
| 21 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 22 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S index f0b18ce89842..38a1c1b8d4e8 100644 --- a/arch/parisc/hpux/gate.S +++ b/arch/parisc/hpux/gate.S | |||
| @@ -13,10 +13,9 @@ | |||
| 13 | #include <asm/unistd.h> | 13 | #include <asm/unistd.h> |
| 14 | #include <asm/errno.h> | 14 | #include <asm/errno.h> |
| 15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
| 16 | #include <linux/init.h> | ||
| 17 | 16 | ||
| 18 | .level LEVEL | 17 | .level LEVEL |
| 19 | __HEAD | 18 | .text |
| 20 | 19 | ||
| 21 | .import hpux_call_table | 20 | .import hpux_call_table |
| 22 | .import hpux_syscall_exit,code | 21 | .import hpux_syscall_exit,code |
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S index ccd3a50c0995..58c53c879c02 100644 --- a/arch/parisc/hpux/wrappers.S +++ b/arch/parisc/hpux/wrappers.S | |||
| @@ -28,10 +28,9 @@ | |||
| 28 | #include <asm/assembly.h> | 28 | #include <asm/assembly.h> |
| 29 | #include <asm/signal.h> | 29 | #include <asm/signal.h> |
| 30 | #include <linux/linkage.h> | 30 | #include <linux/linkage.h> |
| 31 | #include <linux/init.h> | ||
| 32 | 31 | ||
| 33 | .level LEVEL | 32 | .level LEVEL |
| 34 | __HEAD | 33 | .text |
| 35 | 34 | ||
| 36 | /* These should probably go in a header file somewhere. | 35 | /* These should probably go in a header file somewhere. |
| 37 | * They are duplicated in kernel/wrappers.S | 36 | * They are duplicated in kernel/wrappers.S |
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 5d0837458c19..d1fa4edd2d80 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <asm/thread_info.h> | 38 | #include <asm/thread_info.h> |
| 39 | 39 | ||
| 40 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
| 41 | #include <linux/init.h> | ||
| 42 | 41 | ||
| 43 | #ifdef CONFIG_64BIT | 42 | #ifdef CONFIG_64BIT |
| 44 | .level 2.0w | 43 | .level 2.0w |
| @@ -622,7 +621,7 @@ | |||
| 622 | * the static part of the kernel address space. | 621 | * the static part of the kernel address space. |
| 623 | */ | 622 | */ |
| 624 | 623 | ||
| 625 | __HEAD | 624 | .text |
| 626 | 625 | ||
| 627 | .align PAGE_SIZE | 626 | .align PAGE_SIZE |
| 628 | 627 | ||
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 5680a2c3b13d..a84e31e82876 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
| @@ -33,6 +33,7 @@ ENTRY(boot_args) | |||
| 33 | END(boot_args) | 33 | END(boot_args) |
| 34 | 34 | ||
| 35 | __HEAD | 35 | __HEAD |
| 36 | |||
| 36 | .align 4 | 37 | .align 4 |
| 37 | .import init_thread_union,data | 38 | .import init_thread_union,data |
| 38 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ | 39 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ |
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S index 068322eb8c9b..2cbf13b3ef11 100644 --- a/arch/parisc/kernel/hpmc.S +++ b/arch/parisc/kernel/hpmc.S | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | #include <asm/pdc.h> | 47 | #include <asm/pdc.h> |
| 48 | 48 | ||
| 49 | #include <linux/linkage.h> | 49 | #include <linux/linkage.h> |
| 50 | #include <linux/init.h> | ||
| 51 | 50 | ||
| 52 | /* | 51 | /* |
| 53 | * stack for os_hpmc, the HPMC handler. | 52 | * stack for os_hpmc, the HPMC handler. |
| @@ -77,7 +76,7 @@ ENTRY(hpmc_pim_data) | |||
| 77 | .block HPMC_PIM_DATA_SIZE | 76 | .block HPMC_PIM_DATA_SIZE |
| 78 | END(hpmc_pim_data) | 77 | END(hpmc_pim_data) |
| 79 | 78 | ||
| 80 | __HEAD | 79 | .text |
| 81 | 80 | ||
| 82 | .import intr_save, code | 81 | .import intr_save, code |
| 83 | ENTRY(os_hpmc) | 82 | ENTRY(os_hpmc) |
diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c index 26198a074d67..f5941c086551 100644 --- a/arch/parisc/kernel/init_task.c +++ b/arch/parisc/kernel/init_task.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <asm/pgalloc.h> | 35 | #include <asm/pgalloc.h> |
| 36 | 36 | ||
| 37 | static struct fs_struct init_fs = INIT_FS; | 37 | static struct fs_struct init_fs = INIT_FS; |
| 38 | static struct files_struct init_files = INIT_FILES; | ||
| 39 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 38 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 40 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 39 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 41 | struct mm_struct init_mm = INIT_MM(init_mm); | 40 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index e3246a5ca74f..09b77b2553c6 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
| @@ -37,9 +37,8 @@ | |||
| 37 | #include <asm/pgtable.h> | 37 | #include <asm/pgtable.h> |
| 38 | #include <asm/cache.h> | 38 | #include <asm/cache.h> |
| 39 | #include <linux/linkage.h> | 39 | #include <linux/linkage.h> |
| 40 | #include <linux/init.h> | ||
| 41 | 40 | ||
| 42 | __HEAD | 41 | .text |
| 43 | .align 128 | 42 | .align 128 |
| 44 | 43 | ||
| 45 | ENTRY(flush_tlb_all_local) | 44 | ENTRY(flush_tlb_all_local) |
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 5b7fc4aa044d..0eecfbbc59cd 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c | |||
| @@ -152,3 +152,6 @@ EXPORT_SYMBOL($$dyncall); | |||
| 152 | EXPORT_SYMBOL(node_data); | 152 | EXPORT_SYMBOL(node_data); |
| 153 | EXPORT_SYMBOL(pfnnid_map); | 153 | EXPORT_SYMBOL(pfnnid_map); |
| 154 | #endif | 154 | #endif |
| 155 | |||
| 156 | /* from pacache.S -- needed for copy_page */ | ||
| 157 | EXPORT_SYMBOL(copy_user_page_asm); | ||
diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S index d411dfb5b6d1..fa6ea99bb324 100644 --- a/arch/parisc/kernel/perf_asm.S +++ b/arch/parisc/kernel/perf_asm.S | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | ; The coprocessor only needs to be enabled when | 43 | ; The coprocessor only needs to be enabled when |
| 44 | ; starting/stopping the coprocessor with the pmenb/pmdis. | 44 | ; starting/stopping the coprocessor with the pmenb/pmdis. |
| 45 | ; | 45 | ; |
| 46 | __HEAD | 46 | .text |
| 47 | 47 | ||
| 48 | ENTRY(perf_intrigue_enable_perf_counters) | 48 | ENTRY(perf_intrigue_enable_perf_counters) |
| 49 | .proc | 49 | .proc |
diff --git a/arch/parisc/kernel/real2.S b/arch/parisc/kernel/real2.S index 47fbdae6efd5..7a92695d95a6 100644 --- a/arch/parisc/kernel/real2.S +++ b/arch/parisc/kernel/real2.S | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <asm/assembly.h> | 12 | #include <asm/assembly.h> |
| 13 | 13 | ||
| 14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 15 | #include <linux/init.h> | ||
| 16 | 15 | ||
| 17 | .section .bss | 16 | .section .bss |
| 18 | .export real_stack | 17 | .export real_stack |
| @@ -40,7 +39,7 @@ save_cr_end: | |||
| 40 | /************************ 32-bit real-mode calls ***********************/ | 39 | /************************ 32-bit real-mode calls ***********************/ |
| 41 | /* This can be called in both narrow and wide kernels */ | 40 | /* This can be called in both narrow and wide kernels */ |
| 42 | 41 | ||
| 43 | __HEAD | 42 | .text |
| 44 | 43 | ||
| 45 | /* unsigned long real32_call_asm(unsigned int *sp, | 44 | /* unsigned long real32_call_asm(unsigned int *sp, |
| 46 | * unsigned int *arg0p, | 45 | * unsigned int *arg0p, |
| @@ -114,7 +113,7 @@ ENDPROC(real32_call_asm) | |||
| 114 | # define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where) | 113 | # define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where) |
| 115 | # define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r | 114 | # define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r |
| 116 | 115 | ||
| 117 | __HEAD | 116 | .text |
| 118 | save_control_regs: | 117 | save_control_regs: |
| 119 | load32 PA(save_cr_space), %r28 | 118 | load32 PA(save_cr_space), %r28 |
| 120 | PUSH_CR(%cr24, %r28) | 119 | PUSH_CR(%cr24, %r28) |
| @@ -146,7 +145,7 @@ restore_control_regs: | |||
| 146 | /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for | 145 | /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for |
| 147 | * more general-purpose use by the several places which need RFIs | 146 | * more general-purpose use by the several places which need RFIs |
| 148 | */ | 147 | */ |
| 149 | __HEAD | 148 | .text |
| 150 | .align 128 | 149 | .align 128 |
| 151 | rfi_virt2real: | 150 | rfi_virt2real: |
| 152 | /* switch to real mode... */ | 151 | /* switch to real mode... */ |
| @@ -181,7 +180,7 @@ rfi_v2r_1: | |||
| 181 | bv 0(%r2) | 180 | bv 0(%r2) |
| 182 | nop | 181 | nop |
| 183 | 182 | ||
| 184 | __HEAD | 183 | .text |
| 185 | .align 128 | 184 | .align 128 |
| 186 | rfi_real2virt: | 185 | rfi_real2virt: |
| 187 | rsm PSW_SM_I,%r0 | 186 | rsm PSW_SM_I,%r0 |
| @@ -219,7 +218,7 @@ rfi_r2v_1: | |||
| 219 | 218 | ||
| 220 | /************************ 64-bit real-mode calls ***********************/ | 219 | /************************ 64-bit real-mode calls ***********************/ |
| 221 | /* This is only usable in wide kernels right now and will probably stay so */ | 220 | /* This is only usable in wide kernels right now and will probably stay so */ |
| 222 | __HEAD | 221 | .text |
| 223 | /* unsigned long real64_call_asm(unsigned long *sp, | 222 | /* unsigned long real64_call_asm(unsigned long *sp, |
| 224 | * unsigned long *arg0p, | 223 | * unsigned long *arg0p, |
| 225 | * unsigned long fn) | 224 | * unsigned long fn) |
| @@ -277,7 +276,7 @@ ENDPROC(real64_call_asm) | |||
| 277 | 276 | ||
| 278 | #endif | 277 | #endif |
| 279 | 278 | ||
| 280 | __HEAD | 279 | .text |
| 281 | /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html | 280 | /* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html |
| 282 | ** GCC 3.3 and later has a new function in libgcc.a for | 281 | ** GCC 3.3 and later has a new function in libgcc.a for |
| 283 | ** comparing function pointers. | 282 | ** comparing function pointers. |
diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c index db94affe5c71..fb59852006de 100644 --- a/arch/parisc/kernel/signal32.c +++ b/arch/parisc/kernel/signal32.c | |||
| @@ -289,7 +289,7 @@ setup_sigcontext32(struct compat_sigcontext __user *sc, struct compat_regfile __ | |||
| 289 | &sc->sc_iaoq[0], compat_reg); | 289 | &sc->sc_iaoq[0], compat_reg); |
| 290 | 290 | ||
| 291 | /* Store upper half */ | 291 | /* Store upper half */ |
| 292 | compat_reg = (compat_uint_t)(regs->gr[32] >> 32); | 292 | compat_reg = (compat_uint_t)(regs->gr[31] >> 32); |
| 293 | err |= __put_user(compat_reg, &rf->rf_iaoq[0]); | 293 | err |= __put_user(compat_reg, &rf->rf_iaoq[0]); |
| 294 | DBG(2,"setup_sigcontext32: upper half iaoq[0] = %#x\n", compat_reg); | 294 | DBG(2,"setup_sigcontext32: upper half iaoq[0] = %#x\n", compat_reg); |
| 295 | 295 | ||
| @@ -299,7 +299,7 @@ setup_sigcontext32(struct compat_sigcontext __user *sc, struct compat_regfile __ | |||
| 299 | DBG(2,"setup_sigcontext32: sc->sc_iaoq[1] = %p <= %#x\n", | 299 | DBG(2,"setup_sigcontext32: sc->sc_iaoq[1] = %p <= %#x\n", |
| 300 | &sc->sc_iaoq[1], compat_reg); | 300 | &sc->sc_iaoq[1], compat_reg); |
| 301 | /* Store upper half */ | 301 | /* Store upper half */ |
| 302 | compat_reg = (compat_uint_t)((regs->gr[32]+4) >> 32); | 302 | compat_reg = (compat_uint_t)((regs->gr[31]+4) >> 32); |
| 303 | err |= __put_user(compat_reg, &rf->rf_iaoq[1]); | 303 | err |= __put_user(compat_reg, &rf->rf_iaoq[1]); |
| 304 | DBG(2,"setup_sigcontext32: upper half iaoq[1] = %#x\n", compat_reg); | 304 | DBG(2,"setup_sigcontext32: upper half iaoq[1] = %#x\n", compat_reg); |
| 305 | 305 | ||
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index ae509d8cd03f..69b6eebc466e 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
| 18 | 18 | ||
| 19 | #include <linux/linkage.h> | 19 | #include <linux/linkage.h> |
| 20 | #include <linux/init.h> | ||
| 21 | 20 | ||
| 22 | /* We fill the empty parts of the gateway page with | 21 | /* We fill the empty parts of the gateway page with |
| 23 | * something that will kill the kernel or a | 22 | * something that will kill the kernel or a |
| @@ -27,7 +26,7 @@ | |||
| 27 | 26 | ||
| 28 | .level LEVEL | 27 | .level LEVEL |
| 29 | 28 | ||
| 30 | __HEAD | 29 | .text |
| 31 | 30 | ||
| 32 | .import syscall_exit,code | 31 | .import syscall_exit,code |
| 33 | .import syscall_exit_rfi,code | 32 | .import syscall_exit_rfi,code |
| @@ -637,7 +636,7 @@ END(sys_call_table64) | |||
| 637 | All light-weight-syscall atomic operations | 636 | All light-weight-syscall atomic operations |
| 638 | will use this set of locks | 637 | will use this set of locks |
| 639 | */ | 638 | */ |
| 640 | .section .data, "aw" | 639 | .section .data |
| 641 | .align PAGE_SIZE | 640 | .align PAGE_SIZE |
| 642 | ENTRY(lws_lock_start) | 641 | ENTRY(lws_lock_start) |
| 643 | /* lws locks */ | 642 | /* lws locks */ |
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 50b4a3a25d0a..2e516b871752 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
| @@ -50,6 +50,7 @@ SECTIONS | |||
| 50 | 50 | ||
| 51 | _text = .; /* Text and read-only data */ | 51 | _text = .; /* Text and read-only data */ |
| 52 | .text ALIGN(16) : { | 52 | .text ALIGN(16) : { |
| 53 | HEAD_TEXT | ||
| 53 | TEXT_TEXT | 54 | TEXT_TEXT |
| 54 | SCHED_TEXT | 55 | SCHED_TEXT |
| 55 | LOCK_TEXT | 56 | LOCK_TEXT |
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index 4821ad6d5269..d172d4245cdc 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <asm/assembly.h> | 23 | #include <asm/assembly.h> |
| 24 | #include <asm/errno.h> | 24 | #include <asm/errno.h> |
| 25 | #include <linux/linkage.h> | 25 | #include <linux/linkage.h> |
| 26 | #include <linux/init.h> | ||
| 27 | 26 | ||
| 28 | #ifdef CONFIG_SMP | 27 | #ifdef CONFIG_SMP |
| 29 | .macro get_fault_ip t1 t2 | 28 | .macro get_fault_ip t1 t2 |
| @@ -56,7 +55,7 @@ | |||
| 56 | 55 | ||
| 57 | .level LEVEL | 56 | .level LEVEL |
| 58 | 57 | ||
| 59 | __HEAD | 58 | .text |
| 60 | .section .fixup, "ax" | 59 | .section .fixup, "ax" |
| 61 | 60 | ||
| 62 | /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */ | 61 | /* get_user() fixups, store -EFAULT in r8, and 0 in r9 */ |
diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S index b0d885350846..1bd23ccec17b 100644 --- a/arch/parisc/lib/lusercopy.S +++ b/arch/parisc/lib/lusercopy.S | |||
| @@ -33,12 +33,11 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | .text | ||
| 37 | |||
| 36 | #include <asm/assembly.h> | 38 | #include <asm/assembly.h> |
| 37 | #include <asm/errno.h> | 39 | #include <asm/errno.h> |
| 38 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
| 39 | #include <linux/init.h> | ||
| 40 | |||
| 41 | __HEAD | ||
| 42 | 41 | ||
| 43 | /* | 42 | /* |
| 44 | * get_sr gets the appropriate space value into | 43 | * get_sr gets the appropriate space value into |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 78fe252b92c3..ce0da689a89d 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
| @@ -547,6 +547,7 @@ void __init mem_init(void) | |||
| 547 | } | 547 | } |
| 548 | 548 | ||
| 549 | unsigned long *empty_zero_page __read_mostly; | 549 | unsigned long *empty_zero_page __read_mostly; |
| 550 | EXPORT_SYMBOL(empty_zero_page); | ||
| 550 | 551 | ||
| 551 | void show_mem(void) | 552 | void show_mem(void) |
| 552 | { | 553 | { |
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 9dcdc036cdf7..b7d4c4ce2fe6 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
| @@ -96,6 +96,8 @@ endif | |||
| 96 | else | 96 | else |
| 97 | KBUILD_CFLAGS += $(call cc-option,-mtune=power4) | 97 | KBUILD_CFLAGS += $(call cc-option,-mtune=power4) |
| 98 | endif | 98 | endif |
| 99 | else | ||
| 100 | LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o | ||
| 99 | endif | 101 | endif |
| 100 | 102 | ||
| 101 | ifeq ($(CONFIG_TUNE_CELL),y) | 103 | ifeq ($(CONFIG_TUNE_CELL),y) |
| @@ -154,7 +156,7 @@ all: zImage | |||
| 154 | 156 | ||
| 155 | CPPFLAGS_vmlinux.lds := -Upowerpc | 157 | CPPFLAGS_vmlinux.lds := -Upowerpc |
| 156 | 158 | ||
| 157 | BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% | 159 | BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.% |
| 158 | 160 | ||
| 159 | PHONY += $(BOOT_TARGETS) | 161 | PHONY += $(BOOT_TARGETS) |
| 160 | 162 | ||
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore index 2347294ff35b..2f50acd11a60 100644 --- a/arch/powerpc/boot/.gitignore +++ b/arch/powerpc/boot/.gitignore | |||
| @@ -20,21 +20,19 @@ kernel-vmlinux.strip.gz | |||
| 20 | mktree | 20 | mktree |
| 21 | uImage | 21 | uImage |
| 22 | cuImage.* | 22 | cuImage.* |
| 23 | dtbImage.* | ||
| 23 | treeImage.* | 24 | treeImage.* |
| 24 | zImage | 25 | zImage |
| 26 | zImage.initrd | ||
| 25 | zImage.bin.* | 27 | zImage.bin.* |
| 26 | zImage.chrp | 28 | zImage.chrp |
| 27 | zImage.coff | 29 | zImage.coff |
| 28 | zImage.coff.lds | 30 | zImage.holly |
| 29 | zImage.ep* | ||
| 30 | zImage.iseries | 31 | zImage.iseries |
| 31 | zImage.*lds | 32 | zImage.*lds |
| 32 | zImage.miboot | 33 | zImage.miboot |
| 33 | zImage.pmac | 34 | zImage.pmac |
| 34 | zImage.pseries | 35 | zImage.pseries |
| 35 | zImage.redboot* | ||
| 36 | zImage.sandpoint | ||
| 37 | zImage.vmode | ||
| 38 | zconf.h | 36 | zconf.h |
| 39 | zlib.h | 37 | zlib.h |
| 40 | zutil.h | 38 | zutil.h |
diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c index 758edf1c5815..5c878436f348 100644 --- a/arch/powerpc/boot/4xx.c +++ b/arch/powerpc/boot/4xx.c | |||
| @@ -21,6 +21,25 @@ | |||
| 21 | #include "reg.h" | 21 | #include "reg.h" |
| 22 | #include "dcr.h" | 22 | #include "dcr.h" |
| 23 | 23 | ||
| 24 | static unsigned long chip_11_errata(unsigned long memsize) | ||
| 25 | { | ||
| 26 | unsigned long pvr; | ||
| 27 | |||
| 28 | pvr = mfpvr(); | ||
| 29 | |||
| 30 | switch (pvr & 0xf0000ff0) { | ||
| 31 | case 0x40000850: | ||
| 32 | case 0x400008d0: | ||
| 33 | case 0x200008d0: | ||
| 34 | memsize -= 4096; | ||
| 35 | break; | ||
| 36 | default: | ||
| 37 | break; | ||
| 38 | } | ||
| 39 | |||
| 40 | return memsize; | ||
| 41 | } | ||
| 42 | |||
| 24 | /* Read the 4xx SDRAM controller to get size of system memory. */ | 43 | /* Read the 4xx SDRAM controller to get size of system memory. */ |
| 25 | void ibm4xx_sdram_fixup_memsize(void) | 44 | void ibm4xx_sdram_fixup_memsize(void) |
| 26 | { | 45 | { |
| @@ -34,6 +53,7 @@ void ibm4xx_sdram_fixup_memsize(void) | |||
| 34 | memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); | 53 | memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); |
| 35 | } | 54 | } |
| 36 | 55 | ||
| 56 | memsize = chip_11_errata(memsize); | ||
| 37 | dt_fixup_memory(0, memsize); | 57 | dt_fixup_memory(0, memsize); |
| 38 | } | 58 | } |
| 39 | 59 | ||
| @@ -199,6 +219,7 @@ void ibm4xx_denali_fixup_memsize(void) | |||
| 199 | bank = 4; /* 4 banks */ | 219 | bank = 4; /* 4 banks */ |
| 200 | 220 | ||
| 201 | memsize = cs * (1 << (col+row)) * bank * dpath; | 221 | memsize = cs * (1 << (col+row)) * bank * dpath; |
| 222 | memsize = chip_11_errata(memsize); | ||
| 202 | dt_fixup_memory(0, memsize); | 223 | dt_fixup_memory(0, memsize); |
| 203 | } | 224 | } |
| 204 | 225 | ||
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 7822d25c9d31..095e04db1c0e 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -51,7 +51,7 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ | |||
| 51 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) | 51 | $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) |
| 52 | 52 | ||
| 53 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c | 53 | src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c |
| 54 | src-wlib := string.S crt0.S stdio.c main.c \ | 54 | src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \ |
| 55 | $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \ | 55 | $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \ |
| 56 | ns16550.c serial.c simple_alloc.c div64.S util.S \ | 56 | ns16550.c serial.c simple_alloc.c div64.S util.S \ |
| 57 | gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ | 57 | gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \ |
| @@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct | |||
| 99 | @cp $< $@ | 99 | @cp $< $@ |
| 100 | 100 | ||
| 101 | clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \ | 101 | clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \ |
| 102 | empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds | 102 | empty.c zImage.coff.lds zImage.ps3.lds zImage.lds |
| 103 | 103 | ||
| 104 | quiet_cmd_bootcc = BOOTCC $@ | 104 | quiet_cmd_bootcc = BOOTCC $@ |
| 105 | cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< | 105 | cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< |
| @@ -221,8 +221,8 @@ image-$(CONFIG_WARP) += cuImage.warp | |||
| 221 | image-$(CONFIG_YOSEMITE) += cuImage.yosemite | 221 | image-$(CONFIG_YOSEMITE) += cuImage.yosemite |
| 222 | 222 | ||
| 223 | # Board ports in arch/powerpc/platform/8xx/Kconfig | 223 | # Board ports in arch/powerpc/platform/8xx/Kconfig |
| 224 | image-$(CONFIG_PPC_MPC86XADS) += cuImage.mpc866ads | 224 | image-$(CONFIG_MPC86XADS) += cuImage.mpc866ads |
| 225 | image-$(CONFIG_PPC_MPC885ADS) += cuImage.mpc885ads | 225 | image-$(CONFIG_MPC885ADS) += cuImage.mpc885ads |
| 226 | image-$(CONFIG_PPC_EP88XC) += dtbImage.ep88xc | 226 | image-$(CONFIG_PPC_EP88XC) += dtbImage.ep88xc |
| 227 | image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \ | 227 | image-$(CONFIG_PPC_ADDER875) += cuImage.adder875-uboot \ |
| 228 | dtbImage.adder875-redboot | 228 | dtbImage.adder875-redboot |
| @@ -273,7 +273,8 @@ endif | |||
| 273 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) | 273 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) |
| 274 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ | 274 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ |
| 275 | $(patsubst dtbImage%, dtbImage.initrd%, \ | 275 | $(patsubst dtbImage%, dtbImage.initrd%, \ |
| 276 | $(patsubst treeImage%, treeImage.initrd%, $(image-y)))) | 276 | $(patsubst simpleImage%, simpleImage.initrd%, \ |
| 277 | $(patsubst treeImage%, treeImage.initrd%, $(image-y))))) | ||
| 277 | initrd-y := $(filter-out $(image-y), $(initrd-y)) | 278 | initrd-y := $(filter-out $(image-y), $(initrd-y)) |
| 278 | targets += $(image-y) $(initrd-y) | 279 | targets += $(image-y) $(initrd-y) |
| 279 | 280 | ||
| @@ -339,7 +340,9 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) | |||
| 339 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< | 340 | sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $< |
| 340 | 341 | ||
| 341 | # anything not in $(targets) | 342 | # anything not in $(targets) |
| 342 | clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \ | 343 | clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ |
| 344 | zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ | ||
| 345 | zImage.iseries zImage.miboot zImage.pmac zImage.pseries \ | ||
| 343 | otheros.bld *.dtb | 346 | otheros.bld *.dtb |
| 344 | 347 | ||
| 345 | # clean up files cached by wrapper | 348 | # clean up files cached by wrapper |
diff --git a/arch/powerpc/boot/crtsavres.S b/arch/powerpc/boot/crtsavres.S new file mode 100644 index 000000000000..f3d9b35c07d4 --- /dev/null +++ b/arch/powerpc/boot/crtsavres.S | |||
| @@ -0,0 +1,233 @@ | |||
| 1 | /* | ||
| 2 | * Special support for eabi and SVR4 | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. | ||
| 5 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
| 6 | * Written By Michael Meissner | ||
| 7 | * | ||
| 8 | * Based on gcc/config/rs6000/crtsavres.asm from gcc | ||
| 9 | * | ||
| 10 | * This file is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2, or (at your option) any | ||
| 13 | * later version. | ||
| 14 | * | ||
| 15 | * In addition to the permissions in the GNU General Public License, the | ||
| 16 | * Free Software Foundation gives you unlimited permission to link the | ||
| 17 | * compiled version of this file with other programs, and to distribute | ||
| 18 | * those programs without any restriction coming from the use of this | ||
| 19 | * file. (The General Public License restrictions do apply in other | ||
| 20 | * respects; for example, they cover modification of the file, and | ||
| 21 | * distribution when not linked into another program.) | ||
| 22 | * | ||
| 23 | * This file is distributed in the hope that it will be useful, but | ||
| 24 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 26 | * General Public License for more details. | ||
| 27 | * | ||
| 28 | * You should have received a copy of the GNU General Public License | ||
| 29 | * along with this program; see the file COPYING. If not, write to | ||
| 30 | * the Free Software Foundation, 51 Franklin Street, Fifth Floor, | ||
| 31 | * Boston, MA 02110-1301, USA. | ||
| 32 | * | ||
| 33 | * As a special exception, if you link this library with files | ||
| 34 | * compiled with GCC to produce an executable, this does not cause | ||
| 35 | * the resulting executable to be covered by the GNU General Public License. | ||
| 36 | * This exception does not however invalidate any other reasons why | ||
| 37 | * the executable file might be covered by the GNU General Public License. | ||
| 38 | */ | ||
| 39 | |||
| 40 | .file "crtsavres.S" | ||
| 41 | .section ".text" | ||
| 42 | |||
| 43 | /* On PowerPC64 Linux, these functions are provided by the linker. */ | ||
| 44 | #ifndef __powerpc64__ | ||
| 45 | |||
| 46 | #define _GLOBAL(name) \ | ||
| 47 | .type name,@function; \ | ||
| 48 | .globl name; \ | ||
| 49 | name: | ||
| 50 | |||
| 51 | /* Routines for saving integer registers, called by the compiler. */ | ||
| 52 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 53 | /* function, just beyond the end of the integer save area. */ | ||
| 54 | |||
| 55 | _GLOBAL(_savegpr_14) | ||
| 56 | _GLOBAL(_save32gpr_14) | ||
| 57 | stw 14,-72(11) /* save gp registers */ | ||
| 58 | _GLOBAL(_savegpr_15) | ||
| 59 | _GLOBAL(_save32gpr_15) | ||
| 60 | stw 15,-68(11) | ||
| 61 | _GLOBAL(_savegpr_16) | ||
| 62 | _GLOBAL(_save32gpr_16) | ||
| 63 | stw 16,-64(11) | ||
| 64 | _GLOBAL(_savegpr_17) | ||
| 65 | _GLOBAL(_save32gpr_17) | ||
| 66 | stw 17,-60(11) | ||
| 67 | _GLOBAL(_savegpr_18) | ||
| 68 | _GLOBAL(_save32gpr_18) | ||
| 69 | stw 18,-56(11) | ||
| 70 | _GLOBAL(_savegpr_19) | ||
| 71 | _GLOBAL(_save32gpr_19) | ||
| 72 | stw 19,-52(11) | ||
| 73 | _GLOBAL(_savegpr_20) | ||
| 74 | _GLOBAL(_save32gpr_20) | ||
| 75 | stw 20,-48(11) | ||
| 76 | _GLOBAL(_savegpr_21) | ||
| 77 | _GLOBAL(_save32gpr_21) | ||
| 78 | stw 21,-44(11) | ||
| 79 | _GLOBAL(_savegpr_22) | ||
| 80 | _GLOBAL(_save32gpr_22) | ||
| 81 | stw 22,-40(11) | ||
| 82 | _GLOBAL(_savegpr_23) | ||
| 83 | _GLOBAL(_save32gpr_23) | ||
| 84 | stw 23,-36(11) | ||
| 85 | _GLOBAL(_savegpr_24) | ||
| 86 | _GLOBAL(_save32gpr_24) | ||
| 87 | stw 24,-32(11) | ||
| 88 | _GLOBAL(_savegpr_25) | ||
| 89 | _GLOBAL(_save32gpr_25) | ||
| 90 | stw 25,-28(11) | ||
| 91 | _GLOBAL(_savegpr_26) | ||
| 92 | _GLOBAL(_save32gpr_26) | ||
| 93 | stw 26,-24(11) | ||
| 94 | _GLOBAL(_savegpr_27) | ||
| 95 | _GLOBAL(_save32gpr_27) | ||
| 96 | stw 27,-20(11) | ||
| 97 | _GLOBAL(_savegpr_28) | ||
| 98 | _GLOBAL(_save32gpr_28) | ||
| 99 | stw 28,-16(11) | ||
| 100 | _GLOBAL(_savegpr_29) | ||
| 101 | _GLOBAL(_save32gpr_29) | ||
| 102 | stw 29,-12(11) | ||
| 103 | _GLOBAL(_savegpr_30) | ||
| 104 | _GLOBAL(_save32gpr_30) | ||
| 105 | stw 30,-8(11) | ||
| 106 | _GLOBAL(_savegpr_31) | ||
| 107 | _GLOBAL(_save32gpr_31) | ||
| 108 | stw 31,-4(11) | ||
| 109 | blr | ||
| 110 | |||
| 111 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 112 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 113 | /* function, just beyond the end of the integer restore area. */ | ||
| 114 | |||
| 115 | _GLOBAL(_restgpr_14) | ||
| 116 | _GLOBAL(_rest32gpr_14) | ||
| 117 | lwz 14,-72(11) /* restore gp registers */ | ||
| 118 | _GLOBAL(_restgpr_15) | ||
| 119 | _GLOBAL(_rest32gpr_15) | ||
| 120 | lwz 15,-68(11) | ||
| 121 | _GLOBAL(_restgpr_16) | ||
| 122 | _GLOBAL(_rest32gpr_16) | ||
| 123 | lwz 16,-64(11) | ||
| 124 | _GLOBAL(_restgpr_17) | ||
| 125 | _GLOBAL(_rest32gpr_17) | ||
| 126 | lwz 17,-60(11) | ||
| 127 | _GLOBAL(_restgpr_18) | ||
| 128 | _GLOBAL(_rest32gpr_18) | ||
| 129 | lwz 18,-56(11) | ||
| 130 | _GLOBAL(_restgpr_19) | ||
| 131 | _GLOBAL(_rest32gpr_19) | ||
| 132 | lwz 19,-52(11) | ||
| 133 | _GLOBAL(_restgpr_20) | ||
| 134 | _GLOBAL(_rest32gpr_20) | ||
| 135 | lwz 20,-48(11) | ||
| 136 | _GLOBAL(_restgpr_21) | ||
| 137 | _GLOBAL(_rest32gpr_21) | ||
| 138 | lwz 21,-44(11) | ||
| 139 | _GLOBAL(_restgpr_22) | ||
| 140 | _GLOBAL(_rest32gpr_22) | ||
| 141 | lwz 22,-40(11) | ||
| 142 | _GLOBAL(_restgpr_23) | ||
| 143 | _GLOBAL(_rest32gpr_23) | ||
| 144 | lwz 23,-36(11) | ||
| 145 | _GLOBAL(_restgpr_24) | ||
| 146 | _GLOBAL(_rest32gpr_24) | ||
| 147 | lwz 24,-32(11) | ||
| 148 | _GLOBAL(_restgpr_25) | ||
| 149 | _GLOBAL(_rest32gpr_25) | ||
| 150 | lwz 25,-28(11) | ||
| 151 | _GLOBAL(_restgpr_26) | ||
| 152 | _GLOBAL(_rest32gpr_26) | ||
| 153 | lwz 26,-24(11) | ||
| 154 | _GLOBAL(_restgpr_27) | ||
| 155 | _GLOBAL(_rest32gpr_27) | ||
| 156 | lwz 27,-20(11) | ||
| 157 | _GLOBAL(_restgpr_28) | ||
| 158 | _GLOBAL(_rest32gpr_28) | ||
| 159 | lwz 28,-16(11) | ||
| 160 | _GLOBAL(_restgpr_29) | ||
| 161 | _GLOBAL(_rest32gpr_29) | ||
| 162 | lwz 29,-12(11) | ||
| 163 | _GLOBAL(_restgpr_30) | ||
| 164 | _GLOBAL(_rest32gpr_30) | ||
| 165 | lwz 30,-8(11) | ||
| 166 | _GLOBAL(_restgpr_31) | ||
| 167 | _GLOBAL(_rest32gpr_31) | ||
| 168 | lwz 31,-4(11) | ||
| 169 | blr | ||
| 170 | |||
| 171 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 172 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 173 | /* function, just beyond the end of the integer restore area. */ | ||
| 174 | |||
| 175 | _GLOBAL(_restgpr_14_x) | ||
| 176 | _GLOBAL(_rest32gpr_14_x) | ||
| 177 | lwz 14,-72(11) /* restore gp registers */ | ||
| 178 | _GLOBAL(_restgpr_15_x) | ||
| 179 | _GLOBAL(_rest32gpr_15_x) | ||
| 180 | lwz 15,-68(11) | ||
| 181 | _GLOBAL(_restgpr_16_x) | ||
| 182 | _GLOBAL(_rest32gpr_16_x) | ||
| 183 | lwz 16,-64(11) | ||
| 184 | _GLOBAL(_restgpr_17_x) | ||
| 185 | _GLOBAL(_rest32gpr_17_x) | ||
| 186 | lwz 17,-60(11) | ||
| 187 | _GLOBAL(_restgpr_18_x) | ||
| 188 | _GLOBAL(_rest32gpr_18_x) | ||
| 189 | lwz 18,-56(11) | ||
| 190 | _GLOBAL(_restgpr_19_x) | ||
| 191 | _GLOBAL(_rest32gpr_19_x) | ||
| 192 | lwz 19,-52(11) | ||
| 193 | _GLOBAL(_restgpr_20_x) | ||
| 194 | _GLOBAL(_rest32gpr_20_x) | ||
| 195 | lwz 20,-48(11) | ||
| 196 | _GLOBAL(_restgpr_21_x) | ||
| 197 | _GLOBAL(_rest32gpr_21_x) | ||
| 198 | lwz 21,-44(11) | ||
| 199 | _GLOBAL(_restgpr_22_x) | ||
| 200 | _GLOBAL(_rest32gpr_22_x) | ||
| 201 | lwz 22,-40(11) | ||
| 202 | _GLOBAL(_restgpr_23_x) | ||
| 203 | _GLOBAL(_rest32gpr_23_x) | ||
| 204 | lwz 23,-36(11) | ||
| 205 | _GLOBAL(_restgpr_24_x) | ||
| 206 | _GLOBAL(_rest32gpr_24_x) | ||
| 207 | lwz 24,-32(11) | ||
| 208 | _GLOBAL(_restgpr_25_x) | ||
| 209 | _GLOBAL(_rest32gpr_25_x) | ||
| 210 | lwz 25,-28(11) | ||
| 211 | _GLOBAL(_restgpr_26_x) | ||
| 212 | _GLOBAL(_rest32gpr_26_x) | ||
| 213 | lwz 26,-24(11) | ||
| 214 | _GLOBAL(_restgpr_27_x) | ||
| 215 | _GLOBAL(_rest32gpr_27_x) | ||
| 216 | lwz 27,-20(11) | ||
| 217 | _GLOBAL(_restgpr_28_x) | ||
| 218 | _GLOBAL(_rest32gpr_28_x) | ||
| 219 | lwz 28,-16(11) | ||
| 220 | _GLOBAL(_restgpr_29_x) | ||
| 221 | _GLOBAL(_rest32gpr_29_x) | ||
| 222 | lwz 29,-12(11) | ||
| 223 | _GLOBAL(_restgpr_30_x) | ||
| 224 | _GLOBAL(_rest32gpr_30_x) | ||
| 225 | lwz 30,-8(11) | ||
| 226 | _GLOBAL(_restgpr_31_x) | ||
| 227 | _GLOBAL(_rest32gpr_31_x) | ||
| 228 | lwz 0,4(11) | ||
| 229 | lwz 31,-4(11) | ||
| 230 | mtlr 0 | ||
| 231 | mr 1,11 | ||
| 232 | blr | ||
| 233 | #endif | ||
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index 1e7802cc31ae..fea592574004 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
| @@ -271,27 +271,35 @@ | |||
| 271 | dma@82a8 { | 271 | dma@82a8 { |
| 272 | #address-cells = <1>; | 272 | #address-cells = <1>; |
| 273 | #size-cells = <1>; | 273 | #size-cells = <1>; |
| 274 | compatible = "fsl,mpc8349-dma"; | 274 | compatible = "fsl,mpc8377-dma", "fsl,elo-dma"; |
| 275 | reg = <0x82a8 4>; | 275 | reg = <0x82a8 4>; |
| 276 | ranges = <0 0x8100 0x1a8>; | 276 | ranges = <0 0x8100 0x1a8>; |
| 277 | interrupt-parent = <&ipic>; | 277 | interrupt-parent = <&ipic>; |
| 278 | interrupts = <0x47 8>; | 278 | interrupts = <0x47 8>; |
| 279 | cell-index = <0>; | 279 | cell-index = <0>; |
| 280 | dma-channel@0 { | 280 | dma-channel@0 { |
| 281 | compatible = "fsl,mpc8349-dma-channel"; | 281 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
| 282 | reg = <0 0x80>; | 282 | reg = <0 0x80>; |
| 283 | interrupt-parent = <&ipic>; | ||
| 284 | interrupts = <0x47 8>; | ||
| 283 | }; | 285 | }; |
| 284 | dma-channel@80 { | 286 | dma-channel@80 { |
| 285 | compatible = "fsl,mpc8349-dma-channel"; | 287 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
| 286 | reg = <0x80 0x80>; | 288 | reg = <0x80 0x80>; |
| 289 | interrupt-parent = <&ipic>; | ||
| 290 | interrupts = <0x47 8>; | ||
| 287 | }; | 291 | }; |
| 288 | dma-channel@100 { | 292 | dma-channel@100 { |
| 289 | compatible = "fsl,mpc8349-dma-channel"; | 293 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
| 290 | reg = <0x100 0x80>; | 294 | reg = <0x100 0x80>; |
| 295 | interrupt-parent = <&ipic>; | ||
| 296 | interrupts = <0x47 8>; | ||
| 291 | }; | 297 | }; |
| 292 | dma-channel@180 { | 298 | dma-channel@180 { |
| 293 | compatible = "fsl,mpc8349-dma-channel"; | 299 | compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel"; |
| 294 | reg = <0x180 0x28>; | 300 | reg = <0x180 0x28>; |
| 301 | interrupt-parent = <&ipic>; | ||
| 302 | interrupts = <0x47 8>; | ||
| 295 | }; | 303 | }; |
| 296 | }; | 304 | }; |
| 297 | 305 | ||
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 5bc09ad016f5..f3083c779b66 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 711f9a30f9ab..0e872a60e091 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index c11ceb7d3299..1eb8defaff6f 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
| @@ -164,12 +164,6 @@ | |||
| 164 | reg = <0x2>; | 164 | reg = <0x2>; |
| 165 | device_type = "ethernet-phy"; | 165 | device_type = "ethernet-phy"; |
| 166 | }; | 166 | }; |
| 167 | phy3: ethernet-phy@3 { | ||
| 168 | interrupt-parent = <&ipic>; | ||
| 169 | interrupts = <18 0x8>; | ||
| 170 | reg = <0x3>; | ||
| 171 | device_type = "ethernet-phy"; | ||
| 172 | }; | ||
| 173 | }; | 167 | }; |
| 174 | 168 | ||
| 175 | enet0: ethernet@24000 { | 169 | enet0: ethernet@24000 { |
| @@ -195,7 +189,7 @@ | |||
| 195 | interrupts = <35 0x8 36 0x8 37 0x8>; | 189 | interrupts = <35 0x8 36 0x8 37 0x8>; |
| 196 | phy-connection-type = "mii"; | 190 | phy-connection-type = "mii"; |
| 197 | interrupt-parent = <&ipic>; | 191 | interrupt-parent = <&ipic>; |
| 198 | phy-handle = <&phy3>; | 192 | fixed-link = <1 1 1000 0 0>; |
| 199 | }; | 193 | }; |
| 200 | 194 | ||
| 201 | serial0: serial@4500 { | 195 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index fa298a8c81cc..4811b8107415 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
| @@ -409,7 +409,7 @@ | |||
| 409 | interrupts = <26 2>; | 409 | interrupts = <26 2>; |
| 410 | bus-range = <0 255>; | 410 | bus-range = <0 255>; |
| 411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 | 411 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 |
| 412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>; | 412 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>; |
| 413 | clock-frequency = <33333333>; | 413 | clock-frequency = <33333333>; |
| 414 | #interrupt-cells = <1>; | 414 | #interrupt-cells = <1>; |
| 415 | #size-cells = <2>; | 415 | #size-cells = <2>; |
| @@ -428,7 +428,7 @@ | |||
| 428 | 428 | ||
| 429 | 0x1000000 0x0 0x0 | 429 | 0x1000000 0x0 0x0 |
| 430 | 0x1000000 0x0 0x0 | 430 | 0x1000000 0x0 0x0 |
| 431 | 0x0 0x8000000>; | 431 | 0x0 0x100000>; |
| 432 | }; | 432 | }; |
| 433 | }; | 433 | }; |
| 434 | }; | 434 | }; |
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 08a780d89807..fa9b6bbeb5af 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
| @@ -251,14 +251,14 @@ | |||
| 251 | dma@c300 { | 251 | dma@c300 { |
| 252 | #address-cells = <1>; | 252 | #address-cells = <1>; |
| 253 | #size-cells = <1>; | 253 | #size-cells = <1>; |
| 254 | compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma"; | 254 | compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma"; |
| 255 | cell-index = <1>; | 255 | cell-index = <1>; |
| 256 | reg = <0xc300 0x4>; /* DMA general status register */ | 256 | reg = <0xc300 0x4>; /* DMA general status register */ |
| 257 | ranges = <0x0 0xc100 0x200>; | 257 | ranges = <0x0 0xc100 0x200>; |
| 258 | 258 | ||
| 259 | dma-channel@0 { | 259 | dma-channel@0 { |
| 260 | compatible = "fsl,mpc8610-dma-channel", | 260 | compatible = "fsl,mpc8610-dma-channel", |
| 261 | "fsl,mpc8540-dma-channel"; | 261 | "fsl,eloplus-dma-channel"; |
| 262 | cell-index = <0>; | 262 | cell-index = <0>; |
| 263 | reg = <0x0 0x80>; | 263 | reg = <0x0 0x80>; |
| 264 | interrupt-parent = <&mpic>; | 264 | interrupt-parent = <&mpic>; |
| @@ -266,7 +266,7 @@ | |||
| 266 | }; | 266 | }; |
| 267 | dma-channel@1 { | 267 | dma-channel@1 { |
| 268 | compatible = "fsl,mpc8610-dma-channel", | 268 | compatible = "fsl,mpc8610-dma-channel", |
| 269 | "fsl,mpc8540-dma-channel"; | 269 | "fsl,eloplus-dma-channel"; |
| 270 | cell-index = <1>; | 270 | cell-index = <1>; |
| 271 | reg = <0x80 0x80>; | 271 | reg = <0x80 0x80>; |
| 272 | interrupt-parent = <&mpic>; | 272 | interrupt-parent = <&mpic>; |
| @@ -274,7 +274,7 @@ | |||
| 274 | }; | 274 | }; |
| 275 | dma-channel@2 { | 275 | dma-channel@2 { |
| 276 | compatible = "fsl,mpc8610-dma-channel", | 276 | compatible = "fsl,mpc8610-dma-channel", |
| 277 | "fsl,mpc8540-dma-channel"; | 277 | "fsl,eloplus-dma-channel"; |
| 278 | cell-index = <2>; | 278 | cell-index = <2>; |
| 279 | reg = <0x100 0x80>; | 279 | reg = <0x100 0x80>; |
| 280 | interrupt-parent = <&mpic>; | 280 | interrupt-parent = <&mpic>; |
| @@ -282,7 +282,7 @@ | |||
| 282 | }; | 282 | }; |
| 283 | dma-channel@3 { | 283 | dma-channel@3 { |
| 284 | compatible = "fsl,mpc8610-dma-channel", | 284 | compatible = "fsl,mpc8610-dma-channel", |
| 285 | "fsl,mpc8540-dma-channel"; | 285 | "fsl,eloplus-dma-channel"; |
| 286 | cell-index = <3>; | 286 | cell-index = <3>; |
| 287 | reg = <0x180 0x80>; | 287 | reg = <0x180 0x80>; |
| 288 | interrupt-parent = <&mpic>; | 288 | interrupt-parent = <&mpic>; |
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 7d18440e398f..5428f9f5ed85 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Fri Apr 11 11:10:09 2008 | 4 | # Mon Jun 9 08:52:21 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -196,7 +201,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 196 | # CONFIG_PREEMPT is not set | 201 | # CONFIG_PREEMPT is not set |
| 197 | CONFIG_BINFMT_ELF=y | 202 | CONFIG_BINFMT_ELF=y |
| 198 | # CONFIG_BINFMT_MISC is not set | 203 | # CONFIG_BINFMT_MISC is not set |
| 199 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 200 | # CONFIG_IOMMU_HELPER is not set | 204 | # CONFIG_IOMMU_HELPER is not set |
| 201 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 202 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 206 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| @@ -211,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -239,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 239 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
| 240 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 249 | ||
| 243 | # | 250 | # |
| 244 | # Advanced setup | 251 | # Advanced setup |
| @@ -248,11 +255,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 255 | # |
| 249 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 250 | # | 257 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 263 | ||
| 257 | # | 264 | # |
| 258 | # Networking | 265 | # Networking |
| @@ -300,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 307 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 309 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 310 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 311 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 312 | # CONFIG_IP_DCCP is not set |
| @@ -362,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 362 | # CONFIG_MTD_REDBOOT_PARTS is not set | 367 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 363 | # CONFIG_MTD_CMDLINE_PARTS is not set | 368 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 364 | CONFIG_MTD_OF_PARTS=y | 369 | CONFIG_MTD_OF_PARTS=y |
| 370 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 365 | 371 | ||
| 366 | # | 372 | # |
| 367 | # User Modules And Translation Layers | 373 | # User Modules And Translation Layers |
| @@ -445,6 +451,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 445 | # | 451 | # |
| 446 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
| 447 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | ||
| 448 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
| 449 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
| 450 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
| @@ -641,7 +648,6 @@ CONFIG_NETDEV_1000=y | |||
| 641 | # CONFIG_SIS190 is not set | 648 | # CONFIG_SIS190 is not set |
| 642 | # CONFIG_SKGE is not set | 649 | # CONFIG_SKGE is not set |
| 643 | # CONFIG_SKY2 is not set | 650 | # CONFIG_SKY2 is not set |
| 644 | # CONFIG_SK98LIN is not set | ||
| 645 | # CONFIG_VIA_VELOCITY is not set | 651 | # CONFIG_VIA_VELOCITY is not set |
| 646 | # CONFIG_TIGON3 is not set | 652 | # CONFIG_TIGON3 is not set |
| 647 | # CONFIG_BNX2 is not set | 653 | # CONFIG_BNX2 is not set |
| @@ -661,6 +667,7 @@ CONFIG_NETDEV_10000=y | |||
| 661 | # CONFIG_MLX4_CORE is not set | 667 | # CONFIG_MLX4_CORE is not set |
| 662 | # CONFIG_TEHUTI is not set | 668 | # CONFIG_TEHUTI is not set |
| 663 | # CONFIG_BNX2X is not set | 669 | # CONFIG_BNX2X is not set |
| 670 | # CONFIG_SFC is not set | ||
| 664 | # CONFIG_TR is not set | 671 | # CONFIG_TR is not set |
| 665 | 672 | ||
| 666 | # | 673 | # |
| @@ -668,6 +675,7 @@ CONFIG_NETDEV_10000=y | |||
| 668 | # | 675 | # |
| 669 | # CONFIG_WLAN_PRE80211 is not set | 676 | # CONFIG_WLAN_PRE80211 is not set |
| 670 | # CONFIG_WLAN_80211 is not set | 677 | # CONFIG_WLAN_80211 is not set |
| 678 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 671 | 679 | ||
| 672 | # | 680 | # |
| 673 | # USB Network Adapters | 681 | # USB Network Adapters |
| @@ -724,6 +732,7 @@ CONFIG_INPUT=y | |||
| 724 | # Character devices | 732 | # Character devices |
| 725 | # | 733 | # |
| 726 | # CONFIG_VT is not set | 734 | # CONFIG_VT is not set |
| 735 | CONFIG_DEVKMEM=y | ||
| 727 | # CONFIG_SERIAL_NONSTANDARD is not set | 736 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 728 | # CONFIG_NOZOMI is not set | 737 | # CONFIG_NOZOMI is not set |
| 729 | 738 | ||
| @@ -751,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 751 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 752 | CONFIG_HW_RANDOM=y | 761 | CONFIG_HW_RANDOM=y |
| 753 | # CONFIG_NVRAM is not set | 762 | # CONFIG_NVRAM is not set |
| 754 | # CONFIG_GEN_RTC is not set | ||
| 755 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 756 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 757 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -762,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 762 | CONFIG_I2C_CHARDEV=y | 770 | CONFIG_I2C_CHARDEV=y |
| 763 | 771 | ||
| 764 | # | 772 | # |
| 765 | # I2C Algorithms | ||
| 766 | # | ||
| 767 | # CONFIG_I2C_ALGOBIT is not set | ||
| 768 | # CONFIG_I2C_ALGOPCF is not set | ||
| 769 | # CONFIG_I2C_ALGOPCA is not set | ||
| 770 | |||
| 771 | # | ||
| 772 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 773 | # | 774 | # |
| 774 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -795,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 795 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 796 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 797 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 798 | 800 | ||
| 799 | # | 801 | # |
| 800 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -804,17 +806,12 @@ CONFIG_I2C_MPC=y | |||
| 804 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 805 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 806 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 807 | # CONFIG_TPS65010 is not set | ||
| 808 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 809 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 810 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 811 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 812 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 813 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 814 | |||
| 815 | # | ||
| 816 | # SPI support | ||
| 817 | # | ||
| 818 | CONFIG_SPI=y | 815 | CONFIG_SPI=y |
| 819 | # CONFIG_SPI_DEBUG is not set | 816 | # CONFIG_SPI_DEBUG is not set |
| 820 | CONFIG_SPI_MASTER=y | 817 | CONFIG_SPI_MASTER=y |
| @@ -919,12 +916,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 919 | # Multifunction device drivers | 916 | # Multifunction device drivers |
| 920 | # | 917 | # |
| 921 | # CONFIG_MFD_SM501 is not set | 918 | # CONFIG_MFD_SM501 is not set |
| 919 | # CONFIG_HTC_PASIC3 is not set | ||
| 922 | 920 | ||
| 923 | # | 921 | # |
| 924 | # Multimedia devices | 922 | # Multimedia devices |
| 925 | # | 923 | # |
| 924 | |||
| 925 | # | ||
| 926 | # Multimedia core support | ||
| 927 | # | ||
| 926 | # CONFIG_VIDEO_DEV is not set | 928 | # CONFIG_VIDEO_DEV is not set |
| 927 | # CONFIG_DVB_CORE is not set | 929 | # CONFIG_DVB_CORE is not set |
| 930 | # CONFIG_VIDEO_MEDIA is not set | ||
| 931 | |||
| 932 | # | ||
| 933 | # Multimedia drivers | ||
| 934 | # | ||
| 928 | CONFIG_DAB=y | 935 | CONFIG_DAB=y |
| 929 | # CONFIG_USB_DABUSB is not set | 936 | # CONFIG_USB_DABUSB is not set |
| 930 | 937 | ||
| @@ -977,16 +984,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 977 | CONFIG_USB_DEVICE_CLASS=y | 984 | CONFIG_USB_DEVICE_CLASS=y |
| 978 | # CONFIG_USB_DYNAMIC_MINORS is not set | 985 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 979 | # CONFIG_USB_OTG is not set | 986 | # CONFIG_USB_OTG is not set |
| 987 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 988 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 980 | 989 | ||
| 981 | # | 990 | # |
| 982 | # USB Host Controller Drivers | 991 | # USB Host Controller Drivers |
| 983 | # | 992 | # |
| 993 | # CONFIG_USB_C67X00_HCD is not set | ||
| 984 | CONFIG_USB_EHCI_HCD=y | 994 | CONFIG_USB_EHCI_HCD=y |
| 985 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 995 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 986 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 996 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 987 | CONFIG_USB_EHCI_FSL=y | 997 | CONFIG_USB_EHCI_FSL=y |
| 988 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 998 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 989 | # CONFIG_USB_ISP116X_HCD is not set | 999 | # CONFIG_USB_ISP116X_HCD is not set |
| 1000 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 990 | CONFIG_USB_OHCI_HCD=y | 1001 | CONFIG_USB_OHCI_HCD=y |
| 991 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1002 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 992 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1003 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1004,6 +1015,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1004 | # | 1015 | # |
| 1005 | # CONFIG_USB_ACM is not set | 1016 | # CONFIG_USB_ACM is not set |
| 1006 | # CONFIG_USB_PRINTER is not set | 1017 | # CONFIG_USB_PRINTER is not set |
| 1018 | # CONFIG_USB_WDM is not set | ||
| 1007 | 1019 | ||
| 1008 | # | 1020 | # |
| 1009 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1021 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1023,7 +1035,9 @@ CONFIG_USB_STORAGE=y | |||
| 1023 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1035 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1024 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1036 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1025 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1037 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1038 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1026 | # CONFIG_USB_STORAGE_KARMA is not set | 1039 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1040 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1027 | # CONFIG_USB_LIBUSUAL is not set | 1041 | # CONFIG_USB_LIBUSUAL is not set |
| 1028 | 1042 | ||
| 1029 | # | 1043 | # |
| @@ -1061,6 +1075,7 @@ CONFIG_USB_MON=y | |||
| 1061 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1075 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1062 | # CONFIG_USB_IOWARRIOR is not set | 1076 | # CONFIG_USB_IOWARRIOR is not set |
| 1063 | # CONFIG_USB_TEST is not set | 1077 | # CONFIG_USB_TEST is not set |
| 1078 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1064 | CONFIG_USB_GADGET=y | 1079 | CONFIG_USB_GADGET=y |
| 1065 | # CONFIG_USB_GADGET_DEBUG is not set | 1080 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1066 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1081 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1072,6 +1087,7 @@ CONFIG_USB_GADGET_NET2280=y | |||
| 1072 | CONFIG_USB_NET2280=y | 1087 | CONFIG_USB_NET2280=y |
| 1073 | # CONFIG_USB_GADGET_PXA2XX is not set | 1088 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 1074 | # CONFIG_USB_GADGET_M66592 is not set | 1089 | # CONFIG_USB_GADGET_M66592 is not set |
| 1090 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 1075 | # CONFIG_USB_GADGET_GOKU is not set | 1091 | # CONFIG_USB_GADGET_GOKU is not set |
| 1076 | # CONFIG_USB_GADGET_LH7A40X is not set | 1092 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 1077 | # CONFIG_USB_GADGET_OMAP is not set | 1093 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -1090,6 +1106,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1090 | # CONFIG_MMC is not set | 1106 | # CONFIG_MMC is not set |
| 1091 | # CONFIG_MEMSTICK is not set | 1107 | # CONFIG_MEMSTICK is not set |
| 1092 | # CONFIG_NEW_LEDS is not set | 1108 | # CONFIG_NEW_LEDS is not set |
| 1109 | # CONFIG_ACCESSIBILITY is not set | ||
| 1093 | # CONFIG_INFINIBAND is not set | 1110 | # CONFIG_INFINIBAND is not set |
| 1094 | # CONFIG_EDAC is not set | 1111 | # CONFIG_EDAC is not set |
| 1095 | CONFIG_RTC_LIB=y | 1112 | CONFIG_RTC_LIB=y |
| @@ -1144,11 +1161,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1144 | # | 1161 | # |
| 1145 | # on-CPU RTC drivers | 1162 | # on-CPU RTC drivers |
| 1146 | # | 1163 | # |
| 1164 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1147 | # CONFIG_DMADEVICES is not set | 1165 | # CONFIG_DMADEVICES is not set |
| 1148 | |||
| 1149 | # | ||
| 1150 | # Userspace I/O | ||
| 1151 | # | ||
| 1152 | # CONFIG_UIO is not set | 1166 | # CONFIG_UIO is not set |
| 1153 | 1167 | ||
| 1154 | # | 1168 | # |
| @@ -1168,7 +1182,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1168 | # CONFIG_JFS_FS is not set | 1182 | # CONFIG_JFS_FS is not set |
| 1169 | # CONFIG_FS_POSIX_ACL is not set | 1183 | # CONFIG_FS_POSIX_ACL is not set |
| 1170 | # CONFIG_XFS_FS is not set | 1184 | # CONFIG_XFS_FS is not set |
| 1171 | # CONFIG_GFS2_FS is not set | ||
| 1172 | # CONFIG_OCFS2_FS is not set | 1185 | # CONFIG_OCFS2_FS is not set |
| 1173 | CONFIG_DNOTIFY=y | 1186 | CONFIG_DNOTIFY=y |
| 1174 | CONFIG_INOTIFY=y | 1187 | CONFIG_INOTIFY=y |
| @@ -1237,7 +1250,6 @@ CONFIG_NFS_FS=y | |||
| 1237 | CONFIG_NFS_V3=y | 1250 | CONFIG_NFS_V3=y |
| 1238 | # CONFIG_NFS_V3_ACL is not set | 1251 | # CONFIG_NFS_V3_ACL is not set |
| 1239 | CONFIG_NFS_V4=y | 1252 | CONFIG_NFS_V4=y |
| 1240 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1241 | # CONFIG_NFSD is not set | 1253 | # CONFIG_NFSD is not set |
| 1242 | CONFIG_ROOT_NFS=y | 1254 | CONFIG_ROOT_NFS=y |
| 1243 | CONFIG_LOCKD=y | 1255 | CONFIG_LOCKD=y |
| @@ -1282,6 +1294,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1282 | # Library routines | 1294 | # Library routines |
| 1283 | # | 1295 | # |
| 1284 | CONFIG_BITREVERSE=y | 1296 | CONFIG_BITREVERSE=y |
| 1297 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1285 | # CONFIG_CRC_CCITT is not set | 1298 | # CONFIG_CRC_CCITT is not set |
| 1286 | # CONFIG_CRC16 is not set | 1299 | # CONFIG_CRC16 is not set |
| 1287 | # CONFIG_CRC_ITU_T is not set | 1300 | # CONFIG_CRC_ITU_T is not set |
| @@ -1302,6 +1315,7 @@ CONFIG_HAVE_LMB=y | |||
| 1302 | # CONFIG_PRINTK_TIME is not set | 1315 | # CONFIG_PRINTK_TIME is not set |
| 1303 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1316 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1304 | CONFIG_ENABLE_MUST_CHECK=y | 1317 | CONFIG_ENABLE_MUST_CHECK=y |
| 1318 | CONFIG_FRAME_WARN=1024 | ||
| 1305 | # CONFIG_MAGIC_SYSRQ is not set | 1319 | # CONFIG_MAGIC_SYSRQ is not set |
| 1306 | # CONFIG_UNUSED_SYMBOLS is not set | 1320 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1307 | # CONFIG_DEBUG_FS is not set | 1321 | # CONFIG_DEBUG_FS is not set |
| @@ -1312,6 +1326,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1312 | CONFIG_SCHED_DEBUG=y | 1326 | CONFIG_SCHED_DEBUG=y |
| 1313 | # CONFIG_SCHEDSTATS is not set | 1327 | # CONFIG_SCHEDSTATS is not set |
| 1314 | # CONFIG_TIMER_STATS is not set | 1328 | # CONFIG_TIMER_STATS is not set |
| 1329 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1315 | # CONFIG_SLUB_DEBUG_ON is not set | 1330 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1316 | # CONFIG_SLUB_STATS is not set | 1331 | # CONFIG_SLUB_STATS is not set |
| 1317 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1332 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1324,6 +1339,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1324 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1339 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1325 | # CONFIG_DEBUG_INFO is not set | 1340 | # CONFIG_DEBUG_INFO is not set |
| 1326 | # CONFIG_DEBUG_VM is not set | 1341 | # CONFIG_DEBUG_VM is not set |
| 1342 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1327 | # CONFIG_DEBUG_LIST is not set | 1343 | # CONFIG_DEBUG_LIST is not set |
| 1328 | # CONFIG_DEBUG_SG is not set | 1344 | # CONFIG_DEBUG_SG is not set |
| 1329 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1345 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1335,6 +1351,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1335 | # CONFIG_DEBUG_STACK_USAGE is not set | 1351 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1336 | # CONFIG_DEBUG_PAGEALLOC is not set | 1352 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1337 | # CONFIG_DEBUGGER is not set | 1353 | # CONFIG_DEBUGGER is not set |
| 1354 | # CONFIG_IRQSTACKS is not set | ||
| 1338 | # CONFIG_BDI_SWITCH is not set | 1355 | # CONFIG_BDI_SWITCH is not set |
| 1339 | # CONFIG_PPC_EARLY_DEBUG is not set | 1356 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1340 | 1357 | ||
| @@ -1345,51 +1362,81 @@ CONFIG_SCHED_DEBUG=y | |||
| 1345 | # CONFIG_SECURITY is not set | 1362 | # CONFIG_SECURITY is not set |
| 1346 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1363 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1347 | CONFIG_CRYPTO=y | 1364 | CONFIG_CRYPTO=y |
| 1365 | |||
| 1366 | # | ||
| 1367 | # Crypto core or helper | ||
| 1368 | # | ||
| 1348 | CONFIG_CRYPTO_ALGAPI=y | 1369 | CONFIG_CRYPTO_ALGAPI=y |
| 1349 | CONFIG_CRYPTO_BLKCIPHER=y | 1370 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1350 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1351 | CONFIG_CRYPTO_MANAGER=y | 1371 | CONFIG_CRYPTO_MANAGER=y |
| 1372 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1373 | # CONFIG_CRYPTO_NULL is not set | ||
| 1374 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1375 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1376 | # CONFIG_CRYPTO_TEST is not set | ||
| 1377 | |||
| 1378 | # | ||
| 1379 | # Authenticated Encryption with Associated Data | ||
| 1380 | # | ||
| 1381 | # CONFIG_CRYPTO_CCM is not set | ||
| 1382 | # CONFIG_CRYPTO_GCM is not set | ||
| 1383 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1384 | |||
| 1385 | # | ||
| 1386 | # Block modes | ||
| 1387 | # | ||
| 1388 | CONFIG_CRYPTO_CBC=y | ||
| 1389 | # CONFIG_CRYPTO_CTR is not set | ||
| 1390 | # CONFIG_CRYPTO_CTS is not set | ||
| 1391 | # CONFIG_CRYPTO_ECB is not set | ||
| 1392 | # CONFIG_CRYPTO_LRW is not set | ||
| 1393 | CONFIG_CRYPTO_PCBC=m | ||
| 1394 | # CONFIG_CRYPTO_XTS is not set | ||
| 1395 | |||
| 1396 | # | ||
| 1397 | # Hash modes | ||
| 1398 | # | ||
| 1352 | # CONFIG_CRYPTO_HMAC is not set | 1399 | # CONFIG_CRYPTO_HMAC is not set |
| 1353 | # CONFIG_CRYPTO_XCBC is not set | 1400 | # CONFIG_CRYPTO_XCBC is not set |
| 1354 | # CONFIG_CRYPTO_NULL is not set | 1401 | |
| 1402 | # | ||
| 1403 | # Digest | ||
| 1404 | # | ||
| 1405 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1355 | # CONFIG_CRYPTO_MD4 is not set | 1406 | # CONFIG_CRYPTO_MD4 is not set |
| 1356 | CONFIG_CRYPTO_MD5=y | 1407 | CONFIG_CRYPTO_MD5=y |
| 1408 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1357 | # CONFIG_CRYPTO_SHA1 is not set | 1409 | # CONFIG_CRYPTO_SHA1 is not set |
| 1358 | # CONFIG_CRYPTO_SHA256 is not set | 1410 | # CONFIG_CRYPTO_SHA256 is not set |
| 1359 | # CONFIG_CRYPTO_SHA512 is not set | 1411 | # CONFIG_CRYPTO_SHA512 is not set |
| 1360 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1361 | # CONFIG_CRYPTO_TGR192 is not set | 1412 | # CONFIG_CRYPTO_TGR192 is not set |
| 1362 | # CONFIG_CRYPTO_GF128MUL is not set | 1413 | # CONFIG_CRYPTO_WP512 is not set |
| 1363 | # CONFIG_CRYPTO_ECB is not set | 1414 | |
| 1364 | CONFIG_CRYPTO_CBC=y | 1415 | # |
| 1365 | CONFIG_CRYPTO_PCBC=m | 1416 | # Ciphers |
| 1366 | # CONFIG_CRYPTO_LRW is not set | 1417 | # |
| 1367 | # CONFIG_CRYPTO_XTS is not set | ||
| 1368 | # CONFIG_CRYPTO_CTR is not set | ||
| 1369 | # CONFIG_CRYPTO_GCM is not set | ||
| 1370 | # CONFIG_CRYPTO_CCM is not set | ||
| 1371 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1372 | CONFIG_CRYPTO_DES=y | ||
| 1373 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1374 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1375 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1376 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1377 | # CONFIG_CRYPTO_AES is not set | 1418 | # CONFIG_CRYPTO_AES is not set |
| 1419 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1420 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1421 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1422 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1378 | # CONFIG_CRYPTO_CAST5 is not set | 1423 | # CONFIG_CRYPTO_CAST5 is not set |
| 1379 | # CONFIG_CRYPTO_CAST6 is not set | 1424 | # CONFIG_CRYPTO_CAST6 is not set |
| 1380 | # CONFIG_CRYPTO_TEA is not set | 1425 | CONFIG_CRYPTO_DES=y |
| 1381 | # CONFIG_CRYPTO_ARC4 is not set | 1426 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1382 | # CONFIG_CRYPTO_KHAZAD is not set | 1427 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1383 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1384 | # CONFIG_CRYPTO_SEED is not set | ||
| 1385 | # CONFIG_CRYPTO_SALSA20 is not set | 1428 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1429 | # CONFIG_CRYPTO_SEED is not set | ||
| 1430 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1431 | # CONFIG_CRYPTO_TEA is not set | ||
| 1432 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1433 | |||
| 1434 | # | ||
| 1435 | # Compression | ||
| 1436 | # | ||
| 1386 | # CONFIG_CRYPTO_DEFLATE is not set | 1437 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1387 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1388 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1389 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1390 | # CONFIG_CRYPTO_TEST is not set | ||
| 1391 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1392 | # CONFIG_CRYPTO_LZO is not set | 1438 | # CONFIG_CRYPTO_LZO is not set |
| 1393 | CONFIG_CRYPTO_HW=y | 1439 | CONFIG_CRYPTO_HW=y |
| 1394 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1440 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1395 | # CONFIG_PPC_CLOCK is not set | 1441 | # CONFIG_PPC_CLOCK is not set |
| 1442 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index 1f57456dd81e..9bc3a03ae264 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:15 2008 | 4 | # Mon Jun 9 08:52:21 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -238,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 238 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
| 239 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 240 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 241 | 249 | ||
| 242 | # | 250 | # |
| 243 | # Advanced setup | 251 | # Advanced setup |
| @@ -247,11 +255,11 @@ CONFIG_PCI_LEGACY=y | |||
| 247 | # | 255 | # |
| 248 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 249 | # | 257 | # |
| 250 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 251 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 252 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 253 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 254 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 255 | 263 | ||
| 256 | # | 264 | # |
| 257 | # Networking | 265 | # Networking |
| @@ -299,8 +307,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 307 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 309 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 310 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 311 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 312 | # CONFIG_IP_DCCP is not set |
| @@ -361,6 +367,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 367 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 362 | # CONFIG_MTD_CMDLINE_PARTS is not set | 368 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 363 | # CONFIG_MTD_OF_PARTS is not set | 369 | # CONFIG_MTD_OF_PARTS is not set |
| 370 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 364 | 371 | ||
| 365 | # | 372 | # |
| 366 | # User Modules And Translation Layers | 373 | # User Modules And Translation Layers |
| @@ -444,6 +451,7 @@ CONFIG_MTD_NAND_IDS=y | |||
| 444 | # | 451 | # |
| 445 | # CONFIG_MTD_UBI is not set | 452 | # CONFIG_MTD_UBI is not set |
| 446 | CONFIG_OF_DEVICE=y | 453 | CONFIG_OF_DEVICE=y |
| 454 | CONFIG_OF_I2C=y | ||
| 447 | # CONFIG_PARPORT is not set | 455 | # CONFIG_PARPORT is not set |
| 448 | CONFIG_BLK_DEV=y | 456 | CONFIG_BLK_DEV=y |
| 449 | # CONFIG_BLK_DEV_FD is not set | 457 | # CONFIG_BLK_DEV_FD is not set |
| @@ -549,7 +557,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 549 | # CONFIG_SCSI_SRP is not set | 557 | # CONFIG_SCSI_SRP is not set |
| 550 | CONFIG_ATA=y | 558 | CONFIG_ATA=y |
| 551 | # CONFIG_ATA_NONSTANDARD is not set | 559 | # CONFIG_ATA_NONSTANDARD is not set |
| 560 | CONFIG_SATA_PMP=y | ||
| 552 | # CONFIG_SATA_AHCI is not set | 561 | # CONFIG_SATA_AHCI is not set |
| 562 | # CONFIG_SATA_SIL24 is not set | ||
| 563 | CONFIG_SATA_FSL=y | ||
| 564 | CONFIG_ATA_SFF=y | ||
| 553 | # CONFIG_SATA_SVW is not set | 565 | # CONFIG_SATA_SVW is not set |
| 554 | # CONFIG_ATA_PIIX is not set | 566 | # CONFIG_ATA_PIIX is not set |
| 555 | # CONFIG_SATA_MV is not set | 567 | # CONFIG_SATA_MV is not set |
| @@ -559,13 +571,11 @@ CONFIG_ATA=y | |||
| 559 | # CONFIG_SATA_PROMISE is not set | 571 | # CONFIG_SATA_PROMISE is not set |
| 560 | # CONFIG_SATA_SX4 is not set | 572 | # CONFIG_SATA_SX4 is not set |
| 561 | # CONFIG_SATA_SIL is not set | 573 | # CONFIG_SATA_SIL is not set |
| 562 | # CONFIG_SATA_SIL24 is not set | ||
| 563 | # CONFIG_SATA_SIS is not set | 574 | # CONFIG_SATA_SIS is not set |
| 564 | # CONFIG_SATA_ULI is not set | 575 | # CONFIG_SATA_ULI is not set |
| 565 | # CONFIG_SATA_VIA is not set | 576 | # CONFIG_SATA_VIA is not set |
| 566 | # CONFIG_SATA_VITESSE is not set | 577 | # CONFIG_SATA_VITESSE is not set |
| 567 | # CONFIG_SATA_INIC162X is not set | 578 | # CONFIG_SATA_INIC162X is not set |
| 568 | CONFIG_SATA_FSL=y | ||
| 569 | # CONFIG_PATA_ALI is not set | 579 | # CONFIG_PATA_ALI is not set |
| 570 | # CONFIG_PATA_AMD is not set | 580 | # CONFIG_PATA_AMD is not set |
| 571 | # CONFIG_PATA_ARTOP is not set | 581 | # CONFIG_PATA_ARTOP is not set |
| @@ -605,6 +615,7 @@ CONFIG_SATA_FSL=y | |||
| 605 | # CONFIG_PATA_VIA is not set | 615 | # CONFIG_PATA_VIA is not set |
| 606 | # CONFIG_PATA_WINBOND is not set | 616 | # CONFIG_PATA_WINBOND is not set |
| 607 | # CONFIG_PATA_PLATFORM is not set | 617 | # CONFIG_PATA_PLATFORM is not set |
| 618 | # CONFIG_PATA_SCH is not set | ||
| 608 | CONFIG_MD=y | 619 | CONFIG_MD=y |
| 609 | CONFIG_BLK_DEV_MD=y | 620 | CONFIG_BLK_DEV_MD=y |
| 610 | CONFIG_MD_LINEAR=y | 621 | CONFIG_MD_LINEAR=y |
| @@ -698,7 +709,6 @@ CONFIG_NETDEV_1000=y | |||
| 698 | # CONFIG_SIS190 is not set | 709 | # CONFIG_SIS190 is not set |
| 699 | # CONFIG_SKGE is not set | 710 | # CONFIG_SKGE is not set |
| 700 | # CONFIG_SKY2 is not set | 711 | # CONFIG_SKY2 is not set |
| 701 | # CONFIG_SK98LIN is not set | ||
| 702 | # CONFIG_VIA_VELOCITY is not set | 712 | # CONFIG_VIA_VELOCITY is not set |
| 703 | # CONFIG_TIGON3 is not set | 713 | # CONFIG_TIGON3 is not set |
| 704 | # CONFIG_BNX2 is not set | 714 | # CONFIG_BNX2 is not set |
| @@ -718,6 +728,7 @@ CONFIG_NETDEV_10000=y | |||
| 718 | # CONFIG_MLX4_CORE is not set | 728 | # CONFIG_MLX4_CORE is not set |
| 719 | # CONFIG_TEHUTI is not set | 729 | # CONFIG_TEHUTI is not set |
| 720 | # CONFIG_BNX2X is not set | 730 | # CONFIG_BNX2X is not set |
| 731 | # CONFIG_SFC is not set | ||
| 721 | # CONFIG_TR is not set | 732 | # CONFIG_TR is not set |
| 722 | 733 | ||
| 723 | # | 734 | # |
| @@ -725,6 +736,7 @@ CONFIG_NETDEV_10000=y | |||
| 725 | # | 736 | # |
| 726 | # CONFIG_WLAN_PRE80211 is not set | 737 | # CONFIG_WLAN_PRE80211 is not set |
| 727 | # CONFIG_WLAN_80211 is not set | 738 | # CONFIG_WLAN_80211 is not set |
| 739 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 728 | 740 | ||
| 729 | # | 741 | # |
| 730 | # USB Network Adapters | 742 | # USB Network Adapters |
| @@ -781,6 +793,7 @@ CONFIG_INPUT=y | |||
| 781 | # Character devices | 793 | # Character devices |
| 782 | # | 794 | # |
| 783 | # CONFIG_VT is not set | 795 | # CONFIG_VT is not set |
| 796 | CONFIG_DEVKMEM=y | ||
| 784 | # CONFIG_SERIAL_NONSTANDARD is not set | 797 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 785 | # CONFIG_NOZOMI is not set | 798 | # CONFIG_NOZOMI is not set |
| 786 | 799 | ||
| @@ -808,7 +821,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 808 | # CONFIG_IPMI_HANDLER is not set | 821 | # CONFIG_IPMI_HANDLER is not set |
| 809 | CONFIG_HW_RANDOM=y | 822 | CONFIG_HW_RANDOM=y |
| 810 | # CONFIG_NVRAM is not set | 823 | # CONFIG_NVRAM is not set |
| 811 | # CONFIG_GEN_RTC is not set | ||
| 812 | # CONFIG_R3964 is not set | 824 | # CONFIG_R3964 is not set |
| 813 | # CONFIG_APPLICOM is not set | 825 | # CONFIG_APPLICOM is not set |
| 814 | # CONFIG_RAW_DRIVER is not set | 826 | # CONFIG_RAW_DRIVER is not set |
| @@ -819,13 +831,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 819 | CONFIG_I2C_CHARDEV=y | 831 | CONFIG_I2C_CHARDEV=y |
| 820 | 832 | ||
| 821 | # | 833 | # |
| 822 | # I2C Algorithms | ||
| 823 | # | ||
| 824 | # CONFIG_I2C_ALGOBIT is not set | ||
| 825 | # CONFIG_I2C_ALGOPCF is not set | ||
| 826 | # CONFIG_I2C_ALGOPCA is not set | ||
| 827 | |||
| 828 | # | ||
| 829 | # I2C Hardware Bus support | 834 | # I2C Hardware Bus support |
| 830 | # | 835 | # |
| 831 | # CONFIG_I2C_ALI1535 is not set | 836 | # CONFIG_I2C_ALI1535 is not set |
| @@ -852,6 +857,7 @@ CONFIG_I2C_MPC=y | |||
| 852 | # CONFIG_I2C_VIA is not set | 857 | # CONFIG_I2C_VIA is not set |
| 853 | # CONFIG_I2C_VIAPRO is not set | 858 | # CONFIG_I2C_VIAPRO is not set |
| 854 | # CONFIG_I2C_VOODOO3 is not set | 859 | # CONFIG_I2C_VOODOO3 is not set |
| 860 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 855 | 861 | ||
| 856 | # | 862 | # |
| 857 | # Miscellaneous I2C Chip support | 863 | # Miscellaneous I2C Chip support |
| @@ -861,17 +867,12 @@ CONFIG_I2C_MPC=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_PCF8591 is not set | 869 | # CONFIG_SENSORS_PCF8591 is not set |
| 864 | # CONFIG_TPS65010 is not set | ||
| 865 | # CONFIG_SENSORS_MAX6875 is not set | 870 | # CONFIG_SENSORS_MAX6875 is not set |
| 866 | # CONFIG_SENSORS_TSL2550 is not set | 871 | # CONFIG_SENSORS_TSL2550 is not set |
| 867 | # CONFIG_I2C_DEBUG_CORE is not set | 872 | # CONFIG_I2C_DEBUG_CORE is not set |
| 868 | # CONFIG_I2C_DEBUG_ALGO is not set | 873 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 869 | # CONFIG_I2C_DEBUG_BUS is not set | 874 | # CONFIG_I2C_DEBUG_BUS is not set |
| 870 | # CONFIG_I2C_DEBUG_CHIP is not set | 875 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 871 | |||
| 872 | # | ||
| 873 | # SPI support | ||
| 874 | # | ||
| 875 | CONFIG_SPI=y | 876 | CONFIG_SPI=y |
| 876 | # CONFIG_SPI_DEBUG is not set | 877 | # CONFIG_SPI_DEBUG is not set |
| 877 | CONFIG_SPI_MASTER=y | 878 | CONFIG_SPI_MASTER=y |
| @@ -976,12 +977,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 976 | # Multifunction device drivers | 977 | # Multifunction device drivers |
| 977 | # | 978 | # |
| 978 | # CONFIG_MFD_SM501 is not set | 979 | # CONFIG_MFD_SM501 is not set |
| 980 | # CONFIG_HTC_PASIC3 is not set | ||
| 979 | 981 | ||
| 980 | # | 982 | # |
| 981 | # Multimedia devices | 983 | # Multimedia devices |
| 982 | # | 984 | # |
| 985 | |||
| 986 | # | ||
| 987 | # Multimedia core support | ||
| 988 | # | ||
| 983 | # CONFIG_VIDEO_DEV is not set | 989 | # CONFIG_VIDEO_DEV is not set |
| 984 | # CONFIG_DVB_CORE is not set | 990 | # CONFIG_DVB_CORE is not set |
| 991 | # CONFIG_VIDEO_MEDIA is not set | ||
| 992 | |||
| 993 | # | ||
| 994 | # Multimedia drivers | ||
| 995 | # | ||
| 985 | CONFIG_DAB=y | 996 | CONFIG_DAB=y |
| 986 | # CONFIG_USB_DABUSB is not set | 997 | # CONFIG_USB_DABUSB is not set |
| 987 | 998 | ||
| @@ -1034,16 +1045,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1034 | CONFIG_USB_DEVICE_CLASS=y | 1045 | CONFIG_USB_DEVICE_CLASS=y |
| 1035 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1046 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1036 | # CONFIG_USB_OTG is not set | 1047 | # CONFIG_USB_OTG is not set |
| 1048 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1049 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1037 | 1050 | ||
| 1038 | # | 1051 | # |
| 1039 | # USB Host Controller Drivers | 1052 | # USB Host Controller Drivers |
| 1040 | # | 1053 | # |
| 1054 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1041 | CONFIG_USB_EHCI_HCD=y | 1055 | CONFIG_USB_EHCI_HCD=y |
| 1042 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1056 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1043 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1057 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1044 | CONFIG_USB_EHCI_FSL=y | 1058 | CONFIG_USB_EHCI_FSL=y |
| 1045 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1059 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1046 | # CONFIG_USB_ISP116X_HCD is not set | 1060 | # CONFIG_USB_ISP116X_HCD is not set |
| 1061 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1047 | CONFIG_USB_OHCI_HCD=y | 1062 | CONFIG_USB_OHCI_HCD=y |
| 1048 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1063 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1049 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1064 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1061,6 +1076,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 1061 | # | 1076 | # |
| 1062 | # CONFIG_USB_ACM is not set | 1077 | # CONFIG_USB_ACM is not set |
| 1063 | # CONFIG_USB_PRINTER is not set | 1078 | # CONFIG_USB_PRINTER is not set |
| 1079 | # CONFIG_USB_WDM is not set | ||
| 1064 | 1080 | ||
| 1065 | # | 1081 | # |
| 1066 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1082 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1080,7 +1096,9 @@ CONFIG_USB_STORAGE=y | |||
| 1080 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1096 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1081 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1097 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1082 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1098 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1099 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1083 | # CONFIG_USB_STORAGE_KARMA is not set | 1100 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1101 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1084 | # CONFIG_USB_LIBUSUAL is not set | 1102 | # CONFIG_USB_LIBUSUAL is not set |
| 1085 | 1103 | ||
| 1086 | # | 1104 | # |
| @@ -1118,6 +1136,7 @@ CONFIG_USB_MON=y | |||
| 1118 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1136 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1119 | # CONFIG_USB_IOWARRIOR is not set | 1137 | # CONFIG_USB_IOWARRIOR is not set |
| 1120 | # CONFIG_USB_TEST is not set | 1138 | # CONFIG_USB_TEST is not set |
| 1139 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1121 | CONFIG_USB_GADGET=y | 1140 | CONFIG_USB_GADGET=y |
| 1122 | # CONFIG_USB_GADGET_DEBUG is not set | 1141 | # CONFIG_USB_GADGET_DEBUG is not set |
| 1123 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 1142 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| @@ -1129,6 +1148,7 @@ CONFIG_USB_GADGET_NET2280=y | |||
| 1129 | CONFIG_USB_NET2280=y | 1148 | CONFIG_USB_NET2280=y |
| 1130 | # CONFIG_USB_GADGET_PXA2XX is not set | 1149 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 1131 | # CONFIG_USB_GADGET_M66592 is not set | 1150 | # CONFIG_USB_GADGET_M66592 is not set |
| 1151 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 1132 | # CONFIG_USB_GADGET_GOKU is not set | 1152 | # CONFIG_USB_GADGET_GOKU is not set |
| 1133 | # CONFIG_USB_GADGET_LH7A40X is not set | 1153 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 1134 | # CONFIG_USB_GADGET_OMAP is not set | 1154 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -1147,6 +1167,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
| 1147 | # CONFIG_MMC is not set | 1167 | # CONFIG_MMC is not set |
| 1148 | # CONFIG_MEMSTICK is not set | 1168 | # CONFIG_MEMSTICK is not set |
| 1149 | # CONFIG_NEW_LEDS is not set | 1169 | # CONFIG_NEW_LEDS is not set |
| 1170 | # CONFIG_ACCESSIBILITY is not set | ||
| 1150 | # CONFIG_INFINIBAND is not set | 1171 | # CONFIG_INFINIBAND is not set |
| 1151 | # CONFIG_EDAC is not set | 1172 | # CONFIG_EDAC is not set |
| 1152 | CONFIG_RTC_LIB=y | 1173 | CONFIG_RTC_LIB=y |
| @@ -1201,11 +1222,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1201 | # | 1222 | # |
| 1202 | # on-CPU RTC drivers | 1223 | # on-CPU RTC drivers |
| 1203 | # | 1224 | # |
| 1225 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1204 | # CONFIG_DMADEVICES is not set | 1226 | # CONFIG_DMADEVICES is not set |
| 1205 | |||
| 1206 | # | ||
| 1207 | # Userspace I/O | ||
| 1208 | # | ||
| 1209 | # CONFIG_UIO is not set | 1227 | # CONFIG_UIO is not set |
| 1210 | 1228 | ||
| 1211 | # | 1229 | # |
| @@ -1225,7 +1243,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1225 | # CONFIG_JFS_FS is not set | 1243 | # CONFIG_JFS_FS is not set |
| 1226 | # CONFIG_FS_POSIX_ACL is not set | 1244 | # CONFIG_FS_POSIX_ACL is not set |
| 1227 | # CONFIG_XFS_FS is not set | 1245 | # CONFIG_XFS_FS is not set |
| 1228 | # CONFIG_GFS2_FS is not set | ||
| 1229 | # CONFIG_OCFS2_FS is not set | 1246 | # CONFIG_OCFS2_FS is not set |
| 1230 | CONFIG_DNOTIFY=y | 1247 | CONFIG_DNOTIFY=y |
| 1231 | CONFIG_INOTIFY=y | 1248 | CONFIG_INOTIFY=y |
| @@ -1294,7 +1311,6 @@ CONFIG_NFS_FS=y | |||
| 1294 | CONFIG_NFS_V3=y | 1311 | CONFIG_NFS_V3=y |
| 1295 | # CONFIG_NFS_V3_ACL is not set | 1312 | # CONFIG_NFS_V3_ACL is not set |
| 1296 | CONFIG_NFS_V4=y | 1313 | CONFIG_NFS_V4=y |
| 1297 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1298 | # CONFIG_NFSD is not set | 1314 | # CONFIG_NFSD is not set |
| 1299 | CONFIG_ROOT_NFS=y | 1315 | CONFIG_ROOT_NFS=y |
| 1300 | CONFIG_LOCKD=y | 1316 | CONFIG_LOCKD=y |
| @@ -1339,6 +1355,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1339 | # Library routines | 1355 | # Library routines |
| 1340 | # | 1356 | # |
| 1341 | CONFIG_BITREVERSE=y | 1357 | CONFIG_BITREVERSE=y |
| 1358 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1342 | # CONFIG_CRC_CCITT is not set | 1359 | # CONFIG_CRC_CCITT is not set |
| 1343 | # CONFIG_CRC16 is not set | 1360 | # CONFIG_CRC16 is not set |
| 1344 | # CONFIG_CRC_ITU_T is not set | 1361 | # CONFIG_CRC_ITU_T is not set |
| @@ -1351,6 +1368,7 @@ CONFIG_PLIST=y | |||
| 1351 | CONFIG_HAS_IOMEM=y | 1368 | CONFIG_HAS_IOMEM=y |
| 1352 | CONFIG_HAS_IOPORT=y | 1369 | CONFIG_HAS_IOPORT=y |
| 1353 | CONFIG_HAS_DMA=y | 1370 | CONFIG_HAS_DMA=y |
| 1371 | CONFIG_HAVE_LMB=y | ||
| 1354 | 1372 | ||
| 1355 | # | 1373 | # |
| 1356 | # Kernel hacking | 1374 | # Kernel hacking |
| @@ -1358,6 +1376,7 @@ CONFIG_HAS_DMA=y | |||
| 1358 | # CONFIG_PRINTK_TIME is not set | 1376 | # CONFIG_PRINTK_TIME is not set |
| 1359 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1377 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1360 | CONFIG_ENABLE_MUST_CHECK=y | 1378 | CONFIG_ENABLE_MUST_CHECK=y |
| 1379 | CONFIG_FRAME_WARN=1024 | ||
| 1361 | # CONFIG_MAGIC_SYSRQ is not set | 1380 | # CONFIG_MAGIC_SYSRQ is not set |
| 1362 | # CONFIG_UNUSED_SYMBOLS is not set | 1381 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1363 | # CONFIG_DEBUG_FS is not set | 1382 | # CONFIG_DEBUG_FS is not set |
| @@ -1368,6 +1387,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1368 | CONFIG_SCHED_DEBUG=y | 1387 | CONFIG_SCHED_DEBUG=y |
| 1369 | # CONFIG_SCHEDSTATS is not set | 1388 | # CONFIG_SCHEDSTATS is not set |
| 1370 | # CONFIG_TIMER_STATS is not set | 1389 | # CONFIG_TIMER_STATS is not set |
| 1390 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1371 | # CONFIG_SLUB_DEBUG_ON is not set | 1391 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1372 | # CONFIG_SLUB_STATS is not set | 1392 | # CONFIG_SLUB_STATS is not set |
| 1373 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1393 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1380,6 +1400,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1380 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1400 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1381 | # CONFIG_DEBUG_INFO is not set | 1401 | # CONFIG_DEBUG_INFO is not set |
| 1382 | # CONFIG_DEBUG_VM is not set | 1402 | # CONFIG_DEBUG_VM is not set |
| 1403 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1383 | # CONFIG_DEBUG_LIST is not set | 1404 | # CONFIG_DEBUG_LIST is not set |
| 1384 | # CONFIG_DEBUG_SG is not set | 1405 | # CONFIG_DEBUG_SG is not set |
| 1385 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1406 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1391,6 +1412,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1391 | # CONFIG_DEBUG_STACK_USAGE is not set | 1412 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1392 | # CONFIG_DEBUG_PAGEALLOC is not set | 1413 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1393 | # CONFIG_DEBUGGER is not set | 1414 | # CONFIG_DEBUGGER is not set |
| 1415 | # CONFIG_IRQSTACKS is not set | ||
| 1394 | # CONFIG_BDI_SWITCH is not set | 1416 | # CONFIG_BDI_SWITCH is not set |
| 1395 | # CONFIG_PPC_EARLY_DEBUG is not set | 1417 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1396 | 1418 | ||
| @@ -1401,51 +1423,81 @@ CONFIG_SCHED_DEBUG=y | |||
| 1401 | # CONFIG_SECURITY is not set | 1423 | # CONFIG_SECURITY is not set |
| 1402 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1424 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1403 | CONFIG_CRYPTO=y | 1425 | CONFIG_CRYPTO=y |
| 1426 | |||
| 1427 | # | ||
| 1428 | # Crypto core or helper | ||
| 1429 | # | ||
| 1404 | CONFIG_CRYPTO_ALGAPI=y | 1430 | CONFIG_CRYPTO_ALGAPI=y |
| 1405 | CONFIG_CRYPTO_BLKCIPHER=y | 1431 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1406 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1407 | CONFIG_CRYPTO_MANAGER=y | 1432 | CONFIG_CRYPTO_MANAGER=y |
| 1433 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1434 | # CONFIG_CRYPTO_NULL is not set | ||
| 1435 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1436 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1437 | # CONFIG_CRYPTO_TEST is not set | ||
| 1438 | |||
| 1439 | # | ||
| 1440 | # Authenticated Encryption with Associated Data | ||
| 1441 | # | ||
| 1442 | # CONFIG_CRYPTO_CCM is not set | ||
| 1443 | # CONFIG_CRYPTO_GCM is not set | ||
| 1444 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1445 | |||
| 1446 | # | ||
| 1447 | # Block modes | ||
| 1448 | # | ||
| 1449 | CONFIG_CRYPTO_CBC=y | ||
| 1450 | # CONFIG_CRYPTO_CTR is not set | ||
| 1451 | # CONFIG_CRYPTO_CTS is not set | ||
| 1452 | # CONFIG_CRYPTO_ECB is not set | ||
| 1453 | # CONFIG_CRYPTO_LRW is not set | ||
| 1454 | CONFIG_CRYPTO_PCBC=m | ||
| 1455 | # CONFIG_CRYPTO_XTS is not set | ||
| 1456 | |||
| 1457 | # | ||
| 1458 | # Hash modes | ||
| 1459 | # | ||
| 1408 | # CONFIG_CRYPTO_HMAC is not set | 1460 | # CONFIG_CRYPTO_HMAC is not set |
| 1409 | # CONFIG_CRYPTO_XCBC is not set | 1461 | # CONFIG_CRYPTO_XCBC is not set |
| 1410 | # CONFIG_CRYPTO_NULL is not set | 1462 | |
| 1463 | # | ||
| 1464 | # Digest | ||
| 1465 | # | ||
| 1466 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1411 | # CONFIG_CRYPTO_MD4 is not set | 1467 | # CONFIG_CRYPTO_MD4 is not set |
| 1412 | CONFIG_CRYPTO_MD5=y | 1468 | CONFIG_CRYPTO_MD5=y |
| 1469 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1413 | # CONFIG_CRYPTO_SHA1 is not set | 1470 | # CONFIG_CRYPTO_SHA1 is not set |
| 1414 | # CONFIG_CRYPTO_SHA256 is not set | 1471 | # CONFIG_CRYPTO_SHA256 is not set |
| 1415 | # CONFIG_CRYPTO_SHA512 is not set | 1472 | # CONFIG_CRYPTO_SHA512 is not set |
| 1416 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1417 | # CONFIG_CRYPTO_TGR192 is not set | 1473 | # CONFIG_CRYPTO_TGR192 is not set |
| 1418 | # CONFIG_CRYPTO_GF128MUL is not set | 1474 | # CONFIG_CRYPTO_WP512 is not set |
| 1419 | # CONFIG_CRYPTO_ECB is not set | 1475 | |
| 1420 | CONFIG_CRYPTO_CBC=y | 1476 | # |
| 1421 | CONFIG_CRYPTO_PCBC=m | 1477 | # Ciphers |
| 1422 | # CONFIG_CRYPTO_LRW is not set | 1478 | # |
| 1423 | # CONFIG_CRYPTO_XTS is not set | ||
| 1424 | # CONFIG_CRYPTO_CTR is not set | ||
| 1425 | # CONFIG_CRYPTO_GCM is not set | ||
| 1426 | # CONFIG_CRYPTO_CCM is not set | ||
| 1427 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1428 | CONFIG_CRYPTO_DES=y | ||
| 1429 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1430 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1431 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1432 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1433 | # CONFIG_CRYPTO_AES is not set | 1479 | # CONFIG_CRYPTO_AES is not set |
| 1480 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1481 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1482 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1483 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1434 | # CONFIG_CRYPTO_CAST5 is not set | 1484 | # CONFIG_CRYPTO_CAST5 is not set |
| 1435 | # CONFIG_CRYPTO_CAST6 is not set | 1485 | # CONFIG_CRYPTO_CAST6 is not set |
| 1436 | # CONFIG_CRYPTO_TEA is not set | 1486 | CONFIG_CRYPTO_DES=y |
| 1437 | # CONFIG_CRYPTO_ARC4 is not set | 1487 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1438 | # CONFIG_CRYPTO_KHAZAD is not set | 1488 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1439 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1440 | # CONFIG_CRYPTO_SEED is not set | ||
| 1441 | # CONFIG_CRYPTO_SALSA20 is not set | 1489 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1490 | # CONFIG_CRYPTO_SEED is not set | ||
| 1491 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1492 | # CONFIG_CRYPTO_TEA is not set | ||
| 1493 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1494 | |||
| 1495 | # | ||
| 1496 | # Compression | ||
| 1497 | # | ||
| 1442 | # CONFIG_CRYPTO_DEFLATE is not set | 1498 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1443 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1444 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1445 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1446 | # CONFIG_CRYPTO_TEST is not set | ||
| 1447 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1448 | # CONFIG_CRYPTO_LZO is not set | 1499 | # CONFIG_CRYPTO_LZO is not set |
| 1449 | CONFIG_CRYPTO_HW=y | 1500 | CONFIG_CRYPTO_HW=y |
| 1450 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1501 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1451 | # CONFIG_PPC_CLOCK is not set | 1502 | # CONFIG_PPC_CLOCK is not set |
| 1503 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index 50cceda8994f..1eca26f3659a 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:51 2008 | 4 | # Mon Jun 9 08:52:22 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -212,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -239,6 +246,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 239 | CONFIG_PCI_LEGACY=y | 246 | CONFIG_PCI_LEGACY=y |
| 240 | # CONFIG_PCCARD is not set | 247 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 248 | # CONFIG_HOTPLUG_PCI is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 250 | ||
| 243 | # | 251 | # |
| 244 | # Advanced setup | 252 | # Advanced setup |
| @@ -248,11 +256,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 256 | # |
| 249 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 250 | # | 258 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 264 | ||
| 257 | # | 265 | # |
| 258 | # Networking | 266 | # Networking |
| @@ -300,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -355,6 +361,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 355 | # CONFIG_CONNECTOR is not set | 361 | # CONFIG_CONNECTOR is not set |
| 356 | # CONFIG_MTD is not set | 362 | # CONFIG_MTD is not set |
| 357 | CONFIG_OF_DEVICE=y | 363 | CONFIG_OF_DEVICE=y |
| 364 | CONFIG_OF_I2C=y | ||
| 358 | # CONFIG_PARPORT is not set | 365 | # CONFIG_PARPORT is not set |
| 359 | CONFIG_BLK_DEV=y | 366 | CONFIG_BLK_DEV=y |
| 360 | # CONFIG_BLK_DEV_FD is not set | 367 | # CONFIG_BLK_DEV_FD is not set |
| @@ -522,7 +529,6 @@ CONFIG_NETDEV_1000=y | |||
| 522 | # CONFIG_SIS190 is not set | 529 | # CONFIG_SIS190 is not set |
| 523 | # CONFIG_SKGE is not set | 530 | # CONFIG_SKGE is not set |
| 524 | # CONFIG_SKY2 is not set | 531 | # CONFIG_SKY2 is not set |
| 525 | # CONFIG_SK98LIN is not set | ||
| 526 | # CONFIG_VIA_VELOCITY is not set | 532 | # CONFIG_VIA_VELOCITY is not set |
| 527 | # CONFIG_TIGON3 is not set | 533 | # CONFIG_TIGON3 is not set |
| 528 | # CONFIG_BNX2 is not set | 534 | # CONFIG_BNX2 is not set |
| @@ -546,6 +552,7 @@ CONFIG_NETDEV_10000=y | |||
| 546 | # CONFIG_MLX4_CORE is not set | 552 | # CONFIG_MLX4_CORE is not set |
| 547 | # CONFIG_TEHUTI is not set | 553 | # CONFIG_TEHUTI is not set |
| 548 | # CONFIG_BNX2X is not set | 554 | # CONFIG_BNX2X is not set |
| 555 | # CONFIG_SFC is not set | ||
| 549 | # CONFIG_TR is not set | 556 | # CONFIG_TR is not set |
| 550 | 557 | ||
| 551 | # | 558 | # |
| @@ -553,6 +560,7 @@ CONFIG_NETDEV_10000=y | |||
| 553 | # | 560 | # |
| 554 | # CONFIG_WLAN_PRE80211 is not set | 561 | # CONFIG_WLAN_PRE80211 is not set |
| 555 | # CONFIG_WLAN_80211 is not set | 562 | # CONFIG_WLAN_80211 is not set |
| 563 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 556 | # CONFIG_WAN is not set | 564 | # CONFIG_WAN is not set |
| 557 | # CONFIG_FDDI is not set | 565 | # CONFIG_FDDI is not set |
| 558 | # CONFIG_HIPPI is not set | 566 | # CONFIG_HIPPI is not set |
| @@ -600,6 +608,7 @@ CONFIG_INPUT=y | |||
| 600 | # Character devices | 608 | # Character devices |
| 601 | # | 609 | # |
| 602 | # CONFIG_VT is not set | 610 | # CONFIG_VT is not set |
| 611 | CONFIG_DEVKMEM=y | ||
| 603 | # CONFIG_SERIAL_NONSTANDARD is not set | 612 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 604 | # CONFIG_NOZOMI is not set | 613 | # CONFIG_NOZOMI is not set |
| 605 | 614 | ||
| @@ -628,7 +637,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 628 | # CONFIG_IPMI_HANDLER is not set | 637 | # CONFIG_IPMI_HANDLER is not set |
| 629 | CONFIG_HW_RANDOM=y | 638 | CONFIG_HW_RANDOM=y |
| 630 | # CONFIG_NVRAM is not set | 639 | # CONFIG_NVRAM is not set |
| 631 | # CONFIG_GEN_RTC is not set | ||
| 632 | # CONFIG_R3964 is not set | 640 | # CONFIG_R3964 is not set |
| 633 | # CONFIG_APPLICOM is not set | 641 | # CONFIG_APPLICOM is not set |
| 634 | # CONFIG_RAW_DRIVER is not set | 642 | # CONFIG_RAW_DRIVER is not set |
| @@ -639,13 +647,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 639 | CONFIG_I2C_CHARDEV=y | 647 | CONFIG_I2C_CHARDEV=y |
| 640 | 648 | ||
| 641 | # | 649 | # |
| 642 | # I2C Algorithms | ||
| 643 | # | ||
| 644 | # CONFIG_I2C_ALGOBIT is not set | ||
| 645 | # CONFIG_I2C_ALGOPCF is not set | ||
| 646 | # CONFIG_I2C_ALGOPCA is not set | ||
| 647 | |||
| 648 | # | ||
| 649 | # I2C Hardware Bus support | 650 | # I2C Hardware Bus support |
| 650 | # | 651 | # |
| 651 | # CONFIG_I2C_ALI1535 is not set | 652 | # CONFIG_I2C_ALI1535 is not set |
| @@ -671,6 +672,7 @@ CONFIG_I2C_MPC=y | |||
| 671 | # CONFIG_I2C_VIA is not set | 672 | # CONFIG_I2C_VIA is not set |
| 672 | # CONFIG_I2C_VIAPRO is not set | 673 | # CONFIG_I2C_VIAPRO is not set |
| 673 | # CONFIG_I2C_VOODOO3 is not set | 674 | # CONFIG_I2C_VOODOO3 is not set |
| 675 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 674 | 676 | ||
| 675 | # | 677 | # |
| 676 | # Miscellaneous I2C Chip support | 678 | # Miscellaneous I2C Chip support |
| @@ -680,19 +682,13 @@ CONFIG_I2C_MPC=y | |||
| 680 | # CONFIG_SENSORS_PCF8574 is not set | 682 | # CONFIG_SENSORS_PCF8574 is not set |
| 681 | # CONFIG_PCF8575 is not set | 683 | # CONFIG_PCF8575 is not set |
| 682 | # CONFIG_SENSORS_PCF8591 is not set | 684 | # CONFIG_SENSORS_PCF8591 is not set |
| 683 | # CONFIG_TPS65010 is not set | ||
| 684 | # CONFIG_SENSORS_MAX6875 is not set | 685 | # CONFIG_SENSORS_MAX6875 is not set |
| 685 | # CONFIG_SENSORS_TSL2550 is not set | 686 | # CONFIG_SENSORS_TSL2550 is not set |
| 686 | # CONFIG_I2C_DEBUG_CORE is not set | 687 | # CONFIG_I2C_DEBUG_CORE is not set |
| 687 | # CONFIG_I2C_DEBUG_ALGO is not set | 688 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 688 | # CONFIG_I2C_DEBUG_BUS is not set | 689 | # CONFIG_I2C_DEBUG_BUS is not set |
| 689 | # CONFIG_I2C_DEBUG_CHIP is not set | 690 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 690 | |||
| 691 | # | ||
| 692 | # SPI support | ||
| 693 | # | ||
| 694 | # CONFIG_SPI is not set | 691 | # CONFIG_SPI is not set |
| 695 | # CONFIG_SPI_MASTER is not set | ||
| 696 | # CONFIG_W1 is not set | 692 | # CONFIG_W1 is not set |
| 697 | # CONFIG_POWER_SUPPLY is not set | 693 | # CONFIG_POWER_SUPPLY is not set |
| 698 | CONFIG_HWMON=y | 694 | CONFIG_HWMON=y |
| @@ -775,12 +771,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 775 | # Multifunction device drivers | 771 | # Multifunction device drivers |
| 776 | # | 772 | # |
| 777 | # CONFIG_MFD_SM501 is not set | 773 | # CONFIG_MFD_SM501 is not set |
| 774 | # CONFIG_HTC_PASIC3 is not set | ||
| 778 | 775 | ||
| 779 | # | 776 | # |
| 780 | # Multimedia devices | 777 | # Multimedia devices |
| 781 | # | 778 | # |
| 779 | |||
| 780 | # | ||
| 781 | # Multimedia core support | ||
| 782 | # | ||
| 782 | # CONFIG_VIDEO_DEV is not set | 783 | # CONFIG_VIDEO_DEV is not set |
| 783 | # CONFIG_DVB_CORE is not set | 784 | # CONFIG_DVB_CORE is not set |
| 785 | # CONFIG_VIDEO_MEDIA is not set | ||
| 786 | |||
| 787 | # | ||
| 788 | # Multimedia drivers | ||
| 789 | # | ||
| 784 | CONFIG_DAB=y | 790 | CONFIG_DAB=y |
| 785 | 791 | ||
| 786 | # | 792 | # |
| @@ -811,6 +817,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 811 | CONFIG_USB_ARCH_HAS_OHCI=y | 817 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 812 | CONFIG_USB_ARCH_HAS_EHCI=y | 818 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 813 | # CONFIG_USB is not set | 819 | # CONFIG_USB is not set |
| 820 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 821 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 814 | 822 | ||
| 815 | # | 823 | # |
| 816 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 824 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -819,6 +827,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 819 | # CONFIG_MMC is not set | 827 | # CONFIG_MMC is not set |
| 820 | # CONFIG_MEMSTICK is not set | 828 | # CONFIG_MEMSTICK is not set |
| 821 | # CONFIG_NEW_LEDS is not set | 829 | # CONFIG_NEW_LEDS is not set |
| 830 | # CONFIG_ACCESSIBILITY is not set | ||
| 822 | # CONFIG_INFINIBAND is not set | 831 | # CONFIG_INFINIBAND is not set |
| 823 | # CONFIG_EDAC is not set | 832 | # CONFIG_EDAC is not set |
| 824 | CONFIG_RTC_LIB=y | 833 | CONFIG_RTC_LIB=y |
| @@ -870,11 +879,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 870 | # | 879 | # |
| 871 | # on-CPU RTC drivers | 880 | # on-CPU RTC drivers |
| 872 | # | 881 | # |
| 882 | # CONFIG_RTC_DRV_PPC is not set | ||
| 873 | # CONFIG_DMADEVICES is not set | 883 | # CONFIG_DMADEVICES is not set |
| 874 | |||
| 875 | # | ||
| 876 | # Userspace I/O | ||
| 877 | # | ||
| 878 | # CONFIG_UIO is not set | 884 | # CONFIG_UIO is not set |
| 879 | 885 | ||
| 880 | # | 886 | # |
| @@ -894,7 +900,6 @@ CONFIG_FS_MBCACHE=y | |||
| 894 | # CONFIG_JFS_FS is not set | 900 | # CONFIG_JFS_FS is not set |
| 895 | # CONFIG_FS_POSIX_ACL is not set | 901 | # CONFIG_FS_POSIX_ACL is not set |
| 896 | # CONFIG_XFS_FS is not set | 902 | # CONFIG_XFS_FS is not set |
| 897 | # CONFIG_GFS2_FS is not set | ||
| 898 | # CONFIG_OCFS2_FS is not set | 903 | # CONFIG_OCFS2_FS is not set |
| 899 | CONFIG_DNOTIFY=y | 904 | CONFIG_DNOTIFY=y |
| 900 | CONFIG_INOTIFY=y | 905 | CONFIG_INOTIFY=y |
| @@ -952,7 +957,6 @@ CONFIG_NFS_FS=y | |||
| 952 | CONFIG_NFS_V3=y | 957 | CONFIG_NFS_V3=y |
| 953 | # CONFIG_NFS_V3_ACL is not set | 958 | # CONFIG_NFS_V3_ACL is not set |
| 954 | CONFIG_NFS_V4=y | 959 | CONFIG_NFS_V4=y |
| 955 | # CONFIG_NFS_DIRECTIO is not set | ||
| 956 | # CONFIG_NFSD is not set | 960 | # CONFIG_NFSD is not set |
| 957 | CONFIG_ROOT_NFS=y | 961 | CONFIG_ROOT_NFS=y |
| 958 | CONFIG_LOCKD=y | 962 | CONFIG_LOCKD=y |
| @@ -995,6 +999,7 @@ CONFIG_UCC=y | |||
| 995 | # Library routines | 999 | # Library routines |
| 996 | # | 1000 | # |
| 997 | CONFIG_BITREVERSE=y | 1001 | CONFIG_BITREVERSE=y |
| 1002 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 998 | # CONFIG_CRC_CCITT is not set | 1003 | # CONFIG_CRC_CCITT is not set |
| 999 | # CONFIG_CRC16 is not set | 1004 | # CONFIG_CRC16 is not set |
| 1000 | # CONFIG_CRC_ITU_T is not set | 1005 | # CONFIG_CRC_ITU_T is not set |
| @@ -1005,6 +1010,7 @@ CONFIG_PLIST=y | |||
| 1005 | CONFIG_HAS_IOMEM=y | 1010 | CONFIG_HAS_IOMEM=y |
| 1006 | CONFIG_HAS_IOPORT=y | 1011 | CONFIG_HAS_IOPORT=y |
| 1007 | CONFIG_HAS_DMA=y | 1012 | CONFIG_HAS_DMA=y |
| 1013 | CONFIG_HAVE_LMB=y | ||
| 1008 | 1014 | ||
| 1009 | # | 1015 | # |
| 1010 | # Kernel hacking | 1016 | # Kernel hacking |
| @@ -1012,6 +1018,7 @@ CONFIG_HAS_DMA=y | |||
| 1012 | # CONFIG_PRINTK_TIME is not set | 1018 | # CONFIG_PRINTK_TIME is not set |
| 1013 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1019 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1014 | CONFIG_ENABLE_MUST_CHECK=y | 1020 | CONFIG_ENABLE_MUST_CHECK=y |
| 1021 | CONFIG_FRAME_WARN=1024 | ||
| 1015 | # CONFIG_MAGIC_SYSRQ is not set | 1022 | # CONFIG_MAGIC_SYSRQ is not set |
| 1016 | # CONFIG_UNUSED_SYMBOLS is not set | 1023 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1017 | # CONFIG_DEBUG_FS is not set | 1024 | # CONFIG_DEBUG_FS is not set |
| @@ -1021,6 +1028,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1021 | # CONFIG_SLUB_STATS is not set | 1028 | # CONFIG_SLUB_STATS is not set |
| 1022 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1029 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1023 | # CONFIG_SAMPLES is not set | 1030 | # CONFIG_SAMPLES is not set |
| 1031 | # CONFIG_IRQSTACKS is not set | ||
| 1024 | # CONFIG_PPC_EARLY_DEBUG is not set | 1032 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1025 | 1033 | ||
| 1026 | # | 1034 | # |
| @@ -1030,52 +1038,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1030 | # CONFIG_SECURITY is not set | 1038 | # CONFIG_SECURITY is not set |
| 1031 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1039 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1032 | CONFIG_CRYPTO=y | 1040 | CONFIG_CRYPTO=y |
| 1041 | |||
| 1042 | # | ||
| 1043 | # Crypto core or helper | ||
| 1044 | # | ||
| 1033 | CONFIG_CRYPTO_ALGAPI=y | 1045 | CONFIG_CRYPTO_ALGAPI=y |
| 1034 | CONFIG_CRYPTO_BLKCIPHER=y | 1046 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1035 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1036 | CONFIG_CRYPTO_MANAGER=y | 1047 | CONFIG_CRYPTO_MANAGER=y |
| 1048 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1049 | # CONFIG_CRYPTO_NULL is not set | ||
| 1050 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1051 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1052 | # CONFIG_CRYPTO_TEST is not set | ||
| 1053 | |||
| 1054 | # | ||
| 1055 | # Authenticated Encryption with Associated Data | ||
| 1056 | # | ||
| 1057 | # CONFIG_CRYPTO_CCM is not set | ||
| 1058 | # CONFIG_CRYPTO_GCM is not set | ||
| 1059 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1060 | |||
| 1061 | # | ||
| 1062 | # Block modes | ||
| 1063 | # | ||
| 1064 | CONFIG_CRYPTO_CBC=y | ||
| 1065 | # CONFIG_CRYPTO_CTR is not set | ||
| 1066 | # CONFIG_CRYPTO_CTS is not set | ||
| 1067 | CONFIG_CRYPTO_ECB=m | ||
| 1068 | # CONFIG_CRYPTO_LRW is not set | ||
| 1069 | CONFIG_CRYPTO_PCBC=m | ||
| 1070 | # CONFIG_CRYPTO_XTS is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Hash modes | ||
| 1074 | # | ||
| 1037 | # CONFIG_CRYPTO_HMAC is not set | 1075 | # CONFIG_CRYPTO_HMAC is not set |
| 1038 | # CONFIG_CRYPTO_XCBC is not set | 1076 | # CONFIG_CRYPTO_XCBC is not set |
| 1039 | # CONFIG_CRYPTO_NULL is not set | 1077 | |
| 1078 | # | ||
| 1079 | # Digest | ||
| 1080 | # | ||
| 1081 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1040 | # CONFIG_CRYPTO_MD4 is not set | 1082 | # CONFIG_CRYPTO_MD4 is not set |
| 1041 | CONFIG_CRYPTO_MD5=y | 1083 | CONFIG_CRYPTO_MD5=y |
| 1084 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1042 | # CONFIG_CRYPTO_SHA1 is not set | 1085 | # CONFIG_CRYPTO_SHA1 is not set |
| 1043 | # CONFIG_CRYPTO_SHA256 is not set | 1086 | # CONFIG_CRYPTO_SHA256 is not set |
| 1044 | # CONFIG_CRYPTO_SHA512 is not set | 1087 | # CONFIG_CRYPTO_SHA512 is not set |
| 1045 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1046 | # CONFIG_CRYPTO_TGR192 is not set | 1088 | # CONFIG_CRYPTO_TGR192 is not set |
| 1047 | # CONFIG_CRYPTO_GF128MUL is not set | 1089 | # CONFIG_CRYPTO_WP512 is not set |
| 1048 | CONFIG_CRYPTO_ECB=m | 1090 | |
| 1049 | CONFIG_CRYPTO_CBC=y | 1091 | # |
| 1050 | CONFIG_CRYPTO_PCBC=m | 1092 | # Ciphers |
| 1051 | # CONFIG_CRYPTO_LRW is not set | 1093 | # |
| 1052 | # CONFIG_CRYPTO_XTS is not set | ||
| 1053 | # CONFIG_CRYPTO_CTR is not set | ||
| 1054 | # CONFIG_CRYPTO_GCM is not set | ||
| 1055 | # CONFIG_CRYPTO_CCM is not set | ||
| 1056 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1057 | CONFIG_CRYPTO_DES=y | ||
| 1058 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1059 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1060 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1061 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1062 | # CONFIG_CRYPTO_AES is not set | 1094 | # CONFIG_CRYPTO_AES is not set |
| 1095 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1096 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1097 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1098 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1063 | # CONFIG_CRYPTO_CAST5 is not set | 1099 | # CONFIG_CRYPTO_CAST5 is not set |
| 1064 | # CONFIG_CRYPTO_CAST6 is not set | 1100 | # CONFIG_CRYPTO_CAST6 is not set |
| 1065 | # CONFIG_CRYPTO_TEA is not set | 1101 | CONFIG_CRYPTO_DES=y |
| 1066 | # CONFIG_CRYPTO_ARC4 is not set | 1102 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1067 | # CONFIG_CRYPTO_KHAZAD is not set | 1103 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1068 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1069 | # CONFIG_CRYPTO_SEED is not set | ||
| 1070 | # CONFIG_CRYPTO_SALSA20 is not set | 1104 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1105 | # CONFIG_CRYPTO_SEED is not set | ||
| 1106 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1107 | # CONFIG_CRYPTO_TEA is not set | ||
| 1108 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1109 | |||
| 1110 | # | ||
| 1111 | # Compression | ||
| 1112 | # | ||
| 1071 | # CONFIG_CRYPTO_DEFLATE is not set | 1113 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1072 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1073 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1074 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1075 | # CONFIG_CRYPTO_TEST is not set | ||
| 1076 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1077 | # CONFIG_CRYPTO_LZO is not set | 1114 | # CONFIG_CRYPTO_LZO is not set |
| 1078 | CONFIG_CRYPTO_HW=y | 1115 | CONFIG_CRYPTO_HW=y |
| 1079 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1116 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1080 | # CONFIG_PPC_CLOCK is not set | 1117 | # CONFIG_PPC_CLOCK is not set |
| 1081 | CONFIG_PPC_LIB_RHEAP=y | 1118 | CONFIG_PPC_LIB_RHEAP=y |
| 1119 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index ac913025713e..de95d327463c 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:16 2008 | 4 | # Mon Jun 9 08:52:24 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -212,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -239,6 +246,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 239 | CONFIG_PCI_LEGACY=y | 246 | CONFIG_PCI_LEGACY=y |
| 240 | # CONFIG_PCCARD is not set | 247 | # CONFIG_PCCARD is not set |
| 241 | # CONFIG_HOTPLUG_PCI is not set | 248 | # CONFIG_HOTPLUG_PCI is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 242 | 250 | ||
| 243 | # | 251 | # |
| 244 | # Advanced setup | 252 | # Advanced setup |
| @@ -248,11 +256,11 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # | 256 | # |
| 249 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 250 | # | 258 | # |
| 251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 252 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 253 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 254 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 255 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 256 | 264 | ||
| 257 | # | 265 | # |
| 258 | # Networking | 266 | # Networking |
| @@ -300,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 301 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 302 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 304 | # CONFIG_INET6_TUNNEL is not set | ||
| 305 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 306 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 307 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -355,6 +361,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 355 | # CONFIG_CONNECTOR is not set | 361 | # CONFIG_CONNECTOR is not set |
| 356 | # CONFIG_MTD is not set | 362 | # CONFIG_MTD is not set |
| 357 | CONFIG_OF_DEVICE=y | 363 | CONFIG_OF_DEVICE=y |
| 364 | CONFIG_OF_I2C=y | ||
| 358 | # CONFIG_PARPORT is not set | 365 | # CONFIG_PARPORT is not set |
| 359 | CONFIG_BLK_DEV=y | 366 | CONFIG_BLK_DEV=y |
| 360 | # CONFIG_BLK_DEV_FD is not set | 367 | # CONFIG_BLK_DEV_FD is not set |
| @@ -526,7 +533,6 @@ CONFIG_E1000=y | |||
| 526 | # CONFIG_SIS190 is not set | 533 | # CONFIG_SIS190 is not set |
| 527 | # CONFIG_SKGE is not set | 534 | # CONFIG_SKGE is not set |
| 528 | # CONFIG_SKY2 is not set | 535 | # CONFIG_SKY2 is not set |
| 529 | # CONFIG_SK98LIN is not set | ||
| 530 | # CONFIG_VIA_VELOCITY is not set | 536 | # CONFIG_VIA_VELOCITY is not set |
| 531 | # CONFIG_TIGON3 is not set | 537 | # CONFIG_TIGON3 is not set |
| 532 | # CONFIG_BNX2 is not set | 538 | # CONFIG_BNX2 is not set |
| @@ -550,6 +556,7 @@ CONFIG_NETDEV_10000=y | |||
| 550 | # CONFIG_MLX4_CORE is not set | 556 | # CONFIG_MLX4_CORE is not set |
| 551 | # CONFIG_TEHUTI is not set | 557 | # CONFIG_TEHUTI is not set |
| 552 | # CONFIG_BNX2X is not set | 558 | # CONFIG_BNX2X is not set |
| 559 | # CONFIG_SFC is not set | ||
| 553 | # CONFIG_TR is not set | 560 | # CONFIG_TR is not set |
| 554 | 561 | ||
| 555 | # | 562 | # |
| @@ -557,6 +564,7 @@ CONFIG_NETDEV_10000=y | |||
| 557 | # | 564 | # |
| 558 | # CONFIG_WLAN_PRE80211 is not set | 565 | # CONFIG_WLAN_PRE80211 is not set |
| 559 | # CONFIG_WLAN_80211 is not set | 566 | # CONFIG_WLAN_80211 is not set |
| 567 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 560 | 568 | ||
| 561 | # | 569 | # |
| 562 | # USB Network Adapters | 570 | # USB Network Adapters |
| @@ -613,6 +621,7 @@ CONFIG_INPUT=y | |||
| 613 | # Character devices | 621 | # Character devices |
| 614 | # | 622 | # |
| 615 | # CONFIG_VT is not set | 623 | # CONFIG_VT is not set |
| 624 | CONFIG_DEVKMEM=y | ||
| 616 | # CONFIG_SERIAL_NONSTANDARD is not set | 625 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 617 | # CONFIG_NOZOMI is not set | 626 | # CONFIG_NOZOMI is not set |
| 618 | 627 | ||
| @@ -653,13 +662,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 653 | CONFIG_I2C_CHARDEV=y | 662 | CONFIG_I2C_CHARDEV=y |
| 654 | 663 | ||
| 655 | # | 664 | # |
| 656 | # I2C Algorithms | ||
| 657 | # | ||
| 658 | # CONFIG_I2C_ALGOBIT is not set | ||
| 659 | # CONFIG_I2C_ALGOPCF is not set | ||
| 660 | # CONFIG_I2C_ALGOPCA is not set | ||
| 661 | |||
| 662 | # | ||
| 663 | # I2C Hardware Bus support | 665 | # I2C Hardware Bus support |
| 664 | # | 666 | # |
| 665 | # CONFIG_I2C_ALI1535 is not set | 667 | # CONFIG_I2C_ALI1535 is not set |
| @@ -686,6 +688,7 @@ CONFIG_I2C_MPC=y | |||
| 686 | # CONFIG_I2C_VIA is not set | 688 | # CONFIG_I2C_VIA is not set |
| 687 | # CONFIG_I2C_VIAPRO is not set | 689 | # CONFIG_I2C_VIAPRO is not set |
| 688 | # CONFIG_I2C_VOODOO3 is not set | 690 | # CONFIG_I2C_VOODOO3 is not set |
| 691 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 689 | 692 | ||
| 690 | # | 693 | # |
| 691 | # Miscellaneous I2C Chip support | 694 | # Miscellaneous I2C Chip support |
| @@ -695,17 +698,12 @@ CONFIG_I2C_MPC=y | |||
| 695 | # CONFIG_SENSORS_PCF8574 is not set | 698 | # CONFIG_SENSORS_PCF8574 is not set |
| 696 | # CONFIG_PCF8575 is not set | 699 | # CONFIG_PCF8575 is not set |
| 697 | # CONFIG_SENSORS_PCF8591 is not set | 700 | # CONFIG_SENSORS_PCF8591 is not set |
| 698 | # CONFIG_TPS65010 is not set | ||
| 699 | # CONFIG_SENSORS_MAX6875 is not set | 701 | # CONFIG_SENSORS_MAX6875 is not set |
| 700 | # CONFIG_SENSORS_TSL2550 is not set | 702 | # CONFIG_SENSORS_TSL2550 is not set |
| 701 | # CONFIG_I2C_DEBUG_CORE is not set | 703 | # CONFIG_I2C_DEBUG_CORE is not set |
| 702 | # CONFIG_I2C_DEBUG_ALGO is not set | 704 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 703 | # CONFIG_I2C_DEBUG_BUS is not set | 705 | # CONFIG_I2C_DEBUG_BUS is not set |
| 704 | # CONFIG_I2C_DEBUG_CHIP is not set | 706 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 705 | |||
| 706 | # | ||
| 707 | # SPI support | ||
| 708 | # | ||
| 709 | CONFIG_SPI=y | 707 | CONFIG_SPI=y |
| 710 | CONFIG_SPI_MASTER=y | 708 | CONFIG_SPI_MASTER=y |
| 711 | 709 | ||
| @@ -809,12 +807,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 809 | # Multifunction device drivers | 807 | # Multifunction device drivers |
| 810 | # | 808 | # |
| 811 | # CONFIG_MFD_SM501 is not set | 809 | # CONFIG_MFD_SM501 is not set |
| 810 | # CONFIG_HTC_PASIC3 is not set | ||
| 812 | 811 | ||
| 813 | # | 812 | # |
| 814 | # Multimedia devices | 813 | # Multimedia devices |
| 815 | # | 814 | # |
| 815 | |||
| 816 | # | ||
| 817 | # Multimedia core support | ||
| 818 | # | ||
| 816 | # CONFIG_VIDEO_DEV is not set | 819 | # CONFIG_VIDEO_DEV is not set |
| 817 | # CONFIG_DVB_CORE is not set | 820 | # CONFIG_DVB_CORE is not set |
| 821 | # CONFIG_VIDEO_MEDIA is not set | ||
| 822 | |||
| 823 | # | ||
| 824 | # Multimedia drivers | ||
| 825 | # | ||
| 818 | CONFIG_DAB=y | 826 | CONFIG_DAB=y |
| 819 | # CONFIG_USB_DABUSB is not set | 827 | # CONFIG_USB_DABUSB is not set |
| 820 | 828 | ||
| @@ -867,16 +875,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 867 | CONFIG_USB_DEVICE_CLASS=y | 875 | CONFIG_USB_DEVICE_CLASS=y |
| 868 | # CONFIG_USB_DYNAMIC_MINORS is not set | 876 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 869 | # CONFIG_USB_OTG is not set | 877 | # CONFIG_USB_OTG is not set |
| 878 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 879 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 870 | 880 | ||
| 871 | # | 881 | # |
| 872 | # USB Host Controller Drivers | 882 | # USB Host Controller Drivers |
| 873 | # | 883 | # |
| 884 | # CONFIG_USB_C67X00_HCD is not set | ||
| 874 | CONFIG_USB_EHCI_HCD=y | 885 | CONFIG_USB_EHCI_HCD=y |
| 875 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 886 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 876 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 887 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 877 | # CONFIG_USB_EHCI_FSL is not set | 888 | # CONFIG_USB_EHCI_FSL is not set |
| 878 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 889 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 879 | # CONFIG_USB_ISP116X_HCD is not set | 890 | # CONFIG_USB_ISP116X_HCD is not set |
| 891 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 880 | CONFIG_USB_OHCI_HCD=y | 892 | CONFIG_USB_OHCI_HCD=y |
| 881 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 893 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 882 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 894 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -894,6 +906,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 894 | # | 906 | # |
| 895 | # CONFIG_USB_ACM is not set | 907 | # CONFIG_USB_ACM is not set |
| 896 | # CONFIG_USB_PRINTER is not set | 908 | # CONFIG_USB_PRINTER is not set |
| 909 | # CONFIG_USB_WDM is not set | ||
| 897 | 910 | ||
| 898 | # | 911 | # |
| 899 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 912 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -913,7 +926,9 @@ CONFIG_USB_STORAGE=y | |||
| 913 | # CONFIG_USB_STORAGE_SDDR55 is not set | 926 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 914 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 927 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 915 | # CONFIG_USB_STORAGE_ALAUDA is not set | 928 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 929 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 916 | # CONFIG_USB_STORAGE_KARMA is not set | 930 | # CONFIG_USB_STORAGE_KARMA is not set |
| 931 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 917 | # CONFIG_USB_LIBUSUAL is not set | 932 | # CONFIG_USB_LIBUSUAL is not set |
| 918 | 933 | ||
| 919 | # | 934 | # |
| @@ -951,6 +966,7 @@ CONFIG_USB_MON=y | |||
| 951 | # CONFIG_USB_TRANCEVIBRATOR is not set | 966 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 952 | # CONFIG_USB_IOWARRIOR is not set | 967 | # CONFIG_USB_IOWARRIOR is not set |
| 953 | # CONFIG_USB_TEST is not set | 968 | # CONFIG_USB_TEST is not set |
| 969 | # CONFIG_USB_ISIGHTFW is not set | ||
| 954 | # CONFIG_USB_GADGET is not set | 970 | # CONFIG_USB_GADGET is not set |
| 955 | CONFIG_MMC=y | 971 | CONFIG_MMC=y |
| 956 | # CONFIG_MMC_DEBUG is not set | 972 | # CONFIG_MMC_DEBUG is not set |
| @@ -962,6 +978,7 @@ CONFIG_MMC=y | |||
| 962 | CONFIG_MMC_BLOCK=y | 978 | CONFIG_MMC_BLOCK=y |
| 963 | CONFIG_MMC_BLOCK_BOUNCE=y | 979 | CONFIG_MMC_BLOCK_BOUNCE=y |
| 964 | # CONFIG_SDIO_UART is not set | 980 | # CONFIG_SDIO_UART is not set |
| 981 | # CONFIG_MMC_TEST is not set | ||
| 965 | 982 | ||
| 966 | # | 983 | # |
| 967 | # MMC/SD Host Controller Drivers | 984 | # MMC/SD Host Controller Drivers |
| @@ -972,14 +989,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y | |||
| 972 | CONFIG_MMC_SPI=y | 989 | CONFIG_MMC_SPI=y |
| 973 | # CONFIG_MEMSTICK is not set | 990 | # CONFIG_MEMSTICK is not set |
| 974 | # CONFIG_NEW_LEDS is not set | 991 | # CONFIG_NEW_LEDS is not set |
| 992 | # CONFIG_ACCESSIBILITY is not set | ||
| 975 | # CONFIG_INFINIBAND is not set | 993 | # CONFIG_INFINIBAND is not set |
| 976 | # CONFIG_EDAC is not set | 994 | # CONFIG_EDAC is not set |
| 977 | # CONFIG_RTC_CLASS is not set | 995 | # CONFIG_RTC_CLASS is not set |
| 978 | # CONFIG_DMADEVICES is not set | 996 | # CONFIG_DMADEVICES is not set |
| 979 | |||
| 980 | # | ||
| 981 | # Userspace I/O | ||
| 982 | # | ||
| 983 | # CONFIG_UIO is not set | 997 | # CONFIG_UIO is not set |
| 984 | 998 | ||
| 985 | # | 999 | # |
| @@ -999,7 +1013,6 @@ CONFIG_FS_MBCACHE=y | |||
| 999 | # CONFIG_JFS_FS is not set | 1013 | # CONFIG_JFS_FS is not set |
| 1000 | # CONFIG_FS_POSIX_ACL is not set | 1014 | # CONFIG_FS_POSIX_ACL is not set |
| 1001 | # CONFIG_XFS_FS is not set | 1015 | # CONFIG_XFS_FS is not set |
| 1002 | # CONFIG_GFS2_FS is not set | ||
| 1003 | # CONFIG_OCFS2_FS is not set | 1016 | # CONFIG_OCFS2_FS is not set |
| 1004 | CONFIG_DNOTIFY=y | 1017 | CONFIG_DNOTIFY=y |
| 1005 | CONFIG_INOTIFY=y | 1018 | CONFIG_INOTIFY=y |
| @@ -1060,7 +1073,6 @@ CONFIG_NFS_FS=y | |||
| 1060 | CONFIG_NFS_V3=y | 1073 | CONFIG_NFS_V3=y |
| 1061 | # CONFIG_NFS_V3_ACL is not set | 1074 | # CONFIG_NFS_V3_ACL is not set |
| 1062 | CONFIG_NFS_V4=y | 1075 | CONFIG_NFS_V4=y |
| 1063 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1064 | # CONFIG_NFSD is not set | 1076 | # CONFIG_NFSD is not set |
| 1065 | CONFIG_ROOT_NFS=y | 1077 | CONFIG_ROOT_NFS=y |
| 1066 | CONFIG_LOCKD=y | 1078 | CONFIG_LOCKD=y |
| @@ -1147,6 +1159,7 @@ CONFIG_UCC=y | |||
| 1147 | # Library routines | 1159 | # Library routines |
| 1148 | # | 1160 | # |
| 1149 | CONFIG_BITREVERSE=y | 1161 | CONFIG_BITREVERSE=y |
| 1162 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1150 | # CONFIG_CRC_CCITT is not set | 1163 | # CONFIG_CRC_CCITT is not set |
| 1151 | # CONFIG_CRC16 is not set | 1164 | # CONFIG_CRC16 is not set |
| 1152 | CONFIG_CRC_ITU_T=y | 1165 | CONFIG_CRC_ITU_T=y |
| @@ -1157,6 +1170,7 @@ CONFIG_PLIST=y | |||
| 1157 | CONFIG_HAS_IOMEM=y | 1170 | CONFIG_HAS_IOMEM=y |
| 1158 | CONFIG_HAS_IOPORT=y | 1171 | CONFIG_HAS_IOPORT=y |
| 1159 | CONFIG_HAS_DMA=y | 1172 | CONFIG_HAS_DMA=y |
| 1173 | CONFIG_HAVE_LMB=y | ||
| 1160 | 1174 | ||
| 1161 | # | 1175 | # |
| 1162 | # Kernel hacking | 1176 | # Kernel hacking |
| @@ -1164,6 +1178,7 @@ CONFIG_HAS_DMA=y | |||
| 1164 | # CONFIG_PRINTK_TIME is not set | 1178 | # CONFIG_PRINTK_TIME is not set |
| 1165 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1179 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1166 | CONFIG_ENABLE_MUST_CHECK=y | 1180 | CONFIG_ENABLE_MUST_CHECK=y |
| 1181 | CONFIG_FRAME_WARN=1024 | ||
| 1167 | # CONFIG_MAGIC_SYSRQ is not set | 1182 | # CONFIG_MAGIC_SYSRQ is not set |
| 1168 | # CONFIG_UNUSED_SYMBOLS is not set | 1183 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1169 | # CONFIG_DEBUG_FS is not set | 1184 | # CONFIG_DEBUG_FS is not set |
| @@ -1173,6 +1188,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1173 | # CONFIG_SLUB_STATS is not set | 1188 | # CONFIG_SLUB_STATS is not set |
| 1174 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1189 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1175 | # CONFIG_SAMPLES is not set | 1190 | # CONFIG_SAMPLES is not set |
| 1191 | # CONFIG_IRQSTACKS is not set | ||
| 1176 | # CONFIG_PPC_EARLY_DEBUG is not set | 1192 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1177 | 1193 | ||
| 1178 | # | 1194 | # |
| @@ -1182,52 +1198,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1182 | # CONFIG_SECURITY is not set | 1198 | # CONFIG_SECURITY is not set |
| 1183 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1199 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1184 | CONFIG_CRYPTO=y | 1200 | CONFIG_CRYPTO=y |
| 1201 | |||
| 1202 | # | ||
| 1203 | # Crypto core or helper | ||
| 1204 | # | ||
| 1185 | CONFIG_CRYPTO_ALGAPI=y | 1205 | CONFIG_CRYPTO_ALGAPI=y |
| 1186 | CONFIG_CRYPTO_BLKCIPHER=y | 1206 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1187 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1188 | CONFIG_CRYPTO_MANAGER=y | 1207 | CONFIG_CRYPTO_MANAGER=y |
| 1208 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1209 | # CONFIG_CRYPTO_NULL is not set | ||
| 1210 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1211 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1212 | # CONFIG_CRYPTO_TEST is not set | ||
| 1213 | |||
| 1214 | # | ||
| 1215 | # Authenticated Encryption with Associated Data | ||
| 1216 | # | ||
| 1217 | # CONFIG_CRYPTO_CCM is not set | ||
| 1218 | # CONFIG_CRYPTO_GCM is not set | ||
| 1219 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1220 | |||
| 1221 | # | ||
| 1222 | # Block modes | ||
| 1223 | # | ||
| 1224 | CONFIG_CRYPTO_CBC=y | ||
| 1225 | # CONFIG_CRYPTO_CTR is not set | ||
| 1226 | # CONFIG_CRYPTO_CTS is not set | ||
| 1227 | CONFIG_CRYPTO_ECB=m | ||
| 1228 | # CONFIG_CRYPTO_LRW is not set | ||
| 1229 | CONFIG_CRYPTO_PCBC=m | ||
| 1230 | # CONFIG_CRYPTO_XTS is not set | ||
| 1231 | |||
| 1232 | # | ||
| 1233 | # Hash modes | ||
| 1234 | # | ||
| 1189 | # CONFIG_CRYPTO_HMAC is not set | 1235 | # CONFIG_CRYPTO_HMAC is not set |
| 1190 | # CONFIG_CRYPTO_XCBC is not set | 1236 | # CONFIG_CRYPTO_XCBC is not set |
| 1191 | # CONFIG_CRYPTO_NULL is not set | 1237 | |
| 1238 | # | ||
| 1239 | # Digest | ||
| 1240 | # | ||
| 1241 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1192 | # CONFIG_CRYPTO_MD4 is not set | 1242 | # CONFIG_CRYPTO_MD4 is not set |
| 1193 | CONFIG_CRYPTO_MD5=y | 1243 | CONFIG_CRYPTO_MD5=y |
| 1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1194 | # CONFIG_CRYPTO_SHA1 is not set | 1245 | # CONFIG_CRYPTO_SHA1 is not set |
| 1195 | # CONFIG_CRYPTO_SHA256 is not set | 1246 | # CONFIG_CRYPTO_SHA256 is not set |
| 1196 | # CONFIG_CRYPTO_SHA512 is not set | 1247 | # CONFIG_CRYPTO_SHA512 is not set |
| 1197 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1198 | # CONFIG_CRYPTO_TGR192 is not set | 1248 | # CONFIG_CRYPTO_TGR192 is not set |
| 1199 | # CONFIG_CRYPTO_GF128MUL is not set | 1249 | # CONFIG_CRYPTO_WP512 is not set |
| 1200 | CONFIG_CRYPTO_ECB=m | 1250 | |
| 1201 | CONFIG_CRYPTO_CBC=y | 1251 | # |
| 1202 | CONFIG_CRYPTO_PCBC=m | 1252 | # Ciphers |
| 1203 | # CONFIG_CRYPTO_LRW is not set | 1253 | # |
| 1204 | # CONFIG_CRYPTO_XTS is not set | ||
| 1205 | # CONFIG_CRYPTO_CTR is not set | ||
| 1206 | # CONFIG_CRYPTO_GCM is not set | ||
| 1207 | # CONFIG_CRYPTO_CCM is not set | ||
| 1208 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1209 | CONFIG_CRYPTO_DES=y | ||
| 1210 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1211 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1212 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1213 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1214 | # CONFIG_CRYPTO_AES is not set | 1254 | # CONFIG_CRYPTO_AES is not set |
| 1255 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1256 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1257 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1258 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1215 | # CONFIG_CRYPTO_CAST5 is not set | 1259 | # CONFIG_CRYPTO_CAST5 is not set |
| 1216 | # CONFIG_CRYPTO_CAST6 is not set | 1260 | # CONFIG_CRYPTO_CAST6 is not set |
| 1217 | # CONFIG_CRYPTO_TEA is not set | 1261 | CONFIG_CRYPTO_DES=y |
| 1218 | # CONFIG_CRYPTO_ARC4 is not set | 1262 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1219 | # CONFIG_CRYPTO_KHAZAD is not set | 1263 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1220 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1221 | # CONFIG_CRYPTO_SEED is not set | ||
| 1222 | # CONFIG_CRYPTO_SALSA20 is not set | 1264 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1265 | # CONFIG_CRYPTO_SEED is not set | ||
| 1266 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1267 | # CONFIG_CRYPTO_TEA is not set | ||
| 1268 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1269 | |||
| 1270 | # | ||
| 1271 | # Compression | ||
| 1272 | # | ||
| 1223 | # CONFIG_CRYPTO_DEFLATE is not set | 1273 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1224 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1225 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1226 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1227 | # CONFIG_CRYPTO_TEST is not set | ||
| 1228 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1229 | # CONFIG_CRYPTO_LZO is not set | 1274 | # CONFIG_CRYPTO_LZO is not set |
| 1230 | CONFIG_CRYPTO_HW=y | 1275 | CONFIG_CRYPTO_HW=y |
| 1231 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1276 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1232 | # CONFIG_PPC_CLOCK is not set | 1277 | # CONFIG_PPC_CLOCK is not set |
| 1233 | CONFIG_PPC_LIB_RHEAP=y | 1278 | CONFIG_PPC_LIB_RHEAP=y |
| 1279 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index e1de399a7bdd..b47fc9185708 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:17 2008 | 4 | # Mon Jun 9 08:52:25 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -432,6 +438,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 432 | # | 438 | # |
| 433 | # CONFIG_MTD_UBI is not set | 439 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
| 441 | CONFIG_OF_I2C=y | ||
| 435 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 436 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
| 437 | # CONFIG_BLK_DEV_FD is not set | 444 | # CONFIG_BLK_DEV_FD is not set |
| @@ -541,7 +548,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 541 | # CONFIG_SCSI_SRP is not set | 548 | # CONFIG_SCSI_SRP is not set |
| 542 | CONFIG_ATA=y | 549 | CONFIG_ATA=y |
| 543 | # CONFIG_ATA_NONSTANDARD is not set | 550 | # CONFIG_ATA_NONSTANDARD is not set |
| 551 | CONFIG_SATA_PMP=y | ||
| 544 | # CONFIG_SATA_AHCI is not set | 552 | # CONFIG_SATA_AHCI is not set |
| 553 | # CONFIG_SATA_SIL24 is not set | ||
| 554 | # CONFIG_SATA_FSL is not set | ||
| 555 | CONFIG_ATA_SFF=y | ||
| 545 | # CONFIG_SATA_SVW is not set | 556 | # CONFIG_SATA_SVW is not set |
| 546 | # CONFIG_ATA_PIIX is not set | 557 | # CONFIG_ATA_PIIX is not set |
| 547 | # CONFIG_SATA_MV is not set | 558 | # CONFIG_SATA_MV is not set |
| @@ -551,13 +562,11 @@ CONFIG_ATA=y | |||
| 551 | # CONFIG_SATA_PROMISE is not set | 562 | # CONFIG_SATA_PROMISE is not set |
| 552 | # CONFIG_SATA_SX4 is not set | 563 | # CONFIG_SATA_SX4 is not set |
| 553 | CONFIG_SATA_SIL=y | 564 | CONFIG_SATA_SIL=y |
| 554 | # CONFIG_SATA_SIL24 is not set | ||
| 555 | # CONFIG_SATA_SIS is not set | 565 | # CONFIG_SATA_SIS is not set |
| 556 | # CONFIG_SATA_ULI is not set | 566 | # CONFIG_SATA_ULI is not set |
| 557 | # CONFIG_SATA_VIA is not set | 567 | # CONFIG_SATA_VIA is not set |
| 558 | # CONFIG_SATA_VITESSE is not set | 568 | # CONFIG_SATA_VITESSE is not set |
| 559 | # CONFIG_SATA_INIC162X is not set | 569 | # CONFIG_SATA_INIC162X is not set |
| 560 | # CONFIG_SATA_FSL is not set | ||
| 561 | # CONFIG_PATA_ALI is not set | 570 | # CONFIG_PATA_ALI is not set |
| 562 | # CONFIG_PATA_AMD is not set | 571 | # CONFIG_PATA_AMD is not set |
| 563 | # CONFIG_PATA_ARTOP is not set | 572 | # CONFIG_PATA_ARTOP is not set |
| @@ -598,6 +607,7 @@ CONFIG_SATA_SIL=y | |||
| 598 | # CONFIG_PATA_WINBOND is not set | 607 | # CONFIG_PATA_WINBOND is not set |
| 599 | CONFIG_PATA_PLATFORM=y | 608 | CONFIG_PATA_PLATFORM=y |
| 600 | CONFIG_PATA_OF_PLATFORM=y | 609 | CONFIG_PATA_OF_PLATFORM=y |
| 610 | # CONFIG_PATA_SCH is not set | ||
| 601 | CONFIG_MD=y | 611 | CONFIG_MD=y |
| 602 | CONFIG_BLK_DEV_MD=y | 612 | CONFIG_BLK_DEV_MD=y |
| 603 | CONFIG_MD_LINEAR=y | 613 | CONFIG_MD_LINEAR=y |
| @@ -659,7 +669,6 @@ CONFIG_NETDEV_1000=y | |||
| 659 | # CONFIG_SIS190 is not set | 669 | # CONFIG_SIS190 is not set |
| 660 | # CONFIG_SKGE is not set | 670 | # CONFIG_SKGE is not set |
| 661 | # CONFIG_SKY2 is not set | 671 | # CONFIG_SKY2 is not set |
| 662 | # CONFIG_SK98LIN is not set | ||
| 663 | # CONFIG_VIA_VELOCITY is not set | 672 | # CONFIG_VIA_VELOCITY is not set |
| 664 | # CONFIG_TIGON3 is not set | 673 | # CONFIG_TIGON3 is not set |
| 665 | # CONFIG_BNX2 is not set | 674 | # CONFIG_BNX2 is not set |
| @@ -679,6 +688,7 @@ CONFIG_NETDEV_10000=y | |||
| 679 | # CONFIG_MLX4_CORE is not set | 688 | # CONFIG_MLX4_CORE is not set |
| 680 | # CONFIG_TEHUTI is not set | 689 | # CONFIG_TEHUTI is not set |
| 681 | # CONFIG_BNX2X is not set | 690 | # CONFIG_BNX2X is not set |
| 691 | # CONFIG_SFC is not set | ||
| 682 | # CONFIG_TR is not set | 692 | # CONFIG_TR is not set |
| 683 | 693 | ||
| 684 | # | 694 | # |
| @@ -686,6 +696,7 @@ CONFIG_NETDEV_10000=y | |||
| 686 | # | 696 | # |
| 687 | # CONFIG_WLAN_PRE80211 is not set | 697 | # CONFIG_WLAN_PRE80211 is not set |
| 688 | # CONFIG_WLAN_80211 is not set | 698 | # CONFIG_WLAN_80211 is not set |
| 699 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 689 | 700 | ||
| 690 | # | 701 | # |
| 691 | # USB Network Adapters | 702 | # USB Network Adapters |
| @@ -722,6 +733,7 @@ CONFIG_NETDEV_10000=y | |||
| 722 | # Character devices | 733 | # Character devices |
| 723 | # | 734 | # |
| 724 | # CONFIG_VT is not set | 735 | # CONFIG_VT is not set |
| 736 | CONFIG_DEVKMEM=y | ||
| 725 | # CONFIG_SERIAL_NONSTANDARD is not set | 737 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 726 | # CONFIG_NOZOMI is not set | 738 | # CONFIG_NOZOMI is not set |
| 727 | 739 | ||
| @@ -749,7 +761,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 749 | # CONFIG_IPMI_HANDLER is not set | 761 | # CONFIG_IPMI_HANDLER is not set |
| 750 | CONFIG_HW_RANDOM=y | 762 | CONFIG_HW_RANDOM=y |
| 751 | # CONFIG_NVRAM is not set | 763 | # CONFIG_NVRAM is not set |
| 752 | # CONFIG_GEN_RTC is not set | ||
| 753 | # CONFIG_R3964 is not set | 764 | # CONFIG_R3964 is not set |
| 754 | # CONFIG_APPLICOM is not set | 765 | # CONFIG_APPLICOM is not set |
| 755 | # CONFIG_RAW_DRIVER is not set | 766 | # CONFIG_RAW_DRIVER is not set |
| @@ -760,13 +771,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 760 | CONFIG_I2C_CHARDEV=y | 771 | CONFIG_I2C_CHARDEV=y |
| 761 | 772 | ||
| 762 | # | 773 | # |
| 763 | # I2C Algorithms | ||
| 764 | # | ||
| 765 | # CONFIG_I2C_ALGOBIT is not set | ||
| 766 | # CONFIG_I2C_ALGOPCF is not set | ||
| 767 | # CONFIG_I2C_ALGOPCA is not set | ||
| 768 | |||
| 769 | # | ||
| 770 | # I2C Hardware Bus support | 774 | # I2C Hardware Bus support |
| 771 | # | 775 | # |
| 772 | # CONFIG_I2C_ALI1535 is not set | 776 | # CONFIG_I2C_ALI1535 is not set |
| @@ -793,6 +797,7 @@ CONFIG_I2C_MPC=y | |||
| 793 | # CONFIG_I2C_VIA is not set | 797 | # CONFIG_I2C_VIA is not set |
| 794 | # CONFIG_I2C_VIAPRO is not set | 798 | # CONFIG_I2C_VIAPRO is not set |
| 795 | # CONFIG_I2C_VOODOO3 is not set | 799 | # CONFIG_I2C_VOODOO3 is not set |
| 800 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 796 | 801 | ||
| 797 | # | 802 | # |
| 798 | # Miscellaneous I2C Chip support | 803 | # Miscellaneous I2C Chip support |
| @@ -802,17 +807,12 @@ CONFIG_I2C_MPC=y | |||
| 802 | CONFIG_SENSORS_PCF8574=y | 807 | CONFIG_SENSORS_PCF8574=y |
| 803 | # CONFIG_PCF8575 is not set | 808 | # CONFIG_PCF8575 is not set |
| 804 | # CONFIG_SENSORS_PCF8591 is not set | 809 | # CONFIG_SENSORS_PCF8591 is not set |
| 805 | # CONFIG_TPS65010 is not set | ||
| 806 | # CONFIG_SENSORS_MAX6875 is not set | 810 | # CONFIG_SENSORS_MAX6875 is not set |
| 807 | # CONFIG_SENSORS_TSL2550 is not set | 811 | # CONFIG_SENSORS_TSL2550 is not set |
| 808 | # CONFIG_I2C_DEBUG_CORE is not set | 812 | # CONFIG_I2C_DEBUG_CORE is not set |
| 809 | # CONFIG_I2C_DEBUG_ALGO is not set | 813 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 810 | # CONFIG_I2C_DEBUG_BUS is not set | 814 | # CONFIG_I2C_DEBUG_BUS is not set |
| 811 | # CONFIG_I2C_DEBUG_CHIP is not set | 815 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 812 | |||
| 813 | # | ||
| 814 | # SPI support | ||
| 815 | # | ||
| 816 | CONFIG_SPI=y | 816 | CONFIG_SPI=y |
| 817 | CONFIG_SPI_MASTER=y | 817 | CONFIG_SPI_MASTER=y |
| 818 | 818 | ||
| @@ -862,12 +862,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 862 | # Multifunction device drivers | 862 | # Multifunction device drivers |
| 863 | # | 863 | # |
| 864 | # CONFIG_MFD_SM501 is not set | 864 | # CONFIG_MFD_SM501 is not set |
| 865 | # CONFIG_HTC_PASIC3 is not set | ||
| 865 | 866 | ||
| 866 | # | 867 | # |
| 867 | # Multimedia devices | 868 | # Multimedia devices |
| 868 | # | 869 | # |
| 870 | |||
| 871 | # | ||
| 872 | # Multimedia core support | ||
| 873 | # | ||
| 869 | # CONFIG_VIDEO_DEV is not set | 874 | # CONFIG_VIDEO_DEV is not set |
| 870 | # CONFIG_DVB_CORE is not set | 875 | # CONFIG_DVB_CORE is not set |
| 876 | # CONFIG_VIDEO_MEDIA is not set | ||
| 877 | |||
| 878 | # | ||
| 879 | # Multimedia drivers | ||
| 880 | # | ||
| 871 | CONFIG_DAB=y | 881 | CONFIG_DAB=y |
| 872 | # CONFIG_USB_DABUSB is not set | 882 | # CONFIG_USB_DABUSB is not set |
| 873 | 883 | ||
| @@ -905,16 +915,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 905 | CONFIG_USB_DEVICE_CLASS=y | 915 | CONFIG_USB_DEVICE_CLASS=y |
| 906 | # CONFIG_USB_DYNAMIC_MINORS is not set | 916 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 907 | # CONFIG_USB_OTG is not set | 917 | # CONFIG_USB_OTG is not set |
| 918 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 908 | 920 | ||
| 909 | # | 921 | # |
| 910 | # USB Host Controller Drivers | 922 | # USB Host Controller Drivers |
| 911 | # | 923 | # |
| 924 | # CONFIG_USB_C67X00_HCD is not set | ||
| 912 | CONFIG_USB_EHCI_HCD=y | 925 | CONFIG_USB_EHCI_HCD=y |
| 913 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 926 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 914 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 927 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 915 | CONFIG_USB_EHCI_FSL=y | 928 | CONFIG_USB_EHCI_FSL=y |
| 916 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 929 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 917 | # CONFIG_USB_ISP116X_HCD is not set | 930 | # CONFIG_USB_ISP116X_HCD is not set |
| 931 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 918 | # CONFIG_USB_OHCI_HCD is not set | 932 | # CONFIG_USB_OHCI_HCD is not set |
| 919 | CONFIG_USB_UHCI_HCD=y | 933 | CONFIG_USB_UHCI_HCD=y |
| 920 | # CONFIG_USB_SL811_HCD is not set | 934 | # CONFIG_USB_SL811_HCD is not set |
| @@ -925,6 +939,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 925 | # | 939 | # |
| 926 | # CONFIG_USB_ACM is not set | 940 | # CONFIG_USB_ACM is not set |
| 927 | # CONFIG_USB_PRINTER is not set | 941 | # CONFIG_USB_PRINTER is not set |
| 942 | # CONFIG_USB_WDM is not set | ||
| 928 | 943 | ||
| 929 | # | 944 | # |
| 930 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 945 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -945,6 +960,7 @@ CONFIG_USB_STORAGE=y | |||
| 945 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 960 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 946 | # CONFIG_USB_STORAGE_ALAUDA is not set | 961 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 947 | # CONFIG_USB_STORAGE_KARMA is not set | 962 | # CONFIG_USB_STORAGE_KARMA is not set |
| 963 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 948 | # CONFIG_USB_LIBUSUAL is not set | 964 | # CONFIG_USB_LIBUSUAL is not set |
| 949 | 965 | ||
| 950 | # | 966 | # |
| @@ -982,10 +998,12 @@ CONFIG_USB_MON=y | |||
| 982 | # CONFIG_USB_TRANCEVIBRATOR is not set | 998 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 983 | # CONFIG_USB_IOWARRIOR is not set | 999 | # CONFIG_USB_IOWARRIOR is not set |
| 984 | # CONFIG_USB_TEST is not set | 1000 | # CONFIG_USB_TEST is not set |
| 1001 | # CONFIG_USB_ISIGHTFW is not set | ||
| 985 | # CONFIG_USB_GADGET is not set | 1002 | # CONFIG_USB_GADGET is not set |
| 986 | # CONFIG_MMC is not set | 1003 | # CONFIG_MMC is not set |
| 987 | # CONFIG_MEMSTICK is not set | 1004 | # CONFIG_MEMSTICK is not set |
| 988 | # CONFIG_NEW_LEDS is not set | 1005 | # CONFIG_NEW_LEDS is not set |
| 1006 | # CONFIG_ACCESSIBILITY is not set | ||
| 989 | # CONFIG_INFINIBAND is not set | 1007 | # CONFIG_INFINIBAND is not set |
| 990 | # CONFIG_EDAC is not set | 1008 | # CONFIG_EDAC is not set |
| 991 | CONFIG_RTC_LIB=y | 1009 | CONFIG_RTC_LIB=y |
| @@ -1040,11 +1058,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1040 | # | 1058 | # |
| 1041 | # on-CPU RTC drivers | 1059 | # on-CPU RTC drivers |
| 1042 | # | 1060 | # |
| 1061 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1043 | # CONFIG_DMADEVICES is not set | 1062 | # CONFIG_DMADEVICES is not set |
| 1044 | |||
| 1045 | # | ||
| 1046 | # Userspace I/O | ||
| 1047 | # | ||
| 1048 | # CONFIG_UIO is not set | 1063 | # CONFIG_UIO is not set |
| 1049 | 1064 | ||
| 1050 | # | 1065 | # |
| @@ -1064,7 +1079,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1064 | # CONFIG_JFS_FS is not set | 1079 | # CONFIG_JFS_FS is not set |
| 1065 | # CONFIG_FS_POSIX_ACL is not set | 1080 | # CONFIG_FS_POSIX_ACL is not set |
| 1066 | # CONFIG_XFS_FS is not set | 1081 | # CONFIG_XFS_FS is not set |
| 1067 | # CONFIG_GFS2_FS is not set | ||
| 1068 | # CONFIG_OCFS2_FS is not set | 1082 | # CONFIG_OCFS2_FS is not set |
| 1069 | CONFIG_DNOTIFY=y | 1083 | CONFIG_DNOTIFY=y |
| 1070 | CONFIG_INOTIFY=y | 1084 | CONFIG_INOTIFY=y |
| @@ -1126,7 +1140,6 @@ CONFIG_NFS_FS=y | |||
| 1126 | CONFIG_NFS_V3=y | 1140 | CONFIG_NFS_V3=y |
| 1127 | # CONFIG_NFS_V3_ACL is not set | 1141 | # CONFIG_NFS_V3_ACL is not set |
| 1128 | CONFIG_NFS_V4=y | 1142 | CONFIG_NFS_V4=y |
| 1129 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1130 | # CONFIG_NFSD is not set | 1143 | # CONFIG_NFSD is not set |
| 1131 | CONFIG_ROOT_NFS=y | 1144 | CONFIG_ROOT_NFS=y |
| 1132 | CONFIG_LOCKD=y | 1145 | CONFIG_LOCKD=y |
| @@ -1210,6 +1223,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1210 | # Library routines | 1223 | # Library routines |
| 1211 | # | 1224 | # |
| 1212 | CONFIG_BITREVERSE=y | 1225 | CONFIG_BITREVERSE=y |
| 1226 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1213 | # CONFIG_CRC_CCITT is not set | 1227 | # CONFIG_CRC_CCITT is not set |
| 1214 | # CONFIG_CRC16 is not set | 1228 | # CONFIG_CRC16 is not set |
| 1215 | # CONFIG_CRC_ITU_T is not set | 1229 | # CONFIG_CRC_ITU_T is not set |
| @@ -1220,6 +1234,7 @@ CONFIG_PLIST=y | |||
| 1220 | CONFIG_HAS_IOMEM=y | 1234 | CONFIG_HAS_IOMEM=y |
| 1221 | CONFIG_HAS_IOPORT=y | 1235 | CONFIG_HAS_IOPORT=y |
| 1222 | CONFIG_HAS_DMA=y | 1236 | CONFIG_HAS_DMA=y |
| 1237 | CONFIG_HAVE_LMB=y | ||
| 1223 | 1238 | ||
| 1224 | # | 1239 | # |
| 1225 | # Kernel hacking | 1240 | # Kernel hacking |
| @@ -1227,6 +1242,7 @@ CONFIG_HAS_DMA=y | |||
| 1227 | # CONFIG_PRINTK_TIME is not set | 1242 | # CONFIG_PRINTK_TIME is not set |
| 1228 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1243 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1229 | CONFIG_ENABLE_MUST_CHECK=y | 1244 | CONFIG_ENABLE_MUST_CHECK=y |
| 1245 | CONFIG_FRAME_WARN=1024 | ||
| 1230 | # CONFIG_MAGIC_SYSRQ is not set | 1246 | # CONFIG_MAGIC_SYSRQ is not set |
| 1231 | # CONFIG_UNUSED_SYMBOLS is not set | 1247 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1232 | # CONFIG_DEBUG_FS is not set | 1248 | # CONFIG_DEBUG_FS is not set |
| @@ -1236,6 +1252,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1236 | # CONFIG_SLUB_STATS is not set | 1252 | # CONFIG_SLUB_STATS is not set |
| 1237 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1253 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1238 | # CONFIG_SAMPLES is not set | 1254 | # CONFIG_SAMPLES is not set |
| 1255 | # CONFIG_IRQSTACKS is not set | ||
| 1239 | # CONFIG_PPC_EARLY_DEBUG is not set | 1256 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1240 | 1257 | ||
| 1241 | # | 1258 | # |
| @@ -1245,51 +1262,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1245 | # CONFIG_SECURITY is not set | 1262 | # CONFIG_SECURITY is not set |
| 1246 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1263 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1247 | CONFIG_CRYPTO=y | 1264 | CONFIG_CRYPTO=y |
| 1265 | |||
| 1266 | # | ||
| 1267 | # Crypto core or helper | ||
| 1268 | # | ||
| 1248 | CONFIG_CRYPTO_ALGAPI=y | 1269 | CONFIG_CRYPTO_ALGAPI=y |
| 1249 | CONFIG_CRYPTO_BLKCIPHER=y | 1270 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1250 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1251 | CONFIG_CRYPTO_MANAGER=y | 1271 | CONFIG_CRYPTO_MANAGER=y |
| 1272 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1273 | # CONFIG_CRYPTO_NULL is not set | ||
| 1274 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1275 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1276 | # CONFIG_CRYPTO_TEST is not set | ||
| 1277 | |||
| 1278 | # | ||
| 1279 | # Authenticated Encryption with Associated Data | ||
| 1280 | # | ||
| 1281 | # CONFIG_CRYPTO_CCM is not set | ||
| 1282 | # CONFIG_CRYPTO_GCM is not set | ||
| 1283 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1284 | |||
| 1285 | # | ||
| 1286 | # Block modes | ||
| 1287 | # | ||
| 1288 | CONFIG_CRYPTO_CBC=y | ||
| 1289 | # CONFIG_CRYPTO_CTR is not set | ||
| 1290 | # CONFIG_CRYPTO_CTS is not set | ||
| 1291 | # CONFIG_CRYPTO_ECB is not set | ||
| 1292 | # CONFIG_CRYPTO_LRW is not set | ||
| 1293 | CONFIG_CRYPTO_PCBC=m | ||
| 1294 | # CONFIG_CRYPTO_XTS is not set | ||
| 1295 | |||
| 1296 | # | ||
| 1297 | # Hash modes | ||
| 1298 | # | ||
| 1252 | # CONFIG_CRYPTO_HMAC is not set | 1299 | # CONFIG_CRYPTO_HMAC is not set |
| 1253 | # CONFIG_CRYPTO_XCBC is not set | 1300 | # CONFIG_CRYPTO_XCBC is not set |
| 1254 | # CONFIG_CRYPTO_NULL is not set | 1301 | |
| 1302 | # | ||
| 1303 | # Digest | ||
| 1304 | # | ||
| 1305 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1255 | # CONFIG_CRYPTO_MD4 is not set | 1306 | # CONFIG_CRYPTO_MD4 is not set |
| 1256 | CONFIG_CRYPTO_MD5=y | 1307 | CONFIG_CRYPTO_MD5=y |
| 1308 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1257 | # CONFIG_CRYPTO_SHA1 is not set | 1309 | # CONFIG_CRYPTO_SHA1 is not set |
| 1258 | # CONFIG_CRYPTO_SHA256 is not set | 1310 | # CONFIG_CRYPTO_SHA256 is not set |
| 1259 | # CONFIG_CRYPTO_SHA512 is not set | 1311 | # CONFIG_CRYPTO_SHA512 is not set |
| 1260 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1261 | # CONFIG_CRYPTO_TGR192 is not set | 1312 | # CONFIG_CRYPTO_TGR192 is not set |
| 1262 | # CONFIG_CRYPTO_GF128MUL is not set | 1313 | # CONFIG_CRYPTO_WP512 is not set |
| 1263 | # CONFIG_CRYPTO_ECB is not set | 1314 | |
| 1264 | CONFIG_CRYPTO_CBC=y | 1315 | # |
| 1265 | CONFIG_CRYPTO_PCBC=m | 1316 | # Ciphers |
| 1266 | # CONFIG_CRYPTO_LRW is not set | 1317 | # |
| 1267 | # CONFIG_CRYPTO_XTS is not set | ||
| 1268 | # CONFIG_CRYPTO_CTR is not set | ||
| 1269 | # CONFIG_CRYPTO_GCM is not set | ||
| 1270 | # CONFIG_CRYPTO_CCM is not set | ||
| 1271 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1272 | CONFIG_CRYPTO_DES=y | ||
| 1273 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1274 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1275 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1276 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1277 | # CONFIG_CRYPTO_AES is not set | 1318 | # CONFIG_CRYPTO_AES is not set |
| 1319 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1320 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1321 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1322 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1278 | # CONFIG_CRYPTO_CAST5 is not set | 1323 | # CONFIG_CRYPTO_CAST5 is not set |
| 1279 | # CONFIG_CRYPTO_CAST6 is not set | 1324 | # CONFIG_CRYPTO_CAST6 is not set |
| 1280 | # CONFIG_CRYPTO_TEA is not set | 1325 | CONFIG_CRYPTO_DES=y |
| 1281 | # CONFIG_CRYPTO_ARC4 is not set | 1326 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1282 | # CONFIG_CRYPTO_KHAZAD is not set | 1327 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1283 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1284 | # CONFIG_CRYPTO_SEED is not set | ||
| 1285 | # CONFIG_CRYPTO_SALSA20 is not set | 1328 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1329 | # CONFIG_CRYPTO_SEED is not set | ||
| 1330 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1331 | # CONFIG_CRYPTO_TEA is not set | ||
| 1332 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1333 | |||
| 1334 | # | ||
| 1335 | # Compression | ||
| 1336 | # | ||
| 1286 | # CONFIG_CRYPTO_DEFLATE is not set | 1337 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1287 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1288 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1289 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1290 | # CONFIG_CRYPTO_TEST is not set | ||
| 1291 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1292 | # CONFIG_CRYPTO_LZO is not set | 1338 | # CONFIG_CRYPTO_LZO is not set |
| 1293 | CONFIG_CRYPTO_HW=y | 1339 | CONFIG_CRYPTO_HW=y |
| 1294 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1295 | # CONFIG_PPC_CLOCK is not set | 1341 | # CONFIG_PPC_CLOCK is not set |
| 1342 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index b4e39cf82a8c..fdac4845bad9 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:18 2008 | 4 | # Mon Jun 9 08:52:26 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -432,6 +438,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
| 432 | # | 438 | # |
| 433 | # CONFIG_MTD_UBI is not set | 439 | # CONFIG_MTD_UBI is not set |
| 434 | CONFIG_OF_DEVICE=y | 440 | CONFIG_OF_DEVICE=y |
| 441 | CONFIG_OF_I2C=y | ||
| 435 | # CONFIG_PARPORT is not set | 442 | # CONFIG_PARPORT is not set |
| 436 | CONFIG_BLK_DEV=y | 443 | CONFIG_BLK_DEV=y |
| 437 | # CONFIG_BLK_DEV_FD is not set | 444 | # CONFIG_BLK_DEV_FD is not set |
| @@ -587,7 +594,6 @@ CONFIG_NETDEV_1000=y | |||
| 587 | # CONFIG_SIS190 is not set | 594 | # CONFIG_SIS190 is not set |
| 588 | # CONFIG_SKGE is not set | 595 | # CONFIG_SKGE is not set |
| 589 | # CONFIG_SKY2 is not set | 596 | # CONFIG_SKY2 is not set |
| 590 | # CONFIG_SK98LIN is not set | ||
| 591 | # CONFIG_VIA_VELOCITY is not set | 597 | # CONFIG_VIA_VELOCITY is not set |
| 592 | # CONFIG_TIGON3 is not set | 598 | # CONFIG_TIGON3 is not set |
| 593 | # CONFIG_BNX2 is not set | 599 | # CONFIG_BNX2 is not set |
| @@ -607,6 +613,7 @@ CONFIG_NETDEV_10000=y | |||
| 607 | # CONFIG_MLX4_CORE is not set | 613 | # CONFIG_MLX4_CORE is not set |
| 608 | # CONFIG_TEHUTI is not set | 614 | # CONFIG_TEHUTI is not set |
| 609 | # CONFIG_BNX2X is not set | 615 | # CONFIG_BNX2X is not set |
| 616 | # CONFIG_SFC is not set | ||
| 610 | # CONFIG_TR is not set | 617 | # CONFIG_TR is not set |
| 611 | 618 | ||
| 612 | # | 619 | # |
| @@ -614,6 +621,7 @@ CONFIG_NETDEV_10000=y | |||
| 614 | # | 621 | # |
| 615 | # CONFIG_WLAN_PRE80211 is not set | 622 | # CONFIG_WLAN_PRE80211 is not set |
| 616 | # CONFIG_WLAN_80211 is not set | 623 | # CONFIG_WLAN_80211 is not set |
| 624 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 617 | 625 | ||
| 618 | # | 626 | # |
| 619 | # USB Network Adapters | 627 | # USB Network Adapters |
| @@ -650,6 +658,7 @@ CONFIG_NETDEV_10000=y | |||
| 650 | # Character devices | 658 | # Character devices |
| 651 | # | 659 | # |
| 652 | # CONFIG_VT is not set | 660 | # CONFIG_VT is not set |
| 661 | CONFIG_DEVKMEM=y | ||
| 653 | # CONFIG_SERIAL_NONSTANDARD is not set | 662 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 654 | # CONFIG_NOZOMI is not set | 663 | # CONFIG_NOZOMI is not set |
| 655 | 664 | ||
| @@ -677,7 +686,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 677 | # CONFIG_IPMI_HANDLER is not set | 686 | # CONFIG_IPMI_HANDLER is not set |
| 678 | CONFIG_HW_RANDOM=y | 687 | CONFIG_HW_RANDOM=y |
| 679 | # CONFIG_NVRAM is not set | 688 | # CONFIG_NVRAM is not set |
| 680 | # CONFIG_GEN_RTC is not set | ||
| 681 | # CONFIG_R3964 is not set | 689 | # CONFIG_R3964 is not set |
| 682 | # CONFIG_APPLICOM is not set | 690 | # CONFIG_APPLICOM is not set |
| 683 | # CONFIG_RAW_DRIVER is not set | 691 | # CONFIG_RAW_DRIVER is not set |
| @@ -688,13 +696,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 688 | CONFIG_I2C_CHARDEV=y | 696 | CONFIG_I2C_CHARDEV=y |
| 689 | 697 | ||
| 690 | # | 698 | # |
| 691 | # I2C Algorithms | ||
| 692 | # | ||
| 693 | # CONFIG_I2C_ALGOBIT is not set | ||
| 694 | # CONFIG_I2C_ALGOPCF is not set | ||
| 695 | # CONFIG_I2C_ALGOPCA is not set | ||
| 696 | |||
| 697 | # | ||
| 698 | # I2C Hardware Bus support | 699 | # I2C Hardware Bus support |
| 699 | # | 700 | # |
| 700 | # CONFIG_I2C_ALI1535 is not set | 701 | # CONFIG_I2C_ALI1535 is not set |
| @@ -721,6 +722,7 @@ CONFIG_I2C_MPC=y | |||
| 721 | # CONFIG_I2C_VIA is not set | 722 | # CONFIG_I2C_VIA is not set |
| 722 | # CONFIG_I2C_VIAPRO is not set | 723 | # CONFIG_I2C_VIAPRO is not set |
| 723 | # CONFIG_I2C_VOODOO3 is not set | 724 | # CONFIG_I2C_VOODOO3 is not set |
| 725 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 724 | 726 | ||
| 725 | # | 727 | # |
| 726 | # Miscellaneous I2C Chip support | 728 | # Miscellaneous I2C Chip support |
| @@ -730,17 +732,12 @@ CONFIG_I2C_MPC=y | |||
| 730 | CONFIG_SENSORS_PCF8574=y | 732 | CONFIG_SENSORS_PCF8574=y |
| 731 | # CONFIG_PCF8575 is not set | 733 | # CONFIG_PCF8575 is not set |
| 732 | # CONFIG_SENSORS_PCF8591 is not set | 734 | # CONFIG_SENSORS_PCF8591 is not set |
| 733 | # CONFIG_TPS65010 is not set | ||
| 734 | # CONFIG_SENSORS_MAX6875 is not set | 735 | # CONFIG_SENSORS_MAX6875 is not set |
| 735 | # CONFIG_SENSORS_TSL2550 is not set | 736 | # CONFIG_SENSORS_TSL2550 is not set |
| 736 | # CONFIG_I2C_DEBUG_CORE is not set | 737 | # CONFIG_I2C_DEBUG_CORE is not set |
| 737 | # CONFIG_I2C_DEBUG_ALGO is not set | 738 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 738 | # CONFIG_I2C_DEBUG_BUS is not set | 739 | # CONFIG_I2C_DEBUG_BUS is not set |
| 739 | # CONFIG_I2C_DEBUG_CHIP is not set | 740 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 740 | |||
| 741 | # | ||
| 742 | # SPI support | ||
| 743 | # | ||
| 744 | CONFIG_SPI=y | 741 | CONFIG_SPI=y |
| 745 | CONFIG_SPI_MASTER=y | 742 | CONFIG_SPI_MASTER=y |
| 746 | 743 | ||
| @@ -790,12 +787,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 790 | # Multifunction device drivers | 787 | # Multifunction device drivers |
| 791 | # | 788 | # |
| 792 | # CONFIG_MFD_SM501 is not set | 789 | # CONFIG_MFD_SM501 is not set |
| 790 | # CONFIG_HTC_PASIC3 is not set | ||
| 793 | 791 | ||
| 794 | # | 792 | # |
| 795 | # Multimedia devices | 793 | # Multimedia devices |
| 796 | # | 794 | # |
| 795 | |||
| 796 | # | ||
| 797 | # Multimedia core support | ||
| 798 | # | ||
| 797 | # CONFIG_VIDEO_DEV is not set | 799 | # CONFIG_VIDEO_DEV is not set |
| 798 | # CONFIG_DVB_CORE is not set | 800 | # CONFIG_DVB_CORE is not set |
| 801 | # CONFIG_VIDEO_MEDIA is not set | ||
| 802 | |||
| 803 | # | ||
| 804 | # Multimedia drivers | ||
| 805 | # | ||
| 799 | CONFIG_DAB=y | 806 | CONFIG_DAB=y |
| 800 | # CONFIG_USB_DABUSB is not set | 807 | # CONFIG_USB_DABUSB is not set |
| 801 | 808 | ||
| @@ -833,16 +840,20 @@ CONFIG_USB=y | |||
| 833 | CONFIG_USB_DEVICE_CLASS=y | 840 | CONFIG_USB_DEVICE_CLASS=y |
| 834 | # CONFIG_USB_DYNAMIC_MINORS is not set | 841 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 835 | # CONFIG_USB_OTG is not set | 842 | # CONFIG_USB_OTG is not set |
| 843 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 844 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 836 | 845 | ||
| 837 | # | 846 | # |
| 838 | # USB Host Controller Drivers | 847 | # USB Host Controller Drivers |
| 839 | # | 848 | # |
| 849 | # CONFIG_USB_C67X00_HCD is not set | ||
| 840 | CONFIG_USB_EHCI_HCD=y | 850 | CONFIG_USB_EHCI_HCD=y |
| 841 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 851 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 842 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 852 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 843 | CONFIG_USB_EHCI_FSL=y | 853 | CONFIG_USB_EHCI_FSL=y |
| 844 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 854 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 845 | # CONFIG_USB_ISP116X_HCD is not set | 855 | # CONFIG_USB_ISP116X_HCD is not set |
| 856 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 846 | # CONFIG_USB_OHCI_HCD is not set | 857 | # CONFIG_USB_OHCI_HCD is not set |
| 847 | CONFIG_USB_UHCI_HCD=y | 858 | CONFIG_USB_UHCI_HCD=y |
| 848 | # CONFIG_USB_SL811_HCD is not set | 859 | # CONFIG_USB_SL811_HCD is not set |
| @@ -853,6 +864,7 @@ CONFIG_USB_UHCI_HCD=y | |||
| 853 | # | 864 | # |
| 854 | # CONFIG_USB_ACM is not set | 865 | # CONFIG_USB_ACM is not set |
| 855 | # CONFIG_USB_PRINTER is not set | 866 | # CONFIG_USB_PRINTER is not set |
| 867 | # CONFIG_USB_WDM is not set | ||
| 856 | 868 | ||
| 857 | # | 869 | # |
| 858 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 870 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -873,6 +885,7 @@ CONFIG_USB_STORAGE=y | |||
| 873 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 874 | # CONFIG_USB_STORAGE_ALAUDA is not set | 886 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 875 | # CONFIG_USB_STORAGE_KARMA is not set | 887 | # CONFIG_USB_STORAGE_KARMA is not set |
| 888 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 876 | # CONFIG_USB_LIBUSUAL is not set | 889 | # CONFIG_USB_LIBUSUAL is not set |
| 877 | 890 | ||
| 878 | # | 891 | # |
| @@ -909,10 +922,12 @@ CONFIG_USB_MON=y | |||
| 909 | # CONFIG_USB_LD is not set | 922 | # CONFIG_USB_LD is not set |
| 910 | # CONFIG_USB_TRANCEVIBRATOR is not set | 923 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 911 | # CONFIG_USB_IOWARRIOR is not set | 924 | # CONFIG_USB_IOWARRIOR is not set |
| 925 | # CONFIG_USB_ISIGHTFW is not set | ||
| 912 | # CONFIG_USB_GADGET is not set | 926 | # CONFIG_USB_GADGET is not set |
| 913 | # CONFIG_MMC is not set | 927 | # CONFIG_MMC is not set |
| 914 | # CONFIG_MEMSTICK is not set | 928 | # CONFIG_MEMSTICK is not set |
| 915 | # CONFIG_NEW_LEDS is not set | 929 | # CONFIG_NEW_LEDS is not set |
| 930 | # CONFIG_ACCESSIBILITY is not set | ||
| 916 | # CONFIG_INFINIBAND is not set | 931 | # CONFIG_INFINIBAND is not set |
| 917 | # CONFIG_EDAC is not set | 932 | # CONFIG_EDAC is not set |
| 918 | CONFIG_RTC_LIB=y | 933 | CONFIG_RTC_LIB=y |
| @@ -967,11 +982,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 967 | # | 982 | # |
| 968 | # on-CPU RTC drivers | 983 | # on-CPU RTC drivers |
| 969 | # | 984 | # |
| 985 | # CONFIG_RTC_DRV_PPC is not set | ||
| 970 | # CONFIG_DMADEVICES is not set | 986 | # CONFIG_DMADEVICES is not set |
| 971 | |||
| 972 | # | ||
| 973 | # Userspace I/O | ||
| 974 | # | ||
| 975 | # CONFIG_UIO is not set | 987 | # CONFIG_UIO is not set |
| 976 | 988 | ||
| 977 | # | 989 | # |
| @@ -991,7 +1003,6 @@ CONFIG_FS_MBCACHE=y | |||
| 991 | # CONFIG_JFS_FS is not set | 1003 | # CONFIG_JFS_FS is not set |
| 992 | # CONFIG_FS_POSIX_ACL is not set | 1004 | # CONFIG_FS_POSIX_ACL is not set |
| 993 | # CONFIG_XFS_FS is not set | 1005 | # CONFIG_XFS_FS is not set |
| 994 | # CONFIG_GFS2_FS is not set | ||
| 995 | # CONFIG_OCFS2_FS is not set | 1006 | # CONFIG_OCFS2_FS is not set |
| 996 | CONFIG_DNOTIFY=y | 1007 | CONFIG_DNOTIFY=y |
| 997 | CONFIG_INOTIFY=y | 1008 | CONFIG_INOTIFY=y |
| @@ -1053,7 +1064,6 @@ CONFIG_NFS_FS=y | |||
| 1053 | CONFIG_NFS_V3=y | 1064 | CONFIG_NFS_V3=y |
| 1054 | # CONFIG_NFS_V3_ACL is not set | 1065 | # CONFIG_NFS_V3_ACL is not set |
| 1055 | CONFIG_NFS_V4=y | 1066 | CONFIG_NFS_V4=y |
| 1056 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1057 | # CONFIG_NFSD is not set | 1067 | # CONFIG_NFSD is not set |
| 1058 | CONFIG_ROOT_NFS=y | 1068 | CONFIG_ROOT_NFS=y |
| 1059 | CONFIG_LOCKD=y | 1069 | CONFIG_LOCKD=y |
| @@ -1137,6 +1147,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1137 | # Library routines | 1147 | # Library routines |
| 1138 | # | 1148 | # |
| 1139 | CONFIG_BITREVERSE=y | 1149 | CONFIG_BITREVERSE=y |
| 1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1140 | # CONFIG_CRC_CCITT is not set | 1151 | # CONFIG_CRC_CCITT is not set |
| 1141 | # CONFIG_CRC16 is not set | 1152 | # CONFIG_CRC16 is not set |
| 1142 | # CONFIG_CRC_ITU_T is not set | 1153 | # CONFIG_CRC_ITU_T is not set |
| @@ -1147,6 +1158,7 @@ CONFIG_PLIST=y | |||
| 1147 | CONFIG_HAS_IOMEM=y | 1158 | CONFIG_HAS_IOMEM=y |
| 1148 | CONFIG_HAS_IOPORT=y | 1159 | CONFIG_HAS_IOPORT=y |
| 1149 | CONFIG_HAS_DMA=y | 1160 | CONFIG_HAS_DMA=y |
| 1161 | CONFIG_HAVE_LMB=y | ||
| 1150 | 1162 | ||
| 1151 | # | 1163 | # |
| 1152 | # Kernel hacking | 1164 | # Kernel hacking |
| @@ -1154,6 +1166,7 @@ CONFIG_HAS_DMA=y | |||
| 1154 | # CONFIG_PRINTK_TIME is not set | 1166 | # CONFIG_PRINTK_TIME is not set |
| 1155 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1167 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1156 | CONFIG_ENABLE_MUST_CHECK=y | 1168 | CONFIG_ENABLE_MUST_CHECK=y |
| 1169 | CONFIG_FRAME_WARN=1024 | ||
| 1157 | # CONFIG_MAGIC_SYSRQ is not set | 1170 | # CONFIG_MAGIC_SYSRQ is not set |
| 1158 | # CONFIG_UNUSED_SYMBOLS is not set | 1171 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1159 | # CONFIG_DEBUG_FS is not set | 1172 | # CONFIG_DEBUG_FS is not set |
| @@ -1163,6 +1176,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1163 | # CONFIG_SLUB_STATS is not set | 1176 | # CONFIG_SLUB_STATS is not set |
| 1164 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1177 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1165 | # CONFIG_SAMPLES is not set | 1178 | # CONFIG_SAMPLES is not set |
| 1179 | # CONFIG_IRQSTACKS is not set | ||
| 1166 | # CONFIG_PPC_EARLY_DEBUG is not set | 1180 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1167 | 1181 | ||
| 1168 | # | 1182 | # |
| @@ -1172,51 +1186,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1172 | # CONFIG_SECURITY is not set | 1186 | # CONFIG_SECURITY is not set |
| 1173 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1187 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1174 | CONFIG_CRYPTO=y | 1188 | CONFIG_CRYPTO=y |
| 1189 | |||
| 1190 | # | ||
| 1191 | # Crypto core or helper | ||
| 1192 | # | ||
| 1175 | CONFIG_CRYPTO_ALGAPI=y | 1193 | CONFIG_CRYPTO_ALGAPI=y |
| 1176 | CONFIG_CRYPTO_BLKCIPHER=y | 1194 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1177 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1178 | CONFIG_CRYPTO_MANAGER=y | 1195 | CONFIG_CRYPTO_MANAGER=y |
| 1196 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1197 | # CONFIG_CRYPTO_NULL is not set | ||
| 1198 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1199 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1200 | # CONFIG_CRYPTO_TEST is not set | ||
| 1201 | |||
| 1202 | # | ||
| 1203 | # Authenticated Encryption with Associated Data | ||
| 1204 | # | ||
| 1205 | # CONFIG_CRYPTO_CCM is not set | ||
| 1206 | # CONFIG_CRYPTO_GCM is not set | ||
| 1207 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1208 | |||
| 1209 | # | ||
| 1210 | # Block modes | ||
| 1211 | # | ||
| 1212 | CONFIG_CRYPTO_CBC=y | ||
| 1213 | # CONFIG_CRYPTO_CTR is not set | ||
| 1214 | # CONFIG_CRYPTO_CTS is not set | ||
| 1215 | # CONFIG_CRYPTO_ECB is not set | ||
| 1216 | # CONFIG_CRYPTO_LRW is not set | ||
| 1217 | CONFIG_CRYPTO_PCBC=m | ||
| 1218 | # CONFIG_CRYPTO_XTS is not set | ||
| 1219 | |||
| 1220 | # | ||
| 1221 | # Hash modes | ||
| 1222 | # | ||
| 1179 | # CONFIG_CRYPTO_HMAC is not set | 1223 | # CONFIG_CRYPTO_HMAC is not set |
| 1180 | # CONFIG_CRYPTO_XCBC is not set | 1224 | # CONFIG_CRYPTO_XCBC is not set |
| 1181 | # CONFIG_CRYPTO_NULL is not set | 1225 | |
| 1226 | # | ||
| 1227 | # Digest | ||
| 1228 | # | ||
| 1229 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1182 | # CONFIG_CRYPTO_MD4 is not set | 1230 | # CONFIG_CRYPTO_MD4 is not set |
| 1183 | CONFIG_CRYPTO_MD5=y | 1231 | CONFIG_CRYPTO_MD5=y |
| 1232 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1184 | # CONFIG_CRYPTO_SHA1 is not set | 1233 | # CONFIG_CRYPTO_SHA1 is not set |
| 1185 | # CONFIG_CRYPTO_SHA256 is not set | 1234 | # CONFIG_CRYPTO_SHA256 is not set |
| 1186 | # CONFIG_CRYPTO_SHA512 is not set | 1235 | # CONFIG_CRYPTO_SHA512 is not set |
| 1187 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1188 | # CONFIG_CRYPTO_TGR192 is not set | 1236 | # CONFIG_CRYPTO_TGR192 is not set |
| 1189 | # CONFIG_CRYPTO_GF128MUL is not set | 1237 | # CONFIG_CRYPTO_WP512 is not set |
| 1190 | # CONFIG_CRYPTO_ECB is not set | 1238 | |
| 1191 | CONFIG_CRYPTO_CBC=y | 1239 | # |
| 1192 | CONFIG_CRYPTO_PCBC=m | 1240 | # Ciphers |
| 1193 | # CONFIG_CRYPTO_LRW is not set | 1241 | # |
| 1194 | # CONFIG_CRYPTO_XTS is not set | ||
| 1195 | # CONFIG_CRYPTO_CTR is not set | ||
| 1196 | # CONFIG_CRYPTO_GCM is not set | ||
| 1197 | # CONFIG_CRYPTO_CCM is not set | ||
| 1198 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1199 | CONFIG_CRYPTO_DES=y | ||
| 1200 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1201 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1202 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1203 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1204 | # CONFIG_CRYPTO_AES is not set | 1242 | # CONFIG_CRYPTO_AES is not set |
| 1243 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1244 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1245 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1246 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1205 | # CONFIG_CRYPTO_CAST5 is not set | 1247 | # CONFIG_CRYPTO_CAST5 is not set |
| 1206 | # CONFIG_CRYPTO_CAST6 is not set | 1248 | # CONFIG_CRYPTO_CAST6 is not set |
| 1207 | # CONFIG_CRYPTO_TEA is not set | 1249 | CONFIG_CRYPTO_DES=y |
| 1208 | # CONFIG_CRYPTO_ARC4 is not set | 1250 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1209 | # CONFIG_CRYPTO_KHAZAD is not set | 1251 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1210 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1211 | # CONFIG_CRYPTO_SEED is not set | ||
| 1212 | # CONFIG_CRYPTO_SALSA20 is not set | 1252 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1253 | # CONFIG_CRYPTO_SEED is not set | ||
| 1254 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1255 | # CONFIG_CRYPTO_TEA is not set | ||
| 1256 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1257 | |||
| 1258 | # | ||
| 1259 | # Compression | ||
| 1260 | # | ||
| 1213 | # CONFIG_CRYPTO_DEFLATE is not set | 1261 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1214 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1215 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1216 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1217 | # CONFIG_CRYPTO_TEST is not set | ||
| 1218 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1219 | # CONFIG_CRYPTO_LZO is not set | 1262 | # CONFIG_CRYPTO_LZO is not set |
| 1220 | CONFIG_CRYPTO_HW=y | 1263 | CONFIG_CRYPTO_HW=y |
| 1221 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1264 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1222 | # CONFIG_PPC_CLOCK is not set | 1265 | # CONFIG_PPC_CLOCK is not set |
| 1266 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index b4e82c0e2be7..c82e96e984fc 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:56 2008 | 4 | # Mon Jun 9 08:52:26 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +359,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 353 | # CONFIG_CONNECTOR is not set | 359 | # CONFIG_CONNECTOR is not set |
| 354 | # CONFIG_MTD is not set | 360 | # CONFIG_MTD is not set |
| 355 | CONFIG_OF_DEVICE=y | 361 | CONFIG_OF_DEVICE=y |
| 362 | CONFIG_OF_I2C=y | ||
| 356 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
| 357 | CONFIG_BLK_DEV=y | 364 | CONFIG_BLK_DEV=y |
| 358 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
| @@ -471,7 +478,6 @@ CONFIG_NETDEV_1000=y | |||
| 471 | # CONFIG_SIS190 is not set | 478 | # CONFIG_SIS190 is not set |
| 472 | # CONFIG_SKGE is not set | 479 | # CONFIG_SKGE is not set |
| 473 | # CONFIG_SKY2 is not set | 480 | # CONFIG_SKY2 is not set |
| 474 | # CONFIG_SK98LIN is not set | ||
| 475 | # CONFIG_VIA_VELOCITY is not set | 481 | # CONFIG_VIA_VELOCITY is not set |
| 476 | # CONFIG_TIGON3 is not set | 482 | # CONFIG_TIGON3 is not set |
| 477 | # CONFIG_BNX2 is not set | 483 | # CONFIG_BNX2 is not set |
| @@ -491,6 +497,7 @@ CONFIG_NETDEV_10000=y | |||
| 491 | # CONFIG_MLX4_CORE is not set | 497 | # CONFIG_MLX4_CORE is not set |
| 492 | # CONFIG_TEHUTI is not set | 498 | # CONFIG_TEHUTI is not set |
| 493 | # CONFIG_BNX2X is not set | 499 | # CONFIG_BNX2X is not set |
| 500 | # CONFIG_SFC is not set | ||
| 494 | # CONFIG_TR is not set | 501 | # CONFIG_TR is not set |
| 495 | 502 | ||
| 496 | # | 503 | # |
| @@ -498,6 +505,7 @@ CONFIG_NETDEV_10000=y | |||
| 498 | # | 505 | # |
| 499 | # CONFIG_WLAN_PRE80211 is not set | 506 | # CONFIG_WLAN_PRE80211 is not set |
| 500 | # CONFIG_WLAN_80211 is not set | 507 | # CONFIG_WLAN_80211 is not set |
| 508 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 501 | # CONFIG_WAN is not set | 509 | # CONFIG_WAN is not set |
| 502 | # CONFIG_FDDI is not set | 510 | # CONFIG_FDDI is not set |
| 503 | # CONFIG_HIPPI is not set | 511 | # CONFIG_HIPPI is not set |
| @@ -544,6 +552,7 @@ CONFIG_INPUT=y | |||
| 544 | # Character devices | 552 | # Character devices |
| 545 | # | 553 | # |
| 546 | # CONFIG_VT is not set | 554 | # CONFIG_VT is not set |
| 555 | CONFIG_DEVKMEM=y | ||
| 547 | # CONFIG_SERIAL_NONSTANDARD is not set | 556 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 548 | # CONFIG_NOZOMI is not set | 557 | # CONFIG_NOZOMI is not set |
| 549 | 558 | ||
| @@ -571,7 +580,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 571 | # CONFIG_IPMI_HANDLER is not set | 580 | # CONFIG_IPMI_HANDLER is not set |
| 572 | # CONFIG_HW_RANDOM is not set | 581 | # CONFIG_HW_RANDOM is not set |
| 573 | # CONFIG_NVRAM is not set | 582 | # CONFIG_NVRAM is not set |
| 574 | # CONFIG_GEN_RTC is not set | ||
| 575 | # CONFIG_R3964 is not set | 583 | # CONFIG_R3964 is not set |
| 576 | # CONFIG_APPLICOM is not set | 584 | # CONFIG_APPLICOM is not set |
| 577 | # CONFIG_RAW_DRIVER is not set | 585 | # CONFIG_RAW_DRIVER is not set |
| @@ -582,13 +590,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 582 | CONFIG_I2C_CHARDEV=y | 590 | CONFIG_I2C_CHARDEV=y |
| 583 | 591 | ||
| 584 | # | 592 | # |
| 585 | # I2C Algorithms | ||
| 586 | # | ||
| 587 | # CONFIG_I2C_ALGOBIT is not set | ||
| 588 | # CONFIG_I2C_ALGOPCF is not set | ||
| 589 | # CONFIG_I2C_ALGOPCA is not set | ||
| 590 | |||
| 591 | # | ||
| 592 | # I2C Hardware Bus support | 593 | # I2C Hardware Bus support |
| 593 | # | 594 | # |
| 594 | # CONFIG_I2C_ALI1535 is not set | 595 | # CONFIG_I2C_ALI1535 is not set |
| @@ -614,6 +615,7 @@ CONFIG_I2C_MPC=y | |||
| 614 | # CONFIG_I2C_VIA is not set | 615 | # CONFIG_I2C_VIA is not set |
| 615 | # CONFIG_I2C_VIAPRO is not set | 616 | # CONFIG_I2C_VIAPRO is not set |
| 616 | # CONFIG_I2C_VOODOO3 is not set | 617 | # CONFIG_I2C_VOODOO3 is not set |
| 618 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 617 | 619 | ||
| 618 | # | 620 | # |
| 619 | # Miscellaneous I2C Chip support | 621 | # Miscellaneous I2C Chip support |
| @@ -623,19 +625,13 @@ CONFIG_I2C_MPC=y | |||
| 623 | # CONFIG_SENSORS_PCF8574 is not set | 625 | # CONFIG_SENSORS_PCF8574 is not set |
| 624 | # CONFIG_PCF8575 is not set | 626 | # CONFIG_PCF8575 is not set |
| 625 | # CONFIG_SENSORS_PCF8591 is not set | 627 | # CONFIG_SENSORS_PCF8591 is not set |
| 626 | # CONFIG_TPS65010 is not set | ||
| 627 | # CONFIG_SENSORS_MAX6875 is not set | 628 | # CONFIG_SENSORS_MAX6875 is not set |
| 628 | # CONFIG_SENSORS_TSL2550 is not set | 629 | # CONFIG_SENSORS_TSL2550 is not set |
| 629 | # CONFIG_I2C_DEBUG_CORE is not set | 630 | # CONFIG_I2C_DEBUG_CORE is not set |
| 630 | # CONFIG_I2C_DEBUG_ALGO is not set | 631 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 631 | # CONFIG_I2C_DEBUG_BUS is not set | 632 | # CONFIG_I2C_DEBUG_BUS is not set |
| 632 | # CONFIG_I2C_DEBUG_CHIP is not set | 633 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 633 | |||
| 634 | # | ||
| 635 | # SPI support | ||
| 636 | # | ||
| 637 | # CONFIG_SPI is not set | 634 | # CONFIG_SPI is not set |
| 638 | # CONFIG_SPI_MASTER is not set | ||
| 639 | # CONFIG_W1 is not set | 635 | # CONFIG_W1 is not set |
| 640 | # CONFIG_POWER_SUPPLY is not set | 636 | # CONFIG_POWER_SUPPLY is not set |
| 641 | CONFIG_HWMON=y | 637 | CONFIG_HWMON=y |
| @@ -718,12 +714,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 718 | # Multifunction device drivers | 714 | # Multifunction device drivers |
| 719 | # | 715 | # |
| 720 | # CONFIG_MFD_SM501 is not set | 716 | # CONFIG_MFD_SM501 is not set |
| 717 | # CONFIG_HTC_PASIC3 is not set | ||
| 721 | 718 | ||
| 722 | # | 719 | # |
| 723 | # Multimedia devices | 720 | # Multimedia devices |
| 724 | # | 721 | # |
| 722 | |||
| 723 | # | ||
| 724 | # Multimedia core support | ||
| 725 | # | ||
| 725 | # CONFIG_VIDEO_DEV is not set | 726 | # CONFIG_VIDEO_DEV is not set |
| 726 | # CONFIG_DVB_CORE is not set | 727 | # CONFIG_DVB_CORE is not set |
| 728 | # CONFIG_VIDEO_MEDIA is not set | ||
| 729 | |||
| 730 | # | ||
| 731 | # Multimedia drivers | ||
| 732 | # | ||
| 727 | CONFIG_DAB=y | 733 | CONFIG_DAB=y |
| 728 | 734 | ||
| 729 | # | 735 | # |
| @@ -754,6 +760,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 754 | CONFIG_USB_ARCH_HAS_OHCI=y | 760 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 755 | CONFIG_USB_ARCH_HAS_EHCI=y | 761 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 756 | # CONFIG_USB is not set | 762 | # CONFIG_USB is not set |
| 763 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 764 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 757 | 765 | ||
| 758 | # | 766 | # |
| 759 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 767 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -762,6 +770,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 762 | # CONFIG_MMC is not set | 770 | # CONFIG_MMC is not set |
| 763 | # CONFIG_MEMSTICK is not set | 771 | # CONFIG_MEMSTICK is not set |
| 764 | # CONFIG_NEW_LEDS is not set | 772 | # CONFIG_NEW_LEDS is not set |
| 773 | # CONFIG_ACCESSIBILITY is not set | ||
| 765 | # CONFIG_INFINIBAND is not set | 774 | # CONFIG_INFINIBAND is not set |
| 766 | # CONFIG_EDAC is not set | 775 | # CONFIG_EDAC is not set |
| 767 | CONFIG_RTC_LIB=y | 776 | CONFIG_RTC_LIB=y |
| @@ -813,11 +822,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 813 | # | 822 | # |
| 814 | # on-CPU RTC drivers | 823 | # on-CPU RTC drivers |
| 815 | # | 824 | # |
| 825 | # CONFIG_RTC_DRV_PPC is not set | ||
| 816 | # CONFIG_DMADEVICES is not set | 826 | # CONFIG_DMADEVICES is not set |
| 817 | |||
| 818 | # | ||
| 819 | # Userspace I/O | ||
| 820 | # | ||
| 821 | # CONFIG_UIO is not set | 827 | # CONFIG_UIO is not set |
| 822 | 828 | ||
| 823 | # | 829 | # |
| @@ -837,7 +843,6 @@ CONFIG_FS_MBCACHE=y | |||
| 837 | # CONFIG_JFS_FS is not set | 843 | # CONFIG_JFS_FS is not set |
| 838 | # CONFIG_FS_POSIX_ACL is not set | 844 | # CONFIG_FS_POSIX_ACL is not set |
| 839 | # CONFIG_XFS_FS is not set | 845 | # CONFIG_XFS_FS is not set |
| 840 | # CONFIG_GFS2_FS is not set | ||
| 841 | # CONFIG_OCFS2_FS is not set | 846 | # CONFIG_OCFS2_FS is not set |
| 842 | CONFIG_DNOTIFY=y | 847 | CONFIG_DNOTIFY=y |
| 843 | CONFIG_INOTIFY=y | 848 | CONFIG_INOTIFY=y |
| @@ -895,7 +900,6 @@ CONFIG_NFS_FS=y | |||
| 895 | CONFIG_NFS_V3=y | 900 | CONFIG_NFS_V3=y |
| 896 | # CONFIG_NFS_V3_ACL is not set | 901 | # CONFIG_NFS_V3_ACL is not set |
| 897 | CONFIG_NFS_V4=y | 902 | CONFIG_NFS_V4=y |
| 898 | # CONFIG_NFS_DIRECTIO is not set | ||
| 899 | # CONFIG_NFSD is not set | 903 | # CONFIG_NFSD is not set |
| 900 | CONFIG_ROOT_NFS=y | 904 | CONFIG_ROOT_NFS=y |
| 901 | CONFIG_LOCKD=y | 905 | CONFIG_LOCKD=y |
| @@ -936,6 +940,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 936 | # Library routines | 940 | # Library routines |
| 937 | # | 941 | # |
| 938 | CONFIG_BITREVERSE=y | 942 | CONFIG_BITREVERSE=y |
| 943 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 939 | # CONFIG_CRC_CCITT is not set | 944 | # CONFIG_CRC_CCITT is not set |
| 940 | # CONFIG_CRC16 is not set | 945 | # CONFIG_CRC16 is not set |
| 941 | # CONFIG_CRC_ITU_T is not set | 946 | # CONFIG_CRC_ITU_T is not set |
| @@ -946,6 +951,7 @@ CONFIG_PLIST=y | |||
| 946 | CONFIG_HAS_IOMEM=y | 951 | CONFIG_HAS_IOMEM=y |
| 947 | CONFIG_HAS_IOPORT=y | 952 | CONFIG_HAS_IOPORT=y |
| 948 | CONFIG_HAS_DMA=y | 953 | CONFIG_HAS_DMA=y |
| 954 | CONFIG_HAVE_LMB=y | ||
| 949 | 955 | ||
| 950 | # | 956 | # |
| 951 | # Kernel hacking | 957 | # Kernel hacking |
| @@ -953,6 +959,7 @@ CONFIG_HAS_DMA=y | |||
| 953 | # CONFIG_PRINTK_TIME is not set | 959 | # CONFIG_PRINTK_TIME is not set |
| 954 | CONFIG_ENABLE_WARN_DEPRECATED=y | 960 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 955 | CONFIG_ENABLE_MUST_CHECK=y | 961 | CONFIG_ENABLE_MUST_CHECK=y |
| 962 | CONFIG_FRAME_WARN=1024 | ||
| 956 | # CONFIG_MAGIC_SYSRQ is not set | 963 | # CONFIG_MAGIC_SYSRQ is not set |
| 957 | # CONFIG_UNUSED_SYMBOLS is not set | 964 | # CONFIG_UNUSED_SYMBOLS is not set |
| 958 | # CONFIG_DEBUG_FS is not set | 965 | # CONFIG_DEBUG_FS is not set |
| @@ -962,6 +969,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 962 | # CONFIG_SLUB_STATS is not set | 969 | # CONFIG_SLUB_STATS is not set |
| 963 | # CONFIG_DEBUG_BUGVERBOSE is not set | 970 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 964 | # CONFIG_SAMPLES is not set | 971 | # CONFIG_SAMPLES is not set |
| 972 | # CONFIG_IRQSTACKS is not set | ||
| 965 | # CONFIG_PPC_EARLY_DEBUG is not set | 973 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 966 | 974 | ||
| 967 | # | 975 | # |
| @@ -971,51 +979,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 971 | # CONFIG_SECURITY is not set | 979 | # CONFIG_SECURITY is not set |
| 972 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 980 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 973 | CONFIG_CRYPTO=y | 981 | CONFIG_CRYPTO=y |
| 982 | |||
| 983 | # | ||
| 984 | # Crypto core or helper | ||
| 985 | # | ||
| 974 | CONFIG_CRYPTO_ALGAPI=y | 986 | CONFIG_CRYPTO_ALGAPI=y |
| 975 | CONFIG_CRYPTO_BLKCIPHER=y | 987 | CONFIG_CRYPTO_BLKCIPHER=y |
| 976 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 977 | CONFIG_CRYPTO_MANAGER=y | 988 | CONFIG_CRYPTO_MANAGER=y |
| 989 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 990 | # CONFIG_CRYPTO_NULL is not set | ||
| 991 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 992 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 993 | # CONFIG_CRYPTO_TEST is not set | ||
| 994 | |||
| 995 | # | ||
| 996 | # Authenticated Encryption with Associated Data | ||
| 997 | # | ||
| 998 | # CONFIG_CRYPTO_CCM is not set | ||
| 999 | # CONFIG_CRYPTO_GCM is not set | ||
| 1000 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1001 | |||
| 1002 | # | ||
| 1003 | # Block modes | ||
| 1004 | # | ||
| 1005 | CONFIG_CRYPTO_CBC=y | ||
| 1006 | # CONFIG_CRYPTO_CTR is not set | ||
| 1007 | # CONFIG_CRYPTO_CTS is not set | ||
| 1008 | CONFIG_CRYPTO_ECB=m | ||
| 1009 | # CONFIG_CRYPTO_LRW is not set | ||
| 1010 | CONFIG_CRYPTO_PCBC=m | ||
| 1011 | # CONFIG_CRYPTO_XTS is not set | ||
| 1012 | |||
| 1013 | # | ||
| 1014 | # Hash modes | ||
| 1015 | # | ||
| 978 | # CONFIG_CRYPTO_HMAC is not set | 1016 | # CONFIG_CRYPTO_HMAC is not set |
| 979 | # CONFIG_CRYPTO_XCBC is not set | 1017 | # CONFIG_CRYPTO_XCBC is not set |
| 980 | # CONFIG_CRYPTO_NULL is not set | 1018 | |
| 1019 | # | ||
| 1020 | # Digest | ||
| 1021 | # | ||
| 1022 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 981 | # CONFIG_CRYPTO_MD4 is not set | 1023 | # CONFIG_CRYPTO_MD4 is not set |
| 982 | CONFIG_CRYPTO_MD5=y | 1024 | CONFIG_CRYPTO_MD5=y |
| 1025 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 983 | # CONFIG_CRYPTO_SHA1 is not set | 1026 | # CONFIG_CRYPTO_SHA1 is not set |
| 984 | # CONFIG_CRYPTO_SHA256 is not set | 1027 | # CONFIG_CRYPTO_SHA256 is not set |
| 985 | # CONFIG_CRYPTO_SHA512 is not set | 1028 | # CONFIG_CRYPTO_SHA512 is not set |
| 986 | # CONFIG_CRYPTO_WP512 is not set | ||
| 987 | # CONFIG_CRYPTO_TGR192 is not set | 1029 | # CONFIG_CRYPTO_TGR192 is not set |
| 988 | # CONFIG_CRYPTO_GF128MUL is not set | 1030 | # CONFIG_CRYPTO_WP512 is not set |
| 989 | CONFIG_CRYPTO_ECB=m | 1031 | |
| 990 | CONFIG_CRYPTO_CBC=y | 1032 | # |
| 991 | CONFIG_CRYPTO_PCBC=m | 1033 | # Ciphers |
| 992 | # CONFIG_CRYPTO_LRW is not set | 1034 | # |
| 993 | # CONFIG_CRYPTO_XTS is not set | ||
| 994 | # CONFIG_CRYPTO_CTR is not set | ||
| 995 | # CONFIG_CRYPTO_GCM is not set | ||
| 996 | # CONFIG_CRYPTO_CCM is not set | ||
| 997 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 998 | CONFIG_CRYPTO_DES=y | ||
| 999 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1000 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1001 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1002 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1003 | # CONFIG_CRYPTO_AES is not set | 1035 | # CONFIG_CRYPTO_AES is not set |
| 1036 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1037 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1038 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1039 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1004 | # CONFIG_CRYPTO_CAST5 is not set | 1040 | # CONFIG_CRYPTO_CAST5 is not set |
| 1005 | # CONFIG_CRYPTO_CAST6 is not set | 1041 | # CONFIG_CRYPTO_CAST6 is not set |
| 1006 | # CONFIG_CRYPTO_TEA is not set | 1042 | CONFIG_CRYPTO_DES=y |
| 1007 | # CONFIG_CRYPTO_ARC4 is not set | 1043 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1008 | # CONFIG_CRYPTO_KHAZAD is not set | 1044 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1009 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1010 | # CONFIG_CRYPTO_SEED is not set | ||
| 1011 | # CONFIG_CRYPTO_SALSA20 is not set | 1045 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1046 | # CONFIG_CRYPTO_SEED is not set | ||
| 1047 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1048 | # CONFIG_CRYPTO_TEA is not set | ||
| 1049 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1050 | |||
| 1051 | # | ||
| 1052 | # Compression | ||
| 1053 | # | ||
| 1012 | # CONFIG_CRYPTO_DEFLATE is not set | 1054 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1014 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1015 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1016 | # CONFIG_CRYPTO_TEST is not set | ||
| 1017 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1018 | # CONFIG_CRYPTO_LZO is not set | 1055 | # CONFIG_CRYPTO_LZO is not set |
| 1019 | CONFIG_CRYPTO_HW=y | 1056 | CONFIG_CRYPTO_HW=y |
| 1020 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1057 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1021 | # CONFIG_PPC_CLOCK is not set | 1058 | # CONFIG_PPC_CLOCK is not set |
| 1059 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index d50a96eddcdc..20fd9f58cf42 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:36:57 2008 | 4 | # Mon Jun 9 08:52:27 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -110,12 +113,14 @@ CONFIG_SLUB=y | |||
| 110 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
| 112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
| 116 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 113 | CONFIG_PROC_PAGE_MONITOR=y | 117 | CONFIG_PROC_PAGE_MONITOR=y |
| 114 | CONFIG_SLABINFO=y | 118 | CONFIG_SLABINFO=y |
| 115 | CONFIG_RT_MUTEXES=y | 119 | CONFIG_RT_MUTEXES=y |
| 116 | # CONFIG_TINY_SHMEM is not set | 120 | # CONFIG_TINY_SHMEM is not set |
| 117 | CONFIG_BASE_SMALL=0 | 121 | CONFIG_BASE_SMALL=0 |
| 118 | CONFIG_MODULES=y | 122 | CONFIG_MODULES=y |
| 123 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 119 | CONFIG_MODULE_UNLOAD=y | 124 | CONFIG_MODULE_UNLOAD=y |
| 120 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 121 | # CONFIG_MODVERSIONS is not set | 126 | # CONFIG_MODVERSIONS is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -237,6 +244,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 237 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 238 | # CONFIG_PCCARD is not set | 245 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HOTPLUG_PCI is not set | 246 | # CONFIG_HOTPLUG_PCI is not set |
| 247 | # CONFIG_HAS_RAPIDIO is not set | ||
| 240 | 248 | ||
| 241 | # | 249 | # |
| 242 | # Advanced setup | 250 | # Advanced setup |
| @@ -246,11 +254,11 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # | 254 | # |
| 247 | # Default settings for advanced configuration options are used | 255 | # Default settings for advanced configuration options are used |
| 248 | # | 256 | # |
| 249 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 250 | CONFIG_LOWMEM_SIZE=0x30000000 | 257 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 258 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 251 | CONFIG_KERNEL_START=0xc0000000 | 259 | CONFIG_KERNEL_START=0xc0000000 |
| 260 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 253 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Networking | 264 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +359,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 353 | # CONFIG_CONNECTOR is not set | 359 | # CONFIG_CONNECTOR is not set |
| 354 | # CONFIG_MTD is not set | 360 | # CONFIG_MTD is not set |
| 355 | CONFIG_OF_DEVICE=y | 361 | CONFIG_OF_DEVICE=y |
| 362 | CONFIG_OF_I2C=y | ||
| 356 | # CONFIG_PARPORT is not set | 363 | # CONFIG_PARPORT is not set |
| 357 | CONFIG_BLK_DEV=y | 364 | CONFIG_BLK_DEV=y |
| 358 | # CONFIG_BLK_DEV_FD is not set | 365 | # CONFIG_BLK_DEV_FD is not set |
| @@ -520,7 +527,6 @@ CONFIG_NETDEV_1000=y | |||
| 520 | # CONFIG_SIS190 is not set | 527 | # CONFIG_SIS190 is not set |
| 521 | # CONFIG_SKGE is not set | 528 | # CONFIG_SKGE is not set |
| 522 | # CONFIG_SKY2 is not set | 529 | # CONFIG_SKY2 is not set |
| 523 | # CONFIG_SK98LIN is not set | ||
| 524 | # CONFIG_VIA_VELOCITY is not set | 530 | # CONFIG_VIA_VELOCITY is not set |
| 525 | # CONFIG_TIGON3 is not set | 531 | # CONFIG_TIGON3 is not set |
| 526 | # CONFIG_BNX2 is not set | 532 | # CONFIG_BNX2 is not set |
| @@ -544,6 +550,7 @@ CONFIG_NETDEV_10000=y | |||
| 544 | # CONFIG_MLX4_CORE is not set | 550 | # CONFIG_MLX4_CORE is not set |
| 545 | # CONFIG_TEHUTI is not set | 551 | # CONFIG_TEHUTI is not set |
| 546 | # CONFIG_BNX2X is not set | 552 | # CONFIG_BNX2X is not set |
| 553 | # CONFIG_SFC is not set | ||
| 547 | # CONFIG_TR is not set | 554 | # CONFIG_TR is not set |
| 548 | 555 | ||
| 549 | # | 556 | # |
| @@ -551,6 +558,7 @@ CONFIG_NETDEV_10000=y | |||
| 551 | # | 558 | # |
| 552 | # CONFIG_WLAN_PRE80211 is not set | 559 | # CONFIG_WLAN_PRE80211 is not set |
| 553 | # CONFIG_WLAN_80211 is not set | 560 | # CONFIG_WLAN_80211 is not set |
| 561 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 554 | # CONFIG_WAN is not set | 562 | # CONFIG_WAN is not set |
| 555 | # CONFIG_FDDI is not set | 563 | # CONFIG_FDDI is not set |
| 556 | # CONFIG_HIPPI is not set | 564 | # CONFIG_HIPPI is not set |
| @@ -598,6 +606,7 @@ CONFIG_INPUT=y | |||
| 598 | # Character devices | 606 | # Character devices |
| 599 | # | 607 | # |
| 600 | # CONFIG_VT is not set | 608 | # CONFIG_VT is not set |
| 609 | CONFIG_DEVKMEM=y | ||
| 601 | # CONFIG_SERIAL_NONSTANDARD is not set | 610 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 602 | # CONFIG_NOZOMI is not set | 611 | # CONFIG_NOZOMI is not set |
| 603 | 612 | ||
| @@ -626,7 +635,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 626 | # CONFIG_IPMI_HANDLER is not set | 635 | # CONFIG_IPMI_HANDLER is not set |
| 627 | CONFIG_HW_RANDOM=y | 636 | CONFIG_HW_RANDOM=y |
| 628 | # CONFIG_NVRAM is not set | 637 | # CONFIG_NVRAM is not set |
| 629 | # CONFIG_GEN_RTC is not set | ||
| 630 | # CONFIG_R3964 is not set | 638 | # CONFIG_R3964 is not set |
| 631 | # CONFIG_APPLICOM is not set | 639 | # CONFIG_APPLICOM is not set |
| 632 | # CONFIG_RAW_DRIVER is not set | 640 | # CONFIG_RAW_DRIVER is not set |
| @@ -637,13 +645,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 637 | CONFIG_I2C_CHARDEV=y | 645 | CONFIG_I2C_CHARDEV=y |
| 638 | 646 | ||
| 639 | # | 647 | # |
| 640 | # I2C Algorithms | ||
| 641 | # | ||
| 642 | # CONFIG_I2C_ALGOBIT is not set | ||
| 643 | # CONFIG_I2C_ALGOPCF is not set | ||
| 644 | # CONFIG_I2C_ALGOPCA is not set | ||
| 645 | |||
| 646 | # | ||
| 647 | # I2C Hardware Bus support | 648 | # I2C Hardware Bus support |
| 648 | # | 649 | # |
| 649 | # CONFIG_I2C_ALI1535 is not set | 650 | # CONFIG_I2C_ALI1535 is not set |
| @@ -669,6 +670,7 @@ CONFIG_I2C_MPC=y | |||
| 669 | # CONFIG_I2C_VIA is not set | 670 | # CONFIG_I2C_VIA is not set |
| 670 | # CONFIG_I2C_VIAPRO is not set | 671 | # CONFIG_I2C_VIAPRO is not set |
| 671 | # CONFIG_I2C_VOODOO3 is not set | 672 | # CONFIG_I2C_VOODOO3 is not set |
| 673 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 672 | 674 | ||
| 673 | # | 675 | # |
| 674 | # Miscellaneous I2C Chip support | 676 | # Miscellaneous I2C Chip support |
| @@ -678,19 +680,13 @@ CONFIG_I2C_MPC=y | |||
| 678 | # CONFIG_SENSORS_PCF8574 is not set | 680 | # CONFIG_SENSORS_PCF8574 is not set |
| 679 | # CONFIG_PCF8575 is not set | 681 | # CONFIG_PCF8575 is not set |
| 680 | # CONFIG_SENSORS_PCF8591 is not set | 682 | # CONFIG_SENSORS_PCF8591 is not set |
| 681 | # CONFIG_TPS65010 is not set | ||
| 682 | # CONFIG_SENSORS_MAX6875 is not set | 683 | # CONFIG_SENSORS_MAX6875 is not set |
| 683 | # CONFIG_SENSORS_TSL2550 is not set | 684 | # CONFIG_SENSORS_TSL2550 is not set |
| 684 | # CONFIG_I2C_DEBUG_CORE is not set | 685 | # CONFIG_I2C_DEBUG_CORE is not set |
| 685 | # CONFIG_I2C_DEBUG_ALGO is not set | 686 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 686 | # CONFIG_I2C_DEBUG_BUS is not set | 687 | # CONFIG_I2C_DEBUG_BUS is not set |
| 687 | # CONFIG_I2C_DEBUG_CHIP is not set | 688 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 688 | |||
| 689 | # | ||
| 690 | # SPI support | ||
| 691 | # | ||
| 692 | # CONFIG_SPI is not set | 689 | # CONFIG_SPI is not set |
| 693 | # CONFIG_SPI_MASTER is not set | ||
| 694 | # CONFIG_W1 is not set | 690 | # CONFIG_W1 is not set |
| 695 | # CONFIG_POWER_SUPPLY is not set | 691 | # CONFIG_POWER_SUPPLY is not set |
| 696 | CONFIG_HWMON=y | 692 | CONFIG_HWMON=y |
| @@ -773,12 +769,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 773 | # Multifunction device drivers | 769 | # Multifunction device drivers |
| 774 | # | 770 | # |
| 775 | # CONFIG_MFD_SM501 is not set | 771 | # CONFIG_MFD_SM501 is not set |
| 772 | # CONFIG_HTC_PASIC3 is not set | ||
| 776 | 773 | ||
| 777 | # | 774 | # |
| 778 | # Multimedia devices | 775 | # Multimedia devices |
| 779 | # | 776 | # |
| 777 | |||
| 778 | # | ||
| 779 | # Multimedia core support | ||
| 780 | # | ||
| 780 | # CONFIG_VIDEO_DEV is not set | 781 | # CONFIG_VIDEO_DEV is not set |
| 781 | # CONFIG_DVB_CORE is not set | 782 | # CONFIG_DVB_CORE is not set |
| 783 | # CONFIG_VIDEO_MEDIA is not set | ||
| 784 | |||
| 785 | # | ||
| 786 | # Multimedia drivers | ||
| 787 | # | ||
| 782 | CONFIG_DAB=y | 788 | CONFIG_DAB=y |
| 783 | 789 | ||
| 784 | # | 790 | # |
| @@ -809,6 +815,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 809 | CONFIG_USB_ARCH_HAS_OHCI=y | 815 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 810 | CONFIG_USB_ARCH_HAS_EHCI=y | 816 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 811 | # CONFIG_USB is not set | 817 | # CONFIG_USB is not set |
| 818 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 819 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 812 | 820 | ||
| 813 | # | 821 | # |
| 814 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 822 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -817,6 +825,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 817 | # CONFIG_MMC is not set | 825 | # CONFIG_MMC is not set |
| 818 | # CONFIG_MEMSTICK is not set | 826 | # CONFIG_MEMSTICK is not set |
| 819 | # CONFIG_NEW_LEDS is not set | 827 | # CONFIG_NEW_LEDS is not set |
| 828 | # CONFIG_ACCESSIBILITY is not set | ||
| 820 | # CONFIG_INFINIBAND is not set | 829 | # CONFIG_INFINIBAND is not set |
| 821 | # CONFIG_EDAC is not set | 830 | # CONFIG_EDAC is not set |
| 822 | CONFIG_RTC_LIB=y | 831 | CONFIG_RTC_LIB=y |
| @@ -868,11 +877,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 868 | # | 877 | # |
| 869 | # on-CPU RTC drivers | 878 | # on-CPU RTC drivers |
| 870 | # | 879 | # |
| 880 | # CONFIG_RTC_DRV_PPC is not set | ||
| 871 | # CONFIG_DMADEVICES is not set | 881 | # CONFIG_DMADEVICES is not set |
| 872 | |||
| 873 | # | ||
| 874 | # Userspace I/O | ||
| 875 | # | ||
| 876 | # CONFIG_UIO is not set | 882 | # CONFIG_UIO is not set |
| 877 | 883 | ||
| 878 | # | 884 | # |
| @@ -892,7 +898,6 @@ CONFIG_FS_MBCACHE=y | |||
| 892 | # CONFIG_JFS_FS is not set | 898 | # CONFIG_JFS_FS is not set |
| 893 | # CONFIG_FS_POSIX_ACL is not set | 899 | # CONFIG_FS_POSIX_ACL is not set |
| 894 | # CONFIG_XFS_FS is not set | 900 | # CONFIG_XFS_FS is not set |
| 895 | # CONFIG_GFS2_FS is not set | ||
| 896 | # CONFIG_OCFS2_FS is not set | 901 | # CONFIG_OCFS2_FS is not set |
| 897 | CONFIG_DNOTIFY=y | 902 | CONFIG_DNOTIFY=y |
| 898 | CONFIG_INOTIFY=y | 903 | CONFIG_INOTIFY=y |
| @@ -950,7 +955,6 @@ CONFIG_NFS_FS=y | |||
| 950 | CONFIG_NFS_V3=y | 955 | CONFIG_NFS_V3=y |
| 951 | # CONFIG_NFS_V3_ACL is not set | 956 | # CONFIG_NFS_V3_ACL is not set |
| 952 | CONFIG_NFS_V4=y | 957 | CONFIG_NFS_V4=y |
| 953 | # CONFIG_NFS_DIRECTIO is not set | ||
| 954 | # CONFIG_NFSD is not set | 958 | # CONFIG_NFSD is not set |
| 955 | CONFIG_ROOT_NFS=y | 959 | CONFIG_ROOT_NFS=y |
| 956 | CONFIG_LOCKD=y | 960 | CONFIG_LOCKD=y |
| @@ -993,6 +997,7 @@ CONFIG_UCC=y | |||
| 993 | # Library routines | 997 | # Library routines |
| 994 | # | 998 | # |
| 995 | CONFIG_BITREVERSE=y | 999 | CONFIG_BITREVERSE=y |
| 1000 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 996 | # CONFIG_CRC_CCITT is not set | 1001 | # CONFIG_CRC_CCITT is not set |
| 997 | # CONFIG_CRC16 is not set | 1002 | # CONFIG_CRC16 is not set |
| 998 | # CONFIG_CRC_ITU_T is not set | 1003 | # CONFIG_CRC_ITU_T is not set |
| @@ -1003,6 +1008,7 @@ CONFIG_PLIST=y | |||
| 1003 | CONFIG_HAS_IOMEM=y | 1008 | CONFIG_HAS_IOMEM=y |
| 1004 | CONFIG_HAS_IOPORT=y | 1009 | CONFIG_HAS_IOPORT=y |
| 1005 | CONFIG_HAS_DMA=y | 1010 | CONFIG_HAS_DMA=y |
| 1011 | CONFIG_HAVE_LMB=y | ||
| 1006 | 1012 | ||
| 1007 | # | 1013 | # |
| 1008 | # Kernel hacking | 1014 | # Kernel hacking |
| @@ -1010,6 +1016,7 @@ CONFIG_HAS_DMA=y | |||
| 1010 | # CONFIG_PRINTK_TIME is not set | 1016 | # CONFIG_PRINTK_TIME is not set |
| 1011 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1017 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1012 | CONFIG_ENABLE_MUST_CHECK=y | 1018 | CONFIG_ENABLE_MUST_CHECK=y |
| 1019 | CONFIG_FRAME_WARN=1024 | ||
| 1013 | # CONFIG_MAGIC_SYSRQ is not set | 1020 | # CONFIG_MAGIC_SYSRQ is not set |
| 1014 | # CONFIG_UNUSED_SYMBOLS is not set | 1021 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1015 | # CONFIG_DEBUG_FS is not set | 1022 | # CONFIG_DEBUG_FS is not set |
| @@ -1019,6 +1026,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1019 | # CONFIG_SLUB_STATS is not set | 1026 | # CONFIG_SLUB_STATS is not set |
| 1020 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1027 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1021 | # CONFIG_SAMPLES is not set | 1028 | # CONFIG_SAMPLES is not set |
| 1029 | # CONFIG_IRQSTACKS is not set | ||
| 1022 | # CONFIG_PPC_EARLY_DEBUG is not set | 1030 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1023 | 1031 | ||
| 1024 | # | 1032 | # |
| @@ -1028,52 +1036,82 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1028 | # CONFIG_SECURITY is not set | 1036 | # CONFIG_SECURITY is not set |
| 1029 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1037 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1030 | CONFIG_CRYPTO=y | 1038 | CONFIG_CRYPTO=y |
| 1039 | |||
| 1040 | # | ||
| 1041 | # Crypto core or helper | ||
| 1042 | # | ||
| 1031 | CONFIG_CRYPTO_ALGAPI=y | 1043 | CONFIG_CRYPTO_ALGAPI=y |
| 1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1044 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1033 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1034 | CONFIG_CRYPTO_MANAGER=y | 1045 | CONFIG_CRYPTO_MANAGER=y |
| 1046 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1047 | # CONFIG_CRYPTO_NULL is not set | ||
| 1048 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1049 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1050 | # CONFIG_CRYPTO_TEST is not set | ||
| 1051 | |||
| 1052 | # | ||
| 1053 | # Authenticated Encryption with Associated Data | ||
| 1054 | # | ||
| 1055 | # CONFIG_CRYPTO_CCM is not set | ||
| 1056 | # CONFIG_CRYPTO_GCM is not set | ||
| 1057 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1058 | |||
| 1059 | # | ||
| 1060 | # Block modes | ||
| 1061 | # | ||
| 1062 | CONFIG_CRYPTO_CBC=y | ||
| 1063 | # CONFIG_CRYPTO_CTR is not set | ||
| 1064 | # CONFIG_CRYPTO_CTS is not set | ||
| 1065 | CONFIG_CRYPTO_ECB=m | ||
| 1066 | # CONFIG_CRYPTO_LRW is not set | ||
| 1067 | CONFIG_CRYPTO_PCBC=m | ||
| 1068 | # CONFIG_CRYPTO_XTS is not set | ||
| 1069 | |||
| 1070 | # | ||
| 1071 | # Hash modes | ||
| 1072 | # | ||
| 1035 | # CONFIG_CRYPTO_HMAC is not set | 1073 | # CONFIG_CRYPTO_HMAC is not set |
| 1036 | # CONFIG_CRYPTO_XCBC is not set | 1074 | # CONFIG_CRYPTO_XCBC is not set |
| 1037 | # CONFIG_CRYPTO_NULL is not set | 1075 | |
| 1076 | # | ||
| 1077 | # Digest | ||
| 1078 | # | ||
| 1079 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1038 | # CONFIG_CRYPTO_MD4 is not set | 1080 | # CONFIG_CRYPTO_MD4 is not set |
| 1039 | CONFIG_CRYPTO_MD5=y | 1081 | CONFIG_CRYPTO_MD5=y |
| 1082 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1040 | # CONFIG_CRYPTO_SHA1 is not set | 1083 | # CONFIG_CRYPTO_SHA1 is not set |
| 1041 | # CONFIG_CRYPTO_SHA256 is not set | 1084 | # CONFIG_CRYPTO_SHA256 is not set |
| 1042 | # CONFIG_CRYPTO_SHA512 is not set | 1085 | # CONFIG_CRYPTO_SHA512 is not set |
| 1043 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1044 | # CONFIG_CRYPTO_TGR192 is not set | 1086 | # CONFIG_CRYPTO_TGR192 is not set |
| 1045 | # CONFIG_CRYPTO_GF128MUL is not set | 1087 | # CONFIG_CRYPTO_WP512 is not set |
| 1046 | CONFIG_CRYPTO_ECB=m | 1088 | |
| 1047 | CONFIG_CRYPTO_CBC=y | 1089 | # |
| 1048 | CONFIG_CRYPTO_PCBC=m | 1090 | # Ciphers |
| 1049 | # CONFIG_CRYPTO_LRW is not set | 1091 | # |
| 1050 | # CONFIG_CRYPTO_XTS is not set | ||
| 1051 | # CONFIG_CRYPTO_CTR is not set | ||
| 1052 | # CONFIG_CRYPTO_GCM is not set | ||
| 1053 | # CONFIG_CRYPTO_CCM is not set | ||
| 1054 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1055 | CONFIG_CRYPTO_DES=y | ||
| 1056 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1057 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1058 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1059 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1060 | # CONFIG_CRYPTO_AES is not set | 1092 | # CONFIG_CRYPTO_AES is not set |
| 1093 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1094 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1095 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1096 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1061 | # CONFIG_CRYPTO_CAST5 is not set | 1097 | # CONFIG_CRYPTO_CAST5 is not set |
| 1062 | # CONFIG_CRYPTO_CAST6 is not set | 1098 | # CONFIG_CRYPTO_CAST6 is not set |
| 1063 | # CONFIG_CRYPTO_TEA is not set | 1099 | CONFIG_CRYPTO_DES=y |
| 1064 | # CONFIG_CRYPTO_ARC4 is not set | 1100 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1065 | # CONFIG_CRYPTO_KHAZAD is not set | 1101 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1066 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1067 | # CONFIG_CRYPTO_SEED is not set | ||
| 1068 | # CONFIG_CRYPTO_SALSA20 is not set | 1102 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1103 | # CONFIG_CRYPTO_SEED is not set | ||
| 1104 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1105 | # CONFIG_CRYPTO_TEA is not set | ||
| 1106 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1107 | |||
| 1108 | # | ||
| 1109 | # Compression | ||
| 1110 | # | ||
| 1069 | # CONFIG_CRYPTO_DEFLATE is not set | 1111 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1070 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1072 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1073 | # CONFIG_CRYPTO_TEST is not set | ||
| 1074 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1075 | # CONFIG_CRYPTO_LZO is not set | 1112 | # CONFIG_CRYPTO_LZO is not set |
| 1076 | CONFIG_CRYPTO_HW=y | 1113 | CONFIG_CRYPTO_HW=y |
| 1077 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1114 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1078 | # CONFIG_PPC_CLOCK is not set | 1115 | # CONFIG_PPC_CLOCK is not set |
| 1079 | CONFIG_PPC_LIB_RHEAP=y | 1116 | CONFIG_PPC_LIB_RHEAP=y |
| 1117 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index f377cde785b0..0f94d9f56beb 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:23 2008 | 4 | # Mon Jun 9 08:52:28 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -211,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 226 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_SYSCALL is not set | 241 | # CONFIG_PCI_SYSCALL is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,11 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 259 | ||
| 252 | # | 260 | # |
| 253 | # Networking | 261 | # Networking |
| @@ -295,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -350,6 +356,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 350 | # CONFIG_CONNECTOR is not set | 356 | # CONFIG_CONNECTOR is not set |
| 351 | # CONFIG_MTD is not set | 357 | # CONFIG_MTD is not set |
| 352 | CONFIG_OF_DEVICE=y | 358 | CONFIG_OF_DEVICE=y |
| 359 | CONFIG_OF_I2C=y | ||
| 353 | # CONFIG_PARPORT is not set | 360 | # CONFIG_PARPORT is not set |
| 354 | CONFIG_BLK_DEV=y | 361 | CONFIG_BLK_DEV=y |
| 355 | # CONFIG_BLK_DEV_FD is not set | 362 | # CONFIG_BLK_DEV_FD is not set |
| @@ -411,8 +418,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 411 | # CONFIG_SCSI_DEBUG is not set | 418 | # CONFIG_SCSI_DEBUG is not set |
| 412 | CONFIG_ATA=y | 419 | CONFIG_ATA=y |
| 413 | # CONFIG_ATA_NONSTANDARD is not set | 420 | # CONFIG_ATA_NONSTANDARD is not set |
| 414 | # CONFIG_SATA_MV is not set | 421 | CONFIG_SATA_PMP=y |
| 415 | CONFIG_SATA_FSL=y | 422 | CONFIG_SATA_FSL=y |
| 423 | CONFIG_ATA_SFF=y | ||
| 424 | # CONFIG_SATA_MV is not set | ||
| 416 | # CONFIG_PATA_PLATFORM is not set | 425 | # CONFIG_PATA_PLATFORM is not set |
| 417 | # CONFIG_MD is not set | 426 | # CONFIG_MD is not set |
| 418 | # CONFIG_MACINTOSH_DRIVERS is not set | 427 | # CONFIG_MACINTOSH_DRIVERS is not set |
| @@ -459,6 +468,7 @@ CONFIG_NETDEV_10000=y | |||
| 459 | # | 468 | # |
| 460 | # CONFIG_WLAN_PRE80211 is not set | 469 | # CONFIG_WLAN_PRE80211 is not set |
| 461 | # CONFIG_WLAN_80211 is not set | 470 | # CONFIG_WLAN_80211 is not set |
| 471 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 462 | # CONFIG_WAN is not set | 472 | # CONFIG_WAN is not set |
| 463 | # CONFIG_PPP is not set | 473 | # CONFIG_PPP is not set |
| 464 | # CONFIG_SLIP is not set | 474 | # CONFIG_SLIP is not set |
| @@ -503,6 +513,7 @@ CONFIG_INPUT=y | |||
| 503 | # Character devices | 513 | # Character devices |
| 504 | # | 514 | # |
| 505 | # CONFIG_VT is not set | 515 | # CONFIG_VT is not set |
| 516 | CONFIG_DEVKMEM=y | ||
| 506 | # CONFIG_SERIAL_NONSTANDARD is not set | 517 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 507 | 518 | ||
| 508 | # | 519 | # |
| @@ -537,13 +548,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 537 | CONFIG_I2C_CHARDEV=y | 548 | CONFIG_I2C_CHARDEV=y |
| 538 | 549 | ||
| 539 | # | 550 | # |
| 540 | # I2C Algorithms | ||
| 541 | # | ||
| 542 | # CONFIG_I2C_ALGOBIT is not set | ||
| 543 | # CONFIG_I2C_ALGOPCF is not set | ||
| 544 | # CONFIG_I2C_ALGOPCA is not set | ||
| 545 | |||
| 546 | # | ||
| 547 | # I2C Hardware Bus support | 551 | # I2C Hardware Bus support |
| 548 | # | 552 | # |
| 549 | CONFIG_I2C_MPC=y | 553 | CONFIG_I2C_MPC=y |
| @@ -552,6 +556,7 @@ CONFIG_I2C_MPC=y | |||
| 552 | # CONFIG_I2C_SIMTEC is not set | 556 | # CONFIG_I2C_SIMTEC is not set |
| 553 | # CONFIG_I2C_TAOS_EVM is not set | 557 | # CONFIG_I2C_TAOS_EVM is not set |
| 554 | # CONFIG_I2C_STUB is not set | 558 | # CONFIG_I2C_STUB is not set |
| 559 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 555 | 560 | ||
| 556 | # | 561 | # |
| 557 | # Miscellaneous I2C Chip support | 562 | # Miscellaneous I2C Chip support |
| @@ -561,19 +566,13 @@ CONFIG_I2C_MPC=y | |||
| 561 | # CONFIG_SENSORS_PCF8574 is not set | 566 | # CONFIG_SENSORS_PCF8574 is not set |
| 562 | # CONFIG_PCF8575 is not set | 567 | # CONFIG_PCF8575 is not set |
| 563 | # CONFIG_SENSORS_PCF8591 is not set | 568 | # CONFIG_SENSORS_PCF8591 is not set |
| 564 | # CONFIG_TPS65010 is not set | ||
| 565 | # CONFIG_SENSORS_MAX6875 is not set | 569 | # CONFIG_SENSORS_MAX6875 is not set |
| 566 | # CONFIG_SENSORS_TSL2550 is not set | 570 | # CONFIG_SENSORS_TSL2550 is not set |
| 567 | # CONFIG_I2C_DEBUG_CORE is not set | 571 | # CONFIG_I2C_DEBUG_CORE is not set |
| 568 | # CONFIG_I2C_DEBUG_ALGO is not set | 572 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 569 | # CONFIG_I2C_DEBUG_BUS is not set | 573 | # CONFIG_I2C_DEBUG_BUS is not set |
| 570 | # CONFIG_I2C_DEBUG_CHIP is not set | 574 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 571 | |||
| 572 | # | ||
| 573 | # SPI support | ||
| 574 | # | ||
| 575 | # CONFIG_SPI is not set | 575 | # CONFIG_SPI is not set |
| 576 | # CONFIG_SPI_MASTER is not set | ||
| 577 | # CONFIG_W1 is not set | 576 | # CONFIG_W1 is not set |
| 578 | # CONFIG_POWER_SUPPLY is not set | 577 | # CONFIG_POWER_SUPPLY is not set |
| 579 | CONFIG_HWMON=y | 578 | CONFIG_HWMON=y |
| @@ -646,12 +645,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 646 | # Multifunction device drivers | 645 | # Multifunction device drivers |
| 647 | # | 646 | # |
| 648 | # CONFIG_MFD_SM501 is not set | 647 | # CONFIG_MFD_SM501 is not set |
| 648 | # CONFIG_HTC_PASIC3 is not set | ||
| 649 | 649 | ||
| 650 | # | 650 | # |
| 651 | # Multimedia devices | 651 | # Multimedia devices |
| 652 | # | 652 | # |
| 653 | |||
| 654 | # | ||
| 655 | # Multimedia core support | ||
| 656 | # | ||
| 653 | # CONFIG_VIDEO_DEV is not set | 657 | # CONFIG_VIDEO_DEV is not set |
| 654 | # CONFIG_DVB_CORE is not set | 658 | # CONFIG_DVB_CORE is not set |
| 659 | # CONFIG_VIDEO_MEDIA is not set | ||
| 660 | |||
| 661 | # | ||
| 662 | # Multimedia drivers | ||
| 663 | # | ||
| 655 | CONFIG_DAB=y | 664 | CONFIG_DAB=y |
| 656 | 665 | ||
| 657 | # | 666 | # |
| @@ -680,6 +689,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 680 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 689 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 681 | CONFIG_USB_ARCH_HAS_EHCI=y | 690 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 682 | # CONFIG_USB is not set | 691 | # CONFIG_USB is not set |
| 692 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 693 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 683 | 694 | ||
| 684 | # | 695 | # |
| 685 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -688,13 +699,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 688 | # CONFIG_MMC is not set | 699 | # CONFIG_MMC is not set |
| 689 | # CONFIG_MEMSTICK is not set | 700 | # CONFIG_MEMSTICK is not set |
| 690 | # CONFIG_NEW_LEDS is not set | 701 | # CONFIG_NEW_LEDS is not set |
| 702 | # CONFIG_ACCESSIBILITY is not set | ||
| 691 | # CONFIG_EDAC is not set | 703 | # CONFIG_EDAC is not set |
| 692 | # CONFIG_RTC_CLASS is not set | 704 | # CONFIG_RTC_CLASS is not set |
| 693 | # CONFIG_DMADEVICES is not set | 705 | # CONFIG_DMADEVICES is not set |
| 694 | |||
| 695 | # | ||
| 696 | # Userspace I/O | ||
| 697 | # | ||
| 698 | # CONFIG_UIO is not set | 706 | # CONFIG_UIO is not set |
| 699 | 707 | ||
| 700 | # | 708 | # |
| @@ -714,7 +722,6 @@ CONFIG_FS_MBCACHE=y | |||
| 714 | # CONFIG_JFS_FS is not set | 722 | # CONFIG_JFS_FS is not set |
| 715 | # CONFIG_FS_POSIX_ACL is not set | 723 | # CONFIG_FS_POSIX_ACL is not set |
| 716 | # CONFIG_XFS_FS is not set | 724 | # CONFIG_XFS_FS is not set |
| 717 | # CONFIG_GFS2_FS is not set | ||
| 718 | # CONFIG_OCFS2_FS is not set | 725 | # CONFIG_OCFS2_FS is not set |
| 719 | CONFIG_DNOTIFY=y | 726 | CONFIG_DNOTIFY=y |
| 720 | CONFIG_INOTIFY=y | 727 | CONFIG_INOTIFY=y |
| @@ -772,7 +779,6 @@ CONFIG_NFS_FS=y | |||
| 772 | CONFIG_NFS_V3=y | 779 | CONFIG_NFS_V3=y |
| 773 | # CONFIG_NFS_V3_ACL is not set | 780 | # CONFIG_NFS_V3_ACL is not set |
| 774 | CONFIG_NFS_V4=y | 781 | CONFIG_NFS_V4=y |
| 775 | # CONFIG_NFS_DIRECTIO is not set | ||
| 776 | # CONFIG_NFSD is not set | 782 | # CONFIG_NFSD is not set |
| 777 | CONFIG_ROOT_NFS=y | 783 | CONFIG_ROOT_NFS=y |
| 778 | CONFIG_LOCKD=y | 784 | CONFIG_LOCKD=y |
| @@ -817,6 +823,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 817 | # Library routines | 823 | # Library routines |
| 818 | # | 824 | # |
| 819 | CONFIG_BITREVERSE=y | 825 | CONFIG_BITREVERSE=y |
| 826 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 820 | # CONFIG_CRC_CCITT is not set | 827 | # CONFIG_CRC_CCITT is not set |
| 821 | # CONFIG_CRC16 is not set | 828 | # CONFIG_CRC16 is not set |
| 822 | # CONFIG_CRC_ITU_T is not set | 829 | # CONFIG_CRC_ITU_T is not set |
| @@ -827,6 +834,7 @@ CONFIG_PLIST=y | |||
| 827 | CONFIG_HAS_IOMEM=y | 834 | CONFIG_HAS_IOMEM=y |
| 828 | CONFIG_HAS_IOPORT=y | 835 | CONFIG_HAS_IOPORT=y |
| 829 | CONFIG_HAS_DMA=y | 836 | CONFIG_HAS_DMA=y |
| 837 | CONFIG_HAVE_LMB=y | ||
| 830 | 838 | ||
| 831 | # | 839 | # |
| 832 | # Kernel hacking | 840 | # Kernel hacking |
| @@ -834,6 +842,7 @@ CONFIG_HAS_DMA=y | |||
| 834 | # CONFIG_PRINTK_TIME is not set | 842 | # CONFIG_PRINTK_TIME is not set |
| 835 | CONFIG_ENABLE_WARN_DEPRECATED=y | 843 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 836 | CONFIG_ENABLE_MUST_CHECK=y | 844 | CONFIG_ENABLE_MUST_CHECK=y |
| 845 | CONFIG_FRAME_WARN=1024 | ||
| 837 | # CONFIG_MAGIC_SYSRQ is not set | 846 | # CONFIG_MAGIC_SYSRQ is not set |
| 838 | # CONFIG_UNUSED_SYMBOLS is not set | 847 | # CONFIG_UNUSED_SYMBOLS is not set |
| 839 | # CONFIG_DEBUG_FS is not set | 848 | # CONFIG_DEBUG_FS is not set |
| @@ -841,6 +850,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 841 | # CONFIG_DEBUG_KERNEL is not set | 850 | # CONFIG_DEBUG_KERNEL is not set |
| 842 | # CONFIG_DEBUG_BUGVERBOSE is not set | 851 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 843 | # CONFIG_SAMPLES is not set | 852 | # CONFIG_SAMPLES is not set |
| 853 | # CONFIG_IRQSTACKS is not set | ||
| 844 | # CONFIG_PPC_EARLY_DEBUG is not set | 854 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 845 | 855 | ||
| 846 | # | 856 | # |
| @@ -850,50 +860,80 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 850 | # CONFIG_SECURITY is not set | 860 | # CONFIG_SECURITY is not set |
| 851 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 861 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 852 | CONFIG_CRYPTO=y | 862 | CONFIG_CRYPTO=y |
| 863 | |||
| 864 | # | ||
| 865 | # Crypto core or helper | ||
| 866 | # | ||
| 853 | CONFIG_CRYPTO_ALGAPI=y | 867 | CONFIG_CRYPTO_ALGAPI=y |
| 854 | CONFIG_CRYPTO_BLKCIPHER=y | 868 | CONFIG_CRYPTO_BLKCIPHER=y |
| 855 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 856 | CONFIG_CRYPTO_MANAGER=y | 869 | CONFIG_CRYPTO_MANAGER=y |
| 870 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 871 | # CONFIG_CRYPTO_NULL is not set | ||
| 872 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 873 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 874 | # CONFIG_CRYPTO_TEST is not set | ||
| 875 | |||
| 876 | # | ||
| 877 | # Authenticated Encryption with Associated Data | ||
| 878 | # | ||
| 879 | # CONFIG_CRYPTO_CCM is not set | ||
| 880 | # CONFIG_CRYPTO_GCM is not set | ||
| 881 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 882 | |||
| 883 | # | ||
| 884 | # Block modes | ||
| 885 | # | ||
| 886 | CONFIG_CRYPTO_CBC=y | ||
| 887 | # CONFIG_CRYPTO_CTR is not set | ||
| 888 | # CONFIG_CRYPTO_CTS is not set | ||
| 889 | CONFIG_CRYPTO_ECB=m | ||
| 890 | # CONFIG_CRYPTO_LRW is not set | ||
| 891 | CONFIG_CRYPTO_PCBC=m | ||
| 892 | # CONFIG_CRYPTO_XTS is not set | ||
| 893 | |||
| 894 | # | ||
| 895 | # Hash modes | ||
| 896 | # | ||
| 857 | # CONFIG_CRYPTO_HMAC is not set | 897 | # CONFIG_CRYPTO_HMAC is not set |
| 858 | # CONFIG_CRYPTO_XCBC is not set | 898 | # CONFIG_CRYPTO_XCBC is not set |
| 859 | # CONFIG_CRYPTO_NULL is not set | 899 | |
| 900 | # | ||
| 901 | # Digest | ||
| 902 | # | ||
| 903 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 860 | # CONFIG_CRYPTO_MD4 is not set | 904 | # CONFIG_CRYPTO_MD4 is not set |
| 861 | CONFIG_CRYPTO_MD5=y | 905 | CONFIG_CRYPTO_MD5=y |
| 906 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 862 | # CONFIG_CRYPTO_SHA1 is not set | 907 | # CONFIG_CRYPTO_SHA1 is not set |
| 863 | # CONFIG_CRYPTO_SHA256 is not set | 908 | # CONFIG_CRYPTO_SHA256 is not set |
| 864 | # CONFIG_CRYPTO_SHA512 is not set | 909 | # CONFIG_CRYPTO_SHA512 is not set |
| 865 | # CONFIG_CRYPTO_WP512 is not set | ||
| 866 | # CONFIG_CRYPTO_TGR192 is not set | 910 | # CONFIG_CRYPTO_TGR192 is not set |
| 867 | # CONFIG_CRYPTO_GF128MUL is not set | 911 | # CONFIG_CRYPTO_WP512 is not set |
| 868 | CONFIG_CRYPTO_ECB=m | 912 | |
| 869 | CONFIG_CRYPTO_CBC=y | 913 | # |
| 870 | CONFIG_CRYPTO_PCBC=m | 914 | # Ciphers |
| 871 | # CONFIG_CRYPTO_LRW is not set | 915 | # |
| 872 | # CONFIG_CRYPTO_XTS is not set | ||
| 873 | # CONFIG_CRYPTO_CTR is not set | ||
| 874 | # CONFIG_CRYPTO_GCM is not set | ||
| 875 | # CONFIG_CRYPTO_CCM is not set | ||
| 876 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 877 | CONFIG_CRYPTO_DES=y | ||
| 878 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 881 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 882 | # CONFIG_CRYPTO_AES is not set | 916 | # CONFIG_CRYPTO_AES is not set |
| 917 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 918 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 919 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 920 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 883 | # CONFIG_CRYPTO_CAST5 is not set | 921 | # CONFIG_CRYPTO_CAST5 is not set |
| 884 | # CONFIG_CRYPTO_CAST6 is not set | 922 | # CONFIG_CRYPTO_CAST6 is not set |
| 885 | # CONFIG_CRYPTO_TEA is not set | 923 | CONFIG_CRYPTO_DES=y |
| 886 | # CONFIG_CRYPTO_ARC4 is not set | 924 | # CONFIG_CRYPTO_FCRYPT is not set |
| 887 | # CONFIG_CRYPTO_KHAZAD is not set | 925 | # CONFIG_CRYPTO_KHAZAD is not set |
| 888 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 889 | # CONFIG_CRYPTO_SEED is not set | ||
| 890 | # CONFIG_CRYPTO_SALSA20 is not set | 926 | # CONFIG_CRYPTO_SALSA20 is not set |
| 927 | # CONFIG_CRYPTO_SEED is not set | ||
| 928 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 929 | # CONFIG_CRYPTO_TEA is not set | ||
| 930 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 931 | |||
| 932 | # | ||
| 933 | # Compression | ||
| 934 | # | ||
| 891 | # CONFIG_CRYPTO_DEFLATE is not set | 935 | # CONFIG_CRYPTO_DEFLATE is not set |
| 892 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 894 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 895 | # CONFIG_CRYPTO_TEST is not set | ||
| 896 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 897 | # CONFIG_CRYPTO_LZO is not set | 936 | # CONFIG_CRYPTO_LZO is not set |
| 898 | CONFIG_CRYPTO_HW=y | 937 | CONFIG_CRYPTO_HW=y |
| 899 | # CONFIG_PPC_CLOCK is not set | 938 | # CONFIG_PPC_CLOCK is not set |
| 939 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index a6331769d88f..0d448556f53a 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:24 2008 | 4 | # Tue Jun 10 09:17:12 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -211,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 226 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_SYSCALL is not set | 241 | # CONFIG_PCI_SYSCALL is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,11 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 259 | ||
| 252 | # | 260 | # |
| 253 | # Networking | 261 | # Networking |
| @@ -290,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -345,6 +351,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 345 | # CONFIG_CONNECTOR is not set | 351 | # CONFIG_CONNECTOR is not set |
| 346 | # CONFIG_MTD is not set | 352 | # CONFIG_MTD is not set |
| 347 | CONFIG_OF_DEVICE=y | 353 | CONFIG_OF_DEVICE=y |
| 354 | CONFIG_OF_I2C=y | ||
| 348 | # CONFIG_PARPORT is not set | 355 | # CONFIG_PARPORT is not set |
| 349 | CONFIG_BLK_DEV=y | 356 | CONFIG_BLK_DEV=y |
| 350 | # CONFIG_BLK_DEV_FD is not set | 357 | # CONFIG_BLK_DEV_FD is not set |
| @@ -352,6 +359,7 @@ CONFIG_BLK_DEV=y | |||
| 352 | CONFIG_BLK_DEV_LOOP=y | 359 | CONFIG_BLK_DEV_LOOP=y |
| 353 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 360 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| 354 | # CONFIG_BLK_DEV_NBD is not set | 361 | # CONFIG_BLK_DEV_NBD is not set |
| 362 | # CONFIG_BLK_DEV_UB is not set | ||
| 355 | CONFIG_BLK_DEV_RAM=y | 363 | CONFIG_BLK_DEV_RAM=y |
| 356 | CONFIG_BLK_DEV_RAM_COUNT=16 | 364 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 357 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 365 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| @@ -406,8 +414,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 406 | # CONFIG_SCSI_DEBUG is not set | 414 | # CONFIG_SCSI_DEBUG is not set |
| 407 | CONFIG_ATA=y | 415 | CONFIG_ATA=y |
| 408 | # CONFIG_ATA_NONSTANDARD is not set | 416 | # CONFIG_ATA_NONSTANDARD is not set |
| 409 | # CONFIG_SATA_MV is not set | 417 | CONFIG_SATA_PMP=y |
| 410 | CONFIG_SATA_FSL=y | 418 | CONFIG_SATA_FSL=y |
| 419 | CONFIG_ATA_SFF=y | ||
| 420 | # CONFIG_SATA_MV is not set | ||
| 411 | # CONFIG_PATA_PLATFORM is not set | 421 | # CONFIG_PATA_PLATFORM is not set |
| 412 | CONFIG_MD=y | 422 | CONFIG_MD=y |
| 413 | CONFIG_BLK_DEV_MD=y | 423 | CONFIG_BLK_DEV_MD=y |
| @@ -444,7 +454,7 @@ CONFIG_MARVELL_PHY=y | |||
| 444 | # CONFIG_BROADCOM_PHY is not set | 454 | # CONFIG_BROADCOM_PHY is not set |
| 445 | # CONFIG_ICPLUS_PHY is not set | 455 | # CONFIG_ICPLUS_PHY is not set |
| 446 | # CONFIG_REALTEK_PHY is not set | 456 | # CONFIG_REALTEK_PHY is not set |
| 447 | # CONFIG_FIXED_PHY is not set | 457 | CONFIG_FIXED_PHY=y |
| 448 | # CONFIG_MDIO_BITBANG is not set | 458 | # CONFIG_MDIO_BITBANG is not set |
| 449 | CONFIG_NET_ETHERNET=y | 459 | CONFIG_NET_ETHERNET=y |
| 450 | CONFIG_MII=y | 460 | CONFIG_MII=y |
| @@ -464,6 +474,16 @@ CONFIG_GFAR_NAPI=y | |||
| 464 | # | 474 | # |
| 465 | # CONFIG_WLAN_PRE80211 is not set | 475 | # CONFIG_WLAN_PRE80211 is not set |
| 466 | # CONFIG_WLAN_80211 is not set | 476 | # CONFIG_WLAN_80211 is not set |
| 477 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 478 | |||
| 479 | # | ||
| 480 | # USB Network Adapters | ||
| 481 | # | ||
| 482 | # CONFIG_USB_CATC is not set | ||
| 483 | # CONFIG_USB_KAWETH is not set | ||
| 484 | # CONFIG_USB_PEGASUS is not set | ||
| 485 | # CONFIG_USB_RTL8150 is not set | ||
| 486 | # CONFIG_USB_USBNET is not set | ||
| 467 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
| 468 | # CONFIG_PPP is not set | 488 | # CONFIG_PPP is not set |
| 469 | # CONFIG_SLIP is not set | 489 | # CONFIG_SLIP is not set |
| @@ -508,6 +528,7 @@ CONFIG_INPUT=y | |||
| 508 | # Character devices | 528 | # Character devices |
| 509 | # | 529 | # |
| 510 | # CONFIG_VT is not set | 530 | # CONFIG_VT is not set |
| 531 | CONFIG_DEVKMEM=y | ||
| 511 | # CONFIG_SERIAL_NONSTANDARD is not set | 532 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 512 | 533 | ||
| 513 | # | 534 | # |
| @@ -542,13 +563,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 542 | CONFIG_I2C_CHARDEV=y | 563 | CONFIG_I2C_CHARDEV=y |
| 543 | 564 | ||
| 544 | # | 565 | # |
| 545 | # I2C Algorithms | ||
| 546 | # | ||
| 547 | # CONFIG_I2C_ALGOBIT is not set | ||
| 548 | # CONFIG_I2C_ALGOPCF is not set | ||
| 549 | # CONFIG_I2C_ALGOPCA is not set | ||
| 550 | |||
| 551 | # | ||
| 552 | # I2C Hardware Bus support | 566 | # I2C Hardware Bus support |
| 553 | # | 567 | # |
| 554 | CONFIG_I2C_MPC=y | 568 | CONFIG_I2C_MPC=y |
| @@ -557,6 +571,8 @@ CONFIG_I2C_MPC=y | |||
| 557 | # CONFIG_I2C_SIMTEC is not set | 571 | # CONFIG_I2C_SIMTEC is not set |
| 558 | # CONFIG_I2C_TAOS_EVM is not set | 572 | # CONFIG_I2C_TAOS_EVM is not set |
| 559 | # CONFIG_I2C_STUB is not set | 573 | # CONFIG_I2C_STUB is not set |
| 574 | # CONFIG_I2C_TINY_USB is not set | ||
| 575 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 560 | 576 | ||
| 561 | # | 577 | # |
| 562 | # Miscellaneous I2C Chip support | 578 | # Miscellaneous I2C Chip support |
| @@ -566,19 +582,13 @@ CONFIG_I2C_MPC=y | |||
| 566 | # CONFIG_SENSORS_PCF8574 is not set | 582 | # CONFIG_SENSORS_PCF8574 is not set |
| 567 | # CONFIG_PCF8575 is not set | 583 | # CONFIG_PCF8575 is not set |
| 568 | # CONFIG_SENSORS_PCF8591 is not set | 584 | # CONFIG_SENSORS_PCF8591 is not set |
| 569 | # CONFIG_TPS65010 is not set | ||
| 570 | # CONFIG_SENSORS_MAX6875 is not set | 585 | # CONFIG_SENSORS_MAX6875 is not set |
| 571 | # CONFIG_SENSORS_TSL2550 is not set | 586 | # CONFIG_SENSORS_TSL2550 is not set |
| 572 | # CONFIG_I2C_DEBUG_CORE is not set | 587 | # CONFIG_I2C_DEBUG_CORE is not set |
| 573 | # CONFIG_I2C_DEBUG_ALGO is not set | 588 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 574 | # CONFIG_I2C_DEBUG_BUS is not set | 589 | # CONFIG_I2C_DEBUG_BUS is not set |
| 575 | # CONFIG_I2C_DEBUG_CHIP is not set | 590 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 576 | |||
| 577 | # | ||
| 578 | # SPI support | ||
| 579 | # | ||
| 580 | # CONFIG_SPI is not set | 591 | # CONFIG_SPI is not set |
| 581 | # CONFIG_SPI_MASTER is not set | ||
| 582 | # CONFIG_W1 is not set | 592 | # CONFIG_W1 is not set |
| 583 | # CONFIG_POWER_SUPPLY is not set | 593 | # CONFIG_POWER_SUPPLY is not set |
| 584 | CONFIG_HWMON=y | 594 | CONFIG_HWMON=y |
| @@ -642,6 +652,11 @@ CONFIG_WATCHDOG=y | |||
| 642 | CONFIG_83xx_WDT=y | 652 | CONFIG_83xx_WDT=y |
| 643 | 653 | ||
| 644 | # | 654 | # |
| 655 | # USB-based Watchdog Cards | ||
| 656 | # | ||
| 657 | # CONFIG_USBPCWATCHDOG is not set | ||
| 658 | |||
| 659 | # | ||
| 645 | # Sonics Silicon Backplane | 660 | # Sonics Silicon Backplane |
| 646 | # | 661 | # |
| 647 | CONFIG_SSB_POSSIBLE=y | 662 | CONFIG_SSB_POSSIBLE=y |
| @@ -651,13 +666,24 @@ CONFIG_SSB_POSSIBLE=y | |||
| 651 | # Multifunction device drivers | 666 | # Multifunction device drivers |
| 652 | # | 667 | # |
| 653 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
| 669 | # CONFIG_HTC_PASIC3 is not set | ||
| 654 | 670 | ||
| 655 | # | 671 | # |
| 656 | # Multimedia devices | 672 | # Multimedia devices |
| 657 | # | 673 | # |
| 674 | |||
| 675 | # | ||
| 676 | # Multimedia core support | ||
| 677 | # | ||
| 658 | # CONFIG_VIDEO_DEV is not set | 678 | # CONFIG_VIDEO_DEV is not set |
| 659 | # CONFIG_DVB_CORE is not set | 679 | # CONFIG_DVB_CORE is not set |
| 680 | # CONFIG_VIDEO_MEDIA is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Multimedia drivers | ||
| 684 | # | ||
| 660 | CONFIG_DAB=y | 685 | CONFIG_DAB=y |
| 686 | # CONFIG_USB_DABUSB is not set | ||
| 661 | 687 | ||
| 662 | # | 688 | # |
| 663 | # Graphics support | 689 | # Graphics support |
| @@ -680,6 +706,14 @@ CONFIG_HID_SUPPORT=y | |||
| 680 | CONFIG_HID=y | 706 | CONFIG_HID=y |
| 681 | # CONFIG_HID_DEBUG is not set | 707 | # CONFIG_HID_DEBUG is not set |
| 682 | # CONFIG_HIDRAW is not set | 708 | # CONFIG_HIDRAW is not set |
| 709 | |||
| 710 | # | ||
| 711 | # USB Input Devices | ||
| 712 | # | ||
| 713 | CONFIG_USB_HID=y | ||
| 714 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
| 715 | # CONFIG_HID_FF is not set | ||
| 716 | # CONFIG_USB_HIDDEV is not set | ||
| 683 | CONFIG_USB_SUPPORT=y | 717 | CONFIG_USB_SUPPORT=y |
| 684 | CONFIG_USB_ARCH_HAS_HCD=y | 718 | CONFIG_USB_ARCH_HAS_HCD=y |
| 685 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 719 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| @@ -695,33 +729,83 @@ CONFIG_USB=y | |||
| 695 | CONFIG_USB_DEVICE_CLASS=y | 729 | CONFIG_USB_DEVICE_CLASS=y |
| 696 | # CONFIG_USB_DYNAMIC_MINORS is not set | 730 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 697 | # CONFIG_USB_OTG is not set | 731 | # CONFIG_USB_OTG is not set |
| 732 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 733 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 698 | 734 | ||
| 699 | # | 735 | # |
| 700 | # USB Host Controller Drivers | 736 | # USB Host Controller Drivers |
| 701 | # | 737 | # |
| 738 | # CONFIG_USB_C67X00_HCD is not set | ||
| 702 | CONFIG_USB_EHCI_HCD=y | 739 | CONFIG_USB_EHCI_HCD=y |
| 703 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 740 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 704 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 741 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 705 | CONFIG_USB_EHCI_FSL=y | 742 | CONFIG_USB_EHCI_FSL=y |
| 706 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 743 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 707 | # CONFIG_USB_ISP116X_HCD is not set | 744 | # CONFIG_USB_ISP116X_HCD is not set |
| 745 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 708 | # CONFIG_USB_SL811_HCD is not set | 746 | # CONFIG_USB_SL811_HCD is not set |
| 709 | # CONFIG_USB_R8A66597_HCD is not set | 747 | # CONFIG_USB_R8A66597_HCD is not set |
| 710 | 748 | ||
| 711 | # | 749 | # |
| 750 | # USB Device Class drivers | ||
| 751 | # | ||
| 752 | # CONFIG_USB_ACM is not set | ||
| 753 | # CONFIG_USB_PRINTER is not set | ||
| 754 | # CONFIG_USB_WDM is not set | ||
| 755 | |||
| 756 | # | ||
| 712 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 757 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 713 | # | 758 | # |
| 759 | |||
| 760 | # | ||
| 761 | # may also be needed; see USB_STORAGE Help for more information | ||
| 762 | # | ||
| 763 | # CONFIG_USB_STORAGE is not set | ||
| 764 | # CONFIG_USB_LIBUSUAL is not set | ||
| 765 | |||
| 766 | # | ||
| 767 | # USB Imaging devices | ||
| 768 | # | ||
| 769 | # CONFIG_USB_MDC800 is not set | ||
| 770 | # CONFIG_USB_MICROTEK is not set | ||
| 771 | CONFIG_USB_MON=y | ||
| 772 | |||
| 773 | # | ||
| 774 | # USB port drivers | ||
| 775 | # | ||
| 776 | # CONFIG_USB_SERIAL is not set | ||
| 777 | |||
| 778 | # | ||
| 779 | # USB Miscellaneous drivers | ||
| 780 | # | ||
| 781 | # CONFIG_USB_EMI62 is not set | ||
| 782 | # CONFIG_USB_EMI26 is not set | ||
| 783 | # CONFIG_USB_ADUTUX is not set | ||
| 784 | # CONFIG_USB_AUERSWALD is not set | ||
| 785 | # CONFIG_USB_RIO500 is not set | ||
| 786 | # CONFIG_USB_LEGOTOWER is not set | ||
| 787 | # CONFIG_USB_LCD is not set | ||
| 788 | # CONFIG_USB_BERRY_CHARGE is not set | ||
| 789 | # CONFIG_USB_LED is not set | ||
| 790 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
| 791 | # CONFIG_USB_CYTHERM is not set | ||
| 792 | # CONFIG_USB_PHIDGET is not set | ||
| 793 | # CONFIG_USB_IDMOUSE is not set | ||
| 794 | # CONFIG_USB_FTDI_ELAN is not set | ||
| 795 | # CONFIG_USB_APPLEDISPLAY is not set | ||
| 796 | # CONFIG_USB_SISUSBVGA is not set | ||
| 797 | # CONFIG_USB_LD is not set | ||
| 798 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
| 799 | # CONFIG_USB_IOWARRIOR is not set | ||
| 800 | # CONFIG_USB_ISIGHTFW is not set | ||
| 714 | # CONFIG_USB_GADGET is not set | 801 | # CONFIG_USB_GADGET is not set |
| 715 | # CONFIG_MMC is not set | 802 | # CONFIG_MMC is not set |
| 716 | # CONFIG_MEMSTICK is not set | 803 | # CONFIG_MEMSTICK is not set |
| 717 | # CONFIG_NEW_LEDS is not set | 804 | # CONFIG_NEW_LEDS is not set |
| 805 | # CONFIG_ACCESSIBILITY is not set | ||
| 718 | # CONFIG_EDAC is not set | 806 | # CONFIG_EDAC is not set |
| 719 | # CONFIG_RTC_CLASS is not set | 807 | # CONFIG_RTC_CLASS is not set |
| 720 | # CONFIG_DMADEVICES is not set | 808 | # CONFIG_DMADEVICES is not set |
| 721 | |||
| 722 | # | ||
| 723 | # Userspace I/O | ||
| 724 | # | ||
| 725 | # CONFIG_UIO is not set | 809 | # CONFIG_UIO is not set |
| 726 | 810 | ||
| 727 | # | 811 | # |
| @@ -741,7 +825,6 @@ CONFIG_FS_MBCACHE=y | |||
| 741 | # CONFIG_JFS_FS is not set | 825 | # CONFIG_JFS_FS is not set |
| 742 | # CONFIG_FS_POSIX_ACL is not set | 826 | # CONFIG_FS_POSIX_ACL is not set |
| 743 | # CONFIG_XFS_FS is not set | 827 | # CONFIG_XFS_FS is not set |
| 744 | # CONFIG_GFS2_FS is not set | ||
| 745 | # CONFIG_OCFS2_FS is not set | 828 | # CONFIG_OCFS2_FS is not set |
| 746 | CONFIG_DNOTIFY=y | 829 | CONFIG_DNOTIFY=y |
| 747 | CONFIG_INOTIFY=y | 830 | CONFIG_INOTIFY=y |
| @@ -799,7 +882,6 @@ CONFIG_NFS_FS=y | |||
| 799 | CONFIG_NFS_V3=y | 882 | CONFIG_NFS_V3=y |
| 800 | # CONFIG_NFS_V3_ACL is not set | 883 | # CONFIG_NFS_V3_ACL is not set |
| 801 | CONFIG_NFS_V4=y | 884 | CONFIG_NFS_V4=y |
| 802 | # CONFIG_NFS_DIRECTIO is not set | ||
| 803 | # CONFIG_NFSD is not set | 885 | # CONFIG_NFSD is not set |
| 804 | CONFIG_ROOT_NFS=y | 886 | CONFIG_ROOT_NFS=y |
| 805 | CONFIG_LOCKD=y | 887 | CONFIG_LOCKD=y |
| @@ -844,6 +926,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 844 | # Library routines | 926 | # Library routines |
| 845 | # | 927 | # |
| 846 | CONFIG_BITREVERSE=y | 928 | CONFIG_BITREVERSE=y |
| 929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 847 | # CONFIG_CRC_CCITT is not set | 930 | # CONFIG_CRC_CCITT is not set |
| 848 | # CONFIG_CRC16 is not set | 931 | # CONFIG_CRC16 is not set |
| 849 | # CONFIG_CRC_ITU_T is not set | 932 | # CONFIG_CRC_ITU_T is not set |
| @@ -854,6 +937,7 @@ CONFIG_PLIST=y | |||
| 854 | CONFIG_HAS_IOMEM=y | 937 | CONFIG_HAS_IOMEM=y |
| 855 | CONFIG_HAS_IOPORT=y | 938 | CONFIG_HAS_IOPORT=y |
| 856 | CONFIG_HAS_DMA=y | 939 | CONFIG_HAS_DMA=y |
| 940 | CONFIG_HAVE_LMB=y | ||
| 857 | 941 | ||
| 858 | # | 942 | # |
| 859 | # Kernel hacking | 943 | # Kernel hacking |
| @@ -861,6 +945,7 @@ CONFIG_HAS_DMA=y | |||
| 861 | # CONFIG_PRINTK_TIME is not set | 945 | # CONFIG_PRINTK_TIME is not set |
| 862 | CONFIG_ENABLE_WARN_DEPRECATED=y | 946 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 863 | # CONFIG_ENABLE_MUST_CHECK is not set | 947 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 948 | CONFIG_FRAME_WARN=1024 | ||
| 864 | # CONFIG_MAGIC_SYSRQ is not set | 949 | # CONFIG_MAGIC_SYSRQ is not set |
| 865 | # CONFIG_UNUSED_SYMBOLS is not set | 950 | # CONFIG_UNUSED_SYMBOLS is not set |
| 866 | # CONFIG_DEBUG_FS is not set | 951 | # CONFIG_DEBUG_FS is not set |
| @@ -868,6 +953,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y | |||
| 868 | # CONFIG_DEBUG_KERNEL is not set | 953 | # CONFIG_DEBUG_KERNEL is not set |
| 869 | # CONFIG_DEBUG_BUGVERBOSE is not set | 954 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 870 | # CONFIG_SAMPLES is not set | 955 | # CONFIG_SAMPLES is not set |
| 956 | # CONFIG_IRQSTACKS is not set | ||
| 871 | # CONFIG_PPC_EARLY_DEBUG is not set | 957 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 872 | 958 | ||
| 873 | # | 959 | # |
| @@ -881,50 +967,80 @@ CONFIG_ASYNC_CORE=y | |||
| 881 | CONFIG_ASYNC_MEMCPY=y | 967 | CONFIG_ASYNC_MEMCPY=y |
| 882 | CONFIG_ASYNC_XOR=y | 968 | CONFIG_ASYNC_XOR=y |
| 883 | CONFIG_CRYPTO=y | 969 | CONFIG_CRYPTO=y |
| 970 | |||
| 971 | # | ||
| 972 | # Crypto core or helper | ||
| 973 | # | ||
| 884 | CONFIG_CRYPTO_ALGAPI=y | 974 | CONFIG_CRYPTO_ALGAPI=y |
| 885 | CONFIG_CRYPTO_BLKCIPHER=y | 975 | CONFIG_CRYPTO_BLKCIPHER=y |
| 886 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 887 | CONFIG_CRYPTO_MANAGER=y | 976 | CONFIG_CRYPTO_MANAGER=y |
| 977 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 978 | # CONFIG_CRYPTO_NULL is not set | ||
| 979 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 980 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 981 | # CONFIG_CRYPTO_TEST is not set | ||
| 982 | |||
| 983 | # | ||
| 984 | # Authenticated Encryption with Associated Data | ||
| 985 | # | ||
| 986 | # CONFIG_CRYPTO_CCM is not set | ||
| 987 | # CONFIG_CRYPTO_GCM is not set | ||
| 988 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 989 | |||
| 990 | # | ||
| 991 | # Block modes | ||
| 992 | # | ||
| 993 | CONFIG_CRYPTO_CBC=y | ||
| 994 | # CONFIG_CRYPTO_CTR is not set | ||
| 995 | # CONFIG_CRYPTO_CTS is not set | ||
| 996 | CONFIG_CRYPTO_ECB=m | ||
| 997 | # CONFIG_CRYPTO_LRW is not set | ||
| 998 | CONFIG_CRYPTO_PCBC=m | ||
| 999 | # CONFIG_CRYPTO_XTS is not set | ||
| 1000 | |||
| 1001 | # | ||
| 1002 | # Hash modes | ||
| 1003 | # | ||
| 888 | # CONFIG_CRYPTO_HMAC is not set | 1004 | # CONFIG_CRYPTO_HMAC is not set |
| 889 | # CONFIG_CRYPTO_XCBC is not set | 1005 | # CONFIG_CRYPTO_XCBC is not set |
| 890 | # CONFIG_CRYPTO_NULL is not set | 1006 | |
| 1007 | # | ||
| 1008 | # Digest | ||
| 1009 | # | ||
| 1010 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 891 | # CONFIG_CRYPTO_MD4 is not set | 1011 | # CONFIG_CRYPTO_MD4 is not set |
| 892 | CONFIG_CRYPTO_MD5=y | 1012 | CONFIG_CRYPTO_MD5=y |
| 1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_SHA1 is not set | 1014 | # CONFIG_CRYPTO_SHA1 is not set |
| 894 | # CONFIG_CRYPTO_SHA256 is not set | 1015 | # CONFIG_CRYPTO_SHA256 is not set |
| 895 | # CONFIG_CRYPTO_SHA512 is not set | 1016 | # CONFIG_CRYPTO_SHA512 is not set |
| 896 | # CONFIG_CRYPTO_WP512 is not set | ||
| 897 | # CONFIG_CRYPTO_TGR192 is not set | 1017 | # CONFIG_CRYPTO_TGR192 is not set |
| 898 | # CONFIG_CRYPTO_GF128MUL is not set | 1018 | # CONFIG_CRYPTO_WP512 is not set |
| 899 | CONFIG_CRYPTO_ECB=m | 1019 | |
| 900 | CONFIG_CRYPTO_CBC=y | 1020 | # |
| 901 | CONFIG_CRYPTO_PCBC=m | 1021 | # Ciphers |
| 902 | # CONFIG_CRYPTO_LRW is not set | 1022 | # |
| 903 | # CONFIG_CRYPTO_XTS is not set | ||
| 904 | # CONFIG_CRYPTO_CTR is not set | ||
| 905 | # CONFIG_CRYPTO_GCM is not set | ||
| 906 | # CONFIG_CRYPTO_CCM is not set | ||
| 907 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 908 | CONFIG_CRYPTO_DES=y | ||
| 909 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 910 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 911 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 912 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 913 | # CONFIG_CRYPTO_AES is not set | 1023 | # CONFIG_CRYPTO_AES is not set |
| 1024 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1025 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1026 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1027 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 914 | # CONFIG_CRYPTO_CAST5 is not set | 1028 | # CONFIG_CRYPTO_CAST5 is not set |
| 915 | # CONFIG_CRYPTO_CAST6 is not set | 1029 | # CONFIG_CRYPTO_CAST6 is not set |
| 916 | # CONFIG_CRYPTO_TEA is not set | 1030 | CONFIG_CRYPTO_DES=y |
| 917 | # CONFIG_CRYPTO_ARC4 is not set | 1031 | # CONFIG_CRYPTO_FCRYPT is not set |
| 918 | # CONFIG_CRYPTO_KHAZAD is not set | 1032 | # CONFIG_CRYPTO_KHAZAD is not set |
| 919 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 920 | # CONFIG_CRYPTO_SEED is not set | ||
| 921 | # CONFIG_CRYPTO_SALSA20 is not set | 1033 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1034 | # CONFIG_CRYPTO_SEED is not set | ||
| 1035 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1036 | # CONFIG_CRYPTO_TEA is not set | ||
| 1037 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1038 | |||
| 1039 | # | ||
| 1040 | # Compression | ||
| 1041 | # | ||
| 922 | # CONFIG_CRYPTO_DEFLATE is not set | 1042 | # CONFIG_CRYPTO_DEFLATE is not set |
| 923 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 924 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 925 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 926 | # CONFIG_CRYPTO_TEST is not set | ||
| 927 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 928 | # CONFIG_CRYPTO_LZO is not set | 1043 | # CONFIG_CRYPTO_LZO is not set |
| 929 | CONFIG_CRYPTO_HW=y | 1044 | CONFIG_CRYPTO_HW=y |
| 930 | # CONFIG_PPC_CLOCK is not set | 1045 | # CONFIG_PPC_CLOCK is not set |
| 1046 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index 1f1518229f6d..1752918be2c1 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:38 2008 | 4 | # Mon Jun 9 08:52:30 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | # CONFIG_KALLSYMS is not set | 92 | # CONFIG_KALLSYMS is not set |
| 90 | CONFIG_HOTPLUG=y | 93 | CONFIG_HOTPLUG=y |
| 91 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
| @@ -109,12 +112,14 @@ CONFIG_SLAB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| 115 | # CONFIG_TINY_SHMEM is not set | 119 | # CONFIG_TINY_SHMEM is not set |
| 116 | CONFIG_BASE_SMALL=0 | 120 | CONFIG_BASE_SMALL=0 |
| 117 | CONFIG_MODULES=y | 121 | CONFIG_MODULES=y |
| 122 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 118 | CONFIG_MODULE_UNLOAD=y | 123 | CONFIG_MODULE_UNLOAD=y |
| 119 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 120 | # CONFIG_MODVERSIONS is not set | 125 | # CONFIG_MODVERSIONS is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | CONFIG_PROC_DEVICETREE=y | 224 | CONFIG_PROC_DEVICETREE=y |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -232,6 +239,7 @@ CONFIG_FSL_SOC=y | |||
| 232 | # CONFIG_PCI_SYSCALL is not set | 239 | # CONFIG_PCI_SYSCALL is not set |
| 233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 234 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 235 | 243 | ||
| 236 | # | 244 | # |
| 237 | # Advanced setup | 245 | # Advanced setup |
| @@ -241,11 +249,11 @@ CONFIG_FSL_SOC=y | |||
| 241 | # | 249 | # |
| 242 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 243 | # | 251 | # |
| 244 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 245 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 246 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 247 | CONFIG_TASK_SIZE=0xc0000000 | 256 | CONFIG_TASK_SIZE=0xc0000000 |
| 248 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 249 | 257 | ||
| 250 | # | 258 | # |
| 251 | # Networking | 259 | # Networking |
| @@ -293,8 +301,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 293 | CONFIG_DEFAULT_TCP_CONG="cubic" | 301 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 294 | # CONFIG_TCP_MD5SIG is not set | 302 | # CONFIG_TCP_MD5SIG is not set |
| 295 | # CONFIG_IPV6 is not set | 303 | # CONFIG_IPV6 is not set |
| 296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 297 | # CONFIG_INET6_TUNNEL is not set | ||
| 298 | # CONFIG_NETWORK_SECMARK is not set | 304 | # CONFIG_NETWORK_SECMARK is not set |
| 299 | # CONFIG_NETFILTER is not set | 305 | # CONFIG_NETFILTER is not set |
| 300 | # CONFIG_IP_DCCP is not set | 306 | # CONFIG_IP_DCCP is not set |
| @@ -348,6 +354,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 348 | # CONFIG_CONNECTOR is not set | 354 | # CONFIG_CONNECTOR is not set |
| 349 | # CONFIG_MTD is not set | 355 | # CONFIG_MTD is not set |
| 350 | CONFIG_OF_DEVICE=y | 356 | CONFIG_OF_DEVICE=y |
| 357 | CONFIG_OF_I2C=y | ||
| 351 | # CONFIG_PARPORT is not set | 358 | # CONFIG_PARPORT is not set |
| 352 | CONFIG_BLK_DEV=y | 359 | CONFIG_BLK_DEV=y |
| 353 | # CONFIG_BLK_DEV_FD is not set | 360 | # CONFIG_BLK_DEV_FD is not set |
| @@ -420,6 +427,7 @@ CONFIG_GIANFAR=y | |||
| 420 | # | 427 | # |
| 421 | # CONFIG_WLAN_PRE80211 is not set | 428 | # CONFIG_WLAN_PRE80211 is not set |
| 422 | # CONFIG_WLAN_80211 is not set | 429 | # CONFIG_WLAN_80211 is not set |
| 430 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 423 | # CONFIG_WAN is not set | 431 | # CONFIG_WAN is not set |
| 424 | # CONFIG_PPP is not set | 432 | # CONFIG_PPP is not set |
| 425 | # CONFIG_SLIP is not set | 433 | # CONFIG_SLIP is not set |
| @@ -464,6 +472,7 @@ CONFIG_INPUT=y | |||
| 464 | # Character devices | 472 | # Character devices |
| 465 | # | 473 | # |
| 466 | # CONFIG_VT is not set | 474 | # CONFIG_VT is not set |
| 475 | CONFIG_DEVKMEM=y | ||
| 467 | # CONFIG_SERIAL_NONSTANDARD is not set | 476 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 468 | 477 | ||
| 469 | # | 478 | # |
| @@ -498,13 +507,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 498 | CONFIG_I2C_CHARDEV=y | 507 | CONFIG_I2C_CHARDEV=y |
| 499 | 508 | ||
| 500 | # | 509 | # |
| 501 | # I2C Algorithms | ||
| 502 | # | ||
| 503 | # CONFIG_I2C_ALGOBIT is not set | ||
| 504 | # CONFIG_I2C_ALGOPCF is not set | ||
| 505 | # CONFIG_I2C_ALGOPCA is not set | ||
| 506 | |||
| 507 | # | ||
| 508 | # I2C Hardware Bus support | 510 | # I2C Hardware Bus support |
| 509 | # | 511 | # |
| 510 | CONFIG_I2C_MPC=y | 512 | CONFIG_I2C_MPC=y |
| @@ -513,6 +515,7 @@ CONFIG_I2C_MPC=y | |||
| 513 | # CONFIG_I2C_SIMTEC is not set | 515 | # CONFIG_I2C_SIMTEC is not set |
| 514 | # CONFIG_I2C_TAOS_EVM is not set | 516 | # CONFIG_I2C_TAOS_EVM is not set |
| 515 | # CONFIG_I2C_STUB is not set | 517 | # CONFIG_I2C_STUB is not set |
| 518 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 516 | 519 | ||
| 517 | # | 520 | # |
| 518 | # Miscellaneous I2C Chip support | 521 | # Miscellaneous I2C Chip support |
| @@ -522,19 +525,13 @@ CONFIG_I2C_MPC=y | |||
| 522 | # CONFIG_SENSORS_PCF8574 is not set | 525 | # CONFIG_SENSORS_PCF8574 is not set |
| 523 | # CONFIG_PCF8575 is not set | 526 | # CONFIG_PCF8575 is not set |
| 524 | # CONFIG_SENSORS_PCF8591 is not set | 527 | # CONFIG_SENSORS_PCF8591 is not set |
| 525 | # CONFIG_TPS65010 is not set | ||
| 526 | # CONFIG_SENSORS_MAX6875 is not set | 528 | # CONFIG_SENSORS_MAX6875 is not set |
| 527 | # CONFIG_SENSORS_TSL2550 is not set | 529 | # CONFIG_SENSORS_TSL2550 is not set |
| 528 | # CONFIG_I2C_DEBUG_CORE is not set | 530 | # CONFIG_I2C_DEBUG_CORE is not set |
| 529 | # CONFIG_I2C_DEBUG_ALGO is not set | 531 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 530 | # CONFIG_I2C_DEBUG_BUS is not set | 532 | # CONFIG_I2C_DEBUG_BUS is not set |
| 531 | # CONFIG_I2C_DEBUG_CHIP is not set | 533 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 532 | |||
| 533 | # | ||
| 534 | # SPI support | ||
| 535 | # | ||
| 536 | # CONFIG_SPI is not set | 534 | # CONFIG_SPI is not set |
| 537 | # CONFIG_SPI_MASTER is not set | ||
| 538 | # CONFIG_W1 is not set | 535 | # CONFIG_W1 is not set |
| 539 | # CONFIG_POWER_SUPPLY is not set | 536 | # CONFIG_POWER_SUPPLY is not set |
| 540 | CONFIG_HWMON=y | 537 | CONFIG_HWMON=y |
| @@ -607,12 +604,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 607 | # Multifunction device drivers | 604 | # Multifunction device drivers |
| 608 | # | 605 | # |
| 609 | # CONFIG_MFD_SM501 is not set | 606 | # CONFIG_MFD_SM501 is not set |
| 607 | # CONFIG_HTC_PASIC3 is not set | ||
| 610 | 608 | ||
| 611 | # | 609 | # |
| 612 | # Multimedia devices | 610 | # Multimedia devices |
| 613 | # | 611 | # |
| 612 | |||
| 613 | # | ||
| 614 | # Multimedia core support | ||
| 615 | # | ||
| 614 | # CONFIG_VIDEO_DEV is not set | 616 | # CONFIG_VIDEO_DEV is not set |
| 615 | # CONFIG_DVB_CORE is not set | 617 | # CONFIG_DVB_CORE is not set |
| 618 | # CONFIG_VIDEO_MEDIA is not set | ||
| 619 | |||
| 620 | # | ||
| 621 | # Multimedia drivers | ||
| 622 | # | ||
| 616 | # CONFIG_DAB is not set | 623 | # CONFIG_DAB is not set |
| 617 | 624 | ||
| 618 | # | 625 | # |
| @@ -640,13 +647,10 @@ CONFIG_HID=y | |||
| 640 | # CONFIG_MMC is not set | 647 | # CONFIG_MMC is not set |
| 641 | # CONFIG_MEMSTICK is not set | 648 | # CONFIG_MEMSTICK is not set |
| 642 | # CONFIG_NEW_LEDS is not set | 649 | # CONFIG_NEW_LEDS is not set |
| 650 | # CONFIG_ACCESSIBILITY is not set | ||
| 643 | # CONFIG_EDAC is not set | 651 | # CONFIG_EDAC is not set |
| 644 | # CONFIG_RTC_CLASS is not set | 652 | # CONFIG_RTC_CLASS is not set |
| 645 | # CONFIG_DMADEVICES is not set | 653 | # CONFIG_DMADEVICES is not set |
| 646 | |||
| 647 | # | ||
| 648 | # Userspace I/O | ||
| 649 | # | ||
| 650 | # CONFIG_UIO is not set | 654 | # CONFIG_UIO is not set |
| 651 | 655 | ||
| 652 | # | 656 | # |
| @@ -659,7 +663,6 @@ CONFIG_HID=y | |||
| 659 | # CONFIG_JFS_FS is not set | 663 | # CONFIG_JFS_FS is not set |
| 660 | # CONFIG_FS_POSIX_ACL is not set | 664 | # CONFIG_FS_POSIX_ACL is not set |
| 661 | # CONFIG_XFS_FS is not set | 665 | # CONFIG_XFS_FS is not set |
| 662 | # CONFIG_GFS2_FS is not set | ||
| 663 | # CONFIG_OCFS2_FS is not set | 666 | # CONFIG_OCFS2_FS is not set |
| 664 | CONFIG_DNOTIFY=y | 667 | CONFIG_DNOTIFY=y |
| 665 | CONFIG_INOTIFY=y | 668 | CONFIG_INOTIFY=y |
| @@ -717,7 +720,6 @@ CONFIG_NFS_FS=y | |||
| 717 | CONFIG_NFS_V3=y | 720 | CONFIG_NFS_V3=y |
| 718 | # CONFIG_NFS_V3_ACL is not set | 721 | # CONFIG_NFS_V3_ACL is not set |
| 719 | CONFIG_NFS_V4=y | 722 | CONFIG_NFS_V4=y |
| 720 | # CONFIG_NFS_DIRECTIO is not set | ||
| 721 | # CONFIG_NFSD is not set | 723 | # CONFIG_NFSD is not set |
| 722 | CONFIG_ROOT_NFS=y | 724 | CONFIG_ROOT_NFS=y |
| 723 | CONFIG_LOCKD=y | 725 | CONFIG_LOCKD=y |
| @@ -746,6 +748,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 746 | # Library routines | 748 | # Library routines |
| 747 | # | 749 | # |
| 748 | CONFIG_BITREVERSE=y | 750 | CONFIG_BITREVERSE=y |
| 751 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 749 | # CONFIG_CRC_CCITT is not set | 752 | # CONFIG_CRC_CCITT is not set |
| 750 | # CONFIG_CRC16 is not set | 753 | # CONFIG_CRC16 is not set |
| 751 | # CONFIG_CRC_ITU_T is not set | 754 | # CONFIG_CRC_ITU_T is not set |
| @@ -756,6 +759,7 @@ CONFIG_PLIST=y | |||
| 756 | CONFIG_HAS_IOMEM=y | 759 | CONFIG_HAS_IOMEM=y |
| 757 | CONFIG_HAS_IOPORT=y | 760 | CONFIG_HAS_IOPORT=y |
| 758 | CONFIG_HAS_DMA=y | 761 | CONFIG_HAS_DMA=y |
| 762 | CONFIG_HAVE_LMB=y | ||
| 759 | 763 | ||
| 760 | # | 764 | # |
| 761 | # Kernel hacking | 765 | # Kernel hacking |
| @@ -763,6 +767,7 @@ CONFIG_HAS_DMA=y | |||
| 763 | # CONFIG_PRINTK_TIME is not set | 767 | # CONFIG_PRINTK_TIME is not set |
| 764 | CONFIG_ENABLE_WARN_DEPRECATED=y | 768 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 765 | CONFIG_ENABLE_MUST_CHECK=y | 769 | CONFIG_ENABLE_MUST_CHECK=y |
| 770 | CONFIG_FRAME_WARN=1024 | ||
| 766 | # CONFIG_MAGIC_SYSRQ is not set | 771 | # CONFIG_MAGIC_SYSRQ is not set |
| 767 | # CONFIG_UNUSED_SYMBOLS is not set | 772 | # CONFIG_UNUSED_SYMBOLS is not set |
| 768 | # CONFIG_DEBUG_FS is not set | 773 | # CONFIG_DEBUG_FS is not set |
| @@ -770,6 +775,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 770 | # CONFIG_DEBUG_KERNEL is not set | 775 | # CONFIG_DEBUG_KERNEL is not set |
| 771 | # CONFIG_DEBUG_BUGVERBOSE is not set | 776 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 772 | # CONFIG_SAMPLES is not set | 777 | # CONFIG_SAMPLES is not set |
| 778 | # CONFIG_IRQSTACKS is not set | ||
| 773 | # CONFIG_PPC_EARLY_DEBUG is not set | 779 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 774 | 780 | ||
| 775 | # | 781 | # |
| @@ -779,50 +785,80 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 779 | # CONFIG_SECURITY is not set | 785 | # CONFIG_SECURITY is not set |
| 780 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 786 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 781 | CONFIG_CRYPTO=y | 787 | CONFIG_CRYPTO=y |
| 788 | |||
| 789 | # | ||
| 790 | # Crypto core or helper | ||
| 791 | # | ||
| 782 | CONFIG_CRYPTO_ALGAPI=y | 792 | CONFIG_CRYPTO_ALGAPI=y |
| 783 | CONFIG_CRYPTO_BLKCIPHER=y | 793 | CONFIG_CRYPTO_BLKCIPHER=y |
| 784 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 785 | CONFIG_CRYPTO_MANAGER=y | 794 | CONFIG_CRYPTO_MANAGER=y |
| 795 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 796 | # CONFIG_CRYPTO_NULL is not set | ||
| 797 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 798 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 799 | # CONFIG_CRYPTO_TEST is not set | ||
| 800 | |||
| 801 | # | ||
| 802 | # Authenticated Encryption with Associated Data | ||
| 803 | # | ||
| 804 | # CONFIG_CRYPTO_CCM is not set | ||
| 805 | # CONFIG_CRYPTO_GCM is not set | ||
| 806 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 807 | |||
| 808 | # | ||
| 809 | # Block modes | ||
| 810 | # | ||
| 811 | CONFIG_CRYPTO_CBC=y | ||
| 812 | # CONFIG_CRYPTO_CTR is not set | ||
| 813 | # CONFIG_CRYPTO_CTS is not set | ||
| 814 | CONFIG_CRYPTO_ECB=m | ||
| 815 | # CONFIG_CRYPTO_LRW is not set | ||
| 816 | CONFIG_CRYPTO_PCBC=m | ||
| 817 | # CONFIG_CRYPTO_XTS is not set | ||
| 818 | |||
| 819 | # | ||
| 820 | # Hash modes | ||
| 821 | # | ||
| 786 | # CONFIG_CRYPTO_HMAC is not set | 822 | # CONFIG_CRYPTO_HMAC is not set |
| 787 | # CONFIG_CRYPTO_XCBC is not set | 823 | # CONFIG_CRYPTO_XCBC is not set |
| 788 | # CONFIG_CRYPTO_NULL is not set | 824 | |
| 825 | # | ||
| 826 | # Digest | ||
| 827 | # | ||
| 828 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 789 | # CONFIG_CRYPTO_MD4 is not set | 829 | # CONFIG_CRYPTO_MD4 is not set |
| 790 | CONFIG_CRYPTO_MD5=y | 830 | CONFIG_CRYPTO_MD5=y |
| 831 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 791 | # CONFIG_CRYPTO_SHA1 is not set | 832 | # CONFIG_CRYPTO_SHA1 is not set |
| 792 | # CONFIG_CRYPTO_SHA256 is not set | 833 | # CONFIG_CRYPTO_SHA256 is not set |
| 793 | # CONFIG_CRYPTO_SHA512 is not set | 834 | # CONFIG_CRYPTO_SHA512 is not set |
| 794 | # CONFIG_CRYPTO_WP512 is not set | ||
| 795 | # CONFIG_CRYPTO_TGR192 is not set | 835 | # CONFIG_CRYPTO_TGR192 is not set |
| 796 | # CONFIG_CRYPTO_GF128MUL is not set | 836 | # CONFIG_CRYPTO_WP512 is not set |
| 797 | CONFIG_CRYPTO_ECB=m | 837 | |
| 798 | CONFIG_CRYPTO_CBC=y | 838 | # |
| 799 | CONFIG_CRYPTO_PCBC=m | 839 | # Ciphers |
| 800 | # CONFIG_CRYPTO_LRW is not set | 840 | # |
| 801 | # CONFIG_CRYPTO_XTS is not set | ||
| 802 | # CONFIG_CRYPTO_CTR is not set | ||
| 803 | # CONFIG_CRYPTO_GCM is not set | ||
| 804 | # CONFIG_CRYPTO_CCM is not set | ||
| 805 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 806 | CONFIG_CRYPTO_DES=y | ||
| 807 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 808 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 809 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 810 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 811 | # CONFIG_CRYPTO_AES is not set | 841 | # CONFIG_CRYPTO_AES is not set |
| 842 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 843 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 844 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 845 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 812 | # CONFIG_CRYPTO_CAST5 is not set | 846 | # CONFIG_CRYPTO_CAST5 is not set |
| 813 | # CONFIG_CRYPTO_CAST6 is not set | 847 | # CONFIG_CRYPTO_CAST6 is not set |
| 814 | # CONFIG_CRYPTO_TEA is not set | 848 | CONFIG_CRYPTO_DES=y |
| 815 | # CONFIG_CRYPTO_ARC4 is not set | 849 | # CONFIG_CRYPTO_FCRYPT is not set |
| 816 | # CONFIG_CRYPTO_KHAZAD is not set | 850 | # CONFIG_CRYPTO_KHAZAD is not set |
| 817 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 818 | # CONFIG_CRYPTO_SEED is not set | ||
| 819 | # CONFIG_CRYPTO_SALSA20 is not set | 851 | # CONFIG_CRYPTO_SALSA20 is not set |
| 852 | # CONFIG_CRYPTO_SEED is not set | ||
| 853 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 854 | # CONFIG_CRYPTO_TEA is not set | ||
| 855 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 856 | |||
| 857 | # | ||
| 858 | # Compression | ||
| 859 | # | ||
| 820 | # CONFIG_CRYPTO_DEFLATE is not set | 860 | # CONFIG_CRYPTO_DEFLATE is not set |
| 821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 822 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 823 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 824 | # CONFIG_CRYPTO_TEST is not set | ||
| 825 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 826 | # CONFIG_CRYPTO_LZO is not set | 861 | # CONFIG_CRYPTO_LZO is not set |
| 827 | # CONFIG_CRYPTO_HW is not set | 862 | # CONFIG_CRYPTO_HW is not set |
| 828 | # CONFIG_PPC_CLOCK is not set | 863 | # CONFIG_PPC_CLOCK is not set |
| 864 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index 2d0debcefdbf..b82bb042308a 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_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.24 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Feb 11 16:25:19 2008 | 4 | # Mon Jun 9 08:52:30 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -68,23 +70,22 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 68 | # CONFIG_POSIX_MQUEUE is not set | 70 | # CONFIG_POSIX_MQUEUE is not set |
| 69 | # CONFIG_BSD_PROCESS_ACCT is not set | 71 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 70 | # CONFIG_TASKSTATS is not set | 72 | # CONFIG_TASKSTATS is not set |
| 71 | # CONFIG_USER_NS is not set | ||
| 72 | # CONFIG_PID_NS is not set | ||
| 73 | # CONFIG_AUDIT is not set | 73 | # CONFIG_AUDIT is not set |
| 74 | # CONFIG_IKCONFIG is not set | 74 | # CONFIG_IKCONFIG is not set |
| 75 | CONFIG_LOG_BUF_SHIFT=14 | 75 | CONFIG_LOG_BUF_SHIFT=14 |
| 76 | # CONFIG_CGROUPS is not set | 76 | # CONFIG_CGROUPS is not set |
| 77 | CONFIG_FAIR_GROUP_SCHED=y | 77 | # CONFIG_GROUP_SCHED is not set |
| 78 | CONFIG_FAIR_USER_SCHED=y | ||
| 79 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 80 | CONFIG_SYSFS_DEPRECATED=y | 78 | CONFIG_SYSFS_DEPRECATED=y |
| 79 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 81 | # CONFIG_RELAY is not set | 80 | # CONFIG_RELAY is not set |
| 81 | # CONFIG_NAMESPACES is not set | ||
| 82 | CONFIG_BLK_DEV_INITRD=y | 82 | CONFIG_BLK_DEV_INITRD=y |
| 83 | CONFIG_INITRAMFS_SOURCE="" | 83 | CONFIG_INITRAMFS_SOURCE="" |
| 84 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 84 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 85 | CONFIG_SYSCTL=y | 85 | CONFIG_SYSCTL=y |
| 86 | CONFIG_EMBEDDED=y | 86 | CONFIG_EMBEDDED=y |
| 87 | CONFIG_SYSCTL_SYSCALL=y | 87 | CONFIG_SYSCTL_SYSCALL=y |
| 88 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 88 | CONFIG_KALLSYMS=y | 89 | CONFIG_KALLSYMS=y |
| 89 | # CONFIG_KALLSYMS_ALL is not set | 90 | # CONFIG_KALLSYMS_ALL is not set |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -92,6 +93,7 @@ CONFIG_HOTPLUG=y | |||
| 92 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| 93 | CONFIG_BUG=y | 94 | CONFIG_BUG=y |
| 94 | CONFIG_ELF_CORE=y | 95 | CONFIG_ELF_CORE=y |
| 96 | CONFIG_COMPAT_BRK=y | ||
| 95 | CONFIG_BASE_FULL=y | 97 | CONFIG_BASE_FULL=y |
| 96 | CONFIG_FUTEX=y | 98 | CONFIG_FUTEX=y |
| 97 | CONFIG_ANON_INODES=y | 99 | CONFIG_ANON_INODES=y |
| @@ -109,6 +111,8 @@ CONFIG_SLUB=y | |||
| 109 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
| 110 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 111 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | ||
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| @@ -134,7 +138,6 @@ CONFIG_DEFAULT_AS=y | |||
| 134 | # CONFIG_DEFAULT_NOOP is not set | 138 | # CONFIG_DEFAULT_NOOP is not set |
| 135 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 139 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 136 | CONFIG_CLASSIC_RCU=y | 140 | CONFIG_CLASSIC_RCU=y |
| 137 | # CONFIG_PREEMPT_RCU is not set | ||
| 138 | 141 | ||
| 139 | # | 142 | # |
| 140 | # Platform support | 143 | # Platform support |
| @@ -191,12 +194,13 @@ CONFIG_HZ=250 | |||
| 191 | CONFIG_PREEMPT_NONE=y | 194 | CONFIG_PREEMPT_NONE=y |
| 192 | # CONFIG_PREEMPT_VOLUNTARY is not set | 195 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 193 | # CONFIG_PREEMPT is not set | 196 | # CONFIG_PREEMPT is not set |
| 194 | CONFIG_RCU_TRACE=y | ||
| 195 | CONFIG_BINFMT_ELF=y | 197 | CONFIG_BINFMT_ELF=y |
| 196 | CONFIG_BINFMT_MISC=y | 198 | CONFIG_BINFMT_MISC=y |
| 197 | CONFIG_MATH_EMULATION=y | 199 | CONFIG_MATH_EMULATION=y |
| 198 | # CONFIG_IOMMU_HELPER is not set | 200 | # CONFIG_IOMMU_HELPER is not set |
| 199 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 201 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 202 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
| 203 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
| 200 | CONFIG_ARCH_FLATMEM_ENABLE=y | 204 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 201 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 205 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 202 | CONFIG_SELECT_MEMORY_MODEL=y | 206 | CONFIG_SELECT_MEMORY_MODEL=y |
| @@ -207,16 +211,17 @@ CONFIG_FLATMEM=y | |||
| 207 | CONFIG_FLAT_NODE_MEM_MAP=y | 211 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 208 | # CONFIG_SPARSEMEM_STATIC is not set | 212 | # CONFIG_SPARSEMEM_STATIC is not set |
| 209 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 214 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 211 | # CONFIG_RESOURCES_64BIT is not set | 216 | # CONFIG_RESOURCES_64BIT is not set |
| 212 | CONFIG_ZONE_DMA_FLAG=1 | 217 | CONFIG_ZONE_DMA_FLAG=1 |
| 213 | CONFIG_BOUNCE=y | 218 | CONFIG_BOUNCE=y |
| 214 | CONFIG_VIRT_TO_BUS=y | 219 | CONFIG_VIRT_TO_BUS=y |
| 220 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 215 | # CONFIG_PROC_DEVICETREE is not set | 221 | # CONFIG_PROC_DEVICETREE is not set |
| 216 | # CONFIG_CMDLINE_BOOL is not set | 222 | # CONFIG_CMDLINE_BOOL is not set |
| 217 | # CONFIG_PM is not set | 223 | # CONFIG_PM is not set |
| 218 | # CONFIG_SECCOMP is not set | 224 | # CONFIG_SECCOMP is not set |
| 219 | CONFIG_WANT_DEVICE_TREE=y | ||
| 220 | CONFIG_ISA_DMA_API=y | 225 | CONFIG_ISA_DMA_API=y |
| 221 | 226 | ||
| 222 | # | 227 | # |
| @@ -229,6 +234,7 @@ CONFIG_FSL_SOC=y | |||
| 229 | # CONFIG_PCI_SYSCALL is not set | 234 | # CONFIG_PCI_SYSCALL is not set |
| 230 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 231 | # CONFIG_PCCARD is not set | 236 | # CONFIG_PCCARD is not set |
| 237 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 238 | ||
| 233 | # | 239 | # |
| 234 | # Advanced setup | 240 | # Advanced setup |
| @@ -238,11 +244,12 @@ CONFIG_FSL_SOC=y | |||
| 238 | # | 244 | # |
| 239 | # Default settings for advanced configuration options are used | 245 | # Default settings for advanced configuration options are used |
| 240 | # | 246 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 247 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 248 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 249 | CONFIG_KERNEL_START=0xc0000000 |
| 250 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 251 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 252 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 253 | ||
| 247 | # | 254 | # |
| 248 | # Networking | 255 | # Networking |
| @@ -290,8 +297,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 297 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 298 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 299 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 300 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 301 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 302 | # CONFIG_IP_DCCP is not set |
| @@ -351,6 +356,8 @@ CONFIG_MTD_CONCAT=y | |||
| 351 | CONFIG_MTD_PARTITIONS=y | 356 | CONFIG_MTD_PARTITIONS=y |
| 352 | # CONFIG_MTD_REDBOOT_PARTS is not set | 357 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 353 | # CONFIG_MTD_CMDLINE_PARTS is not set | 358 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 359 | # CONFIG_MTD_OF_PARTS is not set | ||
| 360 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 354 | 361 | ||
| 355 | # | 362 | # |
| 356 | # User Modules And Translation Layers | 363 | # User Modules And Translation Layers |
| @@ -430,17 +437,19 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 430 | CONFIG_BLK_DEV_RAM=y | 437 | CONFIG_BLK_DEV_RAM=y |
| 431 | CONFIG_BLK_DEV_RAM_COUNT=16 | 438 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 432 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 439 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
| 433 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 440 | # CONFIG_BLK_DEV_XIP is not set |
| 434 | # CONFIG_CDROM_PKTCDVD is not set | 441 | # CONFIG_CDROM_PKTCDVD is not set |
| 435 | # CONFIG_ATA_OVER_ETH is not set | 442 | # CONFIG_ATA_OVER_ETH is not set |
| 436 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
| 437 | # CONFIG_EEPROM_93CX6 is not set | 444 | # CONFIG_EEPROM_93CX6 is not set |
| 445 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 446 | CONFIG_HAVE_IDE=y | ||
| 438 | CONFIG_IDE=y | 447 | CONFIG_IDE=y |
| 439 | CONFIG_IDE_MAX_HWIFS=4 | 448 | CONFIG_IDE_MAX_HWIFS=4 |
| 440 | CONFIG_BLK_DEV_IDE=y | 449 | CONFIG_BLK_DEV_IDE=y |
| 441 | 450 | ||
| 442 | # | 451 | # |
| 443 | # Please see Documentation/ide.txt for help/info on IDE drives | 452 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
| 444 | # | 453 | # |
| 445 | # CONFIG_BLK_DEV_IDE_SATA is not set | 454 | # CONFIG_BLK_DEV_IDE_SATA is not set |
| 446 | # CONFIG_BLK_DEV_IDEDISK is not set | 455 | # CONFIG_BLK_DEV_IDEDISK is not set |
| @@ -457,7 +466,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 457 | CONFIG_IDE_GENERIC=y | 466 | CONFIG_IDE_GENERIC=y |
| 458 | # CONFIG_BLK_DEV_PLATFORM is not set | 467 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 459 | # CONFIG_BLK_DEV_IDEDMA is not set | 468 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 460 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 469 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 461 | # CONFIG_BLK_DEV_HD is not set | 470 | # CONFIG_BLK_DEV_HD is not set |
| 462 | 471 | ||
| 463 | # | 472 | # |
| @@ -517,6 +526,7 @@ CONFIG_NETDEV_10000=y | |||
| 517 | # | 526 | # |
| 518 | # CONFIG_WLAN_PRE80211 is not set | 527 | # CONFIG_WLAN_PRE80211 is not set |
| 519 | # CONFIG_WLAN_80211 is not set | 528 | # CONFIG_WLAN_80211 is not set |
| 529 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 520 | # CONFIG_WAN is not set | 530 | # CONFIG_WAN is not set |
| 521 | # CONFIG_PPP is not set | 531 | # CONFIG_PPP is not set |
| 522 | # CONFIG_SLIP is not set | 532 | # CONFIG_SLIP is not set |
| @@ -561,6 +571,7 @@ CONFIG_INPUT=y | |||
| 561 | # Character devices | 571 | # Character devices |
| 562 | # | 572 | # |
| 563 | # CONFIG_VT is not set | 573 | # CONFIG_VT is not set |
| 574 | CONFIG_DEVKMEM=y | ||
| 564 | # CONFIG_SERIAL_NONSTANDARD is not set | 575 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 565 | 576 | ||
| 566 | # | 577 | # |
| @@ -594,12 +605,7 @@ CONFIG_GEN_RTC=y | |||
| 594 | # CONFIG_RAW_DRIVER is not set | 605 | # CONFIG_RAW_DRIVER is not set |
| 595 | # CONFIG_TCG_TPM is not set | 606 | # CONFIG_TCG_TPM is not set |
| 596 | # CONFIG_I2C is not set | 607 | # CONFIG_I2C is not set |
| 597 | |||
| 598 | # | ||
| 599 | # SPI support | ||
| 600 | # | ||
| 601 | # CONFIG_SPI is not set | 608 | # CONFIG_SPI is not set |
| 602 | # CONFIG_SPI_MASTER is not set | ||
| 603 | # CONFIG_W1 is not set | 609 | # CONFIG_W1 is not set |
| 604 | # CONFIG_POWER_SUPPLY is not set | 610 | # CONFIG_POWER_SUPPLY is not set |
| 605 | CONFIG_HWMON=y | 611 | CONFIG_HWMON=y |
| @@ -615,6 +621,7 @@ CONFIG_HWMON=y | |||
| 615 | # CONFIG_SENSORS_W83627HF is not set | 621 | # CONFIG_SENSORS_W83627HF is not set |
| 616 | # CONFIG_SENSORS_W83627EHF is not set | 622 | # CONFIG_SENSORS_W83627EHF is not set |
| 617 | # CONFIG_HWMON_DEBUG_CHIP is not set | 623 | # CONFIG_HWMON_DEBUG_CHIP is not set |
| 624 | # CONFIG_THERMAL is not set | ||
| 618 | # CONFIG_WATCHDOG is not set | 625 | # CONFIG_WATCHDOG is not set |
| 619 | 626 | ||
| 620 | # | 627 | # |
| @@ -627,12 +634,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 627 | # Multifunction device drivers | 634 | # Multifunction device drivers |
| 628 | # | 635 | # |
| 629 | # CONFIG_MFD_SM501 is not set | 636 | # CONFIG_MFD_SM501 is not set |
| 637 | # CONFIG_HTC_PASIC3 is not set | ||
| 630 | 638 | ||
| 631 | # | 639 | # |
| 632 | # Multimedia devices | 640 | # Multimedia devices |
| 633 | # | 641 | # |
| 642 | |||
| 643 | # | ||
| 644 | # Multimedia core support | ||
| 645 | # | ||
| 634 | # CONFIG_VIDEO_DEV is not set | 646 | # CONFIG_VIDEO_DEV is not set |
| 635 | # CONFIG_DVB_CORE is not set | 647 | # CONFIG_DVB_CORE is not set |
| 648 | # CONFIG_VIDEO_MEDIA is not set | ||
| 649 | |||
| 650 | # | ||
| 651 | # Multimedia drivers | ||
| 652 | # | ||
| 636 | CONFIG_DAB=y | 653 | CONFIG_DAB=y |
| 637 | 654 | ||
| 638 | # | 655 | # |
| @@ -660,19 +677,20 @@ CONFIG_USB_SUPPORT=y | |||
| 660 | # CONFIG_USB_ARCH_HAS_HCD is not set | 677 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 661 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 678 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 662 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 679 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 680 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 681 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 663 | 682 | ||
| 664 | # | 683 | # |
| 665 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 684 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 666 | # | 685 | # |
| 667 | # CONFIG_USB_GADGET is not set | 686 | # CONFIG_USB_GADGET is not set |
| 668 | # CONFIG_MMC is not set | 687 | # CONFIG_MMC is not set |
| 688 | # CONFIG_MEMSTICK is not set | ||
| 669 | # CONFIG_NEW_LEDS is not set | 689 | # CONFIG_NEW_LEDS is not set |
| 690 | # CONFIG_ACCESSIBILITY is not set | ||
| 670 | # CONFIG_EDAC is not set | 691 | # CONFIG_EDAC is not set |
| 671 | # CONFIG_RTC_CLASS is not set | 692 | # CONFIG_RTC_CLASS is not set |
| 672 | 693 | # CONFIG_DMADEVICES is not set | |
| 673 | # | ||
| 674 | # Userspace I/O | ||
| 675 | # | ||
| 676 | # CONFIG_UIO is not set | 694 | # CONFIG_UIO is not set |
| 677 | 695 | ||
| 678 | # | 696 | # |
| @@ -693,14 +711,11 @@ CONFIG_FS_MBCACHE=y | |||
| 693 | # CONFIG_JFS_FS is not set | 711 | # CONFIG_JFS_FS is not set |
| 694 | # CONFIG_FS_POSIX_ACL is not set | 712 | # CONFIG_FS_POSIX_ACL is not set |
| 695 | # CONFIG_XFS_FS is not set | 713 | # CONFIG_XFS_FS is not set |
| 696 | # CONFIG_GFS2_FS is not set | ||
| 697 | # CONFIG_OCFS2_FS is not set | 714 | # CONFIG_OCFS2_FS is not set |
| 698 | # CONFIG_MINIX_FS is not set | 715 | CONFIG_DNOTIFY=y |
| 699 | # CONFIG_ROMFS_FS is not set | ||
| 700 | CONFIG_INOTIFY=y | 716 | CONFIG_INOTIFY=y |
| 701 | CONFIG_INOTIFY_USER=y | 717 | CONFIG_INOTIFY_USER=y |
| 702 | # CONFIG_QUOTA is not set | 718 | # CONFIG_QUOTA is not set |
| 703 | CONFIG_DNOTIFY=y | ||
| 704 | # CONFIG_AUTOFS_FS is not set | 719 | # CONFIG_AUTOFS_FS is not set |
| 705 | # CONFIG_AUTOFS4_FS is not set | 720 | # CONFIG_AUTOFS4_FS is not set |
| 706 | # CONFIG_FUSE_FS is not set | 721 | # CONFIG_FUSE_FS is not set |
| @@ -743,15 +758,16 @@ CONFIG_TMPFS=y | |||
| 743 | # CONFIG_JFFS2_FS is not set | 758 | # CONFIG_JFFS2_FS is not set |
| 744 | # CONFIG_CRAMFS is not set | 759 | # CONFIG_CRAMFS is not set |
| 745 | # CONFIG_VXFS_FS is not set | 760 | # CONFIG_VXFS_FS is not set |
| 761 | # CONFIG_MINIX_FS is not set | ||
| 746 | # CONFIG_HPFS_FS is not set | 762 | # CONFIG_HPFS_FS is not set |
| 747 | # CONFIG_QNX4FS_FS is not set | 763 | # CONFIG_QNX4FS_FS is not set |
| 764 | # CONFIG_ROMFS_FS is not set | ||
| 748 | # CONFIG_SYSV_FS is not set | 765 | # CONFIG_SYSV_FS is not set |
| 749 | # CONFIG_UFS_FS is not set | 766 | # CONFIG_UFS_FS is not set |
| 750 | CONFIG_NETWORK_FILESYSTEMS=y | 767 | CONFIG_NETWORK_FILESYSTEMS=y |
| 751 | CONFIG_NFS_FS=y | 768 | CONFIG_NFS_FS=y |
| 752 | # CONFIG_NFS_V3 is not set | 769 | # CONFIG_NFS_V3 is not set |
| 753 | # CONFIG_NFS_V4 is not set | 770 | # CONFIG_NFS_V4 is not set |
| 754 | # CONFIG_NFS_DIRECTIO is not set | ||
| 755 | # CONFIG_NFSD is not set | 771 | # CONFIG_NFSD is not set |
| 756 | CONFIG_ROOT_NFS=y | 772 | CONFIG_ROOT_NFS=y |
| 757 | CONFIG_LOCKD=y | 773 | CONFIG_LOCKD=y |
| @@ -790,6 +806,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 790 | # Library routines | 806 | # Library routines |
| 791 | # | 807 | # |
| 792 | CONFIG_BITREVERSE=y | 808 | CONFIG_BITREVERSE=y |
| 809 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 793 | # CONFIG_CRC_CCITT is not set | 810 | # CONFIG_CRC_CCITT is not set |
| 794 | # CONFIG_CRC16 is not set | 811 | # CONFIG_CRC16 is not set |
| 795 | # CONFIG_CRC_ITU_T is not set | 812 | # CONFIG_CRC_ITU_T is not set |
| @@ -800,6 +817,7 @@ CONFIG_PLIST=y | |||
| 800 | CONFIG_HAS_IOMEM=y | 817 | CONFIG_HAS_IOMEM=y |
| 801 | CONFIG_HAS_IOPORT=y | 818 | CONFIG_HAS_IOPORT=y |
| 802 | CONFIG_HAS_DMA=y | 819 | CONFIG_HAS_DMA=y |
| 820 | CONFIG_HAVE_LMB=y | ||
| 803 | 821 | ||
| 804 | # | 822 | # |
| 805 | # Kernel hacking | 823 | # Kernel hacking |
| @@ -807,6 +825,7 @@ CONFIG_HAS_DMA=y | |||
| 807 | # CONFIG_PRINTK_TIME is not set | 825 | # CONFIG_PRINTK_TIME is not set |
| 808 | CONFIG_ENABLE_WARN_DEPRECATED=y | 826 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 809 | CONFIG_ENABLE_MUST_CHECK=y | 827 | CONFIG_ENABLE_MUST_CHECK=y |
| 828 | CONFIG_FRAME_WARN=1024 | ||
| 810 | # CONFIG_MAGIC_SYSRQ is not set | 829 | # CONFIG_MAGIC_SYSRQ is not set |
| 811 | # CONFIG_UNUSED_SYMBOLS is not set | 830 | # CONFIG_UNUSED_SYMBOLS is not set |
| 812 | CONFIG_DEBUG_FS=y | 831 | CONFIG_DEBUG_FS=y |
| @@ -817,7 +836,9 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 817 | CONFIG_SCHED_DEBUG=y | 836 | CONFIG_SCHED_DEBUG=y |
| 818 | # CONFIG_SCHEDSTATS is not set | 837 | # CONFIG_SCHEDSTATS is not set |
| 819 | # CONFIG_TIMER_STATS is not set | 838 | # CONFIG_TIMER_STATS is not set |
| 839 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 820 | # CONFIG_SLUB_DEBUG_ON is not set | 840 | # CONFIG_SLUB_DEBUG_ON is not set |
| 841 | # CONFIG_SLUB_STATS is not set | ||
| 821 | # CONFIG_DEBUG_RT_MUTEXES is not set | 842 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 822 | # CONFIG_RT_MUTEX_TESTER is not set | 843 | # CONFIG_RT_MUTEX_TESTER is not set |
| 823 | # CONFIG_DEBUG_SPINLOCK is not set | 844 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -829,9 +850,9 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 829 | # CONFIG_DEBUG_BUGVERBOSE is not set | 850 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 830 | # CONFIG_DEBUG_INFO is not set | 851 | # CONFIG_DEBUG_INFO is not set |
| 831 | # CONFIG_DEBUG_VM is not set | 852 | # CONFIG_DEBUG_VM is not set |
| 853 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 832 | # CONFIG_DEBUG_LIST is not set | 854 | # CONFIG_DEBUG_LIST is not set |
| 833 | # CONFIG_DEBUG_SG is not set | 855 | # CONFIG_DEBUG_SG is not set |
| 834 | CONFIG_FORCED_INLINING=y | ||
| 835 | # CONFIG_BOOT_PRINTK_DELAY is not set | 856 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 836 | # CONFIG_BACKTRACE_SELF_TEST is not set | 857 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 837 | # CONFIG_FAULT_INJECTION is not set | 858 | # CONFIG_FAULT_INJECTION is not set |
| @@ -841,6 +862,7 @@ CONFIG_FORCED_INLINING=y | |||
| 841 | # CONFIG_DEBUG_PAGEALLOC is not set | 862 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 842 | # CONFIG_DEBUGGER is not set | 863 | # CONFIG_DEBUGGER is not set |
| 843 | # CONFIG_KGDB_CONSOLE is not set | 864 | # CONFIG_KGDB_CONSOLE is not set |
| 865 | # CONFIG_IRQSTACKS is not set | ||
| 844 | # CONFIG_VIRQ_DEBUG is not set | 866 | # CONFIG_VIRQ_DEBUG is not set |
| 845 | # CONFIG_BDI_SWITCH is not set | 867 | # CONFIG_BDI_SWITCH is not set |
| 846 | # CONFIG_PPC_EARLY_DEBUG is not set | 868 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -852,48 +874,78 @@ CONFIG_FORCED_INLINING=y | |||
| 852 | # CONFIG_SECURITY is not set | 874 | # CONFIG_SECURITY is not set |
| 853 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 875 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 854 | CONFIG_CRYPTO=y | 876 | CONFIG_CRYPTO=y |
| 855 | # CONFIG_CRYPTO_SEQIV is not set | 877 | |
| 878 | # | ||
| 879 | # Crypto core or helper | ||
| 880 | # | ||
| 856 | # CONFIG_CRYPTO_MANAGER is not set | 881 | # CONFIG_CRYPTO_MANAGER is not set |
| 882 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 883 | # CONFIG_CRYPTO_NULL is not set | ||
| 884 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 885 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 886 | |||
| 887 | # | ||
| 888 | # Authenticated Encryption with Associated Data | ||
| 889 | # | ||
| 890 | # CONFIG_CRYPTO_CCM is not set | ||
| 891 | # CONFIG_CRYPTO_GCM is not set | ||
| 892 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 893 | |||
| 894 | # | ||
| 895 | # Block modes | ||
| 896 | # | ||
| 897 | # CONFIG_CRYPTO_CBC is not set | ||
| 898 | # CONFIG_CRYPTO_CTR is not set | ||
| 899 | # CONFIG_CRYPTO_CTS is not set | ||
| 900 | # CONFIG_CRYPTO_ECB is not set | ||
| 901 | # CONFIG_CRYPTO_LRW is not set | ||
| 902 | # CONFIG_CRYPTO_PCBC is not set | ||
| 903 | # CONFIG_CRYPTO_XTS is not set | ||
| 904 | |||
| 905 | # | ||
| 906 | # Hash modes | ||
| 907 | # | ||
| 857 | # CONFIG_CRYPTO_HMAC is not set | 908 | # CONFIG_CRYPTO_HMAC is not set |
| 858 | # CONFIG_CRYPTO_XCBC is not set | 909 | # CONFIG_CRYPTO_XCBC is not set |
| 859 | # CONFIG_CRYPTO_NULL is not set | 910 | |
| 911 | # | ||
| 912 | # Digest | ||
| 913 | # | ||
| 914 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 860 | # CONFIG_CRYPTO_MD4 is not set | 915 | # CONFIG_CRYPTO_MD4 is not set |
| 861 | # CONFIG_CRYPTO_MD5 is not set | 916 | # CONFIG_CRYPTO_MD5 is not set |
| 917 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 862 | # CONFIG_CRYPTO_SHA1 is not set | 918 | # CONFIG_CRYPTO_SHA1 is not set |
| 863 | # CONFIG_CRYPTO_SHA256 is not set | 919 | # CONFIG_CRYPTO_SHA256 is not set |
| 864 | # CONFIG_CRYPTO_SHA512 is not set | 920 | # CONFIG_CRYPTO_SHA512 is not set |
| 865 | # CONFIG_CRYPTO_WP512 is not set | ||
| 866 | # CONFIG_CRYPTO_TGR192 is not set | 921 | # CONFIG_CRYPTO_TGR192 is not set |
| 867 | # CONFIG_CRYPTO_GF128MUL is not set | 922 | # CONFIG_CRYPTO_WP512 is not set |
| 868 | # CONFIG_CRYPTO_ECB is not set | 923 | |
| 869 | # CONFIG_CRYPTO_CBC is not set | 924 | # |
| 870 | # CONFIG_CRYPTO_PCBC is not set | 925 | # Ciphers |
| 871 | # CONFIG_CRYPTO_LRW is not set | 926 | # |
| 872 | # CONFIG_CRYPTO_XTS is not set | ||
| 873 | # CONFIG_CRYPTO_CTR is not set | ||
| 874 | # CONFIG_CRYPTO_GCM is not set | ||
| 875 | # CONFIG_CRYPTO_CCM is not set | ||
| 876 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 877 | # CONFIG_CRYPTO_DES is not set | ||
| 878 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 881 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 882 | # CONFIG_CRYPTO_AES is not set | 927 | # CONFIG_CRYPTO_AES is not set |
| 928 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 929 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 930 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 931 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 883 | # CONFIG_CRYPTO_CAST5 is not set | 932 | # CONFIG_CRYPTO_CAST5 is not set |
| 884 | # CONFIG_CRYPTO_CAST6 is not set | 933 | # CONFIG_CRYPTO_CAST6 is not set |
| 885 | # CONFIG_CRYPTO_TEA is not set | 934 | # CONFIG_CRYPTO_DES is not set |
| 886 | # CONFIG_CRYPTO_ARC4 is not set | 935 | # CONFIG_CRYPTO_FCRYPT is not set |
| 887 | # CONFIG_CRYPTO_KHAZAD is not set | 936 | # CONFIG_CRYPTO_KHAZAD is not set |
| 888 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 889 | # CONFIG_CRYPTO_SEED is not set | ||
| 890 | # CONFIG_CRYPTO_SALSA20 is not set | 937 | # CONFIG_CRYPTO_SALSA20 is not set |
| 938 | # CONFIG_CRYPTO_SEED is not set | ||
| 939 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 940 | # CONFIG_CRYPTO_TEA is not set | ||
| 941 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 942 | |||
| 943 | # | ||
| 944 | # Compression | ||
| 945 | # | ||
| 891 | # CONFIG_CRYPTO_DEFLATE is not set | 946 | # CONFIG_CRYPTO_DEFLATE is not set |
| 892 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 893 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 894 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 895 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 896 | # CONFIG_CRYPTO_LZO is not set | 947 | # CONFIG_CRYPTO_LZO is not set |
| 897 | CONFIG_CRYPTO_HW=y | 948 | CONFIG_CRYPTO_HW=y |
| 898 | # CONFIG_PPC_CLOCK is not set | 949 | # CONFIG_PPC_CLOCK is not set |
| 899 | CONFIG_PPC_LIB_RHEAP=y | 950 | CONFIG_PPC_LIB_RHEAP=y |
| 951 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig index b998539da86e..f33fd516fd54 100644 --- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8540_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:25 2008 | 4 | # Mon Jun 9 08:52:31 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC8540_ADS=y | |||
| 153 | # CONFIG_MPC85xx_CDS is not set | 157 | # CONFIG_MPC85xx_CDS is not set |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -208,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -229,6 +236,7 @@ CONFIG_FSL_SOC=y | |||
| 229 | # CONFIG_PCI_SYSCALL is not set | 236 | # CONFIG_PCI_SYSCALL is not set |
| 230 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 237 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 231 | # CONFIG_PCCARD is not set | 238 | # CONFIG_PCCARD is not set |
| 239 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 240 | ||
| 233 | # | 241 | # |
| 234 | # Advanced setup | 242 | # Advanced setup |
| @@ -238,11 +246,12 @@ CONFIG_FSL_SOC=y | |||
| 238 | # | 246 | # |
| 239 | # Default settings for advanced configuration options are used | 247 | # Default settings for advanced configuration options are used |
| 240 | # | 248 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 249 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 250 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 251 | CONFIG_KERNEL_START=0xc0000000 |
| 252 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 253 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 254 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 255 | ||
| 247 | # | 256 | # |
| 248 | # Networking | 257 | # Networking |
| @@ -290,8 +299,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 299 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 291 | # CONFIG_TCP_MD5SIG is not set | 300 | # CONFIG_TCP_MD5SIG is not set |
| 292 | # CONFIG_IPV6 is not set | 301 | # CONFIG_IPV6 is not set |
| 293 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 294 | # CONFIG_INET6_TUNNEL is not set | ||
| 295 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 296 | # CONFIG_NETFILTER is not set | 303 | # CONFIG_NETFILTER is not set |
| 297 | # CONFIG_IP_DCCP is not set | 304 | # CONFIG_IP_DCCP is not set |
| @@ -419,6 +426,7 @@ CONFIG_NETDEV_10000=y | |||
| 419 | # | 426 | # |
| 420 | # CONFIG_WLAN_PRE80211 is not set | 427 | # CONFIG_WLAN_PRE80211 is not set |
| 421 | # CONFIG_WLAN_80211 is not set | 428 | # CONFIG_WLAN_80211 is not set |
| 429 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 422 | # CONFIG_WAN is not set | 430 | # CONFIG_WAN is not set |
| 423 | # CONFIG_PPP is not set | 431 | # CONFIG_PPP is not set |
| 424 | # CONFIG_SLIP is not set | 432 | # CONFIG_SLIP is not set |
| @@ -463,6 +471,7 @@ CONFIG_INPUT=y | |||
| 463 | # Character devices | 471 | # Character devices |
| 464 | # | 472 | # |
| 465 | # CONFIG_VT is not set | 473 | # CONFIG_VT is not set |
| 474 | CONFIG_DEVKMEM=y | ||
| 466 | # CONFIG_SERIAL_NONSTANDARD is not set | 475 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 467 | 476 | ||
| 468 | # | 477 | # |
| @@ -494,12 +503,7 @@ CONFIG_GEN_RTC=y | |||
| 494 | # CONFIG_RAW_DRIVER is not set | 503 | # CONFIG_RAW_DRIVER is not set |
| 495 | # CONFIG_TCG_TPM is not set | 504 | # CONFIG_TCG_TPM is not set |
| 496 | # CONFIG_I2C is not set | 505 | # CONFIG_I2C is not set |
| 497 | |||
| 498 | # | ||
| 499 | # SPI support | ||
| 500 | # | ||
| 501 | # CONFIG_SPI is not set | 506 | # CONFIG_SPI is not set |
| 502 | # CONFIG_SPI_MASTER is not set | ||
| 503 | # CONFIG_W1 is not set | 507 | # CONFIG_W1 is not set |
| 504 | # CONFIG_POWER_SUPPLY is not set | 508 | # CONFIG_POWER_SUPPLY is not set |
| 505 | CONFIG_HWMON=y | 509 | CONFIG_HWMON=y |
| @@ -528,12 +532,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 528 | # Multifunction device drivers | 532 | # Multifunction device drivers |
| 529 | # | 533 | # |
| 530 | # CONFIG_MFD_SM501 is not set | 534 | # CONFIG_MFD_SM501 is not set |
| 535 | # CONFIG_HTC_PASIC3 is not set | ||
| 531 | 536 | ||
| 532 | # | 537 | # |
| 533 | # Multimedia devices | 538 | # Multimedia devices |
| 534 | # | 539 | # |
| 540 | |||
| 541 | # | ||
| 542 | # Multimedia core support | ||
| 543 | # | ||
| 535 | # CONFIG_VIDEO_DEV is not set | 544 | # CONFIG_VIDEO_DEV is not set |
| 536 | # CONFIG_DVB_CORE is not set | 545 | # CONFIG_DVB_CORE is not set |
| 546 | # CONFIG_VIDEO_MEDIA is not set | ||
| 547 | |||
| 548 | # | ||
| 549 | # Multimedia drivers | ||
| 550 | # | ||
| 537 | CONFIG_DAB=y | 551 | CONFIG_DAB=y |
| 538 | 552 | ||
| 539 | # | 553 | # |
| @@ -561,6 +575,8 @@ CONFIG_USB_SUPPORT=y | |||
| 561 | # CONFIG_USB_ARCH_HAS_HCD is not set | 575 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 562 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 576 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 563 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 577 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 578 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 579 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 564 | 580 | ||
| 565 | # | 581 | # |
| 566 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 582 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -569,13 +585,10 @@ CONFIG_USB_SUPPORT=y | |||
| 569 | # CONFIG_MMC is not set | 585 | # CONFIG_MMC is not set |
| 570 | # CONFIG_MEMSTICK is not set | 586 | # CONFIG_MEMSTICK is not set |
| 571 | # CONFIG_NEW_LEDS is not set | 587 | # CONFIG_NEW_LEDS is not set |
| 588 | # CONFIG_ACCESSIBILITY is not set | ||
| 572 | # CONFIG_EDAC is not set | 589 | # CONFIG_EDAC is not set |
| 573 | # CONFIG_RTC_CLASS is not set | 590 | # CONFIG_RTC_CLASS is not set |
| 574 | # CONFIG_DMADEVICES is not set | 591 | # CONFIG_DMADEVICES is not set |
| 575 | |||
| 576 | # | ||
| 577 | # Userspace I/O | ||
| 578 | # | ||
| 579 | # CONFIG_UIO is not set | 592 | # CONFIG_UIO is not set |
| 580 | 593 | ||
| 581 | # | 594 | # |
| @@ -595,7 +608,6 @@ CONFIG_FS_MBCACHE=y | |||
| 595 | # CONFIG_JFS_FS is not set | 608 | # CONFIG_JFS_FS is not set |
| 596 | # CONFIG_FS_POSIX_ACL is not set | 609 | # CONFIG_FS_POSIX_ACL is not set |
| 597 | # CONFIG_XFS_FS is not set | 610 | # CONFIG_XFS_FS is not set |
| 598 | # CONFIG_GFS2_FS is not set | ||
| 599 | # CONFIG_OCFS2_FS is not set | 611 | # CONFIG_OCFS2_FS is not set |
| 600 | CONFIG_DNOTIFY=y | 612 | CONFIG_DNOTIFY=y |
| 601 | CONFIG_INOTIFY=y | 613 | CONFIG_INOTIFY=y |
| @@ -652,7 +664,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 652 | CONFIG_NFS_FS=y | 664 | CONFIG_NFS_FS=y |
| 653 | # CONFIG_NFS_V3 is not set | 665 | # CONFIG_NFS_V3 is not set |
| 654 | # CONFIG_NFS_V4 is not set | 666 | # CONFIG_NFS_V4 is not set |
| 655 | # CONFIG_NFS_DIRECTIO is not set | ||
| 656 | # CONFIG_NFSD is not set | 667 | # CONFIG_NFSD is not set |
| 657 | CONFIG_ROOT_NFS=y | 668 | CONFIG_ROOT_NFS=y |
| 658 | CONFIG_LOCKD=y | 669 | CONFIG_LOCKD=y |
| @@ -691,6 +702,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 691 | # Library routines | 702 | # Library routines |
| 692 | # | 703 | # |
| 693 | CONFIG_BITREVERSE=y | 704 | CONFIG_BITREVERSE=y |
| 705 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 694 | # CONFIG_CRC_CCITT is not set | 706 | # CONFIG_CRC_CCITT is not set |
| 695 | # CONFIG_CRC16 is not set | 707 | # CONFIG_CRC16 is not set |
| 696 | # CONFIG_CRC_ITU_T is not set | 708 | # CONFIG_CRC_ITU_T is not set |
| @@ -701,6 +713,7 @@ CONFIG_PLIST=y | |||
| 701 | CONFIG_HAS_IOMEM=y | 713 | CONFIG_HAS_IOMEM=y |
| 702 | CONFIG_HAS_IOPORT=y | 714 | CONFIG_HAS_IOPORT=y |
| 703 | CONFIG_HAS_DMA=y | 715 | CONFIG_HAS_DMA=y |
| 716 | CONFIG_HAVE_LMB=y | ||
| 704 | 717 | ||
| 705 | # | 718 | # |
| 706 | # Kernel hacking | 719 | # Kernel hacking |
| @@ -708,6 +721,7 @@ CONFIG_HAS_DMA=y | |||
| 708 | # CONFIG_PRINTK_TIME is not set | 721 | # CONFIG_PRINTK_TIME is not set |
| 709 | CONFIG_ENABLE_WARN_DEPRECATED=y | 722 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 710 | CONFIG_ENABLE_MUST_CHECK=y | 723 | CONFIG_ENABLE_MUST_CHECK=y |
| 724 | CONFIG_FRAME_WARN=1024 | ||
| 711 | # CONFIG_MAGIC_SYSRQ is not set | 725 | # CONFIG_MAGIC_SYSRQ is not set |
| 712 | # CONFIG_UNUSED_SYMBOLS is not set | 726 | # CONFIG_UNUSED_SYMBOLS is not set |
| 713 | # CONFIG_DEBUG_FS is not set | 727 | # CONFIG_DEBUG_FS is not set |
| @@ -718,6 +732,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 718 | CONFIG_SCHED_DEBUG=y | 732 | CONFIG_SCHED_DEBUG=y |
| 719 | # CONFIG_SCHEDSTATS is not set | 733 | # CONFIG_SCHEDSTATS is not set |
| 720 | # CONFIG_TIMER_STATS is not set | 734 | # CONFIG_TIMER_STATS is not set |
| 735 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 721 | # CONFIG_SLUB_DEBUG_ON is not set | 736 | # CONFIG_SLUB_DEBUG_ON is not set |
| 722 | # CONFIG_SLUB_STATS is not set | 737 | # CONFIG_SLUB_STATS is not set |
| 723 | # CONFIG_DEBUG_RT_MUTEXES is not set | 738 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -730,6 +745,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 730 | # CONFIG_DEBUG_BUGVERBOSE is not set | 745 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 731 | # CONFIG_DEBUG_INFO is not set | 746 | # CONFIG_DEBUG_INFO is not set |
| 732 | # CONFIG_DEBUG_VM is not set | 747 | # CONFIG_DEBUG_VM is not set |
| 748 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 733 | # CONFIG_DEBUG_LIST is not set | 749 | # CONFIG_DEBUG_LIST is not set |
| 734 | # CONFIG_DEBUG_SG is not set | 750 | # CONFIG_DEBUG_SG is not set |
| 735 | # CONFIG_BOOT_PRINTK_DELAY is not set | 751 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -740,6 +756,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 740 | # CONFIG_DEBUG_STACK_USAGE is not set | 756 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 741 | # CONFIG_DEBUG_PAGEALLOC is not set | 757 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 742 | # CONFIG_DEBUGGER is not set | 758 | # CONFIG_DEBUGGER is not set |
| 759 | # CONFIG_IRQSTACKS is not set | ||
| 743 | # CONFIG_BDI_SWITCH is not set | 760 | # CONFIG_BDI_SWITCH is not set |
| 744 | # CONFIG_PPC_EARLY_DEBUG is not set | 761 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 745 | 762 | ||
| @@ -750,47 +767,77 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 750 | # CONFIG_SECURITY is not set | 767 | # CONFIG_SECURITY is not set |
| 751 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 768 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 752 | CONFIG_CRYPTO=y | 769 | CONFIG_CRYPTO=y |
| 753 | # CONFIG_CRYPTO_SEQIV is not set | 770 | |
| 771 | # | ||
| 772 | # Crypto core or helper | ||
| 773 | # | ||
| 754 | # CONFIG_CRYPTO_MANAGER is not set | 774 | # CONFIG_CRYPTO_MANAGER is not set |
| 775 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 776 | # CONFIG_CRYPTO_NULL is not set | ||
| 777 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 778 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 779 | |||
| 780 | # | ||
| 781 | # Authenticated Encryption with Associated Data | ||
| 782 | # | ||
| 783 | # CONFIG_CRYPTO_CCM is not set | ||
| 784 | # CONFIG_CRYPTO_GCM is not set | ||
| 785 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 786 | |||
| 787 | # | ||
| 788 | # Block modes | ||
| 789 | # | ||
| 790 | # CONFIG_CRYPTO_CBC is not set | ||
| 791 | # CONFIG_CRYPTO_CTR is not set | ||
| 792 | # CONFIG_CRYPTO_CTS is not set | ||
| 793 | # CONFIG_CRYPTO_ECB is not set | ||
| 794 | # CONFIG_CRYPTO_LRW is not set | ||
| 795 | # CONFIG_CRYPTO_PCBC is not set | ||
| 796 | # CONFIG_CRYPTO_XTS is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # Hash modes | ||
| 800 | # | ||
| 755 | # CONFIG_CRYPTO_HMAC is not set | 801 | # CONFIG_CRYPTO_HMAC is not set |
| 756 | # CONFIG_CRYPTO_XCBC is not set | 802 | # CONFIG_CRYPTO_XCBC is not set |
| 757 | # CONFIG_CRYPTO_NULL is not set | 803 | |
| 804 | # | ||
| 805 | # Digest | ||
| 806 | # | ||
| 807 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 758 | # CONFIG_CRYPTO_MD4 is not set | 808 | # CONFIG_CRYPTO_MD4 is not set |
| 759 | # CONFIG_CRYPTO_MD5 is not set | 809 | # CONFIG_CRYPTO_MD5 is not set |
| 810 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 760 | # CONFIG_CRYPTO_SHA1 is not set | 811 | # CONFIG_CRYPTO_SHA1 is not set |
| 761 | # CONFIG_CRYPTO_SHA256 is not set | 812 | # CONFIG_CRYPTO_SHA256 is not set |
| 762 | # CONFIG_CRYPTO_SHA512 is not set | 813 | # CONFIG_CRYPTO_SHA512 is not set |
| 763 | # CONFIG_CRYPTO_WP512 is not set | ||
| 764 | # CONFIG_CRYPTO_TGR192 is not set | 814 | # CONFIG_CRYPTO_TGR192 is not set |
| 765 | # CONFIG_CRYPTO_GF128MUL is not set | 815 | # CONFIG_CRYPTO_WP512 is not set |
| 766 | # CONFIG_CRYPTO_ECB is not set | 816 | |
| 767 | # CONFIG_CRYPTO_CBC is not set | 817 | # |
| 768 | # CONFIG_CRYPTO_PCBC is not set | 818 | # Ciphers |
| 769 | # CONFIG_CRYPTO_LRW is not set | 819 | # |
| 770 | # CONFIG_CRYPTO_XTS is not set | ||
| 771 | # CONFIG_CRYPTO_CTR is not set | ||
| 772 | # CONFIG_CRYPTO_GCM is not set | ||
| 773 | # CONFIG_CRYPTO_CCM is not set | ||
| 774 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 775 | # CONFIG_CRYPTO_DES is not set | ||
| 776 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 777 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 778 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 779 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 780 | # CONFIG_CRYPTO_AES is not set | 820 | # CONFIG_CRYPTO_AES is not set |
| 821 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 822 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 823 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 824 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 781 | # CONFIG_CRYPTO_CAST5 is not set | 825 | # CONFIG_CRYPTO_CAST5 is not set |
| 782 | # CONFIG_CRYPTO_CAST6 is not set | 826 | # CONFIG_CRYPTO_CAST6 is not set |
| 783 | # CONFIG_CRYPTO_TEA is not set | 827 | # CONFIG_CRYPTO_DES is not set |
| 784 | # CONFIG_CRYPTO_ARC4 is not set | 828 | # CONFIG_CRYPTO_FCRYPT is not set |
| 785 | # CONFIG_CRYPTO_KHAZAD is not set | 829 | # CONFIG_CRYPTO_KHAZAD is not set |
| 786 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 787 | # CONFIG_CRYPTO_SEED is not set | ||
| 788 | # CONFIG_CRYPTO_SALSA20 is not set | 830 | # CONFIG_CRYPTO_SALSA20 is not set |
| 831 | # CONFIG_CRYPTO_SEED is not set | ||
| 832 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 833 | # CONFIG_CRYPTO_TEA is not set | ||
| 834 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 835 | |||
| 836 | # | ||
| 837 | # Compression | ||
| 838 | # | ||
| 789 | # CONFIG_CRYPTO_DEFLATE is not set | 839 | # CONFIG_CRYPTO_DEFLATE is not set |
| 790 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 791 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 792 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 793 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 794 | # CONFIG_CRYPTO_LZO is not set | 840 | # CONFIG_CRYPTO_LZO is not set |
| 795 | CONFIG_CRYPTO_HW=y | 841 | CONFIG_CRYPTO_HW=y |
| 796 | # CONFIG_PPC_CLOCK is not set | 842 | # CONFIG_PPC_CLOCK is not set |
| 843 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig index a9f113b243ae..042a85ea7b72 100644 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8544_ds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:03 2008 | 4 | # Mon Jun 9 08:52:32 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -203,7 +208,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 203 | # CONFIG_PREEMPT is not set | 208 | # CONFIG_PREEMPT is not set |
| 204 | CONFIG_BINFMT_ELF=y | 209 | CONFIG_BINFMT_ELF=y |
| 205 | CONFIG_BINFMT_MISC=m | 210 | CONFIG_BINFMT_MISC=m |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 207 | CONFIG_MATH_EMULATION=y | 211 | CONFIG_MATH_EMULATION=y |
| 208 | # CONFIG_IOMMU_HELPER is not set | 212 | # CONFIG_IOMMU_HELPER is not set |
| 209 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 213 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -219,11 +223,13 @@ CONFIG_FLATMEM=y | |||
| 219 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 220 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 223 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 224 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 225 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| 226 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 227 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 229 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| @@ -248,6 +254,7 @@ CONFIG_PCI_LEGACY=y | |||
| 248 | # CONFIG_PCI_DEBUG is not set | 254 | # CONFIG_PCI_DEBUG is not set |
| 249 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 250 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 257 | # CONFIG_HAS_RAPIDIO is not set | ||
| 251 | 258 | ||
| 252 | # | 259 | # |
| 253 | # Advanced setup | 260 | # Advanced setup |
| @@ -257,11 +264,12 @@ CONFIG_PCI_LEGACY=y | |||
| 257 | # | 264 | # |
| 258 | # Default settings for advanced configuration options are used | 265 | # Default settings for advanced configuration options are used |
| 259 | # | 266 | # |
| 260 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 261 | CONFIG_LOWMEM_SIZE=0x30000000 | 267 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 268 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 262 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
| 270 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 263 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
| 264 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 265 | 273 | ||
| 266 | # | 274 | # |
| 267 | # Networking | 275 | # Networking |
| @@ -332,8 +340,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 332 | CONFIG_INET6_XFRM_MODE_BEET=y | 340 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 333 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 341 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 334 | CONFIG_IPV6_SIT=y | 342 | CONFIG_IPV6_SIT=y |
| 343 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 335 | # CONFIG_IPV6_TUNNEL is not set | 344 | # CONFIG_IPV6_TUNNEL is not set |
| 336 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 345 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 346 | # CONFIG_IPV6_MROUTE is not set | ||
| 337 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
| 338 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
| 339 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
| @@ -395,6 +405,7 @@ CONFIG_FW_LOADER=y | |||
| 395 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
| 396 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
| 397 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
| 408 | CONFIG_OF_I2C=y | ||
| 398 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
| 399 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
| 400 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
| @@ -501,7 +512,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 501 | # CONFIG_SCSI_SRP is not set | 512 | # CONFIG_SCSI_SRP is not set |
| 502 | CONFIG_ATA=y | 513 | CONFIG_ATA=y |
| 503 | # CONFIG_ATA_NONSTANDARD is not set | 514 | # CONFIG_ATA_NONSTANDARD is not set |
| 515 | CONFIG_SATA_PMP=y | ||
| 504 | CONFIG_SATA_AHCI=y | 516 | CONFIG_SATA_AHCI=y |
| 517 | # CONFIG_SATA_SIL24 is not set | ||
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_ATA_SFF=y | ||
| 505 | # CONFIG_SATA_SVW is not set | 520 | # CONFIG_SATA_SVW is not set |
| 506 | # CONFIG_ATA_PIIX is not set | 521 | # CONFIG_ATA_PIIX is not set |
| 507 | # CONFIG_SATA_MV is not set | 522 | # CONFIG_SATA_MV is not set |
| @@ -511,13 +526,11 @@ CONFIG_SATA_AHCI=y | |||
| 511 | # CONFIG_SATA_PROMISE is not set | 526 | # CONFIG_SATA_PROMISE is not set |
| 512 | # CONFIG_SATA_SX4 is not set | 527 | # CONFIG_SATA_SX4 is not set |
| 513 | # CONFIG_SATA_SIL is not set | 528 | # CONFIG_SATA_SIL is not set |
| 514 | # CONFIG_SATA_SIL24 is not set | ||
| 515 | # CONFIG_SATA_SIS is not set | 529 | # CONFIG_SATA_SIS is not set |
| 516 | # CONFIG_SATA_ULI is not set | 530 | # CONFIG_SATA_ULI is not set |
| 517 | # CONFIG_SATA_VIA is not set | 531 | # CONFIG_SATA_VIA is not set |
| 518 | # CONFIG_SATA_VITESSE is not set | 532 | # CONFIG_SATA_VITESSE is not set |
| 519 | # CONFIG_SATA_INIC162X is not set | 533 | # CONFIG_SATA_INIC162X is not set |
| 520 | # CONFIG_SATA_FSL is not set | ||
| 521 | CONFIG_PATA_ALI=y | 534 | CONFIG_PATA_ALI=y |
| 522 | # CONFIG_PATA_AMD is not set | 535 | # CONFIG_PATA_AMD is not set |
| 523 | # CONFIG_PATA_ARTOP is not set | 536 | # CONFIG_PATA_ARTOP is not set |
| @@ -557,6 +570,7 @@ CONFIG_PATA_ALI=y | |||
| 557 | # CONFIG_PATA_VIA is not set | 570 | # CONFIG_PATA_VIA is not set |
| 558 | # CONFIG_PATA_WINBOND is not set | 571 | # CONFIG_PATA_WINBOND is not set |
| 559 | # CONFIG_PATA_PLATFORM is not set | 572 | # CONFIG_PATA_PLATFORM is not set |
| 573 | # CONFIG_PATA_SCH is not set | ||
| 560 | # CONFIG_MD is not set | 574 | # CONFIG_MD is not set |
| 561 | # CONFIG_FUSION is not set | 575 | # CONFIG_FUSION is not set |
| 562 | 576 | ||
| @@ -622,7 +636,6 @@ CONFIG_NETDEV_1000=y | |||
| 622 | # CONFIG_SIS190 is not set | 636 | # CONFIG_SIS190 is not set |
| 623 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
| 624 | # CONFIG_SKY2 is not set | 638 | # CONFIG_SKY2 is not set |
| 625 | # CONFIG_SK98LIN is not set | ||
| 626 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
| 627 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
| 628 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
| @@ -642,6 +655,7 @@ CONFIG_NETDEV_10000=y | |||
| 642 | # CONFIG_MLX4_CORE is not set | 655 | # CONFIG_MLX4_CORE is not set |
| 643 | # CONFIG_TEHUTI is not set | 656 | # CONFIG_TEHUTI is not set |
| 644 | # CONFIG_BNX2X is not set | 657 | # CONFIG_BNX2X is not set |
| 658 | # CONFIG_SFC is not set | ||
| 645 | # CONFIG_TR is not set | 659 | # CONFIG_TR is not set |
| 646 | 660 | ||
| 647 | # | 661 | # |
| @@ -649,6 +663,7 @@ CONFIG_NETDEV_10000=y | |||
| 649 | # | 663 | # |
| 650 | # CONFIG_WLAN_PRE80211 is not set | 664 | # CONFIG_WLAN_PRE80211 is not set |
| 651 | # CONFIG_WLAN_80211 is not set | 665 | # CONFIG_WLAN_80211 is not set |
| 666 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 652 | 667 | ||
| 653 | # | 668 | # |
| 654 | # USB Network Adapters | 669 | # USB Network Adapters |
| @@ -713,6 +728,7 @@ CONFIG_VT=y | |||
| 713 | CONFIG_VT_CONSOLE=y | 728 | CONFIG_VT_CONSOLE=y |
| 714 | CONFIG_HW_CONSOLE=y | 729 | CONFIG_HW_CONSOLE=y |
| 715 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 731 | CONFIG_DEVKMEM=y | ||
| 716 | # CONFIG_SERIAL_NONSTANDARD is not set | 732 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 717 | # CONFIG_NOZOMI is not set | 733 | # CONFIG_NOZOMI is not set |
| 718 | 734 | ||
| @@ -744,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 744 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 745 | # CONFIG_HW_RANDOM is not set | 761 | # CONFIG_HW_RANDOM is not set |
| 746 | CONFIG_NVRAM=y | 762 | CONFIG_NVRAM=y |
| 747 | # CONFIG_GEN_RTC is not set | ||
| 748 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 749 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 750 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -755,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 755 | # CONFIG_I2C_CHARDEV is not set | 770 | # CONFIG_I2C_CHARDEV is not set |
| 756 | 771 | ||
| 757 | # | 772 | # |
| 758 | # I2C Algorithms | ||
| 759 | # | ||
| 760 | # CONFIG_I2C_ALGOBIT is not set | ||
| 761 | # CONFIG_I2C_ALGOPCF is not set | ||
| 762 | # CONFIG_I2C_ALGOPCA is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 766 | # | 774 | # |
| 767 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -788,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 788 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 789 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 790 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 791 | 800 | ||
| 792 | # | 801 | # |
| 793 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -797,19 +806,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 797 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 798 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 799 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 800 | # CONFIG_TPS65010 is not set | ||
| 801 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 802 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 803 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 804 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 805 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 806 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 807 | |||
| 808 | # | ||
| 809 | # SPI support | ||
| 810 | # | ||
| 811 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
| 812 | # CONFIG_SPI_MASTER is not set | ||
| 813 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
| 814 | # CONFIG_POWER_SUPPLY is not set | 817 | # CONFIG_POWER_SUPPLY is not set |
| 815 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
| @@ -826,13 +829,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 826 | # Multifunction device drivers | 829 | # Multifunction device drivers |
| 827 | # | 830 | # |
| 828 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
| 832 | # CONFIG_HTC_PASIC3 is not set | ||
| 829 | 833 | ||
| 830 | # | 834 | # |
| 831 | # Multimedia devices | 835 | # Multimedia devices |
| 832 | # | 836 | # |
| 837 | |||
| 838 | # | ||
| 839 | # Multimedia core support | ||
| 840 | # | ||
| 833 | # CONFIG_VIDEO_DEV is not set | 841 | # CONFIG_VIDEO_DEV is not set |
| 834 | CONFIG_DVB_CORE=m | 842 | CONFIG_DVB_CORE=m |
| 835 | # CONFIG_DVB_CORE_ATTACH is not set | 843 | CONFIG_VIDEO_MEDIA=m |
| 844 | |||
| 845 | # | ||
| 846 | # Multimedia drivers | ||
| 847 | # | ||
| 848 | # CONFIG_MEDIA_ATTACH is not set | ||
| 849 | CONFIG_MEDIA_TUNER=m | ||
| 850 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 851 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 852 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 853 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 854 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 855 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 856 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 857 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 858 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 836 | CONFIG_DVB_CAPTURE_DRIVERS=y | 859 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 837 | 860 | ||
| 838 | # | 861 | # |
| @@ -875,14 +898,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 875 | # | 898 | # |
| 876 | # DVB-S (satellite) frontends | 899 | # DVB-S (satellite) frontends |
| 877 | # | 900 | # |
| 878 | # CONFIG_DVB_STV0299 is not set | ||
| 879 | # CONFIG_DVB_CX24110 is not set | 901 | # CONFIG_DVB_CX24110 is not set |
| 880 | # CONFIG_DVB_CX24123 is not set | 902 | # CONFIG_DVB_CX24123 is not set |
| 881 | # CONFIG_DVB_TDA8083 is not set | ||
| 882 | # CONFIG_DVB_MT312 is not set | 903 | # CONFIG_DVB_MT312 is not set |
| 883 | # CONFIG_DVB_VES1X93 is not set | ||
| 884 | # CONFIG_DVB_S5H1420 is not set | 904 | # CONFIG_DVB_S5H1420 is not set |
| 905 | # CONFIG_DVB_STV0299 is not set | ||
| 906 | # CONFIG_DVB_TDA8083 is not set | ||
| 885 | # CONFIG_DVB_TDA10086 is not set | 907 | # CONFIG_DVB_TDA10086 is not set |
| 908 | # CONFIG_DVB_VES1X93 is not set | ||
| 909 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 910 | # CONFIG_DVB_TDA826X is not set | ||
| 911 | # CONFIG_DVB_TUA6100 is not set | ||
| 886 | 912 | ||
| 887 | # | 913 | # |
| 888 | # DVB-T (terrestrial) frontends | 914 | # DVB-T (terrestrial) frontends |
| @@ -900,6 +926,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 900 | # CONFIG_DVB_DIB3000MC is not set | 926 | # CONFIG_DVB_DIB3000MC is not set |
| 901 | # CONFIG_DVB_DIB7000M is not set | 927 | # CONFIG_DVB_DIB7000M is not set |
| 902 | # CONFIG_DVB_DIB7000P is not set | 928 | # CONFIG_DVB_DIB7000P is not set |
| 929 | # CONFIG_DVB_TDA10048 is not set | ||
| 903 | 930 | ||
| 904 | # | 931 | # |
| 905 | # DVB-C (cable) frontends | 932 | # DVB-C (cable) frontends |
| @@ -918,27 +945,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 918 | # CONFIG_DVB_BCM3510 is not set | 945 | # CONFIG_DVB_BCM3510 is not set |
| 919 | # CONFIG_DVB_LGDT330X is not set | 946 | # CONFIG_DVB_LGDT330X is not set |
| 920 | # CONFIG_DVB_S5H1409 is not set | 947 | # CONFIG_DVB_S5H1409 is not set |
| 948 | # CONFIG_DVB_AU8522 is not set | ||
| 949 | # CONFIG_DVB_S5H1411 is not set | ||
| 921 | 950 | ||
| 922 | # | 951 | # |
| 923 | # Tuners/PLL support | 952 | # Digital terrestrial only tuners/PLL |
| 924 | # | 953 | # |
| 925 | # CONFIG_DVB_PLL is not set | 954 | # CONFIG_DVB_PLL is not set |
| 926 | # CONFIG_DVB_TDA826X is not set | ||
| 927 | # CONFIG_DVB_TDA827X is not set | ||
| 928 | # CONFIG_DVB_TDA18271 is not set | ||
| 929 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 930 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 931 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 932 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 933 | # CONFIG_DVB_TUNER_DIB0070 is not set | 955 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 934 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 935 | 956 | ||
| 936 | # | 957 | # |
| 937 | # Miscellaneous devices | 958 | # SEC control devices for DVB-S |
| 938 | # | 959 | # |
| 939 | # CONFIG_DVB_LNBP21 is not set | 960 | # CONFIG_DVB_LNBP21 is not set |
| 961 | # CONFIG_DVB_ISL6405 is not set | ||
| 940 | # CONFIG_DVB_ISL6421 is not set | 962 | # CONFIG_DVB_ISL6421 is not set |
| 941 | # CONFIG_DVB_TUA6100 is not set | ||
| 942 | CONFIG_DAB=y | 963 | CONFIG_DAB=y |
| 943 | # CONFIG_USB_DABUSB is not set | 964 | # CONFIG_USB_DABUSB is not set |
| 944 | 965 | ||
| @@ -1005,6 +1026,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1005 | # CONFIG_SND_AU8810 is not set | 1026 | # CONFIG_SND_AU8810 is not set |
| 1006 | # CONFIG_SND_AU8820 is not set | 1027 | # CONFIG_SND_AU8820 is not set |
| 1007 | # CONFIG_SND_AU8830 is not set | 1028 | # CONFIG_SND_AU8830 is not set |
| 1029 | # CONFIG_SND_AW2 is not set | ||
| 1008 | # CONFIG_SND_AZT3328 is not set | 1030 | # CONFIG_SND_AZT3328 is not set |
| 1009 | # CONFIG_SND_BT87X is not set | 1031 | # CONFIG_SND_BT87X is not set |
| 1010 | # CONFIG_SND_CA0106 is not set | 1032 | # CONFIG_SND_CA0106 is not set |
| @@ -1079,11 +1101,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1079 | # CONFIG_SND_SOC is not set | 1101 | # CONFIG_SND_SOC is not set |
| 1080 | 1102 | ||
| 1081 | # | 1103 | # |
| 1082 | # SoC Audio support for SuperH | 1104 | # ALSA SoC audio for Freescale SOCs |
| 1083 | # | 1105 | # |
| 1084 | 1106 | ||
| 1085 | # | 1107 | # |
| 1086 | # ALSA SoC audio for Freescale SOCs | 1108 | # SoC Audio for the Texas Instruments OMAP |
| 1087 | # | 1109 | # |
| 1088 | 1110 | ||
| 1089 | # | 1111 | # |
| @@ -1118,16 +1140,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1118 | CONFIG_USB_DEVICE_CLASS=y | 1140 | CONFIG_USB_DEVICE_CLASS=y |
| 1119 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1141 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1120 | # CONFIG_USB_OTG is not set | 1142 | # CONFIG_USB_OTG is not set |
| 1143 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1144 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1121 | 1145 | ||
| 1122 | # | 1146 | # |
| 1123 | # USB Host Controller Drivers | 1147 | # USB Host Controller Drivers |
| 1124 | # | 1148 | # |
| 1149 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1125 | CONFIG_USB_EHCI_HCD=y | 1150 | CONFIG_USB_EHCI_HCD=y |
| 1126 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1151 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1127 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1152 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1128 | # CONFIG_USB_EHCI_FSL is not set | 1153 | # CONFIG_USB_EHCI_FSL is not set |
| 1129 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1154 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1130 | # CONFIG_USB_ISP116X_HCD is not set | 1155 | # CONFIG_USB_ISP116X_HCD is not set |
| 1156 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1131 | CONFIG_USB_OHCI_HCD=y | 1157 | CONFIG_USB_OHCI_HCD=y |
| 1132 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1158 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1133 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1159 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1145,6 +1171,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1145 | # | 1171 | # |
| 1146 | # CONFIG_USB_ACM is not set | 1172 | # CONFIG_USB_ACM is not set |
| 1147 | # CONFIG_USB_PRINTER is not set | 1173 | # CONFIG_USB_PRINTER is not set |
| 1174 | # CONFIG_USB_WDM is not set | ||
| 1148 | 1175 | ||
| 1149 | # | 1176 | # |
| 1150 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1177 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1164,7 +1191,9 @@ CONFIG_USB_STORAGE=y | |||
| 1164 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1191 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1165 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1192 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1166 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1193 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1194 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1167 | # CONFIG_USB_STORAGE_KARMA is not set | 1195 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1196 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1168 | # CONFIG_USB_LIBUSUAL is not set | 1197 | # CONFIG_USB_LIBUSUAL is not set |
| 1169 | 1198 | ||
| 1170 | # | 1199 | # |
| @@ -1202,10 +1231,12 @@ CONFIG_USB_MON=y | |||
| 1202 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1231 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1203 | # CONFIG_USB_IOWARRIOR is not set | 1232 | # CONFIG_USB_IOWARRIOR is not set |
| 1204 | # CONFIG_USB_TEST is not set | 1233 | # CONFIG_USB_TEST is not set |
| 1234 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1205 | # CONFIG_USB_GADGET is not set | 1235 | # CONFIG_USB_GADGET is not set |
| 1206 | # CONFIG_MMC is not set | 1236 | # CONFIG_MMC is not set |
| 1207 | # CONFIG_MEMSTICK is not set | 1237 | # CONFIG_MEMSTICK is not set |
| 1208 | # CONFIG_NEW_LEDS is not set | 1238 | # CONFIG_NEW_LEDS is not set |
| 1239 | # CONFIG_ACCESSIBILITY is not set | ||
| 1209 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
| 1210 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
| 1211 | CONFIG_RTC_LIB=y | 1242 | CONFIG_RTC_LIB=y |
| @@ -1257,23 +1288,19 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1257 | # | 1288 | # |
| 1258 | # on-CPU RTC drivers | 1289 | # on-CPU RTC drivers |
| 1259 | # | 1290 | # |
| 1291 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1260 | CONFIG_DMADEVICES=y | 1292 | CONFIG_DMADEVICES=y |
| 1261 | 1293 | ||
| 1262 | # | 1294 | # |
| 1263 | # DMA Devices | 1295 | # DMA Devices |
| 1264 | # | 1296 | # |
| 1265 | CONFIG_FSL_DMA=y | 1297 | CONFIG_FSL_DMA=y |
| 1266 | # CONFIG_FSL_DMA_SELFTEST is not set | ||
| 1267 | CONFIG_DMA_ENGINE=y | 1298 | CONFIG_DMA_ENGINE=y |
| 1268 | 1299 | ||
| 1269 | # | 1300 | # |
| 1270 | # DMA Clients | 1301 | # DMA Clients |
| 1271 | # | 1302 | # |
| 1272 | # CONFIG_NET_DMA is not set | 1303 | # CONFIG_NET_DMA is not set |
| 1273 | |||
| 1274 | # | ||
| 1275 | # Userspace I/O | ||
| 1276 | # | ||
| 1277 | # CONFIG_UIO is not set | 1304 | # CONFIG_UIO is not set |
| 1278 | 1305 | ||
| 1279 | # | 1306 | # |
| @@ -1293,7 +1320,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1293 | # CONFIG_JFS_FS is not set | 1320 | # CONFIG_JFS_FS is not set |
| 1294 | # CONFIG_FS_POSIX_ACL is not set | 1321 | # CONFIG_FS_POSIX_ACL is not set |
| 1295 | # CONFIG_XFS_FS is not set | 1322 | # CONFIG_XFS_FS is not set |
| 1296 | # CONFIG_GFS2_FS is not set | ||
| 1297 | # CONFIG_OCFS2_FS is not set | 1323 | # CONFIG_OCFS2_FS is not set |
| 1298 | CONFIG_DNOTIFY=y | 1324 | CONFIG_DNOTIFY=y |
| 1299 | CONFIG_INOTIFY=y | 1325 | CONFIG_INOTIFY=y |
| @@ -1363,10 +1389,9 @@ CONFIG_NFS_FS=y | |||
| 1363 | CONFIG_NFS_V3=y | 1389 | CONFIG_NFS_V3=y |
| 1364 | # CONFIG_NFS_V3_ACL is not set | 1390 | # CONFIG_NFS_V3_ACL is not set |
| 1365 | CONFIG_NFS_V4=y | 1391 | CONFIG_NFS_V4=y |
| 1366 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1367 | CONFIG_NFSD=y | 1392 | CONFIG_NFSD=y |
| 1368 | # CONFIG_NFSD_V3 is not set | 1393 | # CONFIG_NFSD_V3 is not set |
| 1369 | CONFIG_NFSD_TCP=y | 1394 | # CONFIG_NFSD_V4 is not set |
| 1370 | CONFIG_ROOT_NFS=y | 1395 | CONFIG_ROOT_NFS=y |
| 1371 | CONFIG_LOCKD=y | 1396 | CONFIG_LOCKD=y |
| 1372 | CONFIG_LOCKD_V4=y | 1397 | CONFIG_LOCKD_V4=y |
| @@ -1450,9 +1475,10 @@ CONFIG_NLS_UTF8=m | |||
| 1450 | # Library routines | 1475 | # Library routines |
| 1451 | # | 1476 | # |
| 1452 | CONFIG_BITREVERSE=y | 1477 | CONFIG_BITREVERSE=y |
| 1478 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1453 | # CONFIG_CRC_CCITT is not set | 1479 | # CONFIG_CRC_CCITT is not set |
| 1454 | # CONFIG_CRC16 is not set | 1480 | # CONFIG_CRC16 is not set |
| 1455 | # CONFIG_CRC_ITU_T is not set | 1481 | CONFIG_CRC_ITU_T=m |
| 1456 | CONFIG_CRC32=y | 1482 | CONFIG_CRC32=y |
| 1457 | # CONFIG_CRC7 is not set | 1483 | # CONFIG_CRC7 is not set |
| 1458 | CONFIG_LIBCRC32C=m | 1484 | CONFIG_LIBCRC32C=m |
| @@ -1469,6 +1495,7 @@ CONFIG_HAVE_LMB=y | |||
| 1469 | # CONFIG_PRINTK_TIME is not set | 1495 | # CONFIG_PRINTK_TIME is not set |
| 1470 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1496 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1471 | CONFIG_ENABLE_MUST_CHECK=y | 1497 | CONFIG_ENABLE_MUST_CHECK=y |
| 1498 | CONFIG_FRAME_WARN=1024 | ||
| 1472 | # CONFIG_MAGIC_SYSRQ is not set | 1499 | # CONFIG_MAGIC_SYSRQ is not set |
| 1473 | # CONFIG_UNUSED_SYMBOLS is not set | 1500 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1474 | # CONFIG_DEBUG_FS is not set | 1501 | # CONFIG_DEBUG_FS is not set |
| @@ -1479,6 +1506,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1479 | CONFIG_SCHED_DEBUG=y | 1506 | CONFIG_SCHED_DEBUG=y |
| 1480 | # CONFIG_SCHEDSTATS is not set | 1507 | # CONFIG_SCHEDSTATS is not set |
| 1481 | # CONFIG_TIMER_STATS is not set | 1508 | # CONFIG_TIMER_STATS is not set |
| 1509 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1482 | # CONFIG_SLUB_DEBUG_ON is not set | 1510 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1483 | # CONFIG_SLUB_STATS is not set | 1511 | # CONFIG_SLUB_STATS is not set |
| 1484 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1512 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1492,6 +1520,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1492 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1520 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1493 | CONFIG_DEBUG_INFO=y | 1521 | CONFIG_DEBUG_INFO=y |
| 1494 | # CONFIG_DEBUG_VM is not set | 1522 | # CONFIG_DEBUG_VM is not set |
| 1523 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1495 | # CONFIG_DEBUG_LIST is not set | 1524 | # CONFIG_DEBUG_LIST is not set |
| 1496 | # CONFIG_DEBUG_SG is not set | 1525 | # CONFIG_DEBUG_SG is not set |
| 1497 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1526 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1503,6 +1532,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1503 | # CONFIG_DEBUG_STACK_USAGE is not set | 1532 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1504 | # CONFIG_DEBUG_PAGEALLOC is not set | 1533 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1505 | # CONFIG_DEBUGGER is not set | 1534 | # CONFIG_DEBUGGER is not set |
| 1535 | # CONFIG_IRQSTACKS is not set | ||
| 1506 | # CONFIG_BDI_SWITCH is not set | 1536 | # CONFIG_BDI_SWITCH is not set |
| 1507 | # CONFIG_PPC_EARLY_DEBUG is not set | 1537 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1508 | 1538 | ||
| @@ -1513,52 +1543,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1513 | # CONFIG_SECURITY is not set | 1543 | # CONFIG_SECURITY is not set |
| 1514 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1544 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1515 | CONFIG_CRYPTO=y | 1545 | CONFIG_CRYPTO=y |
| 1546 | |||
| 1547 | # | ||
| 1548 | # Crypto core or helper | ||
| 1549 | # | ||
| 1516 | CONFIG_CRYPTO_ALGAPI=y | 1550 | CONFIG_CRYPTO_ALGAPI=y |
| 1517 | CONFIG_CRYPTO_BLKCIPHER=y | 1551 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1518 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1519 | CONFIG_CRYPTO_HASH=y | 1552 | CONFIG_CRYPTO_HASH=y |
| 1520 | CONFIG_CRYPTO_MANAGER=y | 1553 | CONFIG_CRYPTO_MANAGER=y |
| 1554 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1555 | # CONFIG_CRYPTO_NULL is not set | ||
| 1556 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1557 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1558 | # CONFIG_CRYPTO_TEST is not set | ||
| 1559 | |||
| 1560 | # | ||
| 1561 | # Authenticated Encryption with Associated Data | ||
| 1562 | # | ||
| 1563 | # CONFIG_CRYPTO_CCM is not set | ||
| 1564 | # CONFIG_CRYPTO_GCM is not set | ||
| 1565 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1566 | |||
| 1567 | # | ||
| 1568 | # Block modes | ||
| 1569 | # | ||
| 1570 | CONFIG_CRYPTO_CBC=y | ||
| 1571 | # CONFIG_CRYPTO_CTR is not set | ||
| 1572 | # CONFIG_CRYPTO_CTS is not set | ||
| 1573 | # CONFIG_CRYPTO_ECB is not set | ||
| 1574 | # CONFIG_CRYPTO_LRW is not set | ||
| 1575 | CONFIG_CRYPTO_PCBC=m | ||
| 1576 | # CONFIG_CRYPTO_XTS is not set | ||
| 1577 | |||
| 1578 | # | ||
| 1579 | # Hash modes | ||
| 1580 | # | ||
| 1521 | CONFIG_CRYPTO_HMAC=y | 1581 | CONFIG_CRYPTO_HMAC=y |
| 1522 | # CONFIG_CRYPTO_XCBC is not set | 1582 | # CONFIG_CRYPTO_XCBC is not set |
| 1523 | # CONFIG_CRYPTO_NULL is not set | 1583 | |
| 1584 | # | ||
| 1585 | # Digest | ||
| 1586 | # | ||
| 1587 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1524 | # CONFIG_CRYPTO_MD4 is not set | 1588 | # CONFIG_CRYPTO_MD4 is not set |
| 1525 | CONFIG_CRYPTO_MD5=y | 1589 | CONFIG_CRYPTO_MD5=y |
| 1590 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1526 | CONFIG_CRYPTO_SHA1=m | 1591 | CONFIG_CRYPTO_SHA1=m |
| 1527 | # CONFIG_CRYPTO_SHA256 is not set | 1592 | # CONFIG_CRYPTO_SHA256 is not set |
| 1528 | # CONFIG_CRYPTO_SHA512 is not set | 1593 | # CONFIG_CRYPTO_SHA512 is not set |
| 1529 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1530 | # CONFIG_CRYPTO_TGR192 is not set | 1594 | # CONFIG_CRYPTO_TGR192 is not set |
| 1531 | # CONFIG_CRYPTO_GF128MUL is not set | 1595 | # CONFIG_CRYPTO_WP512 is not set |
| 1532 | # CONFIG_CRYPTO_ECB is not set | 1596 | |
| 1533 | CONFIG_CRYPTO_CBC=y | 1597 | # |
| 1534 | CONFIG_CRYPTO_PCBC=m | 1598 | # Ciphers |
| 1535 | # CONFIG_CRYPTO_LRW is not set | 1599 | # |
| 1536 | # CONFIG_CRYPTO_XTS is not set | ||
| 1537 | # CONFIG_CRYPTO_CTR is not set | ||
| 1538 | # CONFIG_CRYPTO_GCM is not set | ||
| 1539 | # CONFIG_CRYPTO_CCM is not set | ||
| 1540 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1541 | CONFIG_CRYPTO_DES=y | ||
| 1542 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1543 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1544 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1545 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1546 | # CONFIG_CRYPTO_AES is not set | 1600 | # CONFIG_CRYPTO_AES is not set |
| 1601 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1602 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1603 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1604 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1547 | # CONFIG_CRYPTO_CAST5 is not set | 1605 | # CONFIG_CRYPTO_CAST5 is not set |
| 1548 | # CONFIG_CRYPTO_CAST6 is not set | 1606 | # CONFIG_CRYPTO_CAST6 is not set |
| 1549 | # CONFIG_CRYPTO_TEA is not set | 1607 | CONFIG_CRYPTO_DES=y |
| 1550 | # CONFIG_CRYPTO_ARC4 is not set | 1608 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1551 | # CONFIG_CRYPTO_KHAZAD is not set | 1609 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1552 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1553 | # CONFIG_CRYPTO_SEED is not set | ||
| 1554 | # CONFIG_CRYPTO_SALSA20 is not set | 1610 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1611 | # CONFIG_CRYPTO_SEED is not set | ||
| 1612 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1613 | # CONFIG_CRYPTO_TEA is not set | ||
| 1614 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1615 | |||
| 1616 | # | ||
| 1617 | # Compression | ||
| 1618 | # | ||
| 1555 | # CONFIG_CRYPTO_DEFLATE is not set | 1619 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1556 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1557 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1558 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1559 | # CONFIG_CRYPTO_TEST is not set | ||
| 1560 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1561 | # CONFIG_CRYPTO_LZO is not set | 1620 | # CONFIG_CRYPTO_LZO is not set |
| 1562 | CONFIG_CRYPTO_HW=y | 1621 | CONFIG_CRYPTO_HW=y |
| 1563 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1622 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1564 | # CONFIG_PPC_CLOCK is not set | 1623 | # CONFIG_PPC_CLOCK is not set |
| 1624 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig index 851ac9115617..e19592b42043 100644 --- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8560_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:27 2008 | 4 | # Mon Jun 9 08:52:33 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC8560_ADS=y | |||
| 153 | # CONFIG_MPC85xx_CDS is not set | 157 | # CONFIG_MPC85xx_CDS is not set |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -210,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | # CONFIG_PROC_DEVICETREE is not set | 225 | # CONFIG_PROC_DEVICETREE is not set |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -238,6 +245,7 @@ CONFIG_PCI_LEGACY=y | |||
| 238 | CONFIG_PCI_DEBUG=y | 245 | CONFIG_PCI_DEBUG=y |
| 239 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 240 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 241 | 249 | ||
| 242 | # | 250 | # |
| 243 | # Advanced setup | 251 | # Advanced setup |
| @@ -247,11 +255,12 @@ CONFIG_PCI_DEBUG=y | |||
| 247 | # | 255 | # |
| 248 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 249 | # | 257 | # |
| 250 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 251 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 252 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 262 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 253 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 254 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 255 | 264 | ||
| 256 | # | 265 | # |
| 257 | # Networking | 266 | # Networking |
| @@ -299,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -462,7 +469,6 @@ CONFIG_E1000_NAPI=y | |||
| 462 | # CONFIG_SIS190 is not set | 469 | # CONFIG_SIS190 is not set |
| 463 | # CONFIG_SKGE is not set | 470 | # CONFIG_SKGE is not set |
| 464 | # CONFIG_SKY2 is not set | 471 | # CONFIG_SKY2 is not set |
| 465 | # CONFIG_SK98LIN is not set | ||
| 466 | # CONFIG_VIA_VELOCITY is not set | 472 | # CONFIG_VIA_VELOCITY is not set |
| 467 | # CONFIG_TIGON3 is not set | 473 | # CONFIG_TIGON3 is not set |
| 468 | # CONFIG_BNX2 is not set | 474 | # CONFIG_BNX2 is not set |
| @@ -482,6 +488,7 @@ CONFIG_NETDEV_10000=y | |||
| 482 | # CONFIG_MLX4_CORE is not set | 488 | # CONFIG_MLX4_CORE is not set |
| 483 | # CONFIG_TEHUTI is not set | 489 | # CONFIG_TEHUTI is not set |
| 484 | # CONFIG_BNX2X is not set | 490 | # CONFIG_BNX2X is not set |
| 491 | # CONFIG_SFC is not set | ||
| 485 | # CONFIG_TR is not set | 492 | # CONFIG_TR is not set |
| 486 | 493 | ||
| 487 | # | 494 | # |
| @@ -489,6 +496,7 @@ CONFIG_NETDEV_10000=y | |||
| 489 | # | 496 | # |
| 490 | # CONFIG_WLAN_PRE80211 is not set | 497 | # CONFIG_WLAN_PRE80211 is not set |
| 491 | # CONFIG_WLAN_80211 is not set | 498 | # CONFIG_WLAN_80211 is not set |
| 499 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 492 | # CONFIG_WAN is not set | 500 | # CONFIG_WAN is not set |
| 493 | # CONFIG_FDDI is not set | 501 | # CONFIG_FDDI is not set |
| 494 | # CONFIG_HIPPI is not set | 502 | # CONFIG_HIPPI is not set |
| @@ -535,6 +543,7 @@ CONFIG_INPUT=y | |||
| 535 | # Character devices | 543 | # Character devices |
| 536 | # | 544 | # |
| 537 | # CONFIG_VT is not set | 545 | # CONFIG_VT is not set |
| 546 | CONFIG_DEVKMEM=y | ||
| 538 | # CONFIG_SERIAL_NONSTANDARD is not set | 547 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 539 | # CONFIG_NOZOMI is not set | 548 | # CONFIG_NOZOMI is not set |
| 540 | 549 | ||
| @@ -572,12 +581,7 @@ CONFIG_GEN_RTC=y | |||
| 572 | # CONFIG_TCG_TPM is not set | 581 | # CONFIG_TCG_TPM is not set |
| 573 | CONFIG_DEVPORT=y | 582 | CONFIG_DEVPORT=y |
| 574 | # CONFIG_I2C is not set | 583 | # CONFIG_I2C is not set |
| 575 | |||
| 576 | # | ||
| 577 | # SPI support | ||
| 578 | # | ||
| 579 | # CONFIG_SPI is not set | 584 | # CONFIG_SPI is not set |
| 580 | # CONFIG_SPI_MASTER is not set | ||
| 581 | # CONFIG_W1 is not set | 585 | # CONFIG_W1 is not set |
| 582 | # CONFIG_POWER_SUPPLY is not set | 586 | # CONFIG_POWER_SUPPLY is not set |
| 583 | CONFIG_HWMON=y | 587 | CONFIG_HWMON=y |
| @@ -610,12 +614,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 610 | # Multifunction device drivers | 614 | # Multifunction device drivers |
| 611 | # | 615 | # |
| 612 | # CONFIG_MFD_SM501 is not set | 616 | # CONFIG_MFD_SM501 is not set |
| 617 | # CONFIG_HTC_PASIC3 is not set | ||
| 613 | 618 | ||
| 614 | # | 619 | # |
| 615 | # Multimedia devices | 620 | # Multimedia devices |
| 616 | # | 621 | # |
| 622 | |||
| 623 | # | ||
| 624 | # Multimedia core support | ||
| 625 | # | ||
| 617 | # CONFIG_VIDEO_DEV is not set | 626 | # CONFIG_VIDEO_DEV is not set |
| 618 | # CONFIG_DVB_CORE is not set | 627 | # CONFIG_DVB_CORE is not set |
| 628 | # CONFIG_VIDEO_MEDIA is not set | ||
| 629 | |||
| 630 | # | ||
| 631 | # Multimedia drivers | ||
| 632 | # | ||
| 619 | CONFIG_DAB=y | 633 | CONFIG_DAB=y |
| 620 | 634 | ||
| 621 | # | 635 | # |
| @@ -646,6 +660,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 646 | CONFIG_USB_ARCH_HAS_OHCI=y | 660 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 647 | CONFIG_USB_ARCH_HAS_EHCI=y | 661 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 648 | # CONFIG_USB is not set | 662 | # CONFIG_USB is not set |
| 663 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 664 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 649 | 665 | ||
| 650 | # | 666 | # |
| 651 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 667 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -654,14 +670,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 654 | # CONFIG_MMC is not set | 670 | # CONFIG_MMC is not set |
| 655 | # CONFIG_MEMSTICK is not set | 671 | # CONFIG_MEMSTICK is not set |
| 656 | # CONFIG_NEW_LEDS is not set | 672 | # CONFIG_NEW_LEDS is not set |
| 673 | # CONFIG_ACCESSIBILITY is not set | ||
| 657 | # CONFIG_INFINIBAND is not set | 674 | # CONFIG_INFINIBAND is not set |
| 658 | # CONFIG_EDAC is not set | 675 | # CONFIG_EDAC is not set |
| 659 | # CONFIG_RTC_CLASS is not set | 676 | # CONFIG_RTC_CLASS is not set |
| 660 | # CONFIG_DMADEVICES is not set | 677 | # CONFIG_DMADEVICES is not set |
| 661 | |||
| 662 | # | ||
| 663 | # Userspace I/O | ||
| 664 | # | ||
| 665 | # CONFIG_UIO is not set | 678 | # CONFIG_UIO is not set |
| 666 | 679 | ||
| 667 | # | 680 | # |
| @@ -681,7 +694,6 @@ CONFIG_FS_MBCACHE=y | |||
| 681 | # CONFIG_JFS_FS is not set | 694 | # CONFIG_JFS_FS is not set |
| 682 | # CONFIG_FS_POSIX_ACL is not set | 695 | # CONFIG_FS_POSIX_ACL is not set |
| 683 | # CONFIG_XFS_FS is not set | 696 | # CONFIG_XFS_FS is not set |
| 684 | # CONFIG_GFS2_FS is not set | ||
| 685 | # CONFIG_OCFS2_FS is not set | 697 | # CONFIG_OCFS2_FS is not set |
| 686 | CONFIG_DNOTIFY=y | 698 | CONFIG_DNOTIFY=y |
| 687 | CONFIG_INOTIFY=y | 699 | CONFIG_INOTIFY=y |
| @@ -738,7 +750,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 738 | CONFIG_NFS_FS=y | 750 | CONFIG_NFS_FS=y |
| 739 | # CONFIG_NFS_V3 is not set | 751 | # CONFIG_NFS_V3 is not set |
| 740 | # CONFIG_NFS_V4 is not set | 752 | # CONFIG_NFS_V4 is not set |
| 741 | # CONFIG_NFS_DIRECTIO is not set | ||
| 742 | # CONFIG_NFSD is not set | 753 | # CONFIG_NFSD is not set |
| 743 | CONFIG_ROOT_NFS=y | 754 | CONFIG_ROOT_NFS=y |
| 744 | CONFIG_LOCKD=y | 755 | CONFIG_LOCKD=y |
| @@ -777,6 +788,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 777 | # Library routines | 788 | # Library routines |
| 778 | # | 789 | # |
| 779 | CONFIG_BITREVERSE=y | 790 | CONFIG_BITREVERSE=y |
| 791 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 780 | # CONFIG_CRC_CCITT is not set | 792 | # CONFIG_CRC_CCITT is not set |
| 781 | # CONFIG_CRC16 is not set | 793 | # CONFIG_CRC16 is not set |
| 782 | # CONFIG_CRC_ITU_T is not set | 794 | # CONFIG_CRC_ITU_T is not set |
| @@ -787,6 +799,7 @@ CONFIG_PLIST=y | |||
| 787 | CONFIG_HAS_IOMEM=y | 799 | CONFIG_HAS_IOMEM=y |
| 788 | CONFIG_HAS_IOPORT=y | 800 | CONFIG_HAS_IOPORT=y |
| 789 | CONFIG_HAS_DMA=y | 801 | CONFIG_HAS_DMA=y |
| 802 | CONFIG_HAVE_LMB=y | ||
| 790 | 803 | ||
| 791 | # | 804 | # |
| 792 | # Kernel hacking | 805 | # Kernel hacking |
| @@ -794,6 +807,7 @@ CONFIG_HAS_DMA=y | |||
| 794 | # CONFIG_PRINTK_TIME is not set | 807 | # CONFIG_PRINTK_TIME is not set |
| 795 | CONFIG_ENABLE_WARN_DEPRECATED=y | 808 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 796 | CONFIG_ENABLE_MUST_CHECK=y | 809 | CONFIG_ENABLE_MUST_CHECK=y |
| 810 | CONFIG_FRAME_WARN=1024 | ||
| 797 | # CONFIG_MAGIC_SYSRQ is not set | 811 | # CONFIG_MAGIC_SYSRQ is not set |
| 798 | # CONFIG_UNUSED_SYMBOLS is not set | 812 | # CONFIG_UNUSED_SYMBOLS is not set |
| 799 | # CONFIG_DEBUG_FS is not set | 813 | # CONFIG_DEBUG_FS is not set |
| @@ -804,6 +818,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 804 | CONFIG_SCHED_DEBUG=y | 818 | CONFIG_SCHED_DEBUG=y |
| 805 | # CONFIG_SCHEDSTATS is not set | 819 | # CONFIG_SCHEDSTATS is not set |
| 806 | # CONFIG_TIMER_STATS is not set | 820 | # CONFIG_TIMER_STATS is not set |
| 821 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 807 | # CONFIG_SLUB_DEBUG_ON is not set | 822 | # CONFIG_SLUB_DEBUG_ON is not set |
| 808 | # CONFIG_SLUB_STATS is not set | 823 | # CONFIG_SLUB_STATS is not set |
| 809 | # CONFIG_DEBUG_RT_MUTEXES is not set | 824 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -816,6 +831,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 816 | # CONFIG_DEBUG_BUGVERBOSE is not set | 831 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 817 | # CONFIG_DEBUG_INFO is not set | 832 | # CONFIG_DEBUG_INFO is not set |
| 818 | # CONFIG_DEBUG_VM is not set | 833 | # CONFIG_DEBUG_VM is not set |
| 834 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 819 | # CONFIG_DEBUG_LIST is not set | 835 | # CONFIG_DEBUG_LIST is not set |
| 820 | # CONFIG_DEBUG_SG is not set | 836 | # CONFIG_DEBUG_SG is not set |
| 821 | # CONFIG_BOOT_PRINTK_DELAY is not set | 837 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -827,6 +843,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 827 | # CONFIG_DEBUG_PAGEALLOC is not set | 843 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 828 | # CONFIG_DEBUGGER is not set | 844 | # CONFIG_DEBUGGER is not set |
| 829 | # CONFIG_KGDB_CONSOLE is not set | 845 | # CONFIG_KGDB_CONSOLE is not set |
| 846 | # CONFIG_IRQSTACKS is not set | ||
| 830 | # CONFIG_BDI_SWITCH is not set | 847 | # CONFIG_BDI_SWITCH is not set |
| 831 | # CONFIG_PPC_EARLY_DEBUG is not set | 848 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 832 | 849 | ||
| @@ -837,49 +854,79 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 837 | # CONFIG_SECURITY is not set | 854 | # CONFIG_SECURITY is not set |
| 838 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 855 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 839 | CONFIG_CRYPTO=y | 856 | CONFIG_CRYPTO=y |
| 840 | # CONFIG_CRYPTO_SEQIV is not set | 857 | |
| 858 | # | ||
| 859 | # Crypto core or helper | ||
| 860 | # | ||
| 841 | # CONFIG_CRYPTO_MANAGER is not set | 861 | # CONFIG_CRYPTO_MANAGER is not set |
| 862 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 863 | # CONFIG_CRYPTO_NULL is not set | ||
| 864 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 865 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 866 | |||
| 867 | # | ||
| 868 | # Authenticated Encryption with Associated Data | ||
| 869 | # | ||
| 870 | # CONFIG_CRYPTO_CCM is not set | ||
| 871 | # CONFIG_CRYPTO_GCM is not set | ||
| 872 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 873 | |||
| 874 | # | ||
| 875 | # Block modes | ||
| 876 | # | ||
| 877 | # CONFIG_CRYPTO_CBC is not set | ||
| 878 | # CONFIG_CRYPTO_CTR is not set | ||
| 879 | # CONFIG_CRYPTO_CTS is not set | ||
| 880 | # CONFIG_CRYPTO_ECB is not set | ||
| 881 | # CONFIG_CRYPTO_LRW is not set | ||
| 882 | # CONFIG_CRYPTO_PCBC is not set | ||
| 883 | # CONFIG_CRYPTO_XTS is not set | ||
| 884 | |||
| 885 | # | ||
| 886 | # Hash modes | ||
| 887 | # | ||
| 842 | # CONFIG_CRYPTO_HMAC is not set | 888 | # CONFIG_CRYPTO_HMAC is not set |
| 843 | # CONFIG_CRYPTO_XCBC is not set | 889 | # CONFIG_CRYPTO_XCBC is not set |
| 844 | # CONFIG_CRYPTO_NULL is not set | 890 | |
| 891 | # | ||
| 892 | # Digest | ||
| 893 | # | ||
| 894 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 845 | # CONFIG_CRYPTO_MD4 is not set | 895 | # CONFIG_CRYPTO_MD4 is not set |
| 846 | # CONFIG_CRYPTO_MD5 is not set | 896 | # CONFIG_CRYPTO_MD5 is not set |
| 897 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 847 | # CONFIG_CRYPTO_SHA1 is not set | 898 | # CONFIG_CRYPTO_SHA1 is not set |
| 848 | # CONFIG_CRYPTO_SHA256 is not set | 899 | # CONFIG_CRYPTO_SHA256 is not set |
| 849 | # CONFIG_CRYPTO_SHA512 is not set | 900 | # CONFIG_CRYPTO_SHA512 is not set |
| 850 | # CONFIG_CRYPTO_WP512 is not set | ||
| 851 | # CONFIG_CRYPTO_TGR192 is not set | 901 | # CONFIG_CRYPTO_TGR192 is not set |
| 852 | # CONFIG_CRYPTO_GF128MUL is not set | 902 | # CONFIG_CRYPTO_WP512 is not set |
| 853 | # CONFIG_CRYPTO_ECB is not set | 903 | |
| 854 | # CONFIG_CRYPTO_CBC is not set | 904 | # |
| 855 | # CONFIG_CRYPTO_PCBC is not set | 905 | # Ciphers |
| 856 | # CONFIG_CRYPTO_LRW is not set | 906 | # |
| 857 | # CONFIG_CRYPTO_XTS is not set | ||
| 858 | # CONFIG_CRYPTO_CTR is not set | ||
| 859 | # CONFIG_CRYPTO_GCM is not set | ||
| 860 | # CONFIG_CRYPTO_CCM is not set | ||
| 861 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 862 | # CONFIG_CRYPTO_DES is not set | ||
| 863 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 864 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 865 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 866 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 867 | # CONFIG_CRYPTO_AES is not set | 907 | # CONFIG_CRYPTO_AES is not set |
| 908 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 909 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 910 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 911 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 868 | # CONFIG_CRYPTO_CAST5 is not set | 912 | # CONFIG_CRYPTO_CAST5 is not set |
| 869 | # CONFIG_CRYPTO_CAST6 is not set | 913 | # CONFIG_CRYPTO_CAST6 is not set |
| 870 | # CONFIG_CRYPTO_TEA is not set | 914 | # CONFIG_CRYPTO_DES is not set |
| 871 | # CONFIG_CRYPTO_ARC4 is not set | 915 | # CONFIG_CRYPTO_FCRYPT is not set |
| 872 | # CONFIG_CRYPTO_KHAZAD is not set | 916 | # CONFIG_CRYPTO_KHAZAD is not set |
| 873 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 874 | # CONFIG_CRYPTO_SEED is not set | ||
| 875 | # CONFIG_CRYPTO_SALSA20 is not set | 917 | # CONFIG_CRYPTO_SALSA20 is not set |
| 918 | # CONFIG_CRYPTO_SEED is not set | ||
| 919 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 920 | # CONFIG_CRYPTO_TEA is not set | ||
| 921 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 922 | |||
| 923 | # | ||
| 924 | # Compression | ||
| 925 | # | ||
| 876 | # CONFIG_CRYPTO_DEFLATE is not set | 926 | # CONFIG_CRYPTO_DEFLATE is not set |
| 877 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 878 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 879 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 880 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 881 | # CONFIG_CRYPTO_LZO is not set | 927 | # CONFIG_CRYPTO_LZO is not set |
| 882 | CONFIG_CRYPTO_HW=y | 928 | CONFIG_CRYPTO_HW=y |
| 883 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 929 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 884 | # CONFIG_PPC_CLOCK is not set | 930 | # CONFIG_PPC_CLOCK is not set |
| 885 | CONFIG_PPC_LIB_RHEAP=y | 931 | CONFIG_PPC_LIB_RHEAP=y |
| 932 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig index 2b866b385607..28004e93aeee 100644 --- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8568mds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:05 2008 | 4 | # Mon Jun 9 08:52:34 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,12 +114,14 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -156,6 +161,7 @@ CONFIG_MPC85xx=y | |||
| 156 | # CONFIG_MPC85xx_CDS is not set | 161 | # CONFIG_MPC85xx_CDS is not set |
| 157 | CONFIG_MPC85xx_MDS=y | 162 | CONFIG_MPC85xx_MDS=y |
| 158 | # CONFIG_MPC85xx_DS is not set | 163 | # CONFIG_MPC85xx_DS is not set |
| 164 | # CONFIG_KSI8560 is not set | ||
| 159 | # CONFIG_STX_GP3 is not set | 165 | # CONFIG_STX_GP3 is not set |
| 160 | # CONFIG_TQM8540 is not set | 166 | # CONFIG_TQM8540 is not set |
| 161 | # CONFIG_TQM8541 is not set | 167 | # CONFIG_TQM8541 is not set |
| @@ -212,11 +218,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 218 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 219 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 221 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 223 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 226 | CONFIG_VIRT_TO_BUS=y |
| 227 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 228 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 229 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 230 | # CONFIG_PM is not set |
| @@ -240,6 +248,7 @@ CONFIG_PCI_LEGACY=y | |||
| 240 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
| 241 | # CONFIG_PCCARD is not set | 249 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HOTPLUG_PCI is not set | 250 | # CONFIG_HOTPLUG_PCI is not set |
| 251 | # CONFIG_HAS_RAPIDIO is not set | ||
| 243 | 252 | ||
| 244 | # | 253 | # |
| 245 | # Advanced setup | 254 | # Advanced setup |
| @@ -249,11 +258,12 @@ CONFIG_PCI_LEGACY=y | |||
| 249 | # | 258 | # |
| 250 | # Default settings for advanced configuration options are used | 259 | # Default settings for advanced configuration options are used |
| 251 | # | 260 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 261 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 262 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 263 | CONFIG_KERNEL_START=0xc0000000 |
| 264 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 265 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 267 | ||
| 258 | # | 268 | # |
| 259 | # Networking | 269 | # Networking |
| @@ -301,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 301 | CONFIG_DEFAULT_TCP_CONG="cubic" | 311 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 302 | # CONFIG_TCP_MD5SIG is not set | 312 | # CONFIG_TCP_MD5SIG is not set |
| 303 | # CONFIG_IPV6 is not set | 313 | # CONFIG_IPV6 is not set |
| 304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 305 | # CONFIG_INET6_TUNNEL is not set | ||
| 306 | # CONFIG_NETWORK_SECMARK is not set | 314 | # CONFIG_NETWORK_SECMARK is not set |
| 307 | # CONFIG_NETFILTER is not set | 315 | # CONFIG_NETFILTER is not set |
| 308 | # CONFIG_IP_DCCP is not set | 316 | # CONFIG_IP_DCCP is not set |
| @@ -358,6 +366,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 358 | # CONFIG_CONNECTOR is not set | 366 | # CONFIG_CONNECTOR is not set |
| 359 | # CONFIG_MTD is not set | 367 | # CONFIG_MTD is not set |
| 360 | CONFIG_OF_DEVICE=y | 368 | CONFIG_OF_DEVICE=y |
| 369 | CONFIG_OF_I2C=y | ||
| 361 | # CONFIG_PARPORT is not set | 370 | # CONFIG_PARPORT is not set |
| 362 | CONFIG_BLK_DEV=y | 371 | CONFIG_BLK_DEV=y |
| 363 | # CONFIG_BLK_DEV_FD is not set | 372 | # CONFIG_BLK_DEV_FD is not set |
| @@ -525,7 +534,6 @@ CONFIG_NETDEV_1000=y | |||
| 525 | # CONFIG_SIS190 is not set | 534 | # CONFIG_SIS190 is not set |
| 526 | # CONFIG_SKGE is not set | 535 | # CONFIG_SKGE is not set |
| 527 | # CONFIG_SKY2 is not set | 536 | # CONFIG_SKY2 is not set |
| 528 | # CONFIG_SK98LIN is not set | ||
| 529 | # CONFIG_VIA_VELOCITY is not set | 537 | # CONFIG_VIA_VELOCITY is not set |
| 530 | # CONFIG_TIGON3 is not set | 538 | # CONFIG_TIGON3 is not set |
| 531 | # CONFIG_BNX2 is not set | 539 | # CONFIG_BNX2 is not set |
| @@ -546,6 +554,7 @@ CONFIG_NETDEV_10000=y | |||
| 546 | # CONFIG_MLX4_CORE is not set | 554 | # CONFIG_MLX4_CORE is not set |
| 547 | # CONFIG_TEHUTI is not set | 555 | # CONFIG_TEHUTI is not set |
| 548 | # CONFIG_BNX2X is not set | 556 | # CONFIG_BNX2X is not set |
| 557 | # CONFIG_SFC is not set | ||
| 549 | # CONFIG_TR is not set | 558 | # CONFIG_TR is not set |
| 550 | 559 | ||
| 551 | # | 560 | # |
| @@ -553,6 +562,7 @@ CONFIG_NETDEV_10000=y | |||
| 553 | # | 562 | # |
| 554 | # CONFIG_WLAN_PRE80211 is not set | 563 | # CONFIG_WLAN_PRE80211 is not set |
| 555 | # CONFIG_WLAN_80211 is not set | 564 | # CONFIG_WLAN_80211 is not set |
| 565 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 556 | # CONFIG_WAN is not set | 566 | # CONFIG_WAN is not set |
| 557 | # CONFIG_FDDI is not set | 567 | # CONFIG_FDDI is not set |
| 558 | # CONFIG_HIPPI is not set | 568 | # CONFIG_HIPPI is not set |
| @@ -600,6 +610,7 @@ CONFIG_INPUT=y | |||
| 600 | # Character devices | 610 | # Character devices |
| 601 | # | 611 | # |
| 602 | # CONFIG_VT is not set | 612 | # CONFIG_VT is not set |
| 613 | CONFIG_DEVKMEM=y | ||
| 603 | # CONFIG_SERIAL_NONSTANDARD is not set | 614 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 604 | # CONFIG_NOZOMI is not set | 615 | # CONFIG_NOZOMI is not set |
| 605 | 616 | ||
| @@ -629,7 +640,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 629 | # CONFIG_IPMI_HANDLER is not set | 640 | # CONFIG_IPMI_HANDLER is not set |
| 630 | CONFIG_HW_RANDOM=y | 641 | CONFIG_HW_RANDOM=y |
| 631 | # CONFIG_NVRAM is not set | 642 | # CONFIG_NVRAM is not set |
| 632 | # CONFIG_GEN_RTC is not set | ||
| 633 | # CONFIG_R3964 is not set | 643 | # CONFIG_R3964 is not set |
| 634 | # CONFIG_APPLICOM is not set | 644 | # CONFIG_APPLICOM is not set |
| 635 | # CONFIG_RAW_DRIVER is not set | 645 | # CONFIG_RAW_DRIVER is not set |
| @@ -640,13 +650,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 640 | CONFIG_I2C_CHARDEV=y | 650 | CONFIG_I2C_CHARDEV=y |
| 641 | 651 | ||
| 642 | # | 652 | # |
| 643 | # I2C Algorithms | ||
| 644 | # | ||
| 645 | # CONFIG_I2C_ALGOBIT is not set | ||
| 646 | # CONFIG_I2C_ALGOPCF is not set | ||
| 647 | # CONFIG_I2C_ALGOPCA is not set | ||
| 648 | |||
| 649 | # | ||
| 650 | # I2C Hardware Bus support | 653 | # I2C Hardware Bus support |
| 651 | # | 654 | # |
| 652 | # CONFIG_I2C_ALI1535 is not set | 655 | # CONFIG_I2C_ALI1535 is not set |
| @@ -672,6 +675,7 @@ CONFIG_I2C_MPC=y | |||
| 672 | # CONFIG_I2C_VIA is not set | 675 | # CONFIG_I2C_VIA is not set |
| 673 | # CONFIG_I2C_VIAPRO is not set | 676 | # CONFIG_I2C_VIAPRO is not set |
| 674 | # CONFIG_I2C_VOODOO3 is not set | 677 | # CONFIG_I2C_VOODOO3 is not set |
| 678 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 675 | 679 | ||
| 676 | # | 680 | # |
| 677 | # Miscellaneous I2C Chip support | 681 | # Miscellaneous I2C Chip support |
| @@ -681,19 +685,13 @@ CONFIG_I2C_MPC=y | |||
| 681 | # CONFIG_SENSORS_PCF8574 is not set | 685 | # CONFIG_SENSORS_PCF8574 is not set |
| 682 | # CONFIG_PCF8575 is not set | 686 | # CONFIG_PCF8575 is not set |
| 683 | # CONFIG_SENSORS_PCF8591 is not set | 687 | # CONFIG_SENSORS_PCF8591 is not set |
| 684 | # CONFIG_TPS65010 is not set | ||
| 685 | # CONFIG_SENSORS_MAX6875 is not set | 688 | # CONFIG_SENSORS_MAX6875 is not set |
| 686 | # CONFIG_SENSORS_TSL2550 is not set | 689 | # CONFIG_SENSORS_TSL2550 is not set |
| 687 | # CONFIG_I2C_DEBUG_CORE is not set | 690 | # CONFIG_I2C_DEBUG_CORE is not set |
| 688 | # CONFIG_I2C_DEBUG_ALGO is not set | 691 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 689 | # CONFIG_I2C_DEBUG_BUS is not set | 692 | # CONFIG_I2C_DEBUG_BUS is not set |
| 690 | # CONFIG_I2C_DEBUG_CHIP is not set | 693 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 691 | |||
| 692 | # | ||
| 693 | # SPI support | ||
| 694 | # | ||
| 695 | # CONFIG_SPI is not set | 694 | # CONFIG_SPI is not set |
| 696 | # CONFIG_SPI_MASTER is not set | ||
| 697 | # CONFIG_W1 is not set | 695 | # CONFIG_W1 is not set |
| 698 | # CONFIG_POWER_SUPPLY is not set | 696 | # CONFIG_POWER_SUPPLY is not set |
| 699 | CONFIG_HWMON=y | 697 | CONFIG_HWMON=y |
| @@ -776,12 +774,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 776 | # Multifunction device drivers | 774 | # Multifunction device drivers |
| 777 | # | 775 | # |
| 778 | # CONFIG_MFD_SM501 is not set | 776 | # CONFIG_MFD_SM501 is not set |
| 777 | # CONFIG_HTC_PASIC3 is not set | ||
| 779 | 778 | ||
| 780 | # | 779 | # |
| 781 | # Multimedia devices | 780 | # Multimedia devices |
| 782 | # | 781 | # |
| 782 | |||
| 783 | # | ||
| 784 | # Multimedia core support | ||
| 785 | # | ||
| 783 | # CONFIG_VIDEO_DEV is not set | 786 | # CONFIG_VIDEO_DEV is not set |
| 784 | # CONFIG_DVB_CORE is not set | 787 | # CONFIG_DVB_CORE is not set |
| 788 | # CONFIG_VIDEO_MEDIA is not set | ||
| 789 | |||
| 790 | # | ||
| 791 | # Multimedia drivers | ||
| 792 | # | ||
| 785 | CONFIG_DAB=y | 793 | CONFIG_DAB=y |
| 786 | 794 | ||
| 787 | # | 795 | # |
| @@ -812,6 +820,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 812 | CONFIG_USB_ARCH_HAS_OHCI=y | 820 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 813 | CONFIG_USB_ARCH_HAS_EHCI=y | 821 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 814 | # CONFIG_USB is not set | 822 | # CONFIG_USB is not set |
| 823 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 824 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 815 | 825 | ||
| 816 | # | 826 | # |
| 817 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 827 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -820,6 +830,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 820 | # CONFIG_MMC is not set | 830 | # CONFIG_MMC is not set |
| 821 | # CONFIG_MEMSTICK is not set | 831 | # CONFIG_MEMSTICK is not set |
| 822 | # CONFIG_NEW_LEDS is not set | 832 | # CONFIG_NEW_LEDS is not set |
| 833 | # CONFIG_ACCESSIBILITY is not set | ||
| 823 | # CONFIG_INFINIBAND is not set | 834 | # CONFIG_INFINIBAND is not set |
| 824 | # CONFIG_EDAC is not set | 835 | # CONFIG_EDAC is not set |
| 825 | CONFIG_RTC_LIB=y | 836 | CONFIG_RTC_LIB=y |
| @@ -871,11 +882,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
| 871 | # | 882 | # |
| 872 | # on-CPU RTC drivers | 883 | # on-CPU RTC drivers |
| 873 | # | 884 | # |
| 885 | # CONFIG_RTC_DRV_PPC is not set | ||
| 874 | # CONFIG_DMADEVICES is not set | 886 | # CONFIG_DMADEVICES is not set |
| 875 | |||
| 876 | # | ||
| 877 | # Userspace I/O | ||
| 878 | # | ||
| 879 | # CONFIG_UIO is not set | 887 | # CONFIG_UIO is not set |
| 880 | 888 | ||
| 881 | # | 889 | # |
| @@ -895,7 +903,6 @@ CONFIG_FS_MBCACHE=y | |||
| 895 | # CONFIG_JFS_FS is not set | 903 | # CONFIG_JFS_FS is not set |
| 896 | # CONFIG_FS_POSIX_ACL is not set | 904 | # CONFIG_FS_POSIX_ACL is not set |
| 897 | # CONFIG_XFS_FS is not set | 905 | # CONFIG_XFS_FS is not set |
| 898 | # CONFIG_GFS2_FS is not set | ||
| 899 | # CONFIG_OCFS2_FS is not set | 906 | # CONFIG_OCFS2_FS is not set |
| 900 | CONFIG_DNOTIFY=y | 907 | CONFIG_DNOTIFY=y |
| 901 | CONFIG_INOTIFY=y | 908 | CONFIG_INOTIFY=y |
| @@ -953,7 +960,6 @@ CONFIG_NFS_FS=y | |||
| 953 | CONFIG_NFS_V3=y | 960 | CONFIG_NFS_V3=y |
| 954 | # CONFIG_NFS_V3_ACL is not set | 961 | # CONFIG_NFS_V3_ACL is not set |
| 955 | CONFIG_NFS_V4=y | 962 | CONFIG_NFS_V4=y |
| 956 | # CONFIG_NFS_DIRECTIO is not set | ||
| 957 | # CONFIG_NFSD is not set | 963 | # CONFIG_NFSD is not set |
| 958 | CONFIG_ROOT_NFS=y | 964 | CONFIG_ROOT_NFS=y |
| 959 | CONFIG_LOCKD=y | 965 | CONFIG_LOCKD=y |
| @@ -994,6 +1000,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 994 | # Library routines | 1000 | # Library routines |
| 995 | # | 1001 | # |
| 996 | CONFIG_BITREVERSE=y | 1002 | CONFIG_BITREVERSE=y |
| 1003 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 997 | # CONFIG_CRC_CCITT is not set | 1004 | # CONFIG_CRC_CCITT is not set |
| 998 | # CONFIG_CRC16 is not set | 1005 | # CONFIG_CRC16 is not set |
| 999 | # CONFIG_CRC_ITU_T is not set | 1006 | # CONFIG_CRC_ITU_T is not set |
| @@ -1004,6 +1011,7 @@ CONFIG_PLIST=y | |||
| 1004 | CONFIG_HAS_IOMEM=y | 1011 | CONFIG_HAS_IOMEM=y |
| 1005 | CONFIG_HAS_IOPORT=y | 1012 | CONFIG_HAS_IOPORT=y |
| 1006 | CONFIG_HAS_DMA=y | 1013 | CONFIG_HAS_DMA=y |
| 1014 | CONFIG_HAVE_LMB=y | ||
| 1007 | 1015 | ||
| 1008 | # | 1016 | # |
| 1009 | # Kernel hacking | 1017 | # Kernel hacking |
| @@ -1011,6 +1019,7 @@ CONFIG_HAS_DMA=y | |||
| 1011 | # CONFIG_PRINTK_TIME is not set | 1019 | # CONFIG_PRINTK_TIME is not set |
| 1012 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1020 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1013 | CONFIG_ENABLE_MUST_CHECK=y | 1021 | CONFIG_ENABLE_MUST_CHECK=y |
| 1022 | CONFIG_FRAME_WARN=1024 | ||
| 1014 | # CONFIG_MAGIC_SYSRQ is not set | 1023 | # CONFIG_MAGIC_SYSRQ is not set |
| 1015 | # CONFIG_UNUSED_SYMBOLS is not set | 1024 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1016 | # CONFIG_DEBUG_FS is not set | 1025 | # CONFIG_DEBUG_FS is not set |
| @@ -1021,6 +1030,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1021 | CONFIG_SCHED_DEBUG=y | 1030 | CONFIG_SCHED_DEBUG=y |
| 1022 | # CONFIG_SCHEDSTATS is not set | 1031 | # CONFIG_SCHEDSTATS is not set |
| 1023 | # CONFIG_TIMER_STATS is not set | 1032 | # CONFIG_TIMER_STATS is not set |
| 1033 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1024 | # CONFIG_SLUB_DEBUG_ON is not set | 1034 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1025 | # CONFIG_SLUB_STATS is not set | 1035 | # CONFIG_SLUB_STATS is not set |
| 1026 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1036 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1033,6 +1043,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1033 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1043 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1034 | # CONFIG_DEBUG_INFO is not set | 1044 | # CONFIG_DEBUG_INFO is not set |
| 1035 | # CONFIG_DEBUG_VM is not set | 1045 | # CONFIG_DEBUG_VM is not set |
| 1046 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1036 | # CONFIG_DEBUG_LIST is not set | 1047 | # CONFIG_DEBUG_LIST is not set |
| 1037 | # CONFIG_DEBUG_SG is not set | 1048 | # CONFIG_DEBUG_SG is not set |
| 1038 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1049 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1045,6 +1056,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1045 | # CONFIG_DEBUG_PAGEALLOC is not set | 1056 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1046 | CONFIG_DEBUGGER=y | 1057 | CONFIG_DEBUGGER=y |
| 1047 | # CONFIG_XMON is not set | 1058 | # CONFIG_XMON is not set |
| 1059 | # CONFIG_IRQSTACKS is not set | ||
| 1048 | # CONFIG_BDI_SWITCH is not set | 1060 | # CONFIG_BDI_SWITCH is not set |
| 1049 | CONFIG_PPC_EARLY_DEBUG=y | 1061 | CONFIG_PPC_EARLY_DEBUG=y |
| 1050 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 1062 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
| @@ -1066,52 +1078,82 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
| 1066 | # CONFIG_SECURITY is not set | 1078 | # CONFIG_SECURITY is not set |
| 1067 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1079 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1068 | CONFIG_CRYPTO=y | 1080 | CONFIG_CRYPTO=y |
| 1081 | |||
| 1082 | # | ||
| 1083 | # Crypto core or helper | ||
| 1084 | # | ||
| 1069 | CONFIG_CRYPTO_ALGAPI=y | 1085 | CONFIG_CRYPTO_ALGAPI=y |
| 1070 | CONFIG_CRYPTO_BLKCIPHER=y | 1086 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1071 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1072 | CONFIG_CRYPTO_MANAGER=y | 1087 | CONFIG_CRYPTO_MANAGER=y |
| 1088 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1089 | # CONFIG_CRYPTO_NULL is not set | ||
| 1090 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1091 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1092 | # CONFIG_CRYPTO_TEST is not set | ||
| 1093 | |||
| 1094 | # | ||
| 1095 | # Authenticated Encryption with Associated Data | ||
| 1096 | # | ||
| 1097 | # CONFIG_CRYPTO_CCM is not set | ||
| 1098 | # CONFIG_CRYPTO_GCM is not set | ||
| 1099 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1100 | |||
| 1101 | # | ||
| 1102 | # Block modes | ||
| 1103 | # | ||
| 1104 | CONFIG_CRYPTO_CBC=y | ||
| 1105 | # CONFIG_CRYPTO_CTR is not set | ||
| 1106 | # CONFIG_CRYPTO_CTS is not set | ||
| 1107 | CONFIG_CRYPTO_ECB=m | ||
| 1108 | # CONFIG_CRYPTO_LRW is not set | ||
| 1109 | CONFIG_CRYPTO_PCBC=m | ||
| 1110 | # CONFIG_CRYPTO_XTS is not set | ||
| 1111 | |||
| 1112 | # | ||
| 1113 | # Hash modes | ||
| 1114 | # | ||
| 1073 | # CONFIG_CRYPTO_HMAC is not set | 1115 | # CONFIG_CRYPTO_HMAC is not set |
| 1074 | # CONFIG_CRYPTO_XCBC is not set | 1116 | # CONFIG_CRYPTO_XCBC is not set |
| 1075 | # CONFIG_CRYPTO_NULL is not set | 1117 | |
| 1118 | # | ||
| 1119 | # Digest | ||
| 1120 | # | ||
| 1121 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1076 | # CONFIG_CRYPTO_MD4 is not set | 1122 | # CONFIG_CRYPTO_MD4 is not set |
| 1077 | CONFIG_CRYPTO_MD5=y | 1123 | CONFIG_CRYPTO_MD5=y |
| 1124 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1078 | # CONFIG_CRYPTO_SHA1 is not set | 1125 | # CONFIG_CRYPTO_SHA1 is not set |
| 1079 | # CONFIG_CRYPTO_SHA256 is not set | 1126 | # CONFIG_CRYPTO_SHA256 is not set |
| 1080 | # CONFIG_CRYPTO_SHA512 is not set | 1127 | # CONFIG_CRYPTO_SHA512 is not set |
| 1081 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1082 | # CONFIG_CRYPTO_TGR192 is not set | 1128 | # CONFIG_CRYPTO_TGR192 is not set |
| 1083 | # CONFIG_CRYPTO_GF128MUL is not set | 1129 | # CONFIG_CRYPTO_WP512 is not set |
| 1084 | CONFIG_CRYPTO_ECB=m | 1130 | |
| 1085 | CONFIG_CRYPTO_CBC=y | 1131 | # |
| 1086 | CONFIG_CRYPTO_PCBC=m | 1132 | # Ciphers |
| 1087 | # CONFIG_CRYPTO_LRW is not set | 1133 | # |
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | # CONFIG_CRYPTO_CTR is not set | ||
| 1090 | # CONFIG_CRYPTO_GCM is not set | ||
| 1091 | # CONFIG_CRYPTO_CCM is not set | ||
| 1092 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1093 | CONFIG_CRYPTO_DES=y | ||
| 1094 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1095 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1096 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1097 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1098 | # CONFIG_CRYPTO_AES is not set | 1134 | # CONFIG_CRYPTO_AES is not set |
| 1135 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1136 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1137 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1138 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1099 | # CONFIG_CRYPTO_CAST5 is not set | 1139 | # CONFIG_CRYPTO_CAST5 is not set |
| 1100 | # CONFIG_CRYPTO_CAST6 is not set | 1140 | # CONFIG_CRYPTO_CAST6 is not set |
| 1101 | # CONFIG_CRYPTO_TEA is not set | 1141 | CONFIG_CRYPTO_DES=y |
| 1102 | # CONFIG_CRYPTO_ARC4 is not set | 1142 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1103 | # CONFIG_CRYPTO_KHAZAD is not set | 1143 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1104 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1105 | # CONFIG_CRYPTO_SEED is not set | ||
| 1106 | # CONFIG_CRYPTO_SALSA20 is not set | 1144 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1145 | # CONFIG_CRYPTO_SEED is not set | ||
| 1146 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1147 | # CONFIG_CRYPTO_TEA is not set | ||
| 1148 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1149 | |||
| 1150 | # | ||
| 1151 | # Compression | ||
| 1152 | # | ||
| 1107 | # CONFIG_CRYPTO_DEFLATE is not set | 1153 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1109 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1110 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1111 | # CONFIG_CRYPTO_TEST is not set | ||
| 1112 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1113 | # CONFIG_CRYPTO_LZO is not set | 1154 | # CONFIG_CRYPTO_LZO is not set |
| 1114 | CONFIG_CRYPTO_HW=y | 1155 | CONFIG_CRYPTO_HW=y |
| 1115 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1156 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1116 | # CONFIG_PPC_CLOCK is not set | 1157 | # CONFIG_PPC_CLOCK is not set |
| 1117 | CONFIG_PPC_LIB_RHEAP=y | 1158 | CONFIG_PPC_LIB_RHEAP=y |
| 1159 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig index 53aa6f3173a5..03627cfebcb4 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8572_ds_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:06 2008 | 4 | # Mon Jun 9 08:52:35 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_MPC85xx=y | |||
| 162 | # CONFIG_MPC85xx_CDS is not set | 167 | # CONFIG_MPC85xx_CDS is not set |
| 163 | # CONFIG_MPC85xx_MDS is not set | 168 | # CONFIG_MPC85xx_MDS is not set |
| 164 | CONFIG_MPC85xx_DS=y | 169 | CONFIG_MPC85xx_DS=y |
| 170 | # CONFIG_KSI8560 is not set | ||
| 165 | # CONFIG_STX_GP3 is not set | 171 | # CONFIG_STX_GP3 is not set |
| 166 | # CONFIG_TQM8540 is not set | 172 | # CONFIG_TQM8540 is not set |
| 167 | # CONFIG_TQM8541 is not set | 173 | # CONFIG_TQM8541 is not set |
| @@ -217,11 +223,13 @@ CONFIG_FLATMEM=y | |||
| 217 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 218 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| 224 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 225 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| @@ -246,6 +254,7 @@ CONFIG_PCI_LEGACY=y | |||
| 246 | # CONFIG_PCI_DEBUG is not set | 254 | # CONFIG_PCI_DEBUG is not set |
| 247 | # CONFIG_PCCARD is not set | 255 | # CONFIG_PCCARD is not set |
| 248 | # CONFIG_HOTPLUG_PCI is not set | 256 | # CONFIG_HOTPLUG_PCI is not set |
| 257 | # CONFIG_HAS_RAPIDIO is not set | ||
| 249 | 258 | ||
| 250 | # | 259 | # |
| 251 | # Advanced setup | 260 | # Advanced setup |
| @@ -255,11 +264,12 @@ CONFIG_PCI_LEGACY=y | |||
| 255 | # | 264 | # |
| 256 | # Default settings for advanced configuration options are used | 265 | # Default settings for advanced configuration options are used |
| 257 | # | 266 | # |
| 258 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 259 | CONFIG_LOWMEM_SIZE=0x30000000 | 267 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 268 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 260 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
| 270 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 261 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
| 262 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 263 | 273 | ||
| 264 | # | 274 | # |
| 265 | # Networking | 275 | # Networking |
| @@ -330,8 +340,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 330 | CONFIG_INET6_XFRM_MODE_BEET=y | 340 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 331 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 341 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 332 | CONFIG_IPV6_SIT=y | 342 | CONFIG_IPV6_SIT=y |
| 343 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 333 | # CONFIG_IPV6_TUNNEL is not set | 344 | # CONFIG_IPV6_TUNNEL is not set |
| 334 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 345 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 346 | # CONFIG_IPV6_MROUTE is not set | ||
| 335 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
| 336 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
| 337 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
| @@ -393,6 +405,7 @@ CONFIG_FW_LOADER=y | |||
| 393 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
| 394 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
| 395 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
| 408 | CONFIG_OF_I2C=y | ||
| 396 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
| 397 | CONFIG_BLK_DEV=y | 410 | CONFIG_BLK_DEV=y |
| 398 | # CONFIG_BLK_DEV_FD is not set | 411 | # CONFIG_BLK_DEV_FD is not set |
| @@ -499,7 +512,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 499 | # CONFIG_SCSI_SRP is not set | 512 | # CONFIG_SCSI_SRP is not set |
| 500 | CONFIG_ATA=y | 513 | CONFIG_ATA=y |
| 501 | # CONFIG_ATA_NONSTANDARD is not set | 514 | # CONFIG_ATA_NONSTANDARD is not set |
| 515 | CONFIG_SATA_PMP=y | ||
| 502 | CONFIG_SATA_AHCI=y | 516 | CONFIG_SATA_AHCI=y |
| 517 | # CONFIG_SATA_SIL24 is not set | ||
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_ATA_SFF=y | ||
| 503 | # CONFIG_SATA_SVW is not set | 520 | # CONFIG_SATA_SVW is not set |
| 504 | # CONFIG_ATA_PIIX is not set | 521 | # CONFIG_ATA_PIIX is not set |
| 505 | # CONFIG_SATA_MV is not set | 522 | # CONFIG_SATA_MV is not set |
| @@ -509,13 +526,11 @@ CONFIG_SATA_AHCI=y | |||
| 509 | # CONFIG_SATA_PROMISE is not set | 526 | # CONFIG_SATA_PROMISE is not set |
| 510 | # CONFIG_SATA_SX4 is not set | 527 | # CONFIG_SATA_SX4 is not set |
| 511 | # CONFIG_SATA_SIL is not set | 528 | # CONFIG_SATA_SIL is not set |
| 512 | # CONFIG_SATA_SIL24 is not set | ||
| 513 | # CONFIG_SATA_SIS is not set | 529 | # CONFIG_SATA_SIS is not set |
| 514 | # CONFIG_SATA_ULI is not set | 530 | # CONFIG_SATA_ULI is not set |
| 515 | # CONFIG_SATA_VIA is not set | 531 | # CONFIG_SATA_VIA is not set |
| 516 | # CONFIG_SATA_VITESSE is not set | 532 | # CONFIG_SATA_VITESSE is not set |
| 517 | # CONFIG_SATA_INIC162X is not set | 533 | # CONFIG_SATA_INIC162X is not set |
| 518 | # CONFIG_SATA_FSL is not set | ||
| 519 | CONFIG_PATA_ALI=y | 534 | CONFIG_PATA_ALI=y |
| 520 | # CONFIG_PATA_AMD is not set | 535 | # CONFIG_PATA_AMD is not set |
| 521 | # CONFIG_PATA_ARTOP is not set | 536 | # CONFIG_PATA_ARTOP is not set |
| @@ -555,6 +570,7 @@ CONFIG_PATA_ALI=y | |||
| 555 | # CONFIG_PATA_VIA is not set | 570 | # CONFIG_PATA_VIA is not set |
| 556 | # CONFIG_PATA_WINBOND is not set | 571 | # CONFIG_PATA_WINBOND is not set |
| 557 | # CONFIG_PATA_PLATFORM is not set | 572 | # CONFIG_PATA_PLATFORM is not set |
| 573 | # CONFIG_PATA_SCH is not set | ||
| 558 | # CONFIG_MD is not set | 574 | # CONFIG_MD is not set |
| 559 | # CONFIG_FUSION is not set | 575 | # CONFIG_FUSION is not set |
| 560 | 576 | ||
| @@ -620,7 +636,6 @@ CONFIG_NETDEV_1000=y | |||
| 620 | # CONFIG_SIS190 is not set | 636 | # CONFIG_SIS190 is not set |
| 621 | # CONFIG_SKGE is not set | 637 | # CONFIG_SKGE is not set |
| 622 | # CONFIG_SKY2 is not set | 638 | # CONFIG_SKY2 is not set |
| 623 | # CONFIG_SK98LIN is not set | ||
| 624 | # CONFIG_VIA_VELOCITY is not set | 639 | # CONFIG_VIA_VELOCITY is not set |
| 625 | # CONFIG_TIGON3 is not set | 640 | # CONFIG_TIGON3 is not set |
| 626 | # CONFIG_BNX2 is not set | 641 | # CONFIG_BNX2 is not set |
| @@ -640,6 +655,7 @@ CONFIG_NETDEV_10000=y | |||
| 640 | # CONFIG_MLX4_CORE is not set | 655 | # CONFIG_MLX4_CORE is not set |
| 641 | # CONFIG_TEHUTI is not set | 656 | # CONFIG_TEHUTI is not set |
| 642 | # CONFIG_BNX2X is not set | 657 | # CONFIG_BNX2X is not set |
| 658 | # CONFIG_SFC is not set | ||
| 643 | # CONFIG_TR is not set | 659 | # CONFIG_TR is not set |
| 644 | 660 | ||
| 645 | # | 661 | # |
| @@ -647,6 +663,7 @@ CONFIG_NETDEV_10000=y | |||
| 647 | # | 663 | # |
| 648 | # CONFIG_WLAN_PRE80211 is not set | 664 | # CONFIG_WLAN_PRE80211 is not set |
| 649 | # CONFIG_WLAN_80211 is not set | 665 | # CONFIG_WLAN_80211 is not set |
| 666 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 650 | 667 | ||
| 651 | # | 668 | # |
| 652 | # USB Network Adapters | 669 | # USB Network Adapters |
| @@ -711,6 +728,7 @@ CONFIG_VT=y | |||
| 711 | CONFIG_VT_CONSOLE=y | 728 | CONFIG_VT_CONSOLE=y |
| 712 | CONFIG_HW_CONSOLE=y | 729 | CONFIG_HW_CONSOLE=y |
| 713 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 731 | CONFIG_DEVKMEM=y | ||
| 714 | # CONFIG_SERIAL_NONSTANDARD is not set | 732 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 715 | # CONFIG_NOZOMI is not set | 733 | # CONFIG_NOZOMI is not set |
| 716 | 734 | ||
| @@ -742,7 +760,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 742 | # CONFIG_IPMI_HANDLER is not set | 760 | # CONFIG_IPMI_HANDLER is not set |
| 743 | # CONFIG_HW_RANDOM is not set | 761 | # CONFIG_HW_RANDOM is not set |
| 744 | CONFIG_NVRAM=y | 762 | CONFIG_NVRAM=y |
| 745 | # CONFIG_GEN_RTC is not set | ||
| 746 | # CONFIG_R3964 is not set | 763 | # CONFIG_R3964 is not set |
| 747 | # CONFIG_APPLICOM is not set | 764 | # CONFIG_APPLICOM is not set |
| 748 | # CONFIG_RAW_DRIVER is not set | 765 | # CONFIG_RAW_DRIVER is not set |
| @@ -753,13 +770,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 753 | # CONFIG_I2C_CHARDEV is not set | 770 | # CONFIG_I2C_CHARDEV is not set |
| 754 | 771 | ||
| 755 | # | 772 | # |
| 756 | # I2C Algorithms | ||
| 757 | # | ||
| 758 | # CONFIG_I2C_ALGOBIT is not set | ||
| 759 | # CONFIG_I2C_ALGOPCF is not set | ||
| 760 | # CONFIG_I2C_ALGOPCA is not set | ||
| 761 | |||
| 762 | # | ||
| 763 | # I2C Hardware Bus support | 773 | # I2C Hardware Bus support |
| 764 | # | 774 | # |
| 765 | # CONFIG_I2C_ALI1535 is not set | 775 | # CONFIG_I2C_ALI1535 is not set |
| @@ -786,6 +796,7 @@ CONFIG_I2C_MPC=y | |||
| 786 | # CONFIG_I2C_VIA is not set | 796 | # CONFIG_I2C_VIA is not set |
| 787 | # CONFIG_I2C_VIAPRO is not set | 797 | # CONFIG_I2C_VIAPRO is not set |
| 788 | # CONFIG_I2C_VOODOO3 is not set | 798 | # CONFIG_I2C_VOODOO3 is not set |
| 799 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 789 | 800 | ||
| 790 | # | 801 | # |
| 791 | # Miscellaneous I2C Chip support | 802 | # Miscellaneous I2C Chip support |
| @@ -795,19 +806,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 795 | # CONFIG_SENSORS_PCF8574 is not set | 806 | # CONFIG_SENSORS_PCF8574 is not set |
| 796 | # CONFIG_PCF8575 is not set | 807 | # CONFIG_PCF8575 is not set |
| 797 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
| 798 | # CONFIG_TPS65010 is not set | ||
| 799 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
| 800 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
| 801 | # CONFIG_I2C_DEBUG_CORE is not set | 811 | # CONFIG_I2C_DEBUG_CORE is not set |
| 802 | # CONFIG_I2C_DEBUG_ALGO is not set | 812 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 803 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
| 804 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 805 | |||
| 806 | # | ||
| 807 | # SPI support | ||
| 808 | # | ||
| 809 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
| 810 | # CONFIG_SPI_MASTER is not set | ||
| 811 | # CONFIG_W1 is not set | 816 | # CONFIG_W1 is not set |
| 812 | # CONFIG_POWER_SUPPLY is not set | 817 | # CONFIG_POWER_SUPPLY is not set |
| 813 | # CONFIG_HWMON is not set | 818 | # CONFIG_HWMON is not set |
| @@ -824,13 +829,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 824 | # Multifunction device drivers | 829 | # Multifunction device drivers |
| 825 | # | 830 | # |
| 826 | # CONFIG_MFD_SM501 is not set | 831 | # CONFIG_MFD_SM501 is not set |
| 832 | # CONFIG_HTC_PASIC3 is not set | ||
| 827 | 833 | ||
| 828 | # | 834 | # |
| 829 | # Multimedia devices | 835 | # Multimedia devices |
| 830 | # | 836 | # |
| 837 | |||
| 838 | # | ||
| 839 | # Multimedia core support | ||
| 840 | # | ||
| 831 | # CONFIG_VIDEO_DEV is not set | 841 | # CONFIG_VIDEO_DEV is not set |
| 832 | CONFIG_DVB_CORE=m | 842 | CONFIG_DVB_CORE=m |
| 833 | # CONFIG_DVB_CORE_ATTACH is not set | 843 | CONFIG_VIDEO_MEDIA=m |
| 844 | |||
| 845 | # | ||
| 846 | # Multimedia drivers | ||
| 847 | # | ||
| 848 | # CONFIG_MEDIA_ATTACH is not set | ||
| 849 | CONFIG_MEDIA_TUNER=m | ||
| 850 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 851 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 852 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 853 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 854 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 855 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 856 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 857 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 858 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 834 | CONFIG_DVB_CAPTURE_DRIVERS=y | 859 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 835 | 860 | ||
| 836 | # | 861 | # |
| @@ -873,14 +898,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 873 | # | 898 | # |
| 874 | # DVB-S (satellite) frontends | 899 | # DVB-S (satellite) frontends |
| 875 | # | 900 | # |
| 876 | # CONFIG_DVB_STV0299 is not set | ||
| 877 | # CONFIG_DVB_CX24110 is not set | 901 | # CONFIG_DVB_CX24110 is not set |
| 878 | # CONFIG_DVB_CX24123 is not set | 902 | # CONFIG_DVB_CX24123 is not set |
| 879 | # CONFIG_DVB_TDA8083 is not set | ||
| 880 | # CONFIG_DVB_MT312 is not set | 903 | # CONFIG_DVB_MT312 is not set |
| 881 | # CONFIG_DVB_VES1X93 is not set | ||
| 882 | # CONFIG_DVB_S5H1420 is not set | 904 | # CONFIG_DVB_S5H1420 is not set |
| 905 | # CONFIG_DVB_STV0299 is not set | ||
| 906 | # CONFIG_DVB_TDA8083 is not set | ||
| 883 | # CONFIG_DVB_TDA10086 is not set | 907 | # CONFIG_DVB_TDA10086 is not set |
| 908 | # CONFIG_DVB_VES1X93 is not set | ||
| 909 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 910 | # CONFIG_DVB_TDA826X is not set | ||
| 911 | # CONFIG_DVB_TUA6100 is not set | ||
| 884 | 912 | ||
| 885 | # | 913 | # |
| 886 | # DVB-T (terrestrial) frontends | 914 | # DVB-T (terrestrial) frontends |
| @@ -898,6 +926,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 898 | # CONFIG_DVB_DIB3000MC is not set | 926 | # CONFIG_DVB_DIB3000MC is not set |
| 899 | # CONFIG_DVB_DIB7000M is not set | 927 | # CONFIG_DVB_DIB7000M is not set |
| 900 | # CONFIG_DVB_DIB7000P is not set | 928 | # CONFIG_DVB_DIB7000P is not set |
| 929 | # CONFIG_DVB_TDA10048 is not set | ||
| 901 | 930 | ||
| 902 | # | 931 | # |
| 903 | # DVB-C (cable) frontends | 932 | # DVB-C (cable) frontends |
| @@ -916,27 +945,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 916 | # CONFIG_DVB_BCM3510 is not set | 945 | # CONFIG_DVB_BCM3510 is not set |
| 917 | # CONFIG_DVB_LGDT330X is not set | 946 | # CONFIG_DVB_LGDT330X is not set |
| 918 | # CONFIG_DVB_S5H1409 is not set | 947 | # CONFIG_DVB_S5H1409 is not set |
| 948 | # CONFIG_DVB_AU8522 is not set | ||
| 949 | # CONFIG_DVB_S5H1411 is not set | ||
| 919 | 950 | ||
| 920 | # | 951 | # |
| 921 | # Tuners/PLL support | 952 | # Digital terrestrial only tuners/PLL |
| 922 | # | 953 | # |
| 923 | # CONFIG_DVB_PLL is not set | 954 | # CONFIG_DVB_PLL is not set |
| 924 | # CONFIG_DVB_TDA826X is not set | ||
| 925 | # CONFIG_DVB_TDA827X is not set | ||
| 926 | # CONFIG_DVB_TDA18271 is not set | ||
| 927 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 928 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 929 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 930 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 931 | # CONFIG_DVB_TUNER_DIB0070 is not set | 955 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 932 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 933 | 956 | ||
| 934 | # | 957 | # |
| 935 | # Miscellaneous devices | 958 | # SEC control devices for DVB-S |
| 936 | # | 959 | # |
| 937 | # CONFIG_DVB_LNBP21 is not set | 960 | # CONFIG_DVB_LNBP21 is not set |
| 961 | # CONFIG_DVB_ISL6405 is not set | ||
| 938 | # CONFIG_DVB_ISL6421 is not set | 962 | # CONFIG_DVB_ISL6421 is not set |
| 939 | # CONFIG_DVB_TUA6100 is not set | ||
| 940 | CONFIG_DAB=y | 963 | CONFIG_DAB=y |
| 941 | # CONFIG_USB_DABUSB is not set | 964 | # CONFIG_USB_DABUSB is not set |
| 942 | 965 | ||
| @@ -1003,6 +1026,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1003 | # CONFIG_SND_AU8810 is not set | 1026 | # CONFIG_SND_AU8810 is not set |
| 1004 | # CONFIG_SND_AU8820 is not set | 1027 | # CONFIG_SND_AU8820 is not set |
| 1005 | # CONFIG_SND_AU8830 is not set | 1028 | # CONFIG_SND_AU8830 is not set |
| 1029 | # CONFIG_SND_AW2 is not set | ||
| 1006 | # CONFIG_SND_AZT3328 is not set | 1030 | # CONFIG_SND_AZT3328 is not set |
| 1007 | # CONFIG_SND_BT87X is not set | 1031 | # CONFIG_SND_BT87X is not set |
| 1008 | # CONFIG_SND_CA0106 is not set | 1032 | # CONFIG_SND_CA0106 is not set |
| @@ -1077,11 +1101,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1077 | # CONFIG_SND_SOC is not set | 1101 | # CONFIG_SND_SOC is not set |
| 1078 | 1102 | ||
| 1079 | # | 1103 | # |
| 1080 | # SoC Audio support for SuperH | 1104 | # ALSA SoC audio for Freescale SOCs |
| 1081 | # | 1105 | # |
| 1082 | 1106 | ||
| 1083 | # | 1107 | # |
| 1084 | # ALSA SoC audio for Freescale SOCs | 1108 | # SoC Audio for the Texas Instruments OMAP |
| 1085 | # | 1109 | # |
| 1086 | 1110 | ||
| 1087 | # | 1111 | # |
| @@ -1116,16 +1140,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1116 | CONFIG_USB_DEVICE_CLASS=y | 1140 | CONFIG_USB_DEVICE_CLASS=y |
| 1117 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1141 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1118 | # CONFIG_USB_OTG is not set | 1142 | # CONFIG_USB_OTG is not set |
| 1143 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1144 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1119 | 1145 | ||
| 1120 | # | 1146 | # |
| 1121 | # USB Host Controller Drivers | 1147 | # USB Host Controller Drivers |
| 1122 | # | 1148 | # |
| 1149 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1123 | CONFIG_USB_EHCI_HCD=y | 1150 | CONFIG_USB_EHCI_HCD=y |
| 1124 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1151 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1125 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1152 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1126 | # CONFIG_USB_EHCI_FSL is not set | 1153 | # CONFIG_USB_EHCI_FSL is not set |
| 1127 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1154 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1128 | # CONFIG_USB_ISP116X_HCD is not set | 1155 | # CONFIG_USB_ISP116X_HCD is not set |
| 1156 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1129 | CONFIG_USB_OHCI_HCD=y | 1157 | CONFIG_USB_OHCI_HCD=y |
| 1130 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1158 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1131 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1159 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1143,6 +1171,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1143 | # | 1171 | # |
| 1144 | # CONFIG_USB_ACM is not set | 1172 | # CONFIG_USB_ACM is not set |
| 1145 | # CONFIG_USB_PRINTER is not set | 1173 | # CONFIG_USB_PRINTER is not set |
| 1174 | # CONFIG_USB_WDM is not set | ||
| 1146 | 1175 | ||
| 1147 | # | 1176 | # |
| 1148 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1177 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1162,7 +1191,9 @@ CONFIG_USB_STORAGE=y | |||
| 1162 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1191 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1163 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1192 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1164 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1193 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1194 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1165 | # CONFIG_USB_STORAGE_KARMA is not set | 1195 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1196 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1166 | # CONFIG_USB_LIBUSUAL is not set | 1197 | # CONFIG_USB_LIBUSUAL is not set |
| 1167 | 1198 | ||
| 1168 | # | 1199 | # |
| @@ -1200,10 +1231,12 @@ CONFIG_USB_MON=y | |||
| 1200 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1231 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1201 | # CONFIG_USB_IOWARRIOR is not set | 1232 | # CONFIG_USB_IOWARRIOR is not set |
| 1202 | # CONFIG_USB_TEST is not set | 1233 | # CONFIG_USB_TEST is not set |
| 1234 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1203 | # CONFIG_USB_GADGET is not set | 1235 | # CONFIG_USB_GADGET is not set |
| 1204 | # CONFIG_MMC is not set | 1236 | # CONFIG_MMC is not set |
| 1205 | # CONFIG_MEMSTICK is not set | 1237 | # CONFIG_MEMSTICK is not set |
| 1206 | # CONFIG_NEW_LEDS is not set | 1238 | # CONFIG_NEW_LEDS is not set |
| 1239 | # CONFIG_ACCESSIBILITY is not set | ||
| 1207 | # CONFIG_INFINIBAND is not set | 1240 | # CONFIG_INFINIBAND is not set |
| 1208 | # CONFIG_EDAC is not set | 1241 | # CONFIG_EDAC is not set |
| 1209 | CONFIG_RTC_LIB=y | 1242 | CONFIG_RTC_LIB=y |
| @@ -1255,11 +1288,8 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1255 | # | 1288 | # |
| 1256 | # on-CPU RTC drivers | 1289 | # on-CPU RTC drivers |
| 1257 | # | 1290 | # |
| 1291 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1258 | # CONFIG_DMADEVICES is not set | 1292 | # CONFIG_DMADEVICES is not set |
| 1259 | |||
| 1260 | # | ||
| 1261 | # Userspace I/O | ||
| 1262 | # | ||
| 1263 | # CONFIG_UIO is not set | 1293 | # CONFIG_UIO is not set |
| 1264 | 1294 | ||
| 1265 | # | 1295 | # |
| @@ -1279,7 +1309,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1279 | # CONFIG_JFS_FS is not set | 1309 | # CONFIG_JFS_FS is not set |
| 1280 | # CONFIG_FS_POSIX_ACL is not set | 1310 | # CONFIG_FS_POSIX_ACL is not set |
| 1281 | # CONFIG_XFS_FS is not set | 1311 | # CONFIG_XFS_FS is not set |
| 1282 | # CONFIG_GFS2_FS is not set | ||
| 1283 | # CONFIG_OCFS2_FS is not set | 1312 | # CONFIG_OCFS2_FS is not set |
| 1284 | CONFIG_DNOTIFY=y | 1313 | CONFIG_DNOTIFY=y |
| 1285 | CONFIG_INOTIFY=y | 1314 | CONFIG_INOTIFY=y |
| @@ -1349,10 +1378,9 @@ CONFIG_NFS_FS=y | |||
| 1349 | CONFIG_NFS_V3=y | 1378 | CONFIG_NFS_V3=y |
| 1350 | # CONFIG_NFS_V3_ACL is not set | 1379 | # CONFIG_NFS_V3_ACL is not set |
| 1351 | CONFIG_NFS_V4=y | 1380 | CONFIG_NFS_V4=y |
| 1352 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1353 | CONFIG_NFSD=y | 1381 | CONFIG_NFSD=y |
| 1354 | # CONFIG_NFSD_V3 is not set | 1382 | # CONFIG_NFSD_V3 is not set |
| 1355 | CONFIG_NFSD_TCP=y | 1383 | # CONFIG_NFSD_V4 is not set |
| 1356 | CONFIG_ROOT_NFS=y | 1384 | CONFIG_ROOT_NFS=y |
| 1357 | CONFIG_LOCKD=y | 1385 | CONFIG_LOCKD=y |
| 1358 | CONFIG_LOCKD_V4=y | 1386 | CONFIG_LOCKD_V4=y |
| @@ -1436,9 +1464,10 @@ CONFIG_NLS_UTF8=m | |||
| 1436 | # Library routines | 1464 | # Library routines |
| 1437 | # | 1465 | # |
| 1438 | CONFIG_BITREVERSE=y | 1466 | CONFIG_BITREVERSE=y |
| 1467 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1439 | # CONFIG_CRC_CCITT is not set | 1468 | # CONFIG_CRC_CCITT is not set |
| 1440 | # CONFIG_CRC16 is not set | 1469 | # CONFIG_CRC16 is not set |
| 1441 | # CONFIG_CRC_ITU_T is not set | 1470 | CONFIG_CRC_ITU_T=m |
| 1442 | CONFIG_CRC32=y | 1471 | CONFIG_CRC32=y |
| 1443 | # CONFIG_CRC7 is not set | 1472 | # CONFIG_CRC7 is not set |
| 1444 | CONFIG_LIBCRC32C=m | 1473 | CONFIG_LIBCRC32C=m |
| @@ -1447,6 +1476,7 @@ CONFIG_PLIST=y | |||
| 1447 | CONFIG_HAS_IOMEM=y | 1476 | CONFIG_HAS_IOMEM=y |
| 1448 | CONFIG_HAS_IOPORT=y | 1477 | CONFIG_HAS_IOPORT=y |
| 1449 | CONFIG_HAS_DMA=y | 1478 | CONFIG_HAS_DMA=y |
| 1479 | CONFIG_HAVE_LMB=y | ||
| 1450 | 1480 | ||
| 1451 | # | 1481 | # |
| 1452 | # Kernel hacking | 1482 | # Kernel hacking |
| @@ -1454,6 +1484,7 @@ CONFIG_HAS_DMA=y | |||
| 1454 | # CONFIG_PRINTK_TIME is not set | 1484 | # CONFIG_PRINTK_TIME is not set |
| 1455 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1485 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1456 | CONFIG_ENABLE_MUST_CHECK=y | 1486 | CONFIG_ENABLE_MUST_CHECK=y |
| 1487 | CONFIG_FRAME_WARN=1024 | ||
| 1457 | # CONFIG_MAGIC_SYSRQ is not set | 1488 | # CONFIG_MAGIC_SYSRQ is not set |
| 1458 | # CONFIG_UNUSED_SYMBOLS is not set | 1489 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1459 | # CONFIG_DEBUG_FS is not set | 1490 | # CONFIG_DEBUG_FS is not set |
| @@ -1464,6 +1495,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1464 | CONFIG_SCHED_DEBUG=y | 1495 | CONFIG_SCHED_DEBUG=y |
| 1465 | # CONFIG_SCHEDSTATS is not set | 1496 | # CONFIG_SCHEDSTATS is not set |
| 1466 | # CONFIG_TIMER_STATS is not set | 1497 | # CONFIG_TIMER_STATS is not set |
| 1498 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1467 | # CONFIG_SLUB_DEBUG_ON is not set | 1499 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1468 | # CONFIG_SLUB_STATS is not set | 1500 | # CONFIG_SLUB_STATS is not set |
| 1469 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1501 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1477,6 +1509,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1477 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1509 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1478 | CONFIG_DEBUG_INFO=y | 1510 | CONFIG_DEBUG_INFO=y |
| 1479 | # CONFIG_DEBUG_VM is not set | 1511 | # CONFIG_DEBUG_VM is not set |
| 1512 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1480 | # CONFIG_DEBUG_LIST is not set | 1513 | # CONFIG_DEBUG_LIST is not set |
| 1481 | # CONFIG_DEBUG_SG is not set | 1514 | # CONFIG_DEBUG_SG is not set |
| 1482 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1515 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1488,6 +1521,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1488 | # CONFIG_DEBUG_STACK_USAGE is not set | 1521 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1489 | # CONFIG_DEBUG_PAGEALLOC is not set | 1522 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1490 | # CONFIG_DEBUGGER is not set | 1523 | # CONFIG_DEBUGGER is not set |
| 1524 | # CONFIG_IRQSTACKS is not set | ||
| 1491 | # CONFIG_BDI_SWITCH is not set | 1525 | # CONFIG_BDI_SWITCH is not set |
| 1492 | # CONFIG_PPC_EARLY_DEBUG is not set | 1526 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1493 | 1527 | ||
| @@ -1498,52 +1532,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1498 | # CONFIG_SECURITY is not set | 1532 | # CONFIG_SECURITY is not set |
| 1499 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1533 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1500 | CONFIG_CRYPTO=y | 1534 | CONFIG_CRYPTO=y |
| 1535 | |||
| 1536 | # | ||
| 1537 | # Crypto core or helper | ||
| 1538 | # | ||
| 1501 | CONFIG_CRYPTO_ALGAPI=y | 1539 | CONFIG_CRYPTO_ALGAPI=y |
| 1502 | CONFIG_CRYPTO_BLKCIPHER=y | 1540 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1503 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1504 | CONFIG_CRYPTO_HASH=y | 1541 | CONFIG_CRYPTO_HASH=y |
| 1505 | CONFIG_CRYPTO_MANAGER=y | 1542 | CONFIG_CRYPTO_MANAGER=y |
| 1543 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1544 | # CONFIG_CRYPTO_NULL is not set | ||
| 1545 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1546 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1547 | # CONFIG_CRYPTO_TEST is not set | ||
| 1548 | |||
| 1549 | # | ||
| 1550 | # Authenticated Encryption with Associated Data | ||
| 1551 | # | ||
| 1552 | # CONFIG_CRYPTO_CCM is not set | ||
| 1553 | # CONFIG_CRYPTO_GCM is not set | ||
| 1554 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1555 | |||
| 1556 | # | ||
| 1557 | # Block modes | ||
| 1558 | # | ||
| 1559 | CONFIG_CRYPTO_CBC=y | ||
| 1560 | # CONFIG_CRYPTO_CTR is not set | ||
| 1561 | # CONFIG_CRYPTO_CTS is not set | ||
| 1562 | # CONFIG_CRYPTO_ECB is not set | ||
| 1563 | # CONFIG_CRYPTO_LRW is not set | ||
| 1564 | CONFIG_CRYPTO_PCBC=m | ||
| 1565 | # CONFIG_CRYPTO_XTS is not set | ||
| 1566 | |||
| 1567 | # | ||
| 1568 | # Hash modes | ||
| 1569 | # | ||
| 1506 | CONFIG_CRYPTO_HMAC=y | 1570 | CONFIG_CRYPTO_HMAC=y |
| 1507 | # CONFIG_CRYPTO_XCBC is not set | 1571 | # CONFIG_CRYPTO_XCBC is not set |
| 1508 | # CONFIG_CRYPTO_NULL is not set | 1572 | |
| 1573 | # | ||
| 1574 | # Digest | ||
| 1575 | # | ||
| 1576 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1509 | # CONFIG_CRYPTO_MD4 is not set | 1577 | # CONFIG_CRYPTO_MD4 is not set |
| 1510 | CONFIG_CRYPTO_MD5=y | 1578 | CONFIG_CRYPTO_MD5=y |
| 1579 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1511 | CONFIG_CRYPTO_SHA1=m | 1580 | CONFIG_CRYPTO_SHA1=m |
| 1512 | # CONFIG_CRYPTO_SHA256 is not set | 1581 | # CONFIG_CRYPTO_SHA256 is not set |
| 1513 | # CONFIG_CRYPTO_SHA512 is not set | 1582 | # CONFIG_CRYPTO_SHA512 is not set |
| 1514 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1515 | # CONFIG_CRYPTO_TGR192 is not set | 1583 | # CONFIG_CRYPTO_TGR192 is not set |
| 1516 | # CONFIG_CRYPTO_GF128MUL is not set | 1584 | # CONFIG_CRYPTO_WP512 is not set |
| 1517 | # CONFIG_CRYPTO_ECB is not set | 1585 | |
| 1518 | CONFIG_CRYPTO_CBC=y | 1586 | # |
| 1519 | CONFIG_CRYPTO_PCBC=m | 1587 | # Ciphers |
| 1520 | # CONFIG_CRYPTO_LRW is not set | 1588 | # |
| 1521 | # CONFIG_CRYPTO_XTS is not set | ||
| 1522 | # CONFIG_CRYPTO_CTR is not set | ||
| 1523 | # CONFIG_CRYPTO_GCM is not set | ||
| 1524 | # CONFIG_CRYPTO_CCM is not set | ||
| 1525 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1526 | CONFIG_CRYPTO_DES=y | ||
| 1527 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1528 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1529 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1530 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1531 | # CONFIG_CRYPTO_AES is not set | 1589 | # CONFIG_CRYPTO_AES is not set |
| 1590 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1591 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1592 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1593 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1532 | # CONFIG_CRYPTO_CAST5 is not set | 1594 | # CONFIG_CRYPTO_CAST5 is not set |
| 1533 | # CONFIG_CRYPTO_CAST6 is not set | 1595 | # CONFIG_CRYPTO_CAST6 is not set |
| 1534 | # CONFIG_CRYPTO_TEA is not set | 1596 | CONFIG_CRYPTO_DES=y |
| 1535 | # CONFIG_CRYPTO_ARC4 is not set | 1597 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1536 | # CONFIG_CRYPTO_KHAZAD is not set | 1598 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1537 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1538 | # CONFIG_CRYPTO_SEED is not set | ||
| 1539 | # CONFIG_CRYPTO_SALSA20 is not set | 1599 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1600 | # CONFIG_CRYPTO_SEED is not set | ||
| 1601 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1602 | # CONFIG_CRYPTO_TEA is not set | ||
| 1603 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1604 | |||
| 1605 | # | ||
| 1606 | # Compression | ||
| 1607 | # | ||
| 1540 | # CONFIG_CRYPTO_DEFLATE is not set | 1608 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1541 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1542 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1543 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1544 | # CONFIG_CRYPTO_TEST is not set | ||
| 1545 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1546 | # CONFIG_CRYPTO_LZO is not set | 1609 | # CONFIG_CRYPTO_LZO is not set |
| 1547 | CONFIG_CRYPTO_HW=y | 1610 | CONFIG_CRYPTO_HW=y |
| 1548 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1611 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1549 | # CONFIG_PPC_CLOCK is not set | 1612 | # CONFIG_PPC_CLOCK is not set |
| 1613 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig index a469fe918816..b09f0032a10b 100644 --- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/85xx/mpc85xx_cds_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:30 2008 | 4 | # Mon Jun 9 08:52:36 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -113,6 +116,7 @@ CONFIG_SLUB=y | |||
| 113 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 114 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
| 115 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
| 119 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 116 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
| 117 | CONFIG_SLABINFO=y | 121 | CONFIG_SLABINFO=y |
| 118 | CONFIG_RT_MUTEXES=y | 122 | CONFIG_RT_MUTEXES=y |
| @@ -153,6 +157,7 @@ CONFIG_MPC85xx=y | |||
| 153 | CONFIG_MPC85xx_CDS=y | 157 | CONFIG_MPC85xx_CDS=y |
| 154 | # CONFIG_MPC85xx_MDS is not set | 158 | # CONFIG_MPC85xx_MDS is not set |
| 155 | # CONFIG_MPC85xx_DS is not set | 159 | # CONFIG_MPC85xx_DS is not set |
| 160 | # CONFIG_KSI8560 is not set | ||
| 156 | # CONFIG_STX_GP3 is not set | 161 | # CONFIG_STX_GP3 is not set |
| 157 | # CONFIG_TQM8540 is not set | 162 | # CONFIG_TQM8540 is not set |
| 158 | # CONFIG_TQM8541 is not set | 163 | # CONFIG_TQM8541 is not set |
| @@ -208,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -236,6 +243,7 @@ CONFIG_PCI_LEGACY=y | |||
| 236 | # CONFIG_PCI_DEBUG is not set | 243 | # CONFIG_PCI_DEBUG is not set |
| 237 | # CONFIG_PCCARD is not set | 244 | # CONFIG_PCCARD is not set |
| 238 | # CONFIG_HOTPLUG_PCI is not set | 245 | # CONFIG_HOTPLUG_PCI is not set |
| 246 | # CONFIG_HAS_RAPIDIO is not set | ||
| 239 | 247 | ||
| 240 | # | 248 | # |
| 241 | # Advanced setup | 249 | # Advanced setup |
| @@ -245,11 +253,12 @@ CONFIG_PCI_LEGACY=y | |||
| 245 | # | 253 | # |
| 246 | # Default settings for advanced configuration options are used | 254 | # Default settings for advanced configuration options are used |
| 247 | # | 255 | # |
| 248 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 249 | CONFIG_LOWMEM_SIZE=0x30000000 | 256 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 257 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 250 | CONFIG_KERNEL_START=0xc0000000 | 258 | CONFIG_KERNEL_START=0xc0000000 |
| 259 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 260 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 251 | CONFIG_TASK_SIZE=0xc0000000 | 261 | CONFIG_TASK_SIZE=0xc0000000 |
| 252 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 253 | 262 | ||
| 254 | # | 263 | # |
| 255 | # Networking | 264 | # Networking |
| @@ -297,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 297 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 298 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 299 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 300 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 301 | # CONFIG_INET6_TUNNEL is not set | ||
| 302 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 303 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 304 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -437,7 +444,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 437 | CONFIG_BLK_DEV_VIA82CXXX=y | 444 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 438 | # CONFIG_BLK_DEV_TC86C001 is not set | 445 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 439 | CONFIG_BLK_DEV_IDEDMA=y | 446 | CONFIG_BLK_DEV_IDEDMA=y |
| 440 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 447 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 441 | # CONFIG_BLK_DEV_HD is not set | 448 | # CONFIG_BLK_DEV_HD is not set |
| 442 | 449 | ||
| 443 | # | 450 | # |
| @@ -515,7 +522,6 @@ CONFIG_E1000_NAPI=y | |||
| 515 | # CONFIG_SIS190 is not set | 522 | # CONFIG_SIS190 is not set |
| 516 | # CONFIG_SKGE is not set | 523 | # CONFIG_SKGE is not set |
| 517 | # CONFIG_SKY2 is not set | 524 | # CONFIG_SKY2 is not set |
| 518 | # CONFIG_SK98LIN is not set | ||
| 519 | # CONFIG_VIA_VELOCITY is not set | 525 | # CONFIG_VIA_VELOCITY is not set |
| 520 | # CONFIG_TIGON3 is not set | 526 | # CONFIG_TIGON3 is not set |
| 521 | # CONFIG_BNX2 is not set | 527 | # CONFIG_BNX2 is not set |
| @@ -535,6 +541,7 @@ CONFIG_NETDEV_10000=y | |||
| 535 | # CONFIG_MLX4_CORE is not set | 541 | # CONFIG_MLX4_CORE is not set |
| 536 | # CONFIG_TEHUTI is not set | 542 | # CONFIG_TEHUTI is not set |
| 537 | # CONFIG_BNX2X is not set | 543 | # CONFIG_BNX2X is not set |
| 544 | # CONFIG_SFC is not set | ||
| 538 | # CONFIG_TR is not set | 545 | # CONFIG_TR is not set |
| 539 | 546 | ||
| 540 | # | 547 | # |
| @@ -542,6 +549,7 @@ CONFIG_NETDEV_10000=y | |||
| 542 | # | 549 | # |
| 543 | # CONFIG_WLAN_PRE80211 is not set | 550 | # CONFIG_WLAN_PRE80211 is not set |
| 544 | # CONFIG_WLAN_80211 is not set | 551 | # CONFIG_WLAN_80211 is not set |
| 552 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 545 | # CONFIG_WAN is not set | 553 | # CONFIG_WAN is not set |
| 546 | # CONFIG_FDDI is not set | 554 | # CONFIG_FDDI is not set |
| 547 | # CONFIG_HIPPI is not set | 555 | # CONFIG_HIPPI is not set |
| @@ -588,6 +596,7 @@ CONFIG_INPUT=y | |||
| 588 | # Character devices | 596 | # Character devices |
| 589 | # | 597 | # |
| 590 | # CONFIG_VT is not set | 598 | # CONFIG_VT is not set |
| 599 | CONFIG_DEVKMEM=y | ||
| 591 | # CONFIG_SERIAL_NONSTANDARD is not set | 600 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 592 | # CONFIG_NOZOMI is not set | 601 | # CONFIG_NOZOMI is not set |
| 593 | 602 | ||
| @@ -624,12 +633,7 @@ CONFIG_GEN_RTC=y | |||
| 624 | # CONFIG_TCG_TPM is not set | 633 | # CONFIG_TCG_TPM is not set |
| 625 | CONFIG_DEVPORT=y | 634 | CONFIG_DEVPORT=y |
| 626 | # CONFIG_I2C is not set | 635 | # CONFIG_I2C is not set |
| 627 | |||
| 628 | # | ||
| 629 | # SPI support | ||
| 630 | # | ||
| 631 | # CONFIG_SPI is not set | 636 | # CONFIG_SPI is not set |
| 632 | # CONFIG_SPI_MASTER is not set | ||
| 633 | # CONFIG_W1 is not set | 637 | # CONFIG_W1 is not set |
| 634 | # CONFIG_POWER_SUPPLY is not set | 638 | # CONFIG_POWER_SUPPLY is not set |
| 635 | CONFIG_HWMON=y | 639 | CONFIG_HWMON=y |
| @@ -662,12 +666,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 662 | # Multifunction device drivers | 666 | # Multifunction device drivers |
| 663 | # | 667 | # |
| 664 | # CONFIG_MFD_SM501 is not set | 668 | # CONFIG_MFD_SM501 is not set |
| 669 | # CONFIG_HTC_PASIC3 is not set | ||
| 665 | 670 | ||
| 666 | # | 671 | # |
| 667 | # Multimedia devices | 672 | # Multimedia devices |
| 668 | # | 673 | # |
| 674 | |||
| 675 | # | ||
| 676 | # Multimedia core support | ||
| 677 | # | ||
| 669 | # CONFIG_VIDEO_DEV is not set | 678 | # CONFIG_VIDEO_DEV is not set |
| 670 | # CONFIG_DVB_CORE is not set | 679 | # CONFIG_DVB_CORE is not set |
| 680 | # CONFIG_VIDEO_MEDIA is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # Multimedia drivers | ||
| 684 | # | ||
| 671 | CONFIG_DAB=y | 685 | CONFIG_DAB=y |
| 672 | 686 | ||
| 673 | # | 687 | # |
| @@ -698,6 +712,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 698 | CONFIG_USB_ARCH_HAS_OHCI=y | 712 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 699 | CONFIG_USB_ARCH_HAS_EHCI=y | 713 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 700 | # CONFIG_USB is not set | 714 | # CONFIG_USB is not set |
| 715 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 716 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 701 | 717 | ||
| 702 | # | 718 | # |
| 703 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 719 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -706,14 +722,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 706 | # CONFIG_MMC is not set | 722 | # CONFIG_MMC is not set |
| 707 | # CONFIG_MEMSTICK is not set | 723 | # CONFIG_MEMSTICK is not set |
| 708 | # CONFIG_NEW_LEDS is not set | 724 | # CONFIG_NEW_LEDS is not set |
| 725 | # CONFIG_ACCESSIBILITY is not set | ||
| 709 | # CONFIG_INFINIBAND is not set | 726 | # CONFIG_INFINIBAND is not set |
| 710 | # CONFIG_EDAC is not set | 727 | # CONFIG_EDAC is not set |
| 711 | # CONFIG_RTC_CLASS is not set | 728 | # CONFIG_RTC_CLASS is not set |
| 712 | # CONFIG_DMADEVICES is not set | 729 | # CONFIG_DMADEVICES is not set |
| 713 | |||
| 714 | # | ||
| 715 | # Userspace I/O | ||
| 716 | # | ||
| 717 | # CONFIG_UIO is not set | 730 | # CONFIG_UIO is not set |
| 718 | 731 | ||
| 719 | # | 732 | # |
| @@ -733,7 +746,6 @@ CONFIG_FS_MBCACHE=y | |||
| 733 | # CONFIG_JFS_FS is not set | 746 | # CONFIG_JFS_FS is not set |
| 734 | # CONFIG_FS_POSIX_ACL is not set | 747 | # CONFIG_FS_POSIX_ACL is not set |
| 735 | # CONFIG_XFS_FS is not set | 748 | # CONFIG_XFS_FS is not set |
| 736 | # CONFIG_GFS2_FS is not set | ||
| 737 | # CONFIG_OCFS2_FS is not set | 749 | # CONFIG_OCFS2_FS is not set |
| 738 | CONFIG_DNOTIFY=y | 750 | CONFIG_DNOTIFY=y |
| 739 | CONFIG_INOTIFY=y | 751 | CONFIG_INOTIFY=y |
| @@ -790,7 +802,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 790 | CONFIG_NFS_FS=y | 802 | CONFIG_NFS_FS=y |
| 791 | # CONFIG_NFS_V3 is not set | 803 | # CONFIG_NFS_V3 is not set |
| 792 | # CONFIG_NFS_V4 is not set | 804 | # CONFIG_NFS_V4 is not set |
| 793 | # CONFIG_NFS_DIRECTIO is not set | ||
| 794 | # CONFIG_NFSD is not set | 805 | # CONFIG_NFSD is not set |
| 795 | CONFIG_ROOT_NFS=y | 806 | CONFIG_ROOT_NFS=y |
| 796 | CONFIG_LOCKD=y | 807 | CONFIG_LOCKD=y |
| @@ -829,6 +840,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 829 | # Library routines | 840 | # Library routines |
| 830 | # | 841 | # |
| 831 | CONFIG_BITREVERSE=y | 842 | CONFIG_BITREVERSE=y |
| 843 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 832 | # CONFIG_CRC_CCITT is not set | 844 | # CONFIG_CRC_CCITT is not set |
| 833 | # CONFIG_CRC16 is not set | 845 | # CONFIG_CRC16 is not set |
| 834 | # CONFIG_CRC_ITU_T is not set | 846 | # CONFIG_CRC_ITU_T is not set |
| @@ -839,6 +851,7 @@ CONFIG_PLIST=y | |||
| 839 | CONFIG_HAS_IOMEM=y | 851 | CONFIG_HAS_IOMEM=y |
| 840 | CONFIG_HAS_IOPORT=y | 852 | CONFIG_HAS_IOPORT=y |
| 841 | CONFIG_HAS_DMA=y | 853 | CONFIG_HAS_DMA=y |
| 854 | CONFIG_HAVE_LMB=y | ||
| 842 | 855 | ||
| 843 | # | 856 | # |
| 844 | # Kernel hacking | 857 | # Kernel hacking |
| @@ -846,6 +859,7 @@ CONFIG_HAS_DMA=y | |||
| 846 | # CONFIG_PRINTK_TIME is not set | 859 | # CONFIG_PRINTK_TIME is not set |
| 847 | CONFIG_ENABLE_WARN_DEPRECATED=y | 860 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 848 | CONFIG_ENABLE_MUST_CHECK=y | 861 | CONFIG_ENABLE_MUST_CHECK=y |
| 862 | CONFIG_FRAME_WARN=1024 | ||
| 849 | # CONFIG_MAGIC_SYSRQ is not set | 863 | # CONFIG_MAGIC_SYSRQ is not set |
| 850 | # CONFIG_UNUSED_SYMBOLS is not set | 864 | # CONFIG_UNUSED_SYMBOLS is not set |
| 851 | # CONFIG_DEBUG_FS is not set | 865 | # CONFIG_DEBUG_FS is not set |
| @@ -856,6 +870,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 856 | CONFIG_SCHED_DEBUG=y | 870 | CONFIG_SCHED_DEBUG=y |
| 857 | # CONFIG_SCHEDSTATS is not set | 871 | # CONFIG_SCHEDSTATS is not set |
| 858 | # CONFIG_TIMER_STATS is not set | 872 | # CONFIG_TIMER_STATS is not set |
| 873 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 859 | # CONFIG_SLUB_DEBUG_ON is not set | 874 | # CONFIG_SLUB_DEBUG_ON is not set |
| 860 | # CONFIG_SLUB_STATS is not set | 875 | # CONFIG_SLUB_STATS is not set |
| 861 | # CONFIG_DEBUG_RT_MUTEXES is not set | 876 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -868,6 +883,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 868 | # CONFIG_DEBUG_BUGVERBOSE is not set | 883 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 869 | # CONFIG_DEBUG_INFO is not set | 884 | # CONFIG_DEBUG_INFO is not set |
| 870 | # CONFIG_DEBUG_VM is not set | 885 | # CONFIG_DEBUG_VM is not set |
| 886 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 871 | # CONFIG_DEBUG_LIST is not set | 887 | # CONFIG_DEBUG_LIST is not set |
| 872 | # CONFIG_DEBUG_SG is not set | 888 | # CONFIG_DEBUG_SG is not set |
| 873 | # CONFIG_BOOT_PRINTK_DELAY is not set | 889 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -878,6 +894,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 878 | # CONFIG_DEBUG_STACK_USAGE is not set | 894 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 879 | # CONFIG_DEBUG_PAGEALLOC is not set | 895 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 880 | # CONFIG_DEBUGGER is not set | 896 | # CONFIG_DEBUGGER is not set |
| 897 | # CONFIG_IRQSTACKS is not set | ||
| 881 | # CONFIG_BDI_SWITCH is not set | 898 | # CONFIG_BDI_SWITCH is not set |
| 882 | # CONFIG_PPC_EARLY_DEBUG is not set | 899 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 883 | 900 | ||
| @@ -888,48 +905,78 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 888 | # CONFIG_SECURITY is not set | 905 | # CONFIG_SECURITY is not set |
| 889 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 906 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 890 | CONFIG_CRYPTO=y | 907 | CONFIG_CRYPTO=y |
| 891 | # CONFIG_CRYPTO_SEQIV is not set | 908 | |
| 909 | # | ||
| 910 | # Crypto core or helper | ||
| 911 | # | ||
| 892 | # CONFIG_CRYPTO_MANAGER is not set | 912 | # CONFIG_CRYPTO_MANAGER is not set |
| 913 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 914 | # CONFIG_CRYPTO_NULL is not set | ||
| 915 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 916 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 917 | |||
| 918 | # | ||
| 919 | # Authenticated Encryption with Associated Data | ||
| 920 | # | ||
| 921 | # CONFIG_CRYPTO_CCM is not set | ||
| 922 | # CONFIG_CRYPTO_GCM is not set | ||
| 923 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 924 | |||
| 925 | # | ||
| 926 | # Block modes | ||
| 927 | # | ||
| 928 | # CONFIG_CRYPTO_CBC is not set | ||
| 929 | # CONFIG_CRYPTO_CTR is not set | ||
| 930 | # CONFIG_CRYPTO_CTS is not set | ||
| 931 | # CONFIG_CRYPTO_ECB is not set | ||
| 932 | # CONFIG_CRYPTO_LRW is not set | ||
| 933 | # CONFIG_CRYPTO_PCBC is not set | ||
| 934 | # CONFIG_CRYPTO_XTS is not set | ||
| 935 | |||
| 936 | # | ||
| 937 | # Hash modes | ||
| 938 | # | ||
| 893 | # CONFIG_CRYPTO_HMAC is not set | 939 | # CONFIG_CRYPTO_HMAC is not set |
| 894 | # CONFIG_CRYPTO_XCBC is not set | 940 | # CONFIG_CRYPTO_XCBC is not set |
| 895 | # CONFIG_CRYPTO_NULL is not set | 941 | |
| 942 | # | ||
| 943 | # Digest | ||
| 944 | # | ||
| 945 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 896 | # CONFIG_CRYPTO_MD4 is not set | 946 | # CONFIG_CRYPTO_MD4 is not set |
| 897 | # CONFIG_CRYPTO_MD5 is not set | 947 | # CONFIG_CRYPTO_MD5 is not set |
| 948 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 898 | # CONFIG_CRYPTO_SHA1 is not set | 949 | # CONFIG_CRYPTO_SHA1 is not set |
| 899 | # CONFIG_CRYPTO_SHA256 is not set | 950 | # CONFIG_CRYPTO_SHA256 is not set |
| 900 | # CONFIG_CRYPTO_SHA512 is not set | 951 | # CONFIG_CRYPTO_SHA512 is not set |
| 901 | # CONFIG_CRYPTO_WP512 is not set | ||
| 902 | # CONFIG_CRYPTO_TGR192 is not set | 952 | # CONFIG_CRYPTO_TGR192 is not set |
| 903 | # CONFIG_CRYPTO_GF128MUL is not set | 953 | # CONFIG_CRYPTO_WP512 is not set |
| 904 | # CONFIG_CRYPTO_ECB is not set | 954 | |
| 905 | # CONFIG_CRYPTO_CBC is not set | 955 | # |
| 906 | # CONFIG_CRYPTO_PCBC is not set | 956 | # Ciphers |
| 907 | # CONFIG_CRYPTO_LRW is not set | 957 | # |
| 908 | # CONFIG_CRYPTO_XTS is not set | ||
| 909 | # CONFIG_CRYPTO_CTR is not set | ||
| 910 | # CONFIG_CRYPTO_GCM is not set | ||
| 911 | # CONFIG_CRYPTO_CCM is not set | ||
| 912 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 913 | # CONFIG_CRYPTO_DES is not set | ||
| 914 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 915 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 916 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 917 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 918 | # CONFIG_CRYPTO_AES is not set | 958 | # CONFIG_CRYPTO_AES is not set |
| 959 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 960 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 961 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 962 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 919 | # CONFIG_CRYPTO_CAST5 is not set | 963 | # CONFIG_CRYPTO_CAST5 is not set |
| 920 | # CONFIG_CRYPTO_CAST6 is not set | 964 | # CONFIG_CRYPTO_CAST6 is not set |
| 921 | # CONFIG_CRYPTO_TEA is not set | 965 | # CONFIG_CRYPTO_DES is not set |
| 922 | # CONFIG_CRYPTO_ARC4 is not set | 966 | # CONFIG_CRYPTO_FCRYPT is not set |
| 923 | # CONFIG_CRYPTO_KHAZAD is not set | 967 | # CONFIG_CRYPTO_KHAZAD is not set |
| 924 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 925 | # CONFIG_CRYPTO_SEED is not set | ||
| 926 | # CONFIG_CRYPTO_SALSA20 is not set | 968 | # CONFIG_CRYPTO_SALSA20 is not set |
| 969 | # CONFIG_CRYPTO_SEED is not set | ||
| 970 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 971 | # CONFIG_CRYPTO_TEA is not set | ||
| 972 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 973 | |||
| 974 | # | ||
| 975 | # Compression | ||
| 976 | # | ||
| 927 | # CONFIG_CRYPTO_DEFLATE is not set | 977 | # CONFIG_CRYPTO_DEFLATE is not set |
| 928 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 929 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 930 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 931 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 932 | # CONFIG_CRYPTO_LZO is not set | 978 | # CONFIG_CRYPTO_LZO is not set |
| 933 | CONFIG_CRYPTO_HW=y | 979 | CONFIG_CRYPTO_HW=y |
| 934 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 980 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 935 | # CONFIG_PPC_CLOCK is not set | 981 | # CONFIG_PPC_CLOCK is not set |
| 982 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig index 67f67978c742..24f7f44b4821 100644 --- a/arch/powerpc/configs/85xx/sbc8548_defconfig +++ b/arch/powerpc/configs/85xx/sbc8548_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:39 2008 | 4 | # Mon Jun 9 08:52:37 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 94 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 92 | CONFIG_HOTPLUG=y | 95 | CONFIG_HOTPLUG=y |
| @@ -111,6 +114,7 @@ CONFIG_SLAB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -206,11 +211,13 @@ CONFIG_FLATMEM=y | |||
| 206 | CONFIG_FLAT_NODE_MEM_MAP=y | 211 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 207 | # CONFIG_SPARSEMEM_STATIC is not set | 212 | # CONFIG_SPARSEMEM_STATIC is not set |
| 208 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 214 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 209 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 210 | # CONFIG_RESOURCES_64BIT is not set | 216 | # CONFIG_RESOURCES_64BIT is not set |
| 211 | CONFIG_ZONE_DMA_FLAG=1 | 217 | CONFIG_ZONE_DMA_FLAG=1 |
| 212 | CONFIG_BOUNCE=y | 218 | CONFIG_BOUNCE=y |
| 213 | CONFIG_VIRT_TO_BUS=y | 219 | CONFIG_VIRT_TO_BUS=y |
| 220 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 214 | CONFIG_PROC_DEVICETREE=y | 221 | CONFIG_PROC_DEVICETREE=y |
| 215 | # CONFIG_CMDLINE_BOOL is not set | 222 | # CONFIG_CMDLINE_BOOL is not set |
| 216 | # CONFIG_PM is not set | 223 | # CONFIG_PM is not set |
| @@ -233,6 +240,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 233 | CONFIG_PCI_LEGACY=y | 240 | CONFIG_PCI_LEGACY=y |
| 234 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 235 | # CONFIG_HOTPLUG_PCI is not set | 242 | # CONFIG_HOTPLUG_PCI is not set |
| 243 | # CONFIG_HAS_RAPIDIO is not set | ||
| 236 | 244 | ||
| 237 | # | 245 | # |
| 238 | # Advanced setup | 246 | # Advanced setup |
| @@ -242,11 +250,12 @@ CONFIG_PCI_LEGACY=y | |||
| 242 | # | 250 | # |
| 243 | # Default settings for advanced configuration options are used | 251 | # Default settings for advanced configuration options are used |
| 244 | # | 252 | # |
| 245 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 246 | CONFIG_LOWMEM_SIZE=0x30000000 | 253 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 254 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 247 | CONFIG_KERNEL_START=0xc0000000 | 255 | CONFIG_KERNEL_START=0xc0000000 |
| 256 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 257 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 248 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 249 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 250 | 259 | ||
| 251 | # | 260 | # |
| 252 | # Networking | 261 | # Networking |
| @@ -294,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -449,7 +456,6 @@ CONFIG_NETDEV_1000=y | |||
| 449 | # CONFIG_SIS190 is not set | 456 | # CONFIG_SIS190 is not set |
| 450 | # CONFIG_SKGE is not set | 457 | # CONFIG_SKGE is not set |
| 451 | # CONFIG_SKY2 is not set | 458 | # CONFIG_SKY2 is not set |
| 452 | # CONFIG_SK98LIN is not set | ||
| 453 | # CONFIG_VIA_VELOCITY is not set | 459 | # CONFIG_VIA_VELOCITY is not set |
| 454 | # CONFIG_TIGON3 is not set | 460 | # CONFIG_TIGON3 is not set |
| 455 | # CONFIG_BNX2 is not set | 461 | # CONFIG_BNX2 is not set |
| @@ -469,6 +475,7 @@ CONFIG_NETDEV_10000=y | |||
| 469 | # CONFIG_MLX4_CORE is not set | 475 | # CONFIG_MLX4_CORE is not set |
| 470 | # CONFIG_TEHUTI is not set | 476 | # CONFIG_TEHUTI is not set |
| 471 | # CONFIG_BNX2X is not set | 477 | # CONFIG_BNX2X is not set |
| 478 | # CONFIG_SFC is not set | ||
| 472 | # CONFIG_TR is not set | 479 | # CONFIG_TR is not set |
| 473 | 480 | ||
| 474 | # | 481 | # |
| @@ -476,6 +483,7 @@ CONFIG_NETDEV_10000=y | |||
| 476 | # | 483 | # |
| 477 | # CONFIG_WLAN_PRE80211 is not set | 484 | # CONFIG_WLAN_PRE80211 is not set |
| 478 | # CONFIG_WLAN_80211 is not set | 485 | # CONFIG_WLAN_80211 is not set |
| 486 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 479 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
| 480 | # CONFIG_FDDI is not set | 488 | # CONFIG_FDDI is not set |
| 481 | # CONFIG_HIPPI is not set | 489 | # CONFIG_HIPPI is not set |
| @@ -522,6 +530,7 @@ CONFIG_INPUT=y | |||
| 522 | # Character devices | 530 | # Character devices |
| 523 | # | 531 | # |
| 524 | # CONFIG_VT is not set | 532 | # CONFIG_VT is not set |
| 533 | CONFIG_DEVKMEM=y | ||
| 525 | # CONFIG_SERIAL_NONSTANDARD is not set | 534 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 526 | # CONFIG_NOZOMI is not set | 535 | # CONFIG_NOZOMI is not set |
| 527 | 536 | ||
| @@ -558,12 +567,7 @@ CONFIG_GEN_RTC=y | |||
| 558 | # CONFIG_TCG_TPM is not set | 567 | # CONFIG_TCG_TPM is not set |
| 559 | CONFIG_DEVPORT=y | 568 | CONFIG_DEVPORT=y |
| 560 | # CONFIG_I2C is not set | 569 | # CONFIG_I2C is not set |
| 561 | |||
| 562 | # | ||
| 563 | # SPI support | ||
| 564 | # | ||
| 565 | # CONFIG_SPI is not set | 570 | # CONFIG_SPI is not set |
| 566 | # CONFIG_SPI_MASTER is not set | ||
| 567 | # CONFIG_W1 is not set | 571 | # CONFIG_W1 is not set |
| 568 | # CONFIG_POWER_SUPPLY is not set | 572 | # CONFIG_POWER_SUPPLY is not set |
| 569 | CONFIG_HWMON=y | 573 | CONFIG_HWMON=y |
| @@ -596,12 +600,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 596 | # Multifunction device drivers | 600 | # Multifunction device drivers |
| 597 | # | 601 | # |
| 598 | # CONFIG_MFD_SM501 is not set | 602 | # CONFIG_MFD_SM501 is not set |
| 603 | # CONFIG_HTC_PASIC3 is not set | ||
| 599 | 604 | ||
| 600 | # | 605 | # |
| 601 | # Multimedia devices | 606 | # Multimedia devices |
| 602 | # | 607 | # |
| 608 | |||
| 609 | # | ||
| 610 | # Multimedia core support | ||
| 611 | # | ||
| 603 | # CONFIG_VIDEO_DEV is not set | 612 | # CONFIG_VIDEO_DEV is not set |
| 604 | # CONFIG_DVB_CORE is not set | 613 | # CONFIG_DVB_CORE is not set |
| 614 | # CONFIG_VIDEO_MEDIA is not set | ||
| 615 | |||
| 616 | # | ||
| 617 | # Multimedia drivers | ||
| 618 | # | ||
| 605 | CONFIG_DAB=y | 619 | CONFIG_DAB=y |
| 606 | 620 | ||
| 607 | # | 621 | # |
| @@ -628,14 +642,11 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 628 | # CONFIG_MMC is not set | 642 | # CONFIG_MMC is not set |
| 629 | # CONFIG_MEMSTICK is not set | 643 | # CONFIG_MEMSTICK is not set |
| 630 | # CONFIG_NEW_LEDS is not set | 644 | # CONFIG_NEW_LEDS is not set |
| 645 | # CONFIG_ACCESSIBILITY is not set | ||
| 631 | # CONFIG_INFINIBAND is not set | 646 | # CONFIG_INFINIBAND is not set |
| 632 | # CONFIG_EDAC is not set | 647 | # CONFIG_EDAC is not set |
| 633 | # CONFIG_RTC_CLASS is not set | 648 | # CONFIG_RTC_CLASS is not set |
| 634 | # CONFIG_DMADEVICES is not set | 649 | # CONFIG_DMADEVICES is not set |
| 635 | |||
| 636 | # | ||
| 637 | # Userspace I/O | ||
| 638 | # | ||
| 639 | # CONFIG_UIO is not set | 650 | # CONFIG_UIO is not set |
| 640 | 651 | ||
| 641 | # | 652 | # |
| @@ -648,7 +659,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 648 | # CONFIG_JFS_FS is not set | 659 | # CONFIG_JFS_FS is not set |
| 649 | # CONFIG_FS_POSIX_ACL is not set | 660 | # CONFIG_FS_POSIX_ACL is not set |
| 650 | # CONFIG_XFS_FS is not set | 661 | # CONFIG_XFS_FS is not set |
| 651 | # CONFIG_GFS2_FS is not set | ||
| 652 | # CONFIG_OCFS2_FS is not set | 662 | # CONFIG_OCFS2_FS is not set |
| 653 | CONFIG_DNOTIFY=y | 663 | CONFIG_DNOTIFY=y |
| 654 | CONFIG_INOTIFY=y | 664 | CONFIG_INOTIFY=y |
| @@ -705,7 +715,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 705 | CONFIG_NFS_FS=y | 715 | CONFIG_NFS_FS=y |
| 706 | # CONFIG_NFS_V3 is not set | 716 | # CONFIG_NFS_V3 is not set |
| 707 | # CONFIG_NFS_V4 is not set | 717 | # CONFIG_NFS_V4 is not set |
| 708 | # CONFIG_NFS_DIRECTIO is not set | ||
| 709 | # CONFIG_NFSD is not set | 718 | # CONFIG_NFSD is not set |
| 710 | CONFIG_ROOT_NFS=y | 719 | CONFIG_ROOT_NFS=y |
| 711 | CONFIG_LOCKD=y | 720 | CONFIG_LOCKD=y |
| @@ -732,6 +741,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 732 | # Library routines | 741 | # Library routines |
| 733 | # | 742 | # |
| 734 | CONFIG_BITREVERSE=y | 743 | CONFIG_BITREVERSE=y |
| 744 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 735 | # CONFIG_CRC_CCITT is not set | 745 | # CONFIG_CRC_CCITT is not set |
| 736 | # CONFIG_CRC16 is not set | 746 | # CONFIG_CRC16 is not set |
| 737 | # CONFIG_CRC_ITU_T is not set | 747 | # CONFIG_CRC_ITU_T is not set |
| @@ -742,6 +752,7 @@ CONFIG_PLIST=y | |||
| 742 | CONFIG_HAS_IOMEM=y | 752 | CONFIG_HAS_IOMEM=y |
| 743 | CONFIG_HAS_IOPORT=y | 753 | CONFIG_HAS_IOPORT=y |
| 744 | CONFIG_HAS_DMA=y | 754 | CONFIG_HAS_DMA=y |
| 755 | CONFIG_HAVE_LMB=y | ||
| 745 | 756 | ||
| 746 | # | 757 | # |
| 747 | # Kernel hacking | 758 | # Kernel hacking |
| @@ -749,6 +760,7 @@ CONFIG_HAS_DMA=y | |||
| 749 | # CONFIG_PRINTK_TIME is not set | 760 | # CONFIG_PRINTK_TIME is not set |
| 750 | CONFIG_ENABLE_WARN_DEPRECATED=y | 761 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 751 | CONFIG_ENABLE_MUST_CHECK=y | 762 | CONFIG_ENABLE_MUST_CHECK=y |
| 763 | CONFIG_FRAME_WARN=1024 | ||
| 752 | # CONFIG_MAGIC_SYSRQ is not set | 764 | # CONFIG_MAGIC_SYSRQ is not set |
| 753 | # CONFIG_UNUSED_SYMBOLS is not set | 765 | # CONFIG_UNUSED_SYMBOLS is not set |
| 754 | # CONFIG_DEBUG_FS is not set | 766 | # CONFIG_DEBUG_FS is not set |
| @@ -756,6 +768,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 756 | # CONFIG_DEBUG_KERNEL is not set | 768 | # CONFIG_DEBUG_KERNEL is not set |
| 757 | # CONFIG_DEBUG_BUGVERBOSE is not set | 769 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 758 | # CONFIG_SAMPLES is not set | 770 | # CONFIG_SAMPLES is not set |
| 771 | # CONFIG_IRQSTACKS is not set | ||
| 759 | # CONFIG_PPC_EARLY_DEBUG is not set | 772 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 760 | 773 | ||
| 761 | # | 774 | # |
| @@ -765,48 +778,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 765 | # CONFIG_SECURITY is not set | 778 | # CONFIG_SECURITY is not set |
| 766 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 779 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 767 | CONFIG_CRYPTO=y | 780 | CONFIG_CRYPTO=y |
| 768 | # CONFIG_CRYPTO_SEQIV is not set | 781 | |
| 782 | # | ||
| 783 | # Crypto core or helper | ||
| 784 | # | ||
| 769 | # CONFIG_CRYPTO_MANAGER is not set | 785 | # CONFIG_CRYPTO_MANAGER is not set |
| 786 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 787 | # CONFIG_CRYPTO_NULL is not set | ||
| 788 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 789 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 790 | |||
| 791 | # | ||
| 792 | # Authenticated Encryption with Associated Data | ||
| 793 | # | ||
| 794 | # CONFIG_CRYPTO_CCM is not set | ||
| 795 | # CONFIG_CRYPTO_GCM is not set | ||
| 796 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 797 | |||
| 798 | # | ||
| 799 | # Block modes | ||
| 800 | # | ||
| 801 | # CONFIG_CRYPTO_CBC is not set | ||
| 802 | # CONFIG_CRYPTO_CTR is not set | ||
| 803 | # CONFIG_CRYPTO_CTS is not set | ||
| 804 | # CONFIG_CRYPTO_ECB is not set | ||
| 805 | # CONFIG_CRYPTO_LRW is not set | ||
| 806 | # CONFIG_CRYPTO_PCBC is not set | ||
| 807 | # CONFIG_CRYPTO_XTS is not set | ||
| 808 | |||
| 809 | # | ||
| 810 | # Hash modes | ||
| 811 | # | ||
| 770 | # CONFIG_CRYPTO_HMAC is not set | 812 | # CONFIG_CRYPTO_HMAC is not set |
| 771 | # CONFIG_CRYPTO_XCBC is not set | 813 | # CONFIG_CRYPTO_XCBC is not set |
| 772 | # CONFIG_CRYPTO_NULL is not set | 814 | |
| 815 | # | ||
| 816 | # Digest | ||
| 817 | # | ||
| 818 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 773 | # CONFIG_CRYPTO_MD4 is not set | 819 | # CONFIG_CRYPTO_MD4 is not set |
| 774 | # CONFIG_CRYPTO_MD5 is not set | 820 | # CONFIG_CRYPTO_MD5 is not set |
| 821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 775 | # CONFIG_CRYPTO_SHA1 is not set | 822 | # CONFIG_CRYPTO_SHA1 is not set |
| 776 | # CONFIG_CRYPTO_SHA256 is not set | 823 | # CONFIG_CRYPTO_SHA256 is not set |
| 777 | # CONFIG_CRYPTO_SHA512 is not set | 824 | # CONFIG_CRYPTO_SHA512 is not set |
| 778 | # CONFIG_CRYPTO_WP512 is not set | ||
| 779 | # CONFIG_CRYPTO_TGR192 is not set | 825 | # CONFIG_CRYPTO_TGR192 is not set |
| 780 | # CONFIG_CRYPTO_GF128MUL is not set | 826 | # CONFIG_CRYPTO_WP512 is not set |
| 781 | # CONFIG_CRYPTO_ECB is not set | 827 | |
| 782 | # CONFIG_CRYPTO_CBC is not set | 828 | # |
| 783 | # CONFIG_CRYPTO_PCBC is not set | 829 | # Ciphers |
| 784 | # CONFIG_CRYPTO_LRW is not set | 830 | # |
| 785 | # CONFIG_CRYPTO_XTS is not set | ||
| 786 | # CONFIG_CRYPTO_CTR is not set | ||
| 787 | # CONFIG_CRYPTO_GCM is not set | ||
| 788 | # CONFIG_CRYPTO_CCM is not set | ||
| 789 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 790 | # CONFIG_CRYPTO_DES is not set | ||
| 791 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 792 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 793 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 794 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 795 | # CONFIG_CRYPTO_AES is not set | 831 | # CONFIG_CRYPTO_AES is not set |
| 832 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 833 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 834 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 835 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 796 | # CONFIG_CRYPTO_CAST5 is not set | 836 | # CONFIG_CRYPTO_CAST5 is not set |
| 797 | # CONFIG_CRYPTO_CAST6 is not set | 837 | # CONFIG_CRYPTO_CAST6 is not set |
| 798 | # CONFIG_CRYPTO_TEA is not set | 838 | # CONFIG_CRYPTO_DES is not set |
| 799 | # CONFIG_CRYPTO_ARC4 is not set | 839 | # CONFIG_CRYPTO_FCRYPT is not set |
| 800 | # CONFIG_CRYPTO_KHAZAD is not set | 840 | # CONFIG_CRYPTO_KHAZAD is not set |
| 801 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 802 | # CONFIG_CRYPTO_SEED is not set | ||
| 803 | # CONFIG_CRYPTO_SALSA20 is not set | 841 | # CONFIG_CRYPTO_SALSA20 is not set |
| 842 | # CONFIG_CRYPTO_SEED is not set | ||
| 843 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 844 | # CONFIG_CRYPTO_TEA is not set | ||
| 845 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 846 | |||
| 847 | # | ||
| 848 | # Compression | ||
| 849 | # | ||
| 804 | # CONFIG_CRYPTO_DEFLATE is not set | 850 | # CONFIG_CRYPTO_DEFLATE is not set |
| 805 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 806 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 807 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 808 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 809 | # CONFIG_CRYPTO_LZO is not set | 851 | # CONFIG_CRYPTO_LZO is not set |
| 810 | CONFIG_CRYPTO_HW=y | 852 | CONFIG_CRYPTO_HW=y |
| 811 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 853 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 812 | # CONFIG_PPC_CLOCK is not set | 854 | # CONFIG_PPC_CLOCK is not set |
| 855 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index fef605579e29..655518dcd73f 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:39 2008 | 4 | # Mon Jun 9 08:52:38 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -112,6 +115,7 @@ CONFIG_SLAB=y | |||
| 112 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
| 113 | CONFIG_HAVE_KPROBES=y | 116 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 117 | CONFIG_HAVE_KRETPROBES=y |
| 118 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 119 | CONFIG_PROC_PAGE_MONITOR=y |
| 116 | CONFIG_SLABINFO=y | 120 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 121 | CONFIG_RT_MUTEXES=y |
| @@ -152,6 +156,7 @@ CONFIG_MPC85xx=y | |||
| 152 | # CONFIG_MPC85xx_CDS is not set | 156 | # CONFIG_MPC85xx_CDS is not set |
| 153 | # CONFIG_MPC85xx_MDS is not set | 157 | # CONFIG_MPC85xx_MDS is not set |
| 154 | # CONFIG_MPC85xx_DS is not set | 158 | # CONFIG_MPC85xx_DS is not set |
| 159 | # CONFIG_KSI8560 is not set | ||
| 155 | # CONFIG_STX_GP3 is not set | 160 | # CONFIG_STX_GP3 is not set |
| 156 | # CONFIG_TQM8540 is not set | 161 | # CONFIG_TQM8540 is not set |
| 157 | # CONFIG_TQM8541 is not set | 162 | # CONFIG_TQM8541 is not set |
| @@ -207,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 207 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 208 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 209 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 211 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 212 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 213 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 214 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 215 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
| 216 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 217 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -228,6 +235,7 @@ CONFIG_FSL_SOC=y | |||
| 228 | # CONFIG_PCI_SYSCALL is not set | 235 | # CONFIG_PCI_SYSCALL is not set |
| 229 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 230 | # CONFIG_PCCARD is not set | 237 | # CONFIG_PCCARD is not set |
| 238 | # CONFIG_HAS_RAPIDIO is not set | ||
| 231 | 239 | ||
| 232 | # | 240 | # |
| 233 | # Advanced setup | 241 | # Advanced setup |
| @@ -237,11 +245,12 @@ CONFIG_FSL_SOC=y | |||
| 237 | # | 245 | # |
| 238 | # Default settings for advanced configuration options are used | 246 | # Default settings for advanced configuration options are used |
| 239 | # | 247 | # |
| 240 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 241 | CONFIG_LOWMEM_SIZE=0x30000000 | 248 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 249 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 242 | CONFIG_KERNEL_START=0xc0000000 | 250 | CONFIG_KERNEL_START=0xc0000000 |
| 251 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 252 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 243 | CONFIG_TASK_SIZE=0xc0000000 | 253 | CONFIG_TASK_SIZE=0xc0000000 |
| 244 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 245 | 254 | ||
| 246 | # | 255 | # |
| 247 | # Networking | 256 | # Networking |
| @@ -289,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 289 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 290 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 291 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 292 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 293 | # CONFIG_INET6_TUNNEL is not set | ||
| 294 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 295 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 296 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -418,6 +425,7 @@ CONFIG_NETDEV_10000=y | |||
| 418 | # | 425 | # |
| 419 | # CONFIG_WLAN_PRE80211 is not set | 426 | # CONFIG_WLAN_PRE80211 is not set |
| 420 | # CONFIG_WLAN_80211 is not set | 427 | # CONFIG_WLAN_80211 is not set |
| 428 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 421 | # CONFIG_WAN is not set | 429 | # CONFIG_WAN is not set |
| 422 | # CONFIG_PPP is not set | 430 | # CONFIG_PPP is not set |
| 423 | # CONFIG_SLIP is not set | 431 | # CONFIG_SLIP is not set |
| @@ -462,6 +470,7 @@ CONFIG_INPUT=y | |||
| 462 | # Character devices | 470 | # Character devices |
| 463 | # | 471 | # |
| 464 | # CONFIG_VT is not set | 472 | # CONFIG_VT is not set |
| 473 | CONFIG_DEVKMEM=y | ||
| 465 | # CONFIG_SERIAL_NONSTANDARD is not set | 474 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 466 | 475 | ||
| 467 | # | 476 | # |
| @@ -487,17 +496,11 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 487 | # CONFIG_IPMI_HANDLER is not set | 496 | # CONFIG_IPMI_HANDLER is not set |
| 488 | # CONFIG_HW_RANDOM is not set | 497 | # CONFIG_HW_RANDOM is not set |
| 489 | # CONFIG_NVRAM is not set | 498 | # CONFIG_NVRAM is not set |
| 490 | # CONFIG_GEN_RTC is not set | ||
| 491 | # CONFIG_R3964 is not set | 499 | # CONFIG_R3964 is not set |
| 492 | # CONFIG_RAW_DRIVER is not set | 500 | # CONFIG_RAW_DRIVER is not set |
| 493 | # CONFIG_TCG_TPM is not set | 501 | # CONFIG_TCG_TPM is not set |
| 494 | # CONFIG_I2C is not set | 502 | # CONFIG_I2C is not set |
| 495 | |||
| 496 | # | ||
| 497 | # SPI support | ||
| 498 | # | ||
| 499 | # CONFIG_SPI is not set | 503 | # CONFIG_SPI is not set |
| 500 | # CONFIG_SPI_MASTER is not set | ||
| 501 | # CONFIG_W1 is not set | 504 | # CONFIG_W1 is not set |
| 502 | # CONFIG_POWER_SUPPLY is not set | 505 | # CONFIG_POWER_SUPPLY is not set |
| 503 | CONFIG_HWMON=y | 506 | CONFIG_HWMON=y |
| @@ -526,12 +529,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 526 | # Multifunction device drivers | 529 | # Multifunction device drivers |
| 527 | # | 530 | # |
| 528 | # CONFIG_MFD_SM501 is not set | 531 | # CONFIG_MFD_SM501 is not set |
| 532 | # CONFIG_HTC_PASIC3 is not set | ||
| 529 | 533 | ||
| 530 | # | 534 | # |
| 531 | # Multimedia devices | 535 | # Multimedia devices |
| 532 | # | 536 | # |
| 537 | |||
| 538 | # | ||
| 539 | # Multimedia core support | ||
| 540 | # | ||
| 533 | # CONFIG_VIDEO_DEV is not set | 541 | # CONFIG_VIDEO_DEV is not set |
| 534 | # CONFIG_DVB_CORE is not set | 542 | # CONFIG_DVB_CORE is not set |
| 543 | # CONFIG_VIDEO_MEDIA is not set | ||
| 544 | |||
| 545 | # | ||
| 546 | # Multimedia drivers | ||
| 547 | # | ||
| 535 | CONFIG_DAB=y | 548 | CONFIG_DAB=y |
| 536 | 549 | ||
| 537 | # | 550 | # |
| @@ -559,6 +572,8 @@ CONFIG_USB_SUPPORT=y | |||
| 559 | # CONFIG_USB_ARCH_HAS_HCD is not set | 572 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 560 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 573 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 561 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 574 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 575 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 576 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 562 | 577 | ||
| 563 | # | 578 | # |
| 564 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 579 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -567,6 +582,7 @@ CONFIG_USB_SUPPORT=y | |||
| 567 | # CONFIG_MMC is not set | 582 | # CONFIG_MMC is not set |
| 568 | # CONFIG_MEMSTICK is not set | 583 | # CONFIG_MEMSTICK is not set |
| 569 | # CONFIG_NEW_LEDS is not set | 584 | # CONFIG_NEW_LEDS is not set |
| 585 | # CONFIG_ACCESSIBILITY is not set | ||
| 570 | # CONFIG_EDAC is not set | 586 | # CONFIG_EDAC is not set |
| 571 | CONFIG_RTC_LIB=y | 587 | CONFIG_RTC_LIB=y |
| 572 | CONFIG_RTC_CLASS=y | 588 | CONFIG_RTC_CLASS=y |
| @@ -602,11 +618,8 @@ CONFIG_RTC_DRV_M48T59=y | |||
| 602 | # | 618 | # |
| 603 | # on-CPU RTC drivers | 619 | # on-CPU RTC drivers |
| 604 | # | 620 | # |
| 621 | # CONFIG_RTC_DRV_PPC is not set | ||
| 605 | # CONFIG_DMADEVICES is not set | 622 | # CONFIG_DMADEVICES is not set |
| 606 | |||
| 607 | # | ||
| 608 | # Userspace I/O | ||
| 609 | # | ||
| 610 | # CONFIG_UIO is not set | 623 | # CONFIG_UIO is not set |
| 611 | 624 | ||
| 612 | # | 625 | # |
| @@ -619,7 +632,6 @@ CONFIG_RTC_DRV_M48T59=y | |||
| 619 | # CONFIG_JFS_FS is not set | 632 | # CONFIG_JFS_FS is not set |
| 620 | # CONFIG_FS_POSIX_ACL is not set | 633 | # CONFIG_FS_POSIX_ACL is not set |
| 621 | # CONFIG_XFS_FS is not set | 634 | # CONFIG_XFS_FS is not set |
| 622 | # CONFIG_GFS2_FS is not set | ||
| 623 | # CONFIG_OCFS2_FS is not set | 635 | # CONFIG_OCFS2_FS is not set |
| 624 | CONFIG_DNOTIFY=y | 636 | CONFIG_DNOTIFY=y |
| 625 | CONFIG_INOTIFY=y | 637 | CONFIG_INOTIFY=y |
| @@ -676,7 +688,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 676 | CONFIG_NFS_FS=y | 688 | CONFIG_NFS_FS=y |
| 677 | # CONFIG_NFS_V3 is not set | 689 | # CONFIG_NFS_V3 is not set |
| 678 | # CONFIG_NFS_V4 is not set | 690 | # CONFIG_NFS_V4 is not set |
| 679 | # CONFIG_NFS_DIRECTIO is not set | ||
| 680 | # CONFIG_NFSD is not set | 691 | # CONFIG_NFSD is not set |
| 681 | CONFIG_ROOT_NFS=y | 692 | CONFIG_ROOT_NFS=y |
| 682 | CONFIG_LOCKD=y | 693 | CONFIG_LOCKD=y |
| @@ -715,6 +726,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 715 | # Library routines | 726 | # Library routines |
| 716 | # | 727 | # |
| 717 | CONFIG_BITREVERSE=y | 728 | CONFIG_BITREVERSE=y |
| 729 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 718 | # CONFIG_CRC_CCITT is not set | 730 | # CONFIG_CRC_CCITT is not set |
| 719 | # CONFIG_CRC16 is not set | 731 | # CONFIG_CRC16 is not set |
| 720 | # CONFIG_CRC_ITU_T is not set | 732 | # CONFIG_CRC_ITU_T is not set |
| @@ -725,6 +737,7 @@ CONFIG_PLIST=y | |||
| 725 | CONFIG_HAS_IOMEM=y | 737 | CONFIG_HAS_IOMEM=y |
| 726 | CONFIG_HAS_IOPORT=y | 738 | CONFIG_HAS_IOPORT=y |
| 727 | CONFIG_HAS_DMA=y | 739 | CONFIG_HAS_DMA=y |
| 740 | CONFIG_HAVE_LMB=y | ||
| 728 | 741 | ||
| 729 | # | 742 | # |
| 730 | # Kernel hacking | 743 | # Kernel hacking |
| @@ -732,6 +745,7 @@ CONFIG_HAS_DMA=y | |||
| 732 | # CONFIG_PRINTK_TIME is not set | 745 | # CONFIG_PRINTK_TIME is not set |
| 733 | CONFIG_ENABLE_WARN_DEPRECATED=y | 746 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 734 | CONFIG_ENABLE_MUST_CHECK=y | 747 | CONFIG_ENABLE_MUST_CHECK=y |
| 748 | CONFIG_FRAME_WARN=1024 | ||
| 735 | CONFIG_MAGIC_SYSRQ=y | 749 | CONFIG_MAGIC_SYSRQ=y |
| 736 | # CONFIG_UNUSED_SYMBOLS is not set | 750 | # CONFIG_UNUSED_SYMBOLS is not set |
| 737 | # CONFIG_DEBUG_FS is not set | 751 | # CONFIG_DEBUG_FS is not set |
| @@ -742,6 +756,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 742 | CONFIG_SCHED_DEBUG=y | 756 | CONFIG_SCHED_DEBUG=y |
| 743 | # CONFIG_SCHEDSTATS is not set | 757 | # CONFIG_SCHEDSTATS is not set |
| 744 | # CONFIG_TIMER_STATS is not set | 758 | # CONFIG_TIMER_STATS is not set |
| 759 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 745 | # CONFIG_DEBUG_SLAB is not set | 760 | # CONFIG_DEBUG_SLAB is not set |
| 746 | # CONFIG_DEBUG_RT_MUTEXES is not set | 761 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 747 | # CONFIG_RT_MUTEX_TESTER is not set | 762 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -753,6 +768,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 753 | # CONFIG_DEBUG_BUGVERBOSE is not set | 768 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 754 | # CONFIG_DEBUG_INFO is not set | 769 | # CONFIG_DEBUG_INFO is not set |
| 755 | # CONFIG_DEBUG_VM is not set | 770 | # CONFIG_DEBUG_VM is not set |
| 771 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 756 | # CONFIG_DEBUG_LIST is not set | 772 | # CONFIG_DEBUG_LIST is not set |
| 757 | # CONFIG_DEBUG_SG is not set | 773 | # CONFIG_DEBUG_SG is not set |
| 758 | # CONFIG_BOOT_PRINTK_DELAY is not set | 774 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -763,6 +779,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
| 763 | # CONFIG_DEBUG_STACK_USAGE is not set | 779 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 764 | # CONFIG_DEBUG_PAGEALLOC is not set | 780 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 765 | # CONFIG_DEBUGGER is not set | 781 | # CONFIG_DEBUGGER is not set |
| 782 | # CONFIG_IRQSTACKS is not set | ||
| 766 | # CONFIG_BDI_SWITCH is not set | 783 | # CONFIG_BDI_SWITCH is not set |
| 767 | CONFIG_PPC_EARLY_DEBUG=y | 784 | CONFIG_PPC_EARLY_DEBUG=y |
| 768 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 785 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
| @@ -784,47 +801,77 @@ CONFIG_PPC_EARLY_DEBUG=y | |||
| 784 | # CONFIG_SECURITY is not set | 801 | # CONFIG_SECURITY is not set |
| 785 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 802 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 786 | CONFIG_CRYPTO=y | 803 | CONFIG_CRYPTO=y |
| 787 | # CONFIG_CRYPTO_SEQIV is not set | 804 | |
| 805 | # | ||
| 806 | # Crypto core or helper | ||
| 807 | # | ||
| 788 | # CONFIG_CRYPTO_MANAGER is not set | 808 | # CONFIG_CRYPTO_MANAGER is not set |
| 809 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 810 | # CONFIG_CRYPTO_NULL is not set | ||
| 811 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 812 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 813 | |||
| 814 | # | ||
| 815 | # Authenticated Encryption with Associated Data | ||
| 816 | # | ||
| 817 | # CONFIG_CRYPTO_CCM is not set | ||
| 818 | # CONFIG_CRYPTO_GCM is not set | ||
| 819 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 820 | |||
| 821 | # | ||
| 822 | # Block modes | ||
| 823 | # | ||
| 824 | # CONFIG_CRYPTO_CBC is not set | ||
| 825 | # CONFIG_CRYPTO_CTR is not set | ||
| 826 | # CONFIG_CRYPTO_CTS is not set | ||
| 827 | # CONFIG_CRYPTO_ECB is not set | ||
| 828 | # CONFIG_CRYPTO_LRW is not set | ||
| 829 | # CONFIG_CRYPTO_PCBC is not set | ||
| 830 | # CONFIG_CRYPTO_XTS is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # Hash modes | ||
| 834 | # | ||
| 789 | # CONFIG_CRYPTO_HMAC is not set | 835 | # CONFIG_CRYPTO_HMAC is not set |
| 790 | # CONFIG_CRYPTO_XCBC is not set | 836 | # CONFIG_CRYPTO_XCBC is not set |
| 791 | # CONFIG_CRYPTO_NULL is not set | 837 | |
| 838 | # | ||
| 839 | # Digest | ||
| 840 | # | ||
| 841 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 792 | # CONFIG_CRYPTO_MD4 is not set | 842 | # CONFIG_CRYPTO_MD4 is not set |
| 793 | # CONFIG_CRYPTO_MD5 is not set | 843 | # CONFIG_CRYPTO_MD5 is not set |
| 844 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 794 | # CONFIG_CRYPTO_SHA1 is not set | 845 | # CONFIG_CRYPTO_SHA1 is not set |
| 795 | # CONFIG_CRYPTO_SHA256 is not set | 846 | # CONFIG_CRYPTO_SHA256 is not set |
| 796 | # CONFIG_CRYPTO_SHA512 is not set | 847 | # CONFIG_CRYPTO_SHA512 is not set |
| 797 | # CONFIG_CRYPTO_WP512 is not set | ||
| 798 | # CONFIG_CRYPTO_TGR192 is not set | 848 | # CONFIG_CRYPTO_TGR192 is not set |
| 799 | # CONFIG_CRYPTO_GF128MUL is not set | 849 | # CONFIG_CRYPTO_WP512 is not set |
| 800 | # CONFIG_CRYPTO_ECB is not set | 850 | |
| 801 | # CONFIG_CRYPTO_CBC is not set | 851 | # |
| 802 | # CONFIG_CRYPTO_PCBC is not set | 852 | # Ciphers |
| 803 | # CONFIG_CRYPTO_LRW is not set | 853 | # |
| 804 | # CONFIG_CRYPTO_XTS is not set | ||
| 805 | # CONFIG_CRYPTO_CTR is not set | ||
| 806 | # CONFIG_CRYPTO_GCM is not set | ||
| 807 | # CONFIG_CRYPTO_CCM is not set | ||
| 808 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 809 | # CONFIG_CRYPTO_DES is not set | ||
| 810 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 811 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 812 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 813 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 814 | # CONFIG_CRYPTO_AES is not set | 854 | # CONFIG_CRYPTO_AES is not set |
| 855 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 856 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 857 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 858 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 815 | # CONFIG_CRYPTO_CAST5 is not set | 859 | # CONFIG_CRYPTO_CAST5 is not set |
| 816 | # CONFIG_CRYPTO_CAST6 is not set | 860 | # CONFIG_CRYPTO_CAST6 is not set |
| 817 | # CONFIG_CRYPTO_TEA is not set | 861 | # CONFIG_CRYPTO_DES is not set |
| 818 | # CONFIG_CRYPTO_ARC4 is not set | 862 | # CONFIG_CRYPTO_FCRYPT is not set |
| 819 | # CONFIG_CRYPTO_KHAZAD is not set | 863 | # CONFIG_CRYPTO_KHAZAD is not set |
| 820 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 821 | # CONFIG_CRYPTO_SEED is not set | ||
| 822 | # CONFIG_CRYPTO_SALSA20 is not set | 864 | # CONFIG_CRYPTO_SALSA20 is not set |
| 865 | # CONFIG_CRYPTO_SEED is not set | ||
| 866 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 867 | # CONFIG_CRYPTO_TEA is not set | ||
| 868 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 869 | |||
| 870 | # | ||
| 871 | # Compression | ||
| 872 | # | ||
| 823 | # CONFIG_CRYPTO_DEFLATE is not set | 873 | # CONFIG_CRYPTO_DEFLATE is not set |
| 824 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 825 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 826 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 827 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 828 | # CONFIG_CRYPTO_LZO is not set | 874 | # CONFIG_CRYPTO_LZO is not set |
| 829 | CONFIG_CRYPTO_HW=y | 875 | CONFIG_CRYPTO_HW=y |
| 830 | # CONFIG_PPC_CLOCK is not set | 876 | # CONFIG_PPC_CLOCK is not set |
| 877 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index 1d303c49bb0c..7804ca1ecc94 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:42 2008 | 4 | # Mon Jun 9 08:52:38 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -114,12 +117,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 114 | # CONFIG_KPROBES is not set | 117 | # CONFIG_KPROBES is not set |
| 115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 117 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 118 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 119 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 120 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| 121 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
| 122 | CONFIG_MODULES=y | 126 | CONFIG_MODULES=y |
| 127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 123 | # CONFIG_MODULE_UNLOAD is not set | 128 | # CONFIG_MODULE_UNLOAD is not set |
| 124 | CONFIG_MODVERSIONS=y | 129 | CONFIG_MODVERSIONS=y |
| 125 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 130 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| @@ -158,6 +163,7 @@ CONFIG_MPC85xx=y | |||
| 158 | # CONFIG_MPC85xx_CDS is not set | 163 | # CONFIG_MPC85xx_CDS is not set |
| 159 | # CONFIG_MPC85xx_MDS is not set | 164 | # CONFIG_MPC85xx_MDS is not set |
| 160 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
| 166 | # CONFIG_KSI8560 is not set | ||
| 161 | CONFIG_STX_GP3=y | 167 | CONFIG_STX_GP3=y |
| 162 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
| 163 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
| @@ -215,11 +221,13 @@ CONFIG_FLATMEM=y | |||
| 215 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 216 | # CONFIG_SPARSEMEM_STATIC is not set | 222 | # CONFIG_SPARSEMEM_STATIC is not set |
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 219 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 222 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 223 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 225 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| @@ -243,6 +251,7 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # CONFIG_PCI_DEBUG is not set | 251 | # CONFIG_PCI_DEBUG is not set |
| 244 | # CONFIG_PCCARD is not set | 252 | # CONFIG_PCCARD is not set |
| 245 | # CONFIG_HOTPLUG_PCI is not set | 253 | # CONFIG_HOTPLUG_PCI is not set |
| 254 | # CONFIG_HAS_RAPIDIO is not set | ||
| 246 | 255 | ||
| 247 | # | 256 | # |
| 248 | # Advanced setup | 257 | # Advanced setup |
| @@ -252,11 +261,12 @@ CONFIG_PCI_LEGACY=y | |||
| 252 | # | 261 | # |
| 253 | # Default settings for advanced configuration options are used | 262 | # Default settings for advanced configuration options are used |
| 254 | # | 263 | # |
| 255 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 256 | CONFIG_LOWMEM_SIZE=0x30000000 | 264 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 265 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 257 | CONFIG_KERNEL_START=0xc0000000 | 266 | CONFIG_KERNEL_START=0xc0000000 |
| 267 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 268 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 269 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 270 | ||
| 261 | # | 271 | # |
| 262 | # Networking | 272 | # Networking |
| @@ -304,8 +314,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 304 | # CONFIG_TCP_MD5SIG is not set | 314 | # CONFIG_TCP_MD5SIG is not set |
| 305 | # CONFIG_IP_VS is not set | 315 | # CONFIG_IP_VS is not set |
| 306 | # CONFIG_IPV6 is not set | 316 | # CONFIG_IPV6 is not set |
| 307 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 308 | # CONFIG_INET6_TUNNEL is not set | ||
| 309 | # CONFIG_NETWORK_SECMARK is not set | 317 | # CONFIG_NETWORK_SECMARK is not set |
| 310 | CONFIG_NETFILTER=y | 318 | CONFIG_NETFILTER=y |
| 311 | # CONFIG_NETFILTER_DEBUG is not set | 319 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -418,6 +426,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 418 | # CONFIG_CONNECTOR is not set | 426 | # CONFIG_CONNECTOR is not set |
| 419 | # CONFIG_MTD is not set | 427 | # CONFIG_MTD is not set |
| 420 | CONFIG_OF_DEVICE=y | 428 | CONFIG_OF_DEVICE=y |
| 429 | CONFIG_OF_I2C=m | ||
| 421 | CONFIG_PARPORT=m | 430 | CONFIG_PARPORT=m |
| 422 | CONFIG_PARPORT_PC=m | 431 | CONFIG_PARPORT_PC=m |
| 423 | # CONFIG_PARPORT_PC_FIFO is not set | 432 | # CONFIG_PARPORT_PC_FIFO is not set |
| @@ -505,7 +514,7 @@ CONFIG_IDE_GENERIC=y | |||
| 505 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 514 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 506 | # CONFIG_BLK_DEV_TC86C001 is not set | 515 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 507 | # CONFIG_BLK_DEV_IDEDMA is not set | 516 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 508 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 517 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 509 | # CONFIG_BLK_DEV_HD is not set | 518 | # CONFIG_BLK_DEV_HD is not set |
| 510 | 519 | ||
| 511 | # | 520 | # |
| @@ -653,7 +662,6 @@ CONFIG_NETDEV_1000=y | |||
| 653 | # CONFIG_SIS190 is not set | 662 | # CONFIG_SIS190 is not set |
| 654 | # CONFIG_SKGE is not set | 663 | # CONFIG_SKGE is not set |
| 655 | # CONFIG_SKY2 is not set | 664 | # CONFIG_SKY2 is not set |
| 656 | # CONFIG_SK98LIN is not set | ||
| 657 | # CONFIG_VIA_VELOCITY is not set | 665 | # CONFIG_VIA_VELOCITY is not set |
| 658 | # CONFIG_TIGON3 is not set | 666 | # CONFIG_TIGON3 is not set |
| 659 | # CONFIG_BNX2 is not set | 667 | # CONFIG_BNX2 is not set |
| @@ -673,6 +681,7 @@ CONFIG_NETDEV_10000=y | |||
| 673 | # CONFIG_MLX4_CORE is not set | 681 | # CONFIG_MLX4_CORE is not set |
| 674 | # CONFIG_TEHUTI is not set | 682 | # CONFIG_TEHUTI is not set |
| 675 | # CONFIG_BNX2X is not set | 683 | # CONFIG_BNX2X is not set |
| 684 | # CONFIG_SFC is not set | ||
| 676 | # CONFIG_TR is not set | 685 | # CONFIG_TR is not set |
| 677 | 686 | ||
| 678 | # | 687 | # |
| @@ -680,6 +689,7 @@ CONFIG_NETDEV_10000=y | |||
| 680 | # | 689 | # |
| 681 | # CONFIG_WLAN_PRE80211 is not set | 690 | # CONFIG_WLAN_PRE80211 is not set |
| 682 | # CONFIG_WLAN_80211 is not set | 691 | # CONFIG_WLAN_80211 is not set |
| 692 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 683 | # CONFIG_WAN is not set | 693 | # CONFIG_WAN is not set |
| 684 | # CONFIG_FDDI is not set | 694 | # CONFIG_FDDI is not set |
| 685 | # CONFIG_HIPPI is not set | 695 | # CONFIG_HIPPI is not set |
| @@ -753,6 +763,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 753 | # Character devices | 763 | # Character devices |
| 754 | # | 764 | # |
| 755 | # CONFIG_VT is not set | 765 | # CONFIG_VT is not set |
| 766 | CONFIG_DEVKMEM=y | ||
| 756 | # CONFIG_SERIAL_NONSTANDARD is not set | 767 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 757 | # CONFIG_NOZOMI is not set | 768 | # CONFIG_NOZOMI is not set |
| 758 | 769 | ||
| @@ -796,13 +807,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 796 | CONFIG_I2C_CHARDEV=m | 807 | CONFIG_I2C_CHARDEV=m |
| 797 | 808 | ||
| 798 | # | 809 | # |
| 799 | # I2C Algorithms | ||
| 800 | # | ||
| 801 | CONFIG_I2C_ALGOBIT=m | ||
| 802 | # CONFIG_I2C_ALGOPCF is not set | ||
| 803 | # CONFIG_I2C_ALGOPCA is not set | ||
| 804 | |||
| 805 | # | ||
| 806 | # I2C Hardware Bus support | 810 | # I2C Hardware Bus support |
| 807 | # | 811 | # |
| 808 | # CONFIG_I2C_ALI1535 is not set | 812 | # CONFIG_I2C_ALI1535 is not set |
| @@ -829,6 +833,7 @@ CONFIG_I2C_ALGOBIT=m | |||
| 829 | # CONFIG_I2C_VIA is not set | 833 | # CONFIG_I2C_VIA is not set |
| 830 | # CONFIG_I2C_VIAPRO is not set | 834 | # CONFIG_I2C_VIAPRO is not set |
| 831 | # CONFIG_I2C_VOODOO3 is not set | 835 | # CONFIG_I2C_VOODOO3 is not set |
| 836 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 832 | 837 | ||
| 833 | # | 838 | # |
| 834 | # Miscellaneous I2C Chip support | 839 | # Miscellaneous I2C Chip support |
| @@ -838,19 +843,13 @@ CONFIG_I2C_ALGOBIT=m | |||
| 838 | # CONFIG_SENSORS_PCF8574 is not set | 843 | # CONFIG_SENSORS_PCF8574 is not set |
| 839 | # CONFIG_PCF8575 is not set | 844 | # CONFIG_PCF8575 is not set |
| 840 | # CONFIG_SENSORS_PCF8591 is not set | 845 | # CONFIG_SENSORS_PCF8591 is not set |
| 841 | # CONFIG_TPS65010 is not set | ||
| 842 | # CONFIG_SENSORS_MAX6875 is not set | 846 | # CONFIG_SENSORS_MAX6875 is not set |
| 843 | # CONFIG_SENSORS_TSL2550 is not set | 847 | # CONFIG_SENSORS_TSL2550 is not set |
| 844 | # CONFIG_I2C_DEBUG_CORE is not set | 848 | # CONFIG_I2C_DEBUG_CORE is not set |
| 845 | # CONFIG_I2C_DEBUG_ALGO is not set | 849 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 846 | # CONFIG_I2C_DEBUG_BUS is not set | 850 | # CONFIG_I2C_DEBUG_BUS is not set |
| 847 | # CONFIG_I2C_DEBUG_CHIP is not set | 851 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 848 | |||
| 849 | # | ||
| 850 | # SPI support | ||
| 851 | # | ||
| 852 | # CONFIG_SPI is not set | 852 | # CONFIG_SPI is not set |
| 853 | # CONFIG_SPI_MASTER is not set | ||
| 854 | # CONFIG_W1 is not set | 853 | # CONFIG_W1 is not set |
| 855 | # CONFIG_POWER_SUPPLY is not set | 854 | # CONFIG_POWER_SUPPLY is not set |
| 856 | CONFIG_HWMON=y | 855 | CONFIG_HWMON=y |
| @@ -920,12 +919,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 920 | # Multifunction device drivers | 919 | # Multifunction device drivers |
| 921 | # | 920 | # |
| 922 | # CONFIG_MFD_SM501 is not set | 921 | # CONFIG_MFD_SM501 is not set |
| 922 | # CONFIG_HTC_PASIC3 is not set | ||
| 923 | 923 | ||
| 924 | # | 924 | # |
| 925 | # Multimedia devices | 925 | # Multimedia devices |
| 926 | # | 926 | # |
| 927 | |||
| 928 | # | ||
| 929 | # Multimedia core support | ||
| 930 | # | ||
| 927 | # CONFIG_VIDEO_DEV is not set | 931 | # CONFIG_VIDEO_DEV is not set |
| 928 | # CONFIG_DVB_CORE is not set | 932 | # CONFIG_DVB_CORE is not set |
| 933 | # CONFIG_VIDEO_MEDIA is not set | ||
| 934 | |||
| 935 | # | ||
| 936 | # Multimedia drivers | ||
| 937 | # | ||
| 929 | CONFIG_DAB=y | 938 | CONFIG_DAB=y |
| 930 | 939 | ||
| 931 | # | 940 | # |
| @@ -973,6 +982,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 973 | CONFIG_USB_ARCH_HAS_OHCI=y | 982 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 974 | CONFIG_USB_ARCH_HAS_EHCI=y | 983 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 975 | # CONFIG_USB is not set | 984 | # CONFIG_USB is not set |
| 985 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 986 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 976 | 987 | ||
| 977 | # | 988 | # |
| 978 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 989 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -981,15 +992,12 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 981 | # CONFIG_MMC is not set | 992 | # CONFIG_MMC is not set |
| 982 | # CONFIG_MEMSTICK is not set | 993 | # CONFIG_MEMSTICK is not set |
| 983 | # CONFIG_NEW_LEDS is not set | 994 | # CONFIG_NEW_LEDS is not set |
| 995 | # CONFIG_ACCESSIBILITY is not set | ||
| 984 | # CONFIG_INFINIBAND is not set | 996 | # CONFIG_INFINIBAND is not set |
| 985 | # CONFIG_EDAC is not set | 997 | # CONFIG_EDAC is not set |
| 986 | # CONFIG_RTC_CLASS is not set | 998 | # CONFIG_RTC_CLASS is not set |
| 987 | # CONFIG_DMADEVICES is not set | 999 | # CONFIG_DMADEVICES is not set |
| 988 | # CONFIG_AUXDISPLAY is not set | 1000 | # CONFIG_AUXDISPLAY is not set |
| 989 | |||
| 990 | # | ||
| 991 | # Userspace I/O | ||
| 992 | # | ||
| 993 | # CONFIG_UIO is not set | 1001 | # CONFIG_UIO is not set |
| 994 | 1002 | ||
| 995 | # | 1003 | # |
| @@ -1009,7 +1017,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1009 | # CONFIG_JFS_FS is not set | 1017 | # CONFIG_JFS_FS is not set |
| 1010 | # CONFIG_FS_POSIX_ACL is not set | 1018 | # CONFIG_FS_POSIX_ACL is not set |
| 1011 | # CONFIG_XFS_FS is not set | 1019 | # CONFIG_XFS_FS is not set |
| 1012 | # CONFIG_GFS2_FS is not set | ||
| 1013 | # CONFIG_OCFS2_FS is not set | 1020 | # CONFIG_OCFS2_FS is not set |
| 1014 | CONFIG_DNOTIFY=y | 1021 | CONFIG_DNOTIFY=y |
| 1015 | CONFIG_INOTIFY=y | 1022 | CONFIG_INOTIFY=y |
| @@ -1073,7 +1080,6 @@ CONFIG_NFS_FS=y | |||
| 1073 | CONFIG_NFS_V3=y | 1080 | CONFIG_NFS_V3=y |
| 1074 | # CONFIG_NFS_V3_ACL is not set | 1081 | # CONFIG_NFS_V3_ACL is not set |
| 1075 | # CONFIG_NFS_V4 is not set | 1082 | # CONFIG_NFS_V4 is not set |
| 1076 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1077 | # CONFIG_NFSD is not set | 1083 | # CONFIG_NFSD is not set |
| 1078 | CONFIG_ROOT_NFS=y | 1084 | CONFIG_ROOT_NFS=y |
| 1079 | CONFIG_LOCKD=y | 1085 | CONFIG_LOCKD=y |
| @@ -1141,9 +1147,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1141 | # Library routines | 1147 | # Library routines |
| 1142 | # | 1148 | # |
| 1143 | CONFIG_BITREVERSE=y | 1149 | CONFIG_BITREVERSE=y |
| 1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1144 | CONFIG_CRC_CCITT=y | 1151 | CONFIG_CRC_CCITT=y |
| 1145 | # CONFIG_CRC16 is not set | 1152 | # CONFIG_CRC16 is not set |
| 1146 | # CONFIG_CRC_ITU_T is not set | 1153 | CONFIG_CRC_ITU_T=m |
| 1147 | CONFIG_CRC32=y | 1154 | CONFIG_CRC32=y |
| 1148 | # CONFIG_CRC7 is not set | 1155 | # CONFIG_CRC7 is not set |
| 1149 | # CONFIG_LIBCRC32C is not set | 1156 | # CONFIG_LIBCRC32C is not set |
| @@ -1152,6 +1159,7 @@ CONFIG_PLIST=y | |||
| 1152 | CONFIG_HAS_IOMEM=y | 1159 | CONFIG_HAS_IOMEM=y |
| 1153 | CONFIG_HAS_IOPORT=y | 1160 | CONFIG_HAS_IOPORT=y |
| 1154 | CONFIG_HAS_DMA=y | 1161 | CONFIG_HAS_DMA=y |
| 1162 | CONFIG_HAVE_LMB=y | ||
| 1155 | 1163 | ||
| 1156 | # | 1164 | # |
| 1157 | # Kernel hacking | 1165 | # Kernel hacking |
| @@ -1159,6 +1167,7 @@ CONFIG_HAS_DMA=y | |||
| 1159 | # CONFIG_PRINTK_TIME is not set | 1167 | # CONFIG_PRINTK_TIME is not set |
| 1160 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1168 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1161 | CONFIG_ENABLE_MUST_CHECK=y | 1169 | CONFIG_ENABLE_MUST_CHECK=y |
| 1170 | CONFIG_FRAME_WARN=1024 | ||
| 1162 | # CONFIG_MAGIC_SYSRQ is not set | 1171 | # CONFIG_MAGIC_SYSRQ is not set |
| 1163 | # CONFIG_UNUSED_SYMBOLS is not set | 1172 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1164 | # CONFIG_DEBUG_FS is not set | 1173 | # CONFIG_DEBUG_FS is not set |
| @@ -1169,6 +1178,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1169 | CONFIG_SCHED_DEBUG=y | 1178 | CONFIG_SCHED_DEBUG=y |
| 1170 | # CONFIG_SCHEDSTATS is not set | 1179 | # CONFIG_SCHEDSTATS is not set |
| 1171 | # CONFIG_TIMER_STATS is not set | 1180 | # CONFIG_TIMER_STATS is not set |
| 1181 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1172 | # CONFIG_SLUB_DEBUG_ON is not set | 1182 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1173 | # CONFIG_SLUB_STATS is not set | 1183 | # CONFIG_SLUB_STATS is not set |
| 1174 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1184 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1182,6 +1192,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1182 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1192 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1183 | # CONFIG_DEBUG_INFO is not set | 1193 | # CONFIG_DEBUG_INFO is not set |
| 1184 | # CONFIG_DEBUG_VM is not set | 1194 | # CONFIG_DEBUG_VM is not set |
| 1195 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1185 | # CONFIG_DEBUG_LIST is not set | 1196 | # CONFIG_DEBUG_LIST is not set |
| 1186 | # CONFIG_DEBUG_SG is not set | 1197 | # CONFIG_DEBUG_SG is not set |
| 1187 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1198 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1194,6 +1205,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1194 | # CONFIG_DEBUG_PAGEALLOC is not set | 1205 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1195 | # CONFIG_DEBUGGER is not set | 1206 | # CONFIG_DEBUGGER is not set |
| 1196 | # CONFIG_KGDB_CONSOLE is not set | 1207 | # CONFIG_KGDB_CONSOLE is not set |
| 1208 | # CONFIG_IRQSTACKS is not set | ||
| 1197 | CONFIG_BDI_SWITCH=y | 1209 | CONFIG_BDI_SWITCH=y |
| 1198 | # CONFIG_PPC_EARLY_DEBUG is not set | 1210 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1199 | 1211 | ||
| @@ -1204,50 +1216,80 @@ CONFIG_BDI_SWITCH=y | |||
| 1204 | # CONFIG_SECURITY is not set | 1216 | # CONFIG_SECURITY is not set |
| 1205 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1217 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1206 | CONFIG_CRYPTO=y | 1218 | CONFIG_CRYPTO=y |
| 1207 | # CONFIG_CRYPTO_SEQIV is not set | 1219 | |
| 1220 | # | ||
| 1221 | # Crypto core or helper | ||
| 1222 | # | ||
| 1208 | # CONFIG_CRYPTO_MANAGER is not set | 1223 | # CONFIG_CRYPTO_MANAGER is not set |
| 1224 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1225 | # CONFIG_CRYPTO_NULL is not set | ||
| 1226 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1227 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1228 | # CONFIG_CRYPTO_TEST is not set | ||
| 1229 | |||
| 1230 | # | ||
| 1231 | # Authenticated Encryption with Associated Data | ||
| 1232 | # | ||
| 1233 | # CONFIG_CRYPTO_CCM is not set | ||
| 1234 | # CONFIG_CRYPTO_GCM is not set | ||
| 1235 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1236 | |||
| 1237 | # | ||
| 1238 | # Block modes | ||
| 1239 | # | ||
| 1240 | # CONFIG_CRYPTO_CBC is not set | ||
| 1241 | # CONFIG_CRYPTO_CTR is not set | ||
| 1242 | # CONFIG_CRYPTO_CTS is not set | ||
| 1243 | # CONFIG_CRYPTO_ECB is not set | ||
| 1244 | # CONFIG_CRYPTO_LRW is not set | ||
| 1245 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1246 | # CONFIG_CRYPTO_XTS is not set | ||
| 1247 | |||
| 1248 | # | ||
| 1249 | # Hash modes | ||
| 1250 | # | ||
| 1209 | # CONFIG_CRYPTO_HMAC is not set | 1251 | # CONFIG_CRYPTO_HMAC is not set |
| 1210 | # CONFIG_CRYPTO_XCBC is not set | 1252 | # CONFIG_CRYPTO_XCBC is not set |
| 1211 | # CONFIG_CRYPTO_NULL is not set | 1253 | |
| 1254 | # | ||
| 1255 | # Digest | ||
| 1256 | # | ||
| 1257 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1212 | # CONFIG_CRYPTO_MD4 is not set | 1258 | # CONFIG_CRYPTO_MD4 is not set |
| 1213 | # CONFIG_CRYPTO_MD5 is not set | 1259 | # CONFIG_CRYPTO_MD5 is not set |
| 1260 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1214 | # CONFIG_CRYPTO_SHA1 is not set | 1261 | # CONFIG_CRYPTO_SHA1 is not set |
| 1215 | # CONFIG_CRYPTO_SHA256 is not set | 1262 | # CONFIG_CRYPTO_SHA256 is not set |
| 1216 | # CONFIG_CRYPTO_SHA512 is not set | 1263 | # CONFIG_CRYPTO_SHA512 is not set |
| 1217 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1218 | # CONFIG_CRYPTO_TGR192 is not set | 1264 | # CONFIG_CRYPTO_TGR192 is not set |
| 1219 | # CONFIG_CRYPTO_GF128MUL is not set | 1265 | # CONFIG_CRYPTO_WP512 is not set |
| 1220 | # CONFIG_CRYPTO_ECB is not set | 1266 | |
| 1221 | # CONFIG_CRYPTO_CBC is not set | 1267 | # |
| 1222 | # CONFIG_CRYPTO_PCBC is not set | 1268 | # Ciphers |
| 1223 | # CONFIG_CRYPTO_LRW is not set | 1269 | # |
| 1224 | # CONFIG_CRYPTO_XTS is not set | ||
| 1225 | # CONFIG_CRYPTO_CTR is not set | ||
| 1226 | # CONFIG_CRYPTO_GCM is not set | ||
| 1227 | # CONFIG_CRYPTO_CCM is not set | ||
| 1228 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1229 | # CONFIG_CRYPTO_DES is not set | ||
| 1230 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1231 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1232 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1233 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1234 | # CONFIG_CRYPTO_AES is not set | 1270 | # CONFIG_CRYPTO_AES is not set |
| 1271 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1272 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1273 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1274 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1235 | # CONFIG_CRYPTO_CAST5 is not set | 1275 | # CONFIG_CRYPTO_CAST5 is not set |
| 1236 | # CONFIG_CRYPTO_CAST6 is not set | 1276 | # CONFIG_CRYPTO_CAST6 is not set |
| 1237 | # CONFIG_CRYPTO_TEA is not set | 1277 | # CONFIG_CRYPTO_DES is not set |
| 1238 | # CONFIG_CRYPTO_ARC4 is not set | 1278 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1239 | # CONFIG_CRYPTO_KHAZAD is not set | 1279 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1240 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1241 | # CONFIG_CRYPTO_SEED is not set | ||
| 1242 | # CONFIG_CRYPTO_SALSA20 is not set | 1280 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1281 | # CONFIG_CRYPTO_SEED is not set | ||
| 1282 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1283 | # CONFIG_CRYPTO_TEA is not set | ||
| 1284 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1285 | |||
| 1286 | # | ||
| 1287 | # Compression | ||
| 1288 | # | ||
| 1243 | # CONFIG_CRYPTO_DEFLATE is not set | 1289 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1245 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1246 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1247 | # CONFIG_CRYPTO_TEST is not set | ||
| 1248 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1249 | # CONFIG_CRYPTO_LZO is not set | 1290 | # CONFIG_CRYPTO_LZO is not set |
| 1250 | CONFIG_CRYPTO_HW=y | 1291 | CONFIG_CRYPTO_HW=y |
| 1251 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1292 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1252 | # CONFIG_PPC_CLOCK is not set | 1293 | # CONFIG_PPC_CLOCK is not set |
| 1253 | CONFIG_PPC_LIB_RHEAP=y | 1294 | CONFIG_PPC_LIB_RHEAP=y |
| 1295 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index d39ee3b35bfc..e0b5559e84aa 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:43 2008 | 4 | # Mon Jun 9 08:52:39 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | CONFIG_TQM8540=y | 160 | CONFIG_TQM8540=y |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -171,7 +176,6 @@ CONFIG_MPIC=y | |||
| 171 | # CONFIG_GENERIC_IOMAP is not set | 176 | # CONFIG_GENERIC_IOMAP is not set |
| 172 | # CONFIG_CPU_FREQ is not set | 177 | # CONFIG_CPU_FREQ is not set |
| 173 | # CONFIG_CPM2 is not set | 178 | # CONFIG_CPM2 is not set |
| 174 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
| 175 | # CONFIG_FSL_ULI1575 is not set | 179 | # CONFIG_FSL_ULI1575 is not set |
| 176 | 180 | ||
| 177 | # | 181 | # |
| @@ -208,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 208 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 209 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 210 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 215 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 216 | # CONFIG_PROC_DEVICETREE is not set | 222 | # CONFIG_PROC_DEVICETREE is not set |
| 217 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 218 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -233,6 +239,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 233 | CONFIG_ARCH_SUPPORTS_MSI=y | 239 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 234 | # CONFIG_PCI_MSI is not set | 240 | # CONFIG_PCI_MSI is not set |
| 235 | CONFIG_PCI_LEGACY=y | 241 | CONFIG_PCI_LEGACY=y |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 236 | 243 | ||
| 237 | # | 244 | # |
| 238 | # Advanced setup | 245 | # Advanced setup |
| @@ -242,11 +249,12 @@ CONFIG_PCI_LEGACY=y | |||
| 242 | # | 249 | # |
| 243 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 244 | # | 251 | # |
| 245 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 246 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 247 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 248 | CONFIG_TASK_SIZE=0xc0000000 | 257 | CONFIG_TASK_SIZE=0xc0000000 |
| 249 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 250 | 258 | ||
| 251 | # | 259 | # |
| 252 | # Networking | 260 | # Networking |
| @@ -294,8 +302,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 302 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 303 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 304 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 305 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 306 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 307 | # CONFIG_IP_DCCP is not set |
| @@ -352,6 +358,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 352 | # CONFIG_MTD_REDBOOT_PARTS is not set | 358 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 353 | CONFIG_MTD_CMDLINE_PARTS=y | 359 | CONFIG_MTD_CMDLINE_PARTS=y |
| 354 | # CONFIG_MTD_OF_PARTS is not set | 360 | # CONFIG_MTD_OF_PARTS is not set |
| 361 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 355 | 362 | ||
| 356 | # | 363 | # |
| 357 | # User Modules And Translation Layers | 364 | # User Modules And Translation Layers |
| @@ -423,6 +430,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 423 | # | 430 | # |
| 424 | # CONFIG_MTD_UBI is not set | 431 | # CONFIG_MTD_UBI is not set |
| 425 | CONFIG_OF_DEVICE=y | 432 | CONFIG_OF_DEVICE=y |
| 433 | CONFIG_OF_I2C=y | ||
| 426 | # CONFIG_PARPORT is not set | 434 | # CONFIG_PARPORT is not set |
| 427 | CONFIG_BLK_DEV=y | 435 | CONFIG_BLK_DEV=y |
| 428 | # CONFIG_BLK_DEV_FD is not set | 436 | # CONFIG_BLK_DEV_FD is not set |
| @@ -506,7 +514,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 506 | CONFIG_BLK_DEV_VIA82CXXX=y | 514 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 507 | # CONFIG_BLK_DEV_TC86C001 is not set | 515 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 508 | CONFIG_BLK_DEV_IDEDMA=y | 516 | CONFIG_BLK_DEV_IDEDMA=y |
| 509 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 517 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 510 | # CONFIG_BLK_DEV_HD is not set | 518 | # CONFIG_BLK_DEV_HD is not set |
| 511 | 519 | ||
| 512 | # | 520 | # |
| @@ -600,7 +608,6 @@ CONFIG_NETDEV_1000=y | |||
| 600 | # CONFIG_SIS190 is not set | 608 | # CONFIG_SIS190 is not set |
| 601 | # CONFIG_SKGE is not set | 609 | # CONFIG_SKGE is not set |
| 602 | # CONFIG_SKY2 is not set | 610 | # CONFIG_SKY2 is not set |
| 603 | # CONFIG_SK98LIN is not set | ||
| 604 | # CONFIG_VIA_VELOCITY is not set | 611 | # CONFIG_VIA_VELOCITY is not set |
| 605 | # CONFIG_TIGON3 is not set | 612 | # CONFIG_TIGON3 is not set |
| 606 | # CONFIG_BNX2 is not set | 613 | # CONFIG_BNX2 is not set |
| @@ -620,6 +627,7 @@ CONFIG_NETDEV_10000=y | |||
| 620 | # CONFIG_MLX4_CORE is not set | 627 | # CONFIG_MLX4_CORE is not set |
| 621 | # CONFIG_TEHUTI is not set | 628 | # CONFIG_TEHUTI is not set |
| 622 | # CONFIG_BNX2X is not set | 629 | # CONFIG_BNX2X is not set |
| 630 | # CONFIG_SFC is not set | ||
| 623 | # CONFIG_TR is not set | 631 | # CONFIG_TR is not set |
| 624 | 632 | ||
| 625 | # | 633 | # |
| @@ -627,6 +635,7 @@ CONFIG_NETDEV_10000=y | |||
| 627 | # | 635 | # |
| 628 | # CONFIG_WLAN_PRE80211 is not set | 636 | # CONFIG_WLAN_PRE80211 is not set |
| 629 | # CONFIG_WLAN_80211 is not set | 637 | # CONFIG_WLAN_80211 is not set |
| 638 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 630 | # CONFIG_WAN is not set | 639 | # CONFIG_WAN is not set |
| 631 | # CONFIG_FDDI is not set | 640 | # CONFIG_FDDI is not set |
| 632 | # CONFIG_HIPPI is not set | 641 | # CONFIG_HIPPI is not set |
| @@ -673,6 +682,7 @@ CONFIG_INPUT=y | |||
| 673 | # Character devices | 682 | # Character devices |
| 674 | # | 683 | # |
| 675 | # CONFIG_VT is not set | 684 | # CONFIG_VT is not set |
| 685 | CONFIG_DEVKMEM=y | ||
| 676 | # CONFIG_SERIAL_NONSTANDARD is not set | 686 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 677 | # CONFIG_NOZOMI is not set | 687 | # CONFIG_NOZOMI is not set |
| 678 | 688 | ||
| @@ -713,13 +723,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 713 | CONFIG_I2C_CHARDEV=y | 723 | CONFIG_I2C_CHARDEV=y |
| 714 | 724 | ||
| 715 | # | 725 | # |
| 716 | # I2C Algorithms | ||
| 717 | # | ||
| 718 | # CONFIG_I2C_ALGOBIT is not set | ||
| 719 | # CONFIG_I2C_ALGOPCF is not set | ||
| 720 | # CONFIG_I2C_ALGOPCA is not set | ||
| 721 | |||
| 722 | # | ||
| 723 | # I2C Hardware Bus support | 726 | # I2C Hardware Bus support |
| 724 | # | 727 | # |
| 725 | # CONFIG_I2C_ALI1535 is not set | 728 | # CONFIG_I2C_ALI1535 is not set |
| @@ -744,6 +747,7 @@ CONFIG_I2C_MPC=y | |||
| 744 | # CONFIG_I2C_VIA is not set | 747 | # CONFIG_I2C_VIA is not set |
| 745 | # CONFIG_I2C_VIAPRO is not set | 748 | # CONFIG_I2C_VIAPRO is not set |
| 746 | # CONFIG_I2C_VOODOO3 is not set | 749 | # CONFIG_I2C_VOODOO3 is not set |
| 750 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 747 | 751 | ||
| 748 | # | 752 | # |
| 749 | # Miscellaneous I2C Chip support | 753 | # Miscellaneous I2C Chip support |
| @@ -753,19 +757,13 @@ CONFIG_I2C_MPC=y | |||
| 753 | # CONFIG_SENSORS_PCF8574 is not set | 757 | # CONFIG_SENSORS_PCF8574 is not set |
| 754 | # CONFIG_PCF8575 is not set | 758 | # CONFIG_PCF8575 is not set |
| 755 | # CONFIG_SENSORS_PCF8591 is not set | 759 | # CONFIG_SENSORS_PCF8591 is not set |
| 756 | # CONFIG_TPS65010 is not set | ||
| 757 | # CONFIG_SENSORS_MAX6875 is not set | 760 | # CONFIG_SENSORS_MAX6875 is not set |
| 758 | # CONFIG_SENSORS_TSL2550 is not set | 761 | # CONFIG_SENSORS_TSL2550 is not set |
| 759 | # CONFIG_I2C_DEBUG_CORE is not set | 762 | # CONFIG_I2C_DEBUG_CORE is not set |
| 760 | # CONFIG_I2C_DEBUG_ALGO is not set | 763 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 761 | # CONFIG_I2C_DEBUG_BUS is not set | 764 | # CONFIG_I2C_DEBUG_BUS is not set |
| 762 | # CONFIG_I2C_DEBUG_CHIP is not set | 765 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 763 | |||
| 764 | # | ||
| 765 | # SPI support | ||
| 766 | # | ||
| 767 | # CONFIG_SPI is not set | 766 | # CONFIG_SPI is not set |
| 768 | # CONFIG_SPI_MASTER is not set | ||
| 769 | # CONFIG_W1 is not set | 767 | # CONFIG_W1 is not set |
| 770 | # CONFIG_POWER_SUPPLY is not set | 768 | # CONFIG_POWER_SUPPLY is not set |
| 771 | CONFIG_HWMON=y | 769 | CONFIG_HWMON=y |
| @@ -835,12 +833,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 835 | # Multifunction device drivers | 833 | # Multifunction device drivers |
| 836 | # | 834 | # |
| 837 | # CONFIG_MFD_SM501 is not set | 835 | # CONFIG_MFD_SM501 is not set |
| 836 | # CONFIG_HTC_PASIC3 is not set | ||
| 838 | 837 | ||
| 839 | # | 838 | # |
| 840 | # Multimedia devices | 839 | # Multimedia devices |
| 841 | # | 840 | # |
| 841 | |||
| 842 | # | ||
| 843 | # Multimedia core support | ||
| 844 | # | ||
| 842 | # CONFIG_VIDEO_DEV is not set | 845 | # CONFIG_VIDEO_DEV is not set |
| 843 | # CONFIG_DVB_CORE is not set | 846 | # CONFIG_DVB_CORE is not set |
| 847 | # CONFIG_VIDEO_MEDIA is not set | ||
| 848 | |||
| 849 | # | ||
| 850 | # Multimedia drivers | ||
| 851 | # | ||
| 844 | CONFIG_DAB=y | 852 | CONFIG_DAB=y |
| 845 | 853 | ||
| 846 | # | 854 | # |
| @@ -871,6 +879,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 871 | CONFIG_USB_ARCH_HAS_OHCI=y | 879 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 872 | CONFIG_USB_ARCH_HAS_EHCI=y | 880 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 873 | # CONFIG_USB is not set | 881 | # CONFIG_USB is not set |
| 882 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 883 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 874 | 884 | ||
| 875 | # | 885 | # |
| 876 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -879,14 +889,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 879 | # CONFIG_MMC is not set | 889 | # CONFIG_MMC is not set |
| 880 | # CONFIG_MEMSTICK is not set | 890 | # CONFIG_MEMSTICK is not set |
| 881 | # CONFIG_NEW_LEDS is not set | 891 | # CONFIG_NEW_LEDS is not set |
| 892 | # CONFIG_ACCESSIBILITY is not set | ||
| 882 | # CONFIG_INFINIBAND is not set | 893 | # CONFIG_INFINIBAND is not set |
| 883 | # CONFIG_EDAC is not set | 894 | # CONFIG_EDAC is not set |
| 884 | # CONFIG_RTC_CLASS is not set | 895 | # CONFIG_RTC_CLASS is not set |
| 885 | # CONFIG_DMADEVICES is not set | 896 | # CONFIG_DMADEVICES is not set |
| 886 | |||
| 887 | # | ||
| 888 | # Userspace I/O | ||
| 889 | # | ||
| 890 | # CONFIG_UIO is not set | 897 | # CONFIG_UIO is not set |
| 891 | 898 | ||
| 892 | # | 899 | # |
| @@ -906,7 +913,6 @@ CONFIG_FS_MBCACHE=y | |||
| 906 | # CONFIG_JFS_FS is not set | 913 | # CONFIG_JFS_FS is not set |
| 907 | # CONFIG_FS_POSIX_ACL is not set | 914 | # CONFIG_FS_POSIX_ACL is not set |
| 908 | # CONFIG_XFS_FS is not set | 915 | # CONFIG_XFS_FS is not set |
| 909 | # CONFIG_GFS2_FS is not set | ||
| 910 | # CONFIG_OCFS2_FS is not set | 916 | # CONFIG_OCFS2_FS is not set |
| 911 | CONFIG_DNOTIFY=y | 917 | CONFIG_DNOTIFY=y |
| 912 | CONFIG_INOTIFY=y | 918 | CONFIG_INOTIFY=y |
| @@ -974,7 +980,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 974 | CONFIG_NFS_FS=y | 980 | CONFIG_NFS_FS=y |
| 975 | # CONFIG_NFS_V3 is not set | 981 | # CONFIG_NFS_V3 is not set |
| 976 | # CONFIG_NFS_V4 is not set | 982 | # CONFIG_NFS_V4 is not set |
| 977 | # CONFIG_NFS_DIRECTIO is not set | ||
| 978 | # CONFIG_NFSD is not set | 983 | # CONFIG_NFSD is not set |
| 979 | CONFIG_ROOT_NFS=y | 984 | CONFIG_ROOT_NFS=y |
| 980 | CONFIG_LOCKD=y | 985 | CONFIG_LOCKD=y |
| @@ -1013,6 +1018,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1013 | # Library routines | 1018 | # Library routines |
| 1014 | # | 1019 | # |
| 1015 | CONFIG_BITREVERSE=y | 1020 | CONFIG_BITREVERSE=y |
| 1021 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1016 | # CONFIG_CRC_CCITT is not set | 1022 | # CONFIG_CRC_CCITT is not set |
| 1017 | # CONFIG_CRC16 is not set | 1023 | # CONFIG_CRC16 is not set |
| 1018 | # CONFIG_CRC_ITU_T is not set | 1024 | # CONFIG_CRC_ITU_T is not set |
| @@ -1025,6 +1031,7 @@ CONFIG_PLIST=y | |||
| 1025 | CONFIG_HAS_IOMEM=y | 1031 | CONFIG_HAS_IOMEM=y |
| 1026 | CONFIG_HAS_IOPORT=y | 1032 | CONFIG_HAS_IOPORT=y |
| 1027 | CONFIG_HAS_DMA=y | 1033 | CONFIG_HAS_DMA=y |
| 1034 | CONFIG_HAVE_LMB=y | ||
| 1028 | 1035 | ||
| 1029 | # | 1036 | # |
| 1030 | # Kernel hacking | 1037 | # Kernel hacking |
| @@ -1032,6 +1039,7 @@ CONFIG_HAS_DMA=y | |||
| 1032 | # CONFIG_PRINTK_TIME is not set | 1039 | # CONFIG_PRINTK_TIME is not set |
| 1033 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1040 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1034 | CONFIG_ENABLE_MUST_CHECK=y | 1041 | CONFIG_ENABLE_MUST_CHECK=y |
| 1042 | CONFIG_FRAME_WARN=1024 | ||
| 1035 | # CONFIG_MAGIC_SYSRQ is not set | 1043 | # CONFIG_MAGIC_SYSRQ is not set |
| 1036 | # CONFIG_UNUSED_SYMBOLS is not set | 1044 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1037 | # CONFIG_DEBUG_FS is not set | 1045 | # CONFIG_DEBUG_FS is not set |
| @@ -1041,6 +1049,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1041 | # CONFIG_SLUB_STATS is not set | 1049 | # CONFIG_SLUB_STATS is not set |
| 1042 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1050 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1043 | # CONFIG_SAMPLES is not set | 1051 | # CONFIG_SAMPLES is not set |
| 1052 | # CONFIG_IRQSTACKS is not set | ||
| 1044 | # CONFIG_PPC_EARLY_DEBUG is not set | 1053 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1045 | 1054 | ||
| 1046 | # | 1055 | # |
| @@ -1050,48 +1059,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1050 | # CONFIG_SECURITY is not set | 1059 | # CONFIG_SECURITY is not set |
| 1051 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1060 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1052 | CONFIG_CRYPTO=y | 1061 | CONFIG_CRYPTO=y |
| 1053 | # CONFIG_CRYPTO_SEQIV is not set | 1062 | |
| 1063 | # | ||
| 1064 | # Crypto core or helper | ||
| 1065 | # | ||
| 1054 | # CONFIG_CRYPTO_MANAGER is not set | 1066 | # CONFIG_CRYPTO_MANAGER is not set |
| 1067 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1068 | # CONFIG_CRYPTO_NULL is not set | ||
| 1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1070 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Authenticated Encryption with Associated Data | ||
| 1074 | # | ||
| 1075 | # CONFIG_CRYPTO_CCM is not set | ||
| 1076 | # CONFIG_CRYPTO_GCM is not set | ||
| 1077 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1078 | |||
| 1079 | # | ||
| 1080 | # Block modes | ||
| 1081 | # | ||
| 1082 | # CONFIG_CRYPTO_CBC is not set | ||
| 1083 | # CONFIG_CRYPTO_CTR is not set | ||
| 1084 | # CONFIG_CRYPTO_CTS is not set | ||
| 1085 | # CONFIG_CRYPTO_ECB is not set | ||
| 1086 | # CONFIG_CRYPTO_LRW is not set | ||
| 1087 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | |||
| 1090 | # | ||
| 1091 | # Hash modes | ||
| 1092 | # | ||
| 1055 | # CONFIG_CRYPTO_HMAC is not set | 1093 | # CONFIG_CRYPTO_HMAC is not set |
| 1056 | # CONFIG_CRYPTO_XCBC is not set | 1094 | # CONFIG_CRYPTO_XCBC is not set |
| 1057 | # CONFIG_CRYPTO_NULL is not set | 1095 | |
| 1096 | # | ||
| 1097 | # Digest | ||
| 1098 | # | ||
| 1099 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1058 | # CONFIG_CRYPTO_MD4 is not set | 1100 | # CONFIG_CRYPTO_MD4 is not set |
| 1059 | # CONFIG_CRYPTO_MD5 is not set | 1101 | # CONFIG_CRYPTO_MD5 is not set |
| 1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1060 | # CONFIG_CRYPTO_SHA1 is not set | 1103 | # CONFIG_CRYPTO_SHA1 is not set |
| 1061 | # CONFIG_CRYPTO_SHA256 is not set | 1104 | # CONFIG_CRYPTO_SHA256 is not set |
| 1062 | # CONFIG_CRYPTO_SHA512 is not set | 1105 | # CONFIG_CRYPTO_SHA512 is not set |
| 1063 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1064 | # CONFIG_CRYPTO_TGR192 is not set | 1106 | # CONFIG_CRYPTO_TGR192 is not set |
| 1065 | # CONFIG_CRYPTO_GF128MUL is not set | 1107 | # CONFIG_CRYPTO_WP512 is not set |
| 1066 | # CONFIG_CRYPTO_ECB is not set | 1108 | |
| 1067 | # CONFIG_CRYPTO_CBC is not set | 1109 | # |
| 1068 | # CONFIG_CRYPTO_PCBC is not set | 1110 | # Ciphers |
| 1069 | # CONFIG_CRYPTO_LRW is not set | 1111 | # |
| 1070 | # CONFIG_CRYPTO_XTS is not set | ||
| 1071 | # CONFIG_CRYPTO_CTR is not set | ||
| 1072 | # CONFIG_CRYPTO_GCM is not set | ||
| 1073 | # CONFIG_CRYPTO_CCM is not set | ||
| 1074 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1075 | # CONFIG_CRYPTO_DES is not set | ||
| 1076 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1077 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1078 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1079 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1080 | # CONFIG_CRYPTO_AES is not set | 1112 | # CONFIG_CRYPTO_AES is not set |
| 1113 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1114 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1115 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1116 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1081 | # CONFIG_CRYPTO_CAST5 is not set | 1117 | # CONFIG_CRYPTO_CAST5 is not set |
| 1082 | # CONFIG_CRYPTO_CAST6 is not set | 1118 | # CONFIG_CRYPTO_CAST6 is not set |
| 1083 | # CONFIG_CRYPTO_TEA is not set | 1119 | # CONFIG_CRYPTO_DES is not set |
| 1084 | # CONFIG_CRYPTO_ARC4 is not set | 1120 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1085 | # CONFIG_CRYPTO_KHAZAD is not set | 1121 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1086 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1087 | # CONFIG_CRYPTO_SEED is not set | ||
| 1088 | # CONFIG_CRYPTO_SALSA20 is not set | 1122 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1123 | # CONFIG_CRYPTO_SEED is not set | ||
| 1124 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1125 | # CONFIG_CRYPTO_TEA is not set | ||
| 1126 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Compression | ||
| 1130 | # | ||
| 1089 | # CONFIG_CRYPTO_DEFLATE is not set | 1131 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1090 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1091 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1092 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1093 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1094 | # CONFIG_CRYPTO_LZO is not set | 1132 | # CONFIG_CRYPTO_LZO is not set |
| 1095 | CONFIG_CRYPTO_HW=y | 1133 | CONFIG_CRYPTO_HW=y |
| 1096 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1134 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1097 | # CONFIG_PPC_CLOCK is not set | 1135 | # CONFIG_PPC_CLOCK is not set |
| 1136 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index cbf6ad2d71da..6f9067b49e07 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:44 2008 | 4 | # Mon Jun 9 08:52:40 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | CONFIG_TQM8541=y | 161 | CONFIG_TQM8541=y |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index bbff962c8472..03120b5b52fa 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:44 2008 | 4 | # Mon Jun 9 08:52:41 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index 63c5ec8b6515..3113257edf5a 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:45 2008 | 4 | # Mon Jun 9 08:52:42 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -87,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 88 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | # CONFIG_KALLSYMS is not set | 93 | # CONFIG_KALLSYMS is not set |
| 91 | # CONFIG_HOTPLUG is not set | 94 | # CONFIG_HOTPLUG is not set |
| 92 | CONFIG_PRINTK=y | 95 | CONFIG_PRINTK=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -151,6 +155,7 @@ CONFIG_MPC85xx=y | |||
| 151 | # CONFIG_MPC85xx_CDS is not set | 155 | # CONFIG_MPC85xx_CDS is not set |
| 152 | # CONFIG_MPC85xx_MDS is not set | 156 | # CONFIG_MPC85xx_MDS is not set |
| 153 | # CONFIG_MPC85xx_DS is not set | 157 | # CONFIG_MPC85xx_DS is not set |
| 158 | # CONFIG_KSI8560 is not set | ||
| 154 | # CONFIG_STX_GP3 is not set | 159 | # CONFIG_STX_GP3 is not set |
| 155 | # CONFIG_TQM8540 is not set | 160 | # CONFIG_TQM8540 is not set |
| 156 | # CONFIG_TQM8541 is not set | 161 | # CONFIG_TQM8541 is not set |
| @@ -209,11 +214,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 214 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 215 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 217 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 219 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 220 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 221 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 222 | CONFIG_VIRT_TO_BUS=y |
| 223 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | # CONFIG_PROC_DEVICETREE is not set | 224 | # CONFIG_PROC_DEVICETREE is not set |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 225 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 226 | # CONFIG_PM is not set |
| @@ -234,6 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
| 234 | CONFIG_ARCH_SUPPORTS_MSI=y | 241 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 235 | # CONFIG_PCI_MSI is not set | 242 | # CONFIG_PCI_MSI is not set |
| 236 | CONFIG_PCI_LEGACY=y | 243 | CONFIG_PCI_LEGACY=y |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 245 | ||
| 238 | # | 246 | # |
| 239 | # Advanced setup | 247 | # Advanced setup |
| @@ -243,11 +251,12 @@ CONFIG_PCI_LEGACY=y | |||
| 243 | # | 251 | # |
| 244 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 245 | # | 253 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 249 | CONFIG_TASK_SIZE=0xc0000000 | 259 | CONFIG_TASK_SIZE=0xc0000000 |
| 250 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 251 | 260 | ||
| 252 | # | 261 | # |
| 253 | # Networking | 262 | # Networking |
| @@ -295,8 +304,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 295 | CONFIG_DEFAULT_TCP_CONG="cubic" | 304 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 296 | # CONFIG_TCP_MD5SIG is not set | 305 | # CONFIG_TCP_MD5SIG is not set |
| 297 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
| 298 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 299 | # CONFIG_INET6_TUNNEL is not set | ||
| 300 | # CONFIG_NETWORK_SECMARK is not set | 307 | # CONFIG_NETWORK_SECMARK is not set |
| 301 | # CONFIG_NETFILTER is not set | 308 | # CONFIG_NETFILTER is not set |
| 302 | # CONFIG_IP_DCCP is not set | 309 | # CONFIG_IP_DCCP is not set |
| @@ -353,6 +360,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 353 | # CONFIG_MTD_REDBOOT_PARTS is not set | 360 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 354 | CONFIG_MTD_CMDLINE_PARTS=y | 361 | CONFIG_MTD_CMDLINE_PARTS=y |
| 355 | # CONFIG_MTD_OF_PARTS is not set | 362 | # CONFIG_MTD_OF_PARTS is not set |
| 363 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 356 | 364 | ||
| 357 | # | 365 | # |
| 358 | # User Modules And Translation Layers | 366 | # User Modules And Translation Layers |
| @@ -424,6 +432,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 424 | # | 432 | # |
| 425 | # CONFIG_MTD_UBI is not set | 433 | # CONFIG_MTD_UBI is not set |
| 426 | CONFIG_OF_DEVICE=y | 434 | CONFIG_OF_DEVICE=y |
| 435 | CONFIG_OF_I2C=y | ||
| 427 | # CONFIG_PARPORT is not set | 436 | # CONFIG_PARPORT is not set |
| 428 | CONFIG_BLK_DEV=y | 437 | CONFIG_BLK_DEV=y |
| 429 | # CONFIG_BLK_DEV_FD is not set | 438 | # CONFIG_BLK_DEV_FD is not set |
| @@ -507,7 +516,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 507 | CONFIG_BLK_DEV_VIA82CXXX=y | 516 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 508 | # CONFIG_BLK_DEV_TC86C001 is not set | 517 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 509 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 510 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 511 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 512 | 521 | ||
| 513 | # | 522 | # |
| @@ -602,7 +611,6 @@ CONFIG_NETDEV_1000=y | |||
| 602 | # CONFIG_SIS190 is not set | 611 | # CONFIG_SIS190 is not set |
| 603 | # CONFIG_SKGE is not set | 612 | # CONFIG_SKGE is not set |
| 604 | # CONFIG_SKY2 is not set | 613 | # CONFIG_SKY2 is not set |
| 605 | # CONFIG_SK98LIN is not set | ||
| 606 | # CONFIG_VIA_VELOCITY is not set | 614 | # CONFIG_VIA_VELOCITY is not set |
| 607 | # CONFIG_TIGON3 is not set | 615 | # CONFIG_TIGON3 is not set |
| 608 | # CONFIG_BNX2 is not set | 616 | # CONFIG_BNX2 is not set |
| @@ -622,6 +630,7 @@ CONFIG_NETDEV_10000=y | |||
| 622 | # CONFIG_MLX4_CORE is not set | 630 | # CONFIG_MLX4_CORE is not set |
| 623 | # CONFIG_TEHUTI is not set | 631 | # CONFIG_TEHUTI is not set |
| 624 | # CONFIG_BNX2X is not set | 632 | # CONFIG_BNX2X is not set |
| 633 | # CONFIG_SFC is not set | ||
| 625 | # CONFIG_TR is not set | 634 | # CONFIG_TR is not set |
| 626 | 635 | ||
| 627 | # | 636 | # |
| @@ -629,6 +638,7 @@ CONFIG_NETDEV_10000=y | |||
| 629 | # | 638 | # |
| 630 | # CONFIG_WLAN_PRE80211 is not set | 639 | # CONFIG_WLAN_PRE80211 is not set |
| 631 | # CONFIG_WLAN_80211 is not set | 640 | # CONFIG_WLAN_80211 is not set |
| 641 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 632 | # CONFIG_WAN is not set | 642 | # CONFIG_WAN is not set |
| 633 | # CONFIG_FDDI is not set | 643 | # CONFIG_FDDI is not set |
| 634 | # CONFIG_HIPPI is not set | 644 | # CONFIG_HIPPI is not set |
| @@ -675,6 +685,7 @@ CONFIG_INPUT=y | |||
| 675 | # Character devices | 685 | # Character devices |
| 676 | # | 686 | # |
| 677 | # CONFIG_VT is not set | 687 | # CONFIG_VT is not set |
| 688 | CONFIG_DEVKMEM=y | ||
| 678 | # CONFIG_SERIAL_NONSTANDARD is not set | 689 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 679 | # CONFIG_NOZOMI is not set | 690 | # CONFIG_NOZOMI is not set |
| 680 | 691 | ||
| @@ -723,13 +734,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 723 | CONFIG_I2C_CHARDEV=y | 734 | CONFIG_I2C_CHARDEV=y |
| 724 | 735 | ||
| 725 | # | 736 | # |
| 726 | # I2C Algorithms | ||
| 727 | # | ||
| 728 | # CONFIG_I2C_ALGOBIT is not set | ||
| 729 | # CONFIG_I2C_ALGOPCF is not set | ||
| 730 | # CONFIG_I2C_ALGOPCA is not set | ||
| 731 | |||
| 732 | # | ||
| 733 | # I2C Hardware Bus support | 737 | # I2C Hardware Bus support |
| 734 | # | 738 | # |
| 735 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
| @@ -754,6 +758,7 @@ CONFIG_I2C_MPC=y | |||
| 754 | # CONFIG_I2C_VIA is not set | 758 | # CONFIG_I2C_VIA is not set |
| 755 | # CONFIG_I2C_VIAPRO is not set | 759 | # CONFIG_I2C_VIAPRO is not set |
| 756 | # CONFIG_I2C_VOODOO3 is not set | 760 | # CONFIG_I2C_VOODOO3 is not set |
| 761 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 757 | 762 | ||
| 758 | # | 763 | # |
| 759 | # Miscellaneous I2C Chip support | 764 | # Miscellaneous I2C Chip support |
| @@ -763,19 +768,13 @@ CONFIG_I2C_MPC=y | |||
| 763 | # CONFIG_SENSORS_PCF8574 is not set | 768 | # CONFIG_SENSORS_PCF8574 is not set |
| 764 | # CONFIG_PCF8575 is not set | 769 | # CONFIG_PCF8575 is not set |
| 765 | # CONFIG_SENSORS_PCF8591 is not set | 770 | # CONFIG_SENSORS_PCF8591 is not set |
| 766 | # CONFIG_TPS65010 is not set | ||
| 767 | # CONFIG_SENSORS_MAX6875 is not set | 771 | # CONFIG_SENSORS_MAX6875 is not set |
| 768 | # CONFIG_SENSORS_TSL2550 is not set | 772 | # CONFIG_SENSORS_TSL2550 is not set |
| 769 | # CONFIG_I2C_DEBUG_CORE is not set | 773 | # CONFIG_I2C_DEBUG_CORE is not set |
| 770 | # CONFIG_I2C_DEBUG_ALGO is not set | 774 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 771 | # CONFIG_I2C_DEBUG_BUS is not set | 775 | # CONFIG_I2C_DEBUG_BUS is not set |
| 772 | # CONFIG_I2C_DEBUG_CHIP is not set | 776 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 773 | |||
| 774 | # | ||
| 775 | # SPI support | ||
| 776 | # | ||
| 777 | # CONFIG_SPI is not set | 777 | # CONFIG_SPI is not set |
| 778 | # CONFIG_SPI_MASTER is not set | ||
| 779 | # CONFIG_W1 is not set | 778 | # CONFIG_W1 is not set |
| 780 | # CONFIG_POWER_SUPPLY is not set | 779 | # CONFIG_POWER_SUPPLY is not set |
| 781 | CONFIG_HWMON=y | 780 | CONFIG_HWMON=y |
| @@ -845,12 +844,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 845 | # Multifunction device drivers | 844 | # Multifunction device drivers |
| 846 | # | 845 | # |
| 847 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
| 847 | # CONFIG_HTC_PASIC3 is not set | ||
| 848 | 848 | ||
| 849 | # | 849 | # |
| 850 | # Multimedia devices | 850 | # Multimedia devices |
| 851 | # | 851 | # |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia core support | ||
| 855 | # | ||
| 852 | # CONFIG_VIDEO_DEV is not set | 856 | # CONFIG_VIDEO_DEV is not set |
| 853 | # CONFIG_DVB_CORE is not set | 857 | # CONFIG_DVB_CORE is not set |
| 858 | # CONFIG_VIDEO_MEDIA is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Multimedia drivers | ||
| 862 | # | ||
| 854 | CONFIG_DAB=y | 863 | CONFIG_DAB=y |
| 855 | 864 | ||
| 856 | # | 865 | # |
| @@ -881,6 +890,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 881 | CONFIG_USB_ARCH_HAS_OHCI=y | 890 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 882 | CONFIG_USB_ARCH_HAS_EHCI=y | 891 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 883 | # CONFIG_USB is not set | 892 | # CONFIG_USB is not set |
| 893 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 884 | 895 | ||
| 885 | # | 896 | # |
| 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -889,14 +900,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 889 | # CONFIG_MMC is not set | 900 | # CONFIG_MMC is not set |
| 890 | # CONFIG_MEMSTICK is not set | 901 | # CONFIG_MEMSTICK is not set |
| 891 | # CONFIG_NEW_LEDS is not set | 902 | # CONFIG_NEW_LEDS is not set |
| 903 | # CONFIG_ACCESSIBILITY is not set | ||
| 892 | # CONFIG_INFINIBAND is not set | 904 | # CONFIG_INFINIBAND is not set |
| 893 | # CONFIG_EDAC is not set | 905 | # CONFIG_EDAC is not set |
| 894 | # CONFIG_RTC_CLASS is not set | 906 | # CONFIG_RTC_CLASS is not set |
| 895 | # CONFIG_DMADEVICES is not set | 907 | # CONFIG_DMADEVICES is not set |
| 896 | |||
| 897 | # | ||
| 898 | # Userspace I/O | ||
| 899 | # | ||
| 900 | # CONFIG_UIO is not set | 908 | # CONFIG_UIO is not set |
| 901 | 909 | ||
| 902 | # | 910 | # |
| @@ -916,7 +924,6 @@ CONFIG_FS_MBCACHE=y | |||
| 916 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
| 917 | # CONFIG_FS_POSIX_ACL is not set | 925 | # CONFIG_FS_POSIX_ACL is not set |
| 918 | # CONFIG_XFS_FS is not set | 926 | # CONFIG_XFS_FS is not set |
| 919 | # CONFIG_GFS2_FS is not set | ||
| 920 | # CONFIG_OCFS2_FS is not set | 927 | # CONFIG_OCFS2_FS is not set |
| 921 | CONFIG_DNOTIFY=y | 928 | CONFIG_DNOTIFY=y |
| 922 | CONFIG_INOTIFY=y | 929 | CONFIG_INOTIFY=y |
| @@ -984,7 +991,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 984 | CONFIG_NFS_FS=y | 991 | CONFIG_NFS_FS=y |
| 985 | # CONFIG_NFS_V3 is not set | 992 | # CONFIG_NFS_V3 is not set |
| 986 | # CONFIG_NFS_V4 is not set | 993 | # CONFIG_NFS_V4 is not set |
| 987 | # CONFIG_NFS_DIRECTIO is not set | ||
| 988 | # CONFIG_NFSD is not set | 994 | # CONFIG_NFSD is not set |
| 989 | CONFIG_ROOT_NFS=y | 995 | CONFIG_ROOT_NFS=y |
| 990 | CONFIG_LOCKD=y | 996 | CONFIG_LOCKD=y |
| @@ -1023,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
| 1023 | # Library routines | 1029 | # Library routines |
| 1024 | # | 1030 | # |
| 1025 | CONFIG_BITREVERSE=y | 1031 | CONFIG_BITREVERSE=y |
| 1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1026 | # CONFIG_CRC_CCITT is not set | 1033 | # CONFIG_CRC_CCITT is not set |
| 1027 | # CONFIG_CRC16 is not set | 1034 | # CONFIG_CRC16 is not set |
| 1028 | # CONFIG_CRC_ITU_T is not set | 1035 | # CONFIG_CRC_ITU_T is not set |
| @@ -1035,6 +1042,7 @@ CONFIG_PLIST=y | |||
| 1035 | CONFIG_HAS_IOMEM=y | 1042 | CONFIG_HAS_IOMEM=y |
| 1036 | CONFIG_HAS_IOPORT=y | 1043 | CONFIG_HAS_IOPORT=y |
| 1037 | CONFIG_HAS_DMA=y | 1044 | CONFIG_HAS_DMA=y |
| 1045 | CONFIG_HAVE_LMB=y | ||
| 1038 | 1046 | ||
| 1039 | # | 1047 | # |
| 1040 | # Kernel hacking | 1048 | # Kernel hacking |
| @@ -1042,6 +1050,7 @@ CONFIG_HAS_DMA=y | |||
| 1042 | # CONFIG_PRINTK_TIME is not set | 1050 | # CONFIG_PRINTK_TIME is not set |
| 1043 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1051 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1044 | CONFIG_ENABLE_MUST_CHECK=y | 1052 | CONFIG_ENABLE_MUST_CHECK=y |
| 1053 | CONFIG_FRAME_WARN=1024 | ||
| 1045 | # CONFIG_MAGIC_SYSRQ is not set | 1054 | # CONFIG_MAGIC_SYSRQ is not set |
| 1046 | # CONFIG_UNUSED_SYMBOLS is not set | 1055 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1047 | # CONFIG_DEBUG_FS is not set | 1056 | # CONFIG_DEBUG_FS is not set |
| @@ -1052,6 +1061,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1052 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1061 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1053 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
| 1054 | # CONFIG_KGDB_CONSOLE is not set | 1063 | # CONFIG_KGDB_CONSOLE is not set |
| 1064 | # CONFIG_IRQSTACKS is not set | ||
| 1055 | # CONFIG_PPC_EARLY_DEBUG is not set | 1065 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1056 | 1066 | ||
| 1057 | # | 1067 | # |
| @@ -1061,49 +1071,79 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1061 | # CONFIG_SECURITY is not set | 1071 | # CONFIG_SECURITY is not set |
| 1062 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1072 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1063 | CONFIG_CRYPTO=y | 1073 | CONFIG_CRYPTO=y |
| 1064 | # CONFIG_CRYPTO_SEQIV is not set | 1074 | |
| 1075 | # | ||
| 1076 | # Crypto core or helper | ||
| 1077 | # | ||
| 1065 | # CONFIG_CRYPTO_MANAGER is not set | 1078 | # CONFIG_CRYPTO_MANAGER is not set |
| 1079 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1080 | # CONFIG_CRYPTO_NULL is not set | ||
| 1081 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1082 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1083 | |||
| 1084 | # | ||
| 1085 | # Authenticated Encryption with Associated Data | ||
| 1086 | # | ||
| 1087 | # CONFIG_CRYPTO_CCM is not set | ||
| 1088 | # CONFIG_CRYPTO_GCM is not set | ||
| 1089 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1090 | |||
| 1091 | # | ||
| 1092 | # Block modes | ||
| 1093 | # | ||
| 1094 | # CONFIG_CRYPTO_CBC is not set | ||
| 1095 | # CONFIG_CRYPTO_CTR is not set | ||
| 1096 | # CONFIG_CRYPTO_CTS is not set | ||
| 1097 | # CONFIG_CRYPTO_ECB is not set | ||
| 1098 | # CONFIG_CRYPTO_LRW is not set | ||
| 1099 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1100 | # CONFIG_CRYPTO_XTS is not set | ||
| 1101 | |||
| 1102 | # | ||
| 1103 | # Hash modes | ||
| 1104 | # | ||
| 1066 | # CONFIG_CRYPTO_HMAC is not set | 1105 | # CONFIG_CRYPTO_HMAC is not set |
| 1067 | # CONFIG_CRYPTO_XCBC is not set | 1106 | # CONFIG_CRYPTO_XCBC is not set |
| 1068 | # CONFIG_CRYPTO_NULL is not set | 1107 | |
| 1108 | # | ||
| 1109 | # Digest | ||
| 1110 | # | ||
| 1111 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1069 | # CONFIG_CRYPTO_MD4 is not set | 1112 | # CONFIG_CRYPTO_MD4 is not set |
| 1070 | # CONFIG_CRYPTO_MD5 is not set | 1113 | # CONFIG_CRYPTO_MD5 is not set |
| 1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1071 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
| 1072 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
| 1073 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
| 1074 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1075 | # CONFIG_CRYPTO_TGR192 is not set | 1118 | # CONFIG_CRYPTO_TGR192 is not set |
| 1076 | # CONFIG_CRYPTO_GF128MUL is not set | 1119 | # CONFIG_CRYPTO_WP512 is not set |
| 1077 | # CONFIG_CRYPTO_ECB is not set | 1120 | |
| 1078 | # CONFIG_CRYPTO_CBC is not set | 1121 | # |
| 1079 | # CONFIG_CRYPTO_PCBC is not set | 1122 | # Ciphers |
| 1080 | # CONFIG_CRYPTO_LRW is not set | 1123 | # |
| 1081 | # CONFIG_CRYPTO_XTS is not set | ||
| 1082 | # CONFIG_CRYPTO_CTR is not set | ||
| 1083 | # CONFIG_CRYPTO_GCM is not set | ||
| 1084 | # CONFIG_CRYPTO_CCM is not set | ||
| 1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1086 | # CONFIG_CRYPTO_DES is not set | ||
| 1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1091 | # CONFIG_CRYPTO_AES is not set | 1124 | # CONFIG_CRYPTO_AES is not set |
| 1125 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1126 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1127 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1128 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1092 | # CONFIG_CRYPTO_CAST5 is not set | 1129 | # CONFIG_CRYPTO_CAST5 is not set |
| 1093 | # CONFIG_CRYPTO_CAST6 is not set | 1130 | # CONFIG_CRYPTO_CAST6 is not set |
| 1094 | # CONFIG_CRYPTO_TEA is not set | 1131 | # CONFIG_CRYPTO_DES is not set |
| 1095 | # CONFIG_CRYPTO_ARC4 is not set | 1132 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1096 | # CONFIG_CRYPTO_KHAZAD is not set | 1133 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1098 | # CONFIG_CRYPTO_SEED is not set | ||
| 1099 | # CONFIG_CRYPTO_SALSA20 is not set | 1134 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1135 | # CONFIG_CRYPTO_SEED is not set | ||
| 1136 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1137 | # CONFIG_CRYPTO_TEA is not set | ||
| 1138 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1139 | |||
| 1140 | # | ||
| 1141 | # Compression | ||
| 1142 | # | ||
| 1100 | # CONFIG_CRYPTO_DEFLATE is not set | 1143 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1101 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1102 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1103 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1104 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1105 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
| 1106 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
| 1107 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1108 | # CONFIG_PPC_CLOCK is not set | 1147 | # CONFIG_PPC_CLOCK is not set |
| 1109 | CONFIG_PPC_LIB_RHEAP=y | 1148 | CONFIG_PPC_LIB_RHEAP=y |
| 1149 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index a3cc94a2ff06..6740f2a3aa3d 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_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.25-rc2 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Wed Feb 20 12:26:07 2008 | 4 | # Mon Jun 9 08:52:08 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -75,6 +77,7 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
| 75 | CONFIG_USER_SCHED=y | 77 | CONFIG_USER_SCHED=y |
| 76 | # CONFIG_CGROUP_SCHED is not set | 78 | # CONFIG_CGROUP_SCHED is not set |
| 77 | CONFIG_SYSFS_DEPRECATED=y | 79 | CONFIG_SYSFS_DEPRECATED=y |
| 80 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 78 | # CONFIG_RELAY is not set | 81 | # CONFIG_RELAY is not set |
| 79 | # CONFIG_NAMESPACES is not set | 82 | # CONFIG_NAMESPACES is not set |
| 80 | # CONFIG_BLK_DEV_INITRD is not set | 83 | # CONFIG_BLK_DEV_INITRD is not set |
| @@ -107,6 +110,8 @@ CONFIG_SLUB=y | |||
| 107 | # CONFIG_MARKERS is not set | 110 | # CONFIG_MARKERS is not set |
| 108 | CONFIG_HAVE_OPROFILE=y | 111 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 112 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | ||
| 114 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 110 | CONFIG_PROC_PAGE_MONITOR=y | 115 | CONFIG_PROC_PAGE_MONITOR=y |
| 111 | CONFIG_SLABINFO=y | 116 | CONFIG_SLABINFO=y |
| 112 | # CONFIG_TINY_SHMEM is not set | 117 | # CONFIG_TINY_SHMEM is not set |
| @@ -131,7 +136,6 @@ CONFIG_DEFAULT_DEADLINE=y | |||
| 131 | # CONFIG_DEFAULT_NOOP is not set | 136 | # CONFIG_DEFAULT_NOOP is not set |
| 132 | CONFIG_DEFAULT_IOSCHED="deadline" | 137 | CONFIG_DEFAULT_IOSCHED="deadline" |
| 133 | CONFIG_CLASSIC_RCU=y | 138 | CONFIG_CLASSIC_RCU=y |
| 134 | # CONFIG_PREEMPT_RCU is not set | ||
| 135 | 139 | ||
| 136 | # | 140 | # |
| 137 | # Platform support | 141 | # Platform support |
| @@ -194,7 +198,6 @@ CONFIG_HZ=1000 | |||
| 194 | CONFIG_PREEMPT_NONE=y | 198 | CONFIG_PREEMPT_NONE=y |
| 195 | # CONFIG_PREEMPT_VOLUNTARY is not set | 199 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 196 | # CONFIG_PREEMPT is not set | 200 | # CONFIG_PREEMPT is not set |
| 197 | CONFIG_RCU_TRACE=y | ||
| 198 | CONFIG_BINFMT_ELF=y | 201 | CONFIG_BINFMT_ELF=y |
| 199 | # CONFIG_BINFMT_MISC is not set | 202 | # CONFIG_BINFMT_MISC is not set |
| 200 | # CONFIG_MATH_EMULATION is not set | 203 | # CONFIG_MATH_EMULATION is not set |
| @@ -213,11 +216,13 @@ CONFIG_FLATMEM=y | |||
| 213 | CONFIG_FLAT_NODE_MEM_MAP=y | 216 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 214 | # CONFIG_SPARSEMEM_STATIC is not set | 217 | # CONFIG_SPARSEMEM_STATIC is not set |
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 219 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 217 | # CONFIG_RESOURCES_64BIT is not set | 221 | # CONFIG_RESOURCES_64BIT is not set |
| 218 | CONFIG_ZONE_DMA_FLAG=1 | 222 | CONFIG_ZONE_DMA_FLAG=1 |
| 219 | CONFIG_BOUNCE=y | 223 | CONFIG_BOUNCE=y |
| 220 | CONFIG_VIRT_TO_BUS=y | 224 | CONFIG_VIRT_TO_BUS=y |
| 225 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 221 | # CONFIG_PROC_DEVICETREE is not set | 226 | # CONFIG_PROC_DEVICETREE is not set |
| 222 | # CONFIG_CMDLINE_BOOL is not set | 227 | # CONFIG_CMDLINE_BOOL is not set |
| 223 | # CONFIG_PM is not set | 228 | # CONFIG_PM is not set |
| @@ -235,6 +240,7 @@ CONFIG_FSL_SOC=y | |||
| 235 | # CONFIG_PCI_QSPAN is not set | 240 | # CONFIG_PCI_QSPAN is not set |
| 236 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 241 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 237 | # CONFIG_PCCARD is not set | 242 | # CONFIG_PCCARD is not set |
| 243 | # CONFIG_HAS_RAPIDIO is not set | ||
| 238 | 244 | ||
| 239 | # | 245 | # |
| 240 | # Advanced setup | 246 | # Advanced setup |
| @@ -244,13 +250,13 @@ CONFIG_FSL_SOC=y | |||
| 244 | # | 250 | # |
| 245 | # Default settings for advanced configuration options are used | 251 | # Default settings for advanced configuration options are used |
| 246 | # | 252 | # |
| 247 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 248 | CONFIG_LOWMEM_SIZE=0x30000000 | 253 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 254 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 249 | CONFIG_KERNEL_START=0xc0000000 | 255 | CONFIG_KERNEL_START=0xc0000000 |
| 256 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 250 | CONFIG_TASK_SIZE=0x80000000 | 257 | CONFIG_TASK_SIZE=0x80000000 |
| 251 | CONFIG_CONSISTENT_START=0xfd000000 | 258 | CONFIG_CONSISTENT_START=0xfd000000 |
| 252 | CONFIG_CONSISTENT_SIZE=0x00200000 | 259 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 253 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 254 | 260 | ||
| 255 | # | 261 | # |
| 256 | # Networking | 262 | # Networking |
| @@ -293,8 +299,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 293 | CONFIG_DEFAULT_TCP_CONG="cubic" | 299 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 294 | # CONFIG_TCP_MD5SIG is not set | 300 | # CONFIG_TCP_MD5SIG is not set |
| 295 | # CONFIG_IPV6 is not set | 301 | # CONFIG_IPV6 is not set |
| 296 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 297 | # CONFIG_INET6_TUNNEL is not set | ||
| 298 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 299 | # CONFIG_NETFILTER is not set | 303 | # CONFIG_NETFILTER is not set |
| 300 | # CONFIG_IP_DCCP is not set | 304 | # CONFIG_IP_DCCP is not set |
| @@ -482,6 +486,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 482 | # | 486 | # |
| 483 | # CONFIG_WLAN_PRE80211 is not set | 487 | # CONFIG_WLAN_PRE80211 is not set |
| 484 | # CONFIG_WLAN_80211 is not set | 488 | # CONFIG_WLAN_80211 is not set |
| 489 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 485 | # CONFIG_WAN is not set | 490 | # CONFIG_WAN is not set |
| 486 | # CONFIG_PPP is not set | 491 | # CONFIG_PPP is not set |
| 487 | # CONFIG_SLIP is not set | 492 | # CONFIG_SLIP is not set |
| @@ -548,6 +553,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 548 | # Character devices | 553 | # Character devices |
| 549 | # | 554 | # |
| 550 | # CONFIG_VT is not set | 555 | # CONFIG_VT is not set |
| 556 | CONFIG_DEVKMEM=y | ||
| 551 | # CONFIG_SERIAL_NONSTANDARD is not set | 557 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 552 | 558 | ||
| 553 | # | 559 | # |
| @@ -580,12 +586,7 @@ CONFIG_GEN_RTC=y | |||
| 580 | # CONFIG_RAW_DRIVER is not set | 586 | # CONFIG_RAW_DRIVER is not set |
| 581 | # CONFIG_TCG_TPM is not set | 587 | # CONFIG_TCG_TPM is not set |
| 582 | # CONFIG_I2C is not set | 588 | # CONFIG_I2C is not set |
| 583 | |||
| 584 | # | ||
| 585 | # SPI support | ||
| 586 | # | ||
| 587 | # CONFIG_SPI is not set | 589 | # CONFIG_SPI is not set |
| 588 | # CONFIG_SPI_MASTER is not set | ||
| 589 | # CONFIG_W1 is not set | 590 | # CONFIG_W1 is not set |
| 590 | # CONFIG_POWER_SUPPLY is not set | 591 | # CONFIG_POWER_SUPPLY is not set |
| 591 | # CONFIG_HWMON is not set | 592 | # CONFIG_HWMON is not set |
| @@ -602,12 +603,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 602 | # Multifunction device drivers | 603 | # Multifunction device drivers |
| 603 | # | 604 | # |
| 604 | # CONFIG_MFD_SM501 is not set | 605 | # CONFIG_MFD_SM501 is not set |
| 606 | # CONFIG_HTC_PASIC3 is not set | ||
| 605 | 607 | ||
| 606 | # | 608 | # |
| 607 | # Multimedia devices | 609 | # Multimedia devices |
| 608 | # | 610 | # |
| 611 | |||
| 612 | # | ||
| 613 | # Multimedia core support | ||
| 614 | # | ||
| 609 | # CONFIG_VIDEO_DEV is not set | 615 | # CONFIG_VIDEO_DEV is not set |
| 610 | # CONFIG_DVB_CORE is not set | 616 | # CONFIG_DVB_CORE is not set |
| 617 | # CONFIG_VIDEO_MEDIA is not set | ||
| 618 | |||
| 619 | # | ||
| 620 | # Multimedia drivers | ||
| 621 | # | ||
| 611 | CONFIG_DAB=y | 622 | CONFIG_DAB=y |
| 612 | 623 | ||
| 613 | # | 624 | # |
| @@ -632,12 +643,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 632 | # CONFIG_MMC is not set | 643 | # CONFIG_MMC is not set |
| 633 | # CONFIG_MEMSTICK is not set | 644 | # CONFIG_MEMSTICK is not set |
| 634 | # CONFIG_NEW_LEDS is not set | 645 | # CONFIG_NEW_LEDS is not set |
| 646 | # CONFIG_ACCESSIBILITY is not set | ||
| 635 | # CONFIG_EDAC is not set | 647 | # CONFIG_EDAC is not set |
| 636 | # CONFIG_RTC_CLASS is not set | 648 | # CONFIG_RTC_CLASS is not set |
| 637 | 649 | # CONFIG_DMADEVICES is not set | |
| 638 | # | ||
| 639 | # Userspace I/O | ||
| 640 | # | ||
| 641 | # CONFIG_UIO is not set | 650 | # CONFIG_UIO is not set |
| 642 | 651 | ||
| 643 | # | 652 | # |
| @@ -650,7 +659,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 650 | # CONFIG_JFS_FS is not set | 659 | # CONFIG_JFS_FS is not set |
| 651 | # CONFIG_FS_POSIX_ACL is not set | 660 | # CONFIG_FS_POSIX_ACL is not set |
| 652 | # CONFIG_XFS_FS is not set | 661 | # CONFIG_XFS_FS is not set |
| 653 | # CONFIG_GFS2_FS is not set | ||
| 654 | # CONFIG_OCFS2_FS is not set | 662 | # CONFIG_OCFS2_FS is not set |
| 655 | # CONFIG_DNOTIFY is not set | 663 | # CONFIG_DNOTIFY is not set |
| 656 | # CONFIG_INOTIFY is not set | 664 | # CONFIG_INOTIFY is not set |
| @@ -708,7 +716,6 @@ CONFIG_NFS_FS=y | |||
| 708 | CONFIG_NFS_V3=y | 716 | CONFIG_NFS_V3=y |
| 709 | # CONFIG_NFS_V3_ACL is not set | 717 | # CONFIG_NFS_V3_ACL is not set |
| 710 | # CONFIG_NFS_V4 is not set | 718 | # CONFIG_NFS_V4 is not set |
| 711 | # CONFIG_NFS_DIRECTIO is not set | ||
| 712 | # CONFIG_NFSD is not set | 719 | # CONFIG_NFSD is not set |
| 713 | CONFIG_ROOT_NFS=y | 720 | CONFIG_ROOT_NFS=y |
| 714 | CONFIG_LOCKD=y | 721 | CONFIG_LOCKD=y |
| @@ -751,6 +758,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 751 | # | 758 | # |
| 752 | # Library routines | 759 | # Library routines |
| 753 | # | 760 | # |
| 761 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 754 | # CONFIG_CRC_CCITT is not set | 762 | # CONFIG_CRC_CCITT is not set |
| 755 | # CONFIG_CRC16 is not set | 763 | # CONFIG_CRC16 is not set |
| 756 | # CONFIG_CRC_ITU_T is not set | 764 | # CONFIG_CRC_ITU_T is not set |
| @@ -761,6 +769,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 761 | CONFIG_HAS_IOMEM=y | 769 | CONFIG_HAS_IOMEM=y |
| 762 | CONFIG_HAS_IOPORT=y | 770 | CONFIG_HAS_IOPORT=y |
| 763 | CONFIG_HAS_DMA=y | 771 | CONFIG_HAS_DMA=y |
| 772 | CONFIG_HAVE_LMB=y | ||
| 764 | 773 | ||
| 765 | # | 774 | # |
| 766 | # Kernel hacking | 775 | # Kernel hacking |
| @@ -768,6 +777,7 @@ CONFIG_HAS_DMA=y | |||
| 768 | # CONFIG_PRINTK_TIME is not set | 777 | # CONFIG_PRINTK_TIME is not set |
| 769 | CONFIG_ENABLE_WARN_DEPRECATED=y | 778 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 770 | CONFIG_ENABLE_MUST_CHECK=y | 779 | CONFIG_ENABLE_MUST_CHECK=y |
| 780 | CONFIG_FRAME_WARN=1024 | ||
| 771 | CONFIG_MAGIC_SYSRQ=y | 781 | CONFIG_MAGIC_SYSRQ=y |
| 772 | # CONFIG_UNUSED_SYMBOLS is not set | 782 | # CONFIG_UNUSED_SYMBOLS is not set |
| 773 | CONFIG_DEBUG_FS=y | 783 | CONFIG_DEBUG_FS=y |
| @@ -778,6 +788,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 778 | CONFIG_SCHED_DEBUG=y | 788 | CONFIG_SCHED_DEBUG=y |
| 779 | # CONFIG_SCHEDSTATS is not set | 789 | # CONFIG_SCHEDSTATS is not set |
| 780 | # CONFIG_TIMER_STATS is not set | 790 | # CONFIG_TIMER_STATS is not set |
| 791 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 781 | # CONFIG_SLUB_DEBUG_ON is not set | 792 | # CONFIG_SLUB_DEBUG_ON is not set |
| 782 | # CONFIG_SLUB_STATS is not set | 793 | # CONFIG_SLUB_STATS is not set |
| 783 | # CONFIG_DEBUG_SPINLOCK is not set | 794 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -788,6 +799,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 788 | CONFIG_DEBUG_BUGVERBOSE=y | 799 | CONFIG_DEBUG_BUGVERBOSE=y |
| 789 | CONFIG_DEBUG_INFO=y | 800 | CONFIG_DEBUG_INFO=y |
| 790 | # CONFIG_DEBUG_VM is not set | 801 | # CONFIG_DEBUG_VM is not set |
| 802 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 791 | # CONFIG_DEBUG_LIST is not set | 803 | # CONFIG_DEBUG_LIST is not set |
| 792 | # CONFIG_DEBUG_SG is not set | 804 | # CONFIG_DEBUG_SG is not set |
| 793 | # CONFIG_BOOT_PRINTK_DELAY is not set | 805 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -798,6 +810,7 @@ CONFIG_DEBUG_INFO=y | |||
| 798 | # CONFIG_DEBUG_STACK_USAGE is not set | 810 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 799 | # CONFIG_DEBUG_PAGEALLOC is not set | 811 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 800 | # CONFIG_DEBUGGER is not set | 812 | # CONFIG_DEBUGGER is not set |
| 813 | # CONFIG_IRQSTACKS is not set | ||
| 801 | # CONFIG_VIRQ_DEBUG is not set | 814 | # CONFIG_VIRQ_DEBUG is not set |
| 802 | # CONFIG_BDI_SWITCH is not set | 815 | # CONFIG_BDI_SWITCH is not set |
| 803 | # CONFIG_PPC_EARLY_DEBUG is not set | 816 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -811,3 +824,4 @@ CONFIG_DEBUG_INFO=y | |||
| 811 | # CONFIG_CRYPTO is not set | 824 | # CONFIG_CRYPTO is not set |
| 812 | # CONFIG_PPC_CLOCK is not set | 825 | # CONFIG_PPC_CLOCK is not set |
| 813 | CONFIG_PPC_LIB_RHEAP=y | 826 | CONFIG_PPC_LIB_RHEAP=y |
| 827 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index d7fd298bd234..05360d4ef1b1 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Thu Mar 27 13:55:37 2008 | 4 | # Tue May 20 20:00:44 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -88,6 +90,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 88 | CONFIG_SYSCTL=y | 90 | CONFIG_SYSCTL=y |
| 89 | # CONFIG_EMBEDDED is not set | 91 | # CONFIG_EMBEDDED is not set |
| 90 | CONFIG_SYSCTL_SYSCALL=y | 92 | CONFIG_SYSCTL_SYSCALL=y |
| 93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 91 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
| 92 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
| 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -95,6 +98,7 @@ CONFIG_HOTPLUG=y | |||
| 95 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
| 96 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
| 97 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
| 101 | CONFIG_PCSPKR_PLATFORM=y | ||
| 98 | # CONFIG_COMPAT_BRK is not set | 102 | # CONFIG_COMPAT_BRK is not set |
| 99 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
| 100 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
| @@ -115,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 115 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 116 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 117 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
| 119 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
| 122 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
| 123 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
| 129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 124 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
| 125 | CONFIG_MODULE_FORCE_UNLOAD=y | 131 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 126 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
| @@ -217,11 +223,13 @@ CONFIG_FLATMEM=y | |||
| 217 | CONFIG_FLAT_NODE_MEM_MAP=y | 223 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 218 | # CONFIG_SPARSEMEM_STATIC is not set | 224 | # CONFIG_SPARSEMEM_STATIC is not set |
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 226 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
| 224 | CONFIG_VIRT_TO_BUS=y | 231 | CONFIG_VIRT_TO_BUS=y |
| 232 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 225 | CONFIG_PROC_DEVICETREE=y | 233 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
| 227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
| @@ -245,6 +253,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 245 | # CONFIG_PCI_DEBUG is not set | 253 | # CONFIG_PCI_DEBUG is not set |
| 246 | # CONFIG_PCCARD is not set | 254 | # CONFIG_PCCARD is not set |
| 247 | # CONFIG_HOTPLUG_PCI is not set | 255 | # CONFIG_HOTPLUG_PCI is not set |
| 256 | # CONFIG_HAS_RAPIDIO is not set | ||
| 248 | 257 | ||
| 249 | # | 258 | # |
| 250 | # Advanced setup | 259 | # Advanced setup |
| @@ -254,11 +263,11 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 254 | # | 263 | # |
| 255 | # Default settings for advanced configuration options are used | 264 | # Default settings for advanced configuration options are used |
| 256 | # | 265 | # |
| 257 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 258 | CONFIG_LOWMEM_SIZE=0x30000000 | 266 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 267 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 259 | CONFIG_KERNEL_START=0xc0000000 | 268 | CONFIG_KERNEL_START=0xc0000000 |
| 269 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 260 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
| 261 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 262 | 271 | ||
| 263 | # | 272 | # |
| 264 | # Networking | 273 | # Networking |
| @@ -299,8 +308,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 299 | # CONFIG_TCP_MD5SIG is not set | 308 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IP_VS is not set | 309 | # CONFIG_IP_VS is not set |
| 301 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | CONFIG_NETFILTER=y | 312 | CONFIG_NETFILTER=y |
| 306 | # CONFIG_NETFILTER_DEBUG is not set | 313 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -398,6 +405,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 398 | # CONFIG_CONNECTOR is not set | 405 | # CONFIG_CONNECTOR is not set |
| 399 | # CONFIG_MTD is not set | 406 | # CONFIG_MTD is not set |
| 400 | CONFIG_OF_DEVICE=y | 407 | CONFIG_OF_DEVICE=y |
| 408 | CONFIG_OF_I2C=y | ||
| 401 | # CONFIG_PARPORT is not set | 409 | # CONFIG_PARPORT is not set |
| 402 | # CONFIG_PNP is not set | 410 | # CONFIG_PNP is not set |
| 403 | CONFIG_BLK_DEV=y | 411 | CONFIG_BLK_DEV=y |
| @@ -484,22 +492,8 @@ CONFIG_BLK_DEV_SL82C105=y | |||
| 484 | # CONFIG_BLK_DEV_TRM290 is not set | 492 | # CONFIG_BLK_DEV_TRM290 is not set |
| 485 | CONFIG_BLK_DEV_VIA82CXXX=y | 493 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 486 | # CONFIG_BLK_DEV_TC86C001 is not set | 494 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 487 | |||
| 488 | # | ||
| 489 | # Other IDE chipsets support | ||
| 490 | # | ||
| 491 | |||
| 492 | # | ||
| 493 | # Note: most of these also require special kernel boot parameters | ||
| 494 | # | ||
| 495 | # CONFIG_BLK_DEV_4DRIVES is not set | ||
| 496 | # CONFIG_BLK_DEV_ALI14XX is not set | ||
| 497 | # CONFIG_BLK_DEV_DTC2278 is not set | ||
| 498 | # CONFIG_BLK_DEV_HT6560B is not set | ||
| 499 | # CONFIG_BLK_DEV_QD65XX is not set | ||
| 500 | # CONFIG_BLK_DEV_UMC8672 is not set | ||
| 501 | CONFIG_BLK_DEV_IDEDMA=y | 495 | CONFIG_BLK_DEV_IDEDMA=y |
| 502 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 496 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 503 | # CONFIG_BLK_DEV_HD is not set | 497 | # CONFIG_BLK_DEV_HD is not set |
| 504 | 498 | ||
| 505 | # | 499 | # |
| @@ -641,7 +635,6 @@ CONFIG_DE4X5=y | |||
| 641 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 635 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 642 | CONFIG_NET_PCI=y | 636 | CONFIG_NET_PCI=y |
| 643 | CONFIG_PCNET32=y | 637 | CONFIG_PCNET32=y |
| 644 | # CONFIG_PCNET32_NAPI is not set | ||
| 645 | # CONFIG_AMD8111_ETH is not set | 638 | # CONFIG_AMD8111_ETH is not set |
| 646 | # CONFIG_ADAPTEC_STARFIRE is not set | 639 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 647 | # CONFIG_AC3200 is not set | 640 | # CONFIG_AC3200 is not set |
| @@ -684,7 +677,6 @@ CONFIG_NETDEV_1000=y | |||
| 684 | # CONFIG_SIS190 is not set | 677 | # CONFIG_SIS190 is not set |
| 685 | # CONFIG_SKGE is not set | 678 | # CONFIG_SKGE is not set |
| 686 | # CONFIG_SKY2 is not set | 679 | # CONFIG_SKY2 is not set |
| 687 | # CONFIG_SK98LIN is not set | ||
| 688 | # CONFIG_VIA_VELOCITY is not set | 680 | # CONFIG_VIA_VELOCITY is not set |
| 689 | # CONFIG_TIGON3 is not set | 681 | # CONFIG_TIGON3 is not set |
| 690 | # CONFIG_BNX2 is not set | 682 | # CONFIG_BNX2 is not set |
| @@ -703,6 +695,7 @@ CONFIG_NETDEV_10000=y | |||
| 703 | # CONFIG_MLX4_CORE is not set | 695 | # CONFIG_MLX4_CORE is not set |
| 704 | # CONFIG_TEHUTI is not set | 696 | # CONFIG_TEHUTI is not set |
| 705 | # CONFIG_BNX2X is not set | 697 | # CONFIG_BNX2X is not set |
| 698 | # CONFIG_SFC is not set | ||
| 706 | # CONFIG_TR is not set | 699 | # CONFIG_TR is not set |
| 707 | 700 | ||
| 708 | # | 701 | # |
| @@ -710,6 +703,7 @@ CONFIG_NETDEV_10000=y | |||
| 710 | # | 703 | # |
| 711 | # CONFIG_WLAN_PRE80211 is not set | 704 | # CONFIG_WLAN_PRE80211 is not set |
| 712 | # CONFIG_WLAN_80211 is not set | 705 | # CONFIG_WLAN_80211 is not set |
| 706 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 713 | 707 | ||
| 714 | # | 708 | # |
| 715 | # USB Network Adapters | 709 | # USB Network Adapters |
| @@ -813,6 +807,7 @@ CONFIG_VT=y | |||
| 813 | CONFIG_VT_CONSOLE=y | 807 | CONFIG_VT_CONSOLE=y |
| 814 | CONFIG_HW_CONSOLE=y | 808 | CONFIG_HW_CONSOLE=y |
| 815 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 809 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 810 | CONFIG_DEVKMEM=y | ||
| 816 | # CONFIG_SERIAL_NONSTANDARD is not set | 811 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 817 | # CONFIG_NOZOMI is not set | 812 | # CONFIG_NOZOMI is not set |
| 818 | 813 | ||
| @@ -853,13 +848,7 @@ CONFIG_DEVPORT=y | |||
| 853 | CONFIG_I2C=y | 848 | CONFIG_I2C=y |
| 854 | CONFIG_I2C_BOARDINFO=y | 849 | CONFIG_I2C_BOARDINFO=y |
| 855 | # CONFIG_I2C_CHARDEV is not set | 850 | # CONFIG_I2C_CHARDEV is not set |
| 856 | |||
| 857 | # | ||
| 858 | # I2C Algorithms | ||
| 859 | # | ||
| 860 | CONFIG_I2C_ALGOBIT=y | 851 | CONFIG_I2C_ALGOBIT=y |
| 861 | # CONFIG_I2C_ALGOPCF is not set | ||
| 862 | # CONFIG_I2C_ALGOPCA is not set | ||
| 863 | 852 | ||
| 864 | # | 853 | # |
| 865 | # I2C Hardware Bus support | 854 | # I2C Hardware Bus support |
| @@ -890,6 +879,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 890 | # CONFIG_I2C_VIAPRO is not set | 879 | # CONFIG_I2C_VIAPRO is not set |
| 891 | # CONFIG_I2C_VOODOO3 is not set | 880 | # CONFIG_I2C_VOODOO3 is not set |
| 892 | # CONFIG_I2C_PCA_ISA is not set | 881 | # CONFIG_I2C_PCA_ISA is not set |
| 882 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 893 | 883 | ||
| 894 | # | 884 | # |
| 895 | # Miscellaneous I2C Chip support | 885 | # Miscellaneous I2C Chip support |
| @@ -899,19 +889,13 @@ CONFIG_I2C_ALGOBIT=y | |||
| 899 | # CONFIG_SENSORS_PCF8574 is not set | 889 | # CONFIG_SENSORS_PCF8574 is not set |
| 900 | # CONFIG_PCF8575 is not set | 890 | # CONFIG_PCF8575 is not set |
| 901 | # CONFIG_SENSORS_PCF8591 is not set | 891 | # CONFIG_SENSORS_PCF8591 is not set |
| 902 | # CONFIG_TPS65010 is not set | ||
| 903 | # CONFIG_SENSORS_MAX6875 is not set | 892 | # CONFIG_SENSORS_MAX6875 is not set |
| 904 | # CONFIG_SENSORS_TSL2550 is not set | 893 | # CONFIG_SENSORS_TSL2550 is not set |
| 905 | # CONFIG_I2C_DEBUG_CORE is not set | 894 | # CONFIG_I2C_DEBUG_CORE is not set |
| 906 | # CONFIG_I2C_DEBUG_ALGO is not set | 895 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 907 | # CONFIG_I2C_DEBUG_BUS is not set | 896 | # CONFIG_I2C_DEBUG_BUS is not set |
| 908 | # CONFIG_I2C_DEBUG_CHIP is not set | 897 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 909 | |||
| 910 | # | ||
| 911 | # SPI support | ||
| 912 | # | ||
| 913 | # CONFIG_SPI is not set | 898 | # CONFIG_SPI is not set |
| 914 | # CONFIG_SPI_MASTER is not set | ||
| 915 | # CONFIG_W1 is not set | 899 | # CONFIG_W1 is not set |
| 916 | # CONFIG_POWER_SUPPLY is not set | 900 | # CONFIG_POWER_SUPPLY is not set |
| 917 | # CONFIG_HWMON is not set | 901 | # CONFIG_HWMON is not set |
| @@ -928,12 +912,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 928 | # Multifunction device drivers | 912 | # Multifunction device drivers |
| 929 | # | 913 | # |
| 930 | # CONFIG_MFD_SM501 is not set | 914 | # CONFIG_MFD_SM501 is not set |
| 915 | # CONFIG_HTC_PASIC3 is not set | ||
| 931 | 916 | ||
| 932 | # | 917 | # |
| 933 | # Multimedia devices | 918 | # Multimedia devices |
| 934 | # | 919 | # |
| 920 | |||
| 921 | # | ||
| 922 | # Multimedia core support | ||
| 923 | # | ||
| 935 | # CONFIG_VIDEO_DEV is not set | 924 | # CONFIG_VIDEO_DEV is not set |
| 936 | # CONFIG_DVB_CORE is not set | 925 | # CONFIG_DVB_CORE is not set |
| 926 | # CONFIG_VIDEO_MEDIA is not set | ||
| 927 | |||
| 928 | # | ||
| 929 | # Multimedia drivers | ||
| 930 | # | ||
| 937 | # CONFIG_DAB is not set | 931 | # CONFIG_DAB is not set |
| 938 | 932 | ||
| 939 | # | 933 | # |
| @@ -953,8 +947,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 953 | # CONFIG_FB_SYS_FILLRECT is not set | 947 | # CONFIG_FB_SYS_FILLRECT is not set |
| 954 | # CONFIG_FB_SYS_COPYAREA is not set | 948 | # CONFIG_FB_SYS_COPYAREA is not set |
| 955 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 949 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 950 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 956 | # CONFIG_FB_SYS_FOPS is not set | 951 | # CONFIG_FB_SYS_FOPS is not set |
| 957 | CONFIG_FB_DEFERRED_IO=y | ||
| 958 | # CONFIG_FB_SVGALIB is not set | 952 | # CONFIG_FB_SVGALIB is not set |
| 959 | CONFIG_FB_MACMODES=y | 953 | CONFIG_FB_MACMODES=y |
| 960 | CONFIG_FB_BACKLIGHT=y | 954 | CONFIG_FB_BACKLIGHT=y |
| @@ -1072,11 +1066,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1072 | # | 1066 | # |
| 1073 | # USB Host Controller Drivers | 1067 | # USB Host Controller Drivers |
| 1074 | # | 1068 | # |
| 1069 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1075 | CONFIG_USB_EHCI_HCD=m | 1070 | CONFIG_USB_EHCI_HCD=m |
| 1076 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1071 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1077 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1072 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1078 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1073 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 1079 | # CONFIG_USB_ISP116X_HCD is not set | 1074 | # CONFIG_USB_ISP116X_HCD is not set |
| 1075 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1080 | CONFIG_USB_OHCI_HCD=y | 1076 | CONFIG_USB_OHCI_HCD=y |
| 1081 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1077 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1082 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1078 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1112,6 +1108,7 @@ CONFIG_USB_STORAGE=m | |||
| 1112 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1108 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1113 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1109 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1114 | # CONFIG_USB_STORAGE_KARMA is not set | 1110 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1111 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1115 | # CONFIG_USB_LIBUSUAL is not set | 1112 | # CONFIG_USB_LIBUSUAL is not set |
| 1116 | 1113 | ||
| 1117 | # | 1114 | # |
| @@ -1153,14 +1150,11 @@ CONFIG_USB_MON=y | |||
| 1153 | # CONFIG_MMC is not set | 1150 | # CONFIG_MMC is not set |
| 1154 | # CONFIG_MEMSTICK is not set | 1151 | # CONFIG_MEMSTICK is not set |
| 1155 | # CONFIG_NEW_LEDS is not set | 1152 | # CONFIG_NEW_LEDS is not set |
| 1153 | # CONFIG_ACCESSIBILITY is not set | ||
| 1156 | # CONFIG_INFINIBAND is not set | 1154 | # CONFIG_INFINIBAND is not set |
| 1157 | # CONFIG_EDAC is not set | 1155 | # CONFIG_EDAC is not set |
| 1158 | # CONFIG_RTC_CLASS is not set | 1156 | # CONFIG_RTC_CLASS is not set |
| 1159 | # CONFIG_DMADEVICES is not set | 1157 | # CONFIG_DMADEVICES is not set |
| 1160 | |||
| 1161 | # | ||
| 1162 | # Userspace I/O | ||
| 1163 | # | ||
| 1164 | # CONFIG_UIO is not set | 1158 | # CONFIG_UIO is not set |
| 1165 | 1159 | ||
| 1166 | # | 1160 | # |
| @@ -1180,7 +1174,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1180 | # CONFIG_JFS_FS is not set | 1174 | # CONFIG_JFS_FS is not set |
| 1181 | # CONFIG_FS_POSIX_ACL is not set | 1175 | # CONFIG_FS_POSIX_ACL is not set |
| 1182 | # CONFIG_XFS_FS is not set | 1176 | # CONFIG_XFS_FS is not set |
| 1183 | # CONFIG_GFS2_FS is not set | ||
| 1184 | # CONFIG_OCFS2_FS is not set | 1177 | # CONFIG_OCFS2_FS is not set |
| 1185 | CONFIG_DNOTIFY=y | 1178 | CONFIG_DNOTIFY=y |
| 1186 | CONFIG_INOTIFY=y | 1179 | CONFIG_INOTIFY=y |
| @@ -1314,6 +1307,7 @@ CONFIG_NLS_ISO8859_1=m | |||
| 1314 | # Library routines | 1307 | # Library routines |
| 1315 | # | 1308 | # |
| 1316 | CONFIG_BITREVERSE=y | 1309 | CONFIG_BITREVERSE=y |
| 1310 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1317 | CONFIG_CRC_CCITT=m | 1311 | CONFIG_CRC_CCITT=m |
| 1318 | # CONFIG_CRC16 is not set | 1312 | # CONFIG_CRC16 is not set |
| 1319 | # CONFIG_CRC_ITU_T is not set | 1313 | # CONFIG_CRC_ITU_T is not set |
| @@ -1334,6 +1328,7 @@ CONFIG_HAVE_LMB=y | |||
| 1334 | # CONFIG_PRINTK_TIME is not set | 1328 | # CONFIG_PRINTK_TIME is not set |
| 1335 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1329 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1336 | CONFIG_ENABLE_MUST_CHECK=y | 1330 | CONFIG_ENABLE_MUST_CHECK=y |
| 1331 | CONFIG_FRAME_WARN=1024 | ||
| 1337 | CONFIG_MAGIC_SYSRQ=y | 1332 | CONFIG_MAGIC_SYSRQ=y |
| 1338 | # CONFIG_UNUSED_SYMBOLS is not set | 1333 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1339 | # CONFIG_DEBUG_FS is not set | 1334 | # CONFIG_DEBUG_FS is not set |
| @@ -1344,6 +1339,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1344 | CONFIG_SCHED_DEBUG=y | 1339 | CONFIG_SCHED_DEBUG=y |
| 1345 | # CONFIG_SCHEDSTATS is not set | 1340 | # CONFIG_SCHEDSTATS is not set |
| 1346 | # CONFIG_TIMER_STATS is not set | 1341 | # CONFIG_TIMER_STATS is not set |
| 1342 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1347 | # CONFIG_SLUB_DEBUG_ON is not set | 1343 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1348 | # CONFIG_SLUB_STATS is not set | 1344 | # CONFIG_SLUB_STATS is not set |
| 1349 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1345 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1357,6 +1353,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y | |||
| 1357 | CONFIG_DEBUG_BUGVERBOSE=y | 1353 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1358 | # CONFIG_DEBUG_INFO is not set | 1354 | # CONFIG_DEBUG_INFO is not set |
| 1359 | # CONFIG_DEBUG_VM is not set | 1355 | # CONFIG_DEBUG_VM is not set |
| 1356 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1360 | # CONFIG_DEBUG_LIST is not set | 1357 | # CONFIG_DEBUG_LIST is not set |
| 1361 | # CONFIG_DEBUG_SG is not set | 1358 | # CONFIG_DEBUG_SG is not set |
| 1362 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1359 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1371,6 +1368,7 @@ CONFIG_DEBUGGER=y | |||
| 1371 | CONFIG_XMON=y | 1368 | CONFIG_XMON=y |
| 1372 | CONFIG_XMON_DEFAULT=y | 1369 | CONFIG_XMON_DEFAULT=y |
| 1373 | CONFIG_XMON_DISASSEMBLY=y | 1370 | CONFIG_XMON_DISASSEMBLY=y |
| 1371 | CONFIG_IRQSTACKS=y | ||
| 1374 | # CONFIG_BDI_SWITCH is not set | 1372 | # CONFIG_BDI_SWITCH is not set |
| 1375 | # CONFIG_BOOTX_TEXT is not set | 1373 | # CONFIG_BOOTX_TEXT is not set |
| 1376 | # CONFIG_PPC_EARLY_DEBUG is not set | 1374 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1382,50 +1380,80 @@ CONFIG_XMON_DISASSEMBLY=y | |||
| 1382 | # CONFIG_SECURITY is not set | 1380 | # CONFIG_SECURITY is not set |
| 1383 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1381 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1384 | CONFIG_CRYPTO=y | 1382 | CONFIG_CRYPTO=y |
| 1383 | |||
| 1384 | # | ||
| 1385 | # Crypto core or helper | ||
| 1386 | # | ||
| 1385 | CONFIG_CRYPTO_ALGAPI=m | 1387 | CONFIG_CRYPTO_ALGAPI=m |
| 1386 | CONFIG_CRYPTO_BLKCIPHER=m | 1388 | CONFIG_CRYPTO_BLKCIPHER=m |
| 1387 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1388 | CONFIG_CRYPTO_MANAGER=m | 1389 | CONFIG_CRYPTO_MANAGER=m |
| 1390 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1391 | # CONFIG_CRYPTO_NULL is not set | ||
| 1392 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1393 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1394 | # CONFIG_CRYPTO_TEST is not set | ||
| 1395 | |||
| 1396 | # | ||
| 1397 | # Authenticated Encryption with Associated Data | ||
| 1398 | # | ||
| 1399 | # CONFIG_CRYPTO_CCM is not set | ||
| 1400 | # CONFIG_CRYPTO_GCM is not set | ||
| 1401 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1402 | |||
| 1403 | # | ||
| 1404 | # Block modes | ||
| 1405 | # | ||
| 1406 | CONFIG_CRYPTO_CBC=m | ||
| 1407 | # CONFIG_CRYPTO_CTR is not set | ||
| 1408 | # CONFIG_CRYPTO_CTS is not set | ||
| 1409 | CONFIG_CRYPTO_ECB=m | ||
| 1410 | # CONFIG_CRYPTO_LRW is not set | ||
| 1411 | CONFIG_CRYPTO_PCBC=m | ||
| 1412 | # CONFIG_CRYPTO_XTS is not set | ||
| 1413 | |||
| 1414 | # | ||
| 1415 | # Hash modes | ||
| 1416 | # | ||
| 1389 | # CONFIG_CRYPTO_HMAC is not set | 1417 | # CONFIG_CRYPTO_HMAC is not set |
| 1390 | # CONFIG_CRYPTO_XCBC is not set | 1418 | # CONFIG_CRYPTO_XCBC is not set |
| 1391 | # CONFIG_CRYPTO_NULL is not set | 1419 | |
| 1420 | # | ||
| 1421 | # Digest | ||
| 1422 | # | ||
| 1423 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1392 | # CONFIG_CRYPTO_MD4 is not set | 1424 | # CONFIG_CRYPTO_MD4 is not set |
| 1393 | # CONFIG_CRYPTO_MD5 is not set | 1425 | # CONFIG_CRYPTO_MD5 is not set |
| 1426 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1394 | CONFIG_CRYPTO_SHA1=m | 1427 | CONFIG_CRYPTO_SHA1=m |
| 1395 | # CONFIG_CRYPTO_SHA256 is not set | 1428 | # CONFIG_CRYPTO_SHA256 is not set |
| 1396 | # CONFIG_CRYPTO_SHA512 is not set | 1429 | # CONFIG_CRYPTO_SHA512 is not set |
| 1397 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1398 | # CONFIG_CRYPTO_TGR192 is not set | 1430 | # CONFIG_CRYPTO_TGR192 is not set |
| 1399 | # CONFIG_CRYPTO_GF128MUL is not set | 1431 | # CONFIG_CRYPTO_WP512 is not set |
| 1400 | CONFIG_CRYPTO_ECB=m | 1432 | |
| 1401 | CONFIG_CRYPTO_CBC=m | 1433 | # |
| 1402 | CONFIG_CRYPTO_PCBC=m | 1434 | # Ciphers |
| 1403 | # CONFIG_CRYPTO_LRW is not set | 1435 | # |
| 1404 | # CONFIG_CRYPTO_XTS is not set | ||
| 1405 | # CONFIG_CRYPTO_CTR is not set | ||
| 1406 | # CONFIG_CRYPTO_GCM is not set | ||
| 1407 | # CONFIG_CRYPTO_CCM is not set | ||
| 1408 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1409 | # CONFIG_CRYPTO_DES is not set | ||
| 1410 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1411 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1412 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1413 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1414 | # CONFIG_CRYPTO_AES is not set | 1436 | # CONFIG_CRYPTO_AES is not set |
| 1437 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1438 | CONFIG_CRYPTO_ARC4=m | ||
| 1439 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1440 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1415 | # CONFIG_CRYPTO_CAST5 is not set | 1441 | # CONFIG_CRYPTO_CAST5 is not set |
| 1416 | # CONFIG_CRYPTO_CAST6 is not set | 1442 | # CONFIG_CRYPTO_CAST6 is not set |
| 1417 | # CONFIG_CRYPTO_TEA is not set | 1443 | # CONFIG_CRYPTO_DES is not set |
| 1418 | CONFIG_CRYPTO_ARC4=m | 1444 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1419 | # CONFIG_CRYPTO_KHAZAD is not set | 1445 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1420 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1421 | # CONFIG_CRYPTO_SEED is not set | ||
| 1422 | # CONFIG_CRYPTO_SALSA20 is not set | 1446 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1447 | # CONFIG_CRYPTO_SEED is not set | ||
| 1448 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1449 | # CONFIG_CRYPTO_TEA is not set | ||
| 1450 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1451 | |||
| 1452 | # | ||
| 1453 | # Compression | ||
| 1454 | # | ||
| 1423 | # CONFIG_CRYPTO_DEFLATE is not set | 1455 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1424 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1425 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1426 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1427 | # CONFIG_CRYPTO_TEST is not set | ||
| 1428 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1429 | # CONFIG_CRYPTO_LZO is not set | 1456 | # CONFIG_CRYPTO_LZO is not set |
| 1430 | # CONFIG_CRYPTO_HW is not set | 1457 | # CONFIG_CRYPTO_HW is not set |
| 1431 | # CONFIG_PPC_CLOCK is not set | 1458 | # CONFIG_PPC_CLOCK is not set |
| 1459 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index 2b1504e0a111..ba2a463b9305 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:09 2008 | 4 | # Mon Jun 9 08:52:09 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,18 +72,16 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | # CONFIG_BLK_DEV_INITRD is not set | 79 | # CONFIG_BLK_DEV_INITRD is not set |
| 80 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 82 | CONFIG_SYSCTL=y | 81 | CONFIG_SYSCTL=y |
| 83 | CONFIG_EMBEDDED=y | 82 | CONFIG_EMBEDDED=y |
| 84 | CONFIG_SYSCTL_SYSCALL=y | 83 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 85 | CONFIG_KALLSYMS=y | 85 | CONFIG_KALLSYMS=y |
| 86 | CONFIG_KALLSYMS_ALL=y | 86 | CONFIG_KALLSYMS_ALL=y |
| 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -107,6 +107,7 @@ CONFIG_SLAB=y | |||
| 107 | CONFIG_HAVE_OPROFILE=y | 107 | CONFIG_HAVE_OPROFILE=y |
| 108 | CONFIG_HAVE_KPROBES=y | 108 | CONFIG_HAVE_KPROBES=y |
| 109 | CONFIG_HAVE_KRETPROBES=y | 109 | CONFIG_HAVE_KRETPROBES=y |
| 110 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 110 | CONFIG_PROC_PAGE_MONITOR=y | 111 | CONFIG_PROC_PAGE_MONITOR=y |
| 111 | CONFIG_SLABINFO=y | 112 | CONFIG_SLABINFO=y |
| 112 | CONFIG_RT_MUTEXES=y | 113 | CONFIG_RT_MUTEXES=y |
| @@ -194,11 +195,13 @@ CONFIG_FLATMEM=y | |||
| 194 | CONFIG_FLAT_NODE_MEM_MAP=y | 195 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 195 | # CONFIG_SPARSEMEM_STATIC is not set | 196 | # CONFIG_SPARSEMEM_STATIC is not set |
| 196 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 197 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 198 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 197 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 198 | # CONFIG_RESOURCES_64BIT is not set | 200 | # CONFIG_RESOURCES_64BIT is not set |
| 199 | CONFIG_ZONE_DMA_FLAG=1 | 201 | CONFIG_ZONE_DMA_FLAG=1 |
| 200 | CONFIG_BOUNCE=y | 202 | CONFIG_BOUNCE=y |
| 201 | CONFIG_VIRT_TO_BUS=y | 203 | CONFIG_VIRT_TO_BUS=y |
| 204 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 202 | CONFIG_PROC_DEVICETREE=y | 205 | CONFIG_PROC_DEVICETREE=y |
| 203 | # CONFIG_CMDLINE_BOOL is not set | 206 | # CONFIG_CMDLINE_BOOL is not set |
| 204 | # CONFIG_PM is not set | 207 | # CONFIG_PM is not set |
| @@ -215,6 +218,7 @@ CONFIG_FSL_SOC=y | |||
| 215 | # CONFIG_PCI_SYSCALL is not set | 218 | # CONFIG_PCI_SYSCALL is not set |
| 216 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 219 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 217 | # CONFIG_PCCARD is not set | 220 | # CONFIG_PCCARD is not set |
| 221 | # CONFIG_HAS_RAPIDIO is not set | ||
| 218 | 222 | ||
| 219 | # | 223 | # |
| 220 | # Advanced setup | 224 | # Advanced setup |
| @@ -224,11 +228,11 @@ CONFIG_FSL_SOC=y | |||
| 224 | # | 228 | # |
| 225 | # Default settings for advanced configuration options are used | 229 | # Default settings for advanced configuration options are used |
| 226 | # | 230 | # |
| 227 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 228 | CONFIG_LOWMEM_SIZE=0x30000000 | 231 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 232 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 229 | CONFIG_KERNEL_START=0xc0000000 | 233 | CONFIG_KERNEL_START=0xc0000000 |
| 234 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 230 | CONFIG_TASK_SIZE=0xc0000000 | 235 | CONFIG_TASK_SIZE=0xc0000000 |
| 231 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 232 | 236 | ||
| 233 | # | 237 | # |
| 234 | # Networking | 238 | # Networking |
| @@ -283,6 +287,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 283 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 287 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 284 | CONFIG_INET6_XFRM_MODE_BEET=y | 288 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 285 | CONFIG_IPV6_SIT=y | 289 | CONFIG_IPV6_SIT=y |
| 290 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 286 | # CONFIG_IPV6_TUNNEL is not set | 291 | # CONFIG_IPV6_TUNNEL is not set |
| 287 | # CONFIG_NETWORK_SECMARK is not set | 292 | # CONFIG_NETWORK_SECMARK is not set |
| 288 | CONFIG_NETFILTER=y | 293 | CONFIG_NETFILTER=y |
| @@ -498,6 +503,7 @@ CONFIG_NETDEV_10000=y | |||
| 498 | # | 503 | # |
| 499 | # CONFIG_WLAN_PRE80211 is not set | 504 | # CONFIG_WLAN_PRE80211 is not set |
| 500 | # CONFIG_WLAN_80211 is not set | 505 | # CONFIG_WLAN_80211 is not set |
| 506 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 501 | # CONFIG_WAN is not set | 507 | # CONFIG_WAN is not set |
| 502 | # CONFIG_PPP is not set | 508 | # CONFIG_PPP is not set |
| 503 | # CONFIG_SLIP is not set | 509 | # CONFIG_SLIP is not set |
| @@ -521,6 +527,7 @@ CONFIG_NETDEV_10000=y | |||
| 521 | # Character devices | 527 | # Character devices |
| 522 | # | 528 | # |
| 523 | # CONFIG_VT is not set | 529 | # CONFIG_VT is not set |
| 530 | CONFIG_DEVKMEM=y | ||
| 524 | # CONFIG_SERIAL_NONSTANDARD is not set | 531 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 525 | 532 | ||
| 526 | # | 533 | # |
| @@ -552,12 +559,7 @@ CONFIG_HW_RANDOM=y | |||
| 552 | # CONFIG_R3964 is not set | 559 | # CONFIG_R3964 is not set |
| 553 | # CONFIG_RAW_DRIVER is not set | 560 | # CONFIG_RAW_DRIVER is not set |
| 554 | # CONFIG_I2C is not set | 561 | # CONFIG_I2C is not set |
| 555 | |||
| 556 | # | ||
| 557 | # SPI support | ||
| 558 | # | ||
| 559 | # CONFIG_SPI is not set | 562 | # CONFIG_SPI is not set |
| 560 | # CONFIG_SPI_MASTER is not set | ||
| 561 | # CONFIG_W1 is not set | 563 | # CONFIG_W1 is not set |
| 562 | # CONFIG_POWER_SUPPLY is not set | 564 | # CONFIG_POWER_SUPPLY is not set |
| 563 | # CONFIG_HWMON is not set | 565 | # CONFIG_HWMON is not set |
| @@ -574,12 +576,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 574 | # Multifunction device drivers | 576 | # Multifunction device drivers |
| 575 | # | 577 | # |
| 576 | # CONFIG_MFD_SM501 is not set | 578 | # CONFIG_MFD_SM501 is not set |
| 579 | # CONFIG_HTC_PASIC3 is not set | ||
| 577 | 580 | ||
| 578 | # | 581 | # |
| 579 | # Multimedia devices | 582 | # Multimedia devices |
| 580 | # | 583 | # |
| 584 | |||
| 585 | # | ||
| 586 | # Multimedia core support | ||
| 587 | # | ||
| 581 | # CONFIG_VIDEO_DEV is not set | 588 | # CONFIG_VIDEO_DEV is not set |
| 582 | # CONFIG_DVB_CORE is not set | 589 | # CONFIG_DVB_CORE is not set |
| 590 | # CONFIG_VIDEO_MEDIA is not set | ||
| 591 | |||
| 592 | # | ||
| 593 | # Multimedia drivers | ||
| 594 | # | ||
| 583 | CONFIG_DAB=y | 595 | CONFIG_DAB=y |
| 584 | 596 | ||
| 585 | # | 597 | # |
| @@ -603,12 +615,9 @@ CONFIG_DAB=y | |||
| 603 | # CONFIG_MMC is not set | 615 | # CONFIG_MMC is not set |
| 604 | # CONFIG_MEMSTICK is not set | 616 | # CONFIG_MEMSTICK is not set |
| 605 | # CONFIG_NEW_LEDS is not set | 617 | # CONFIG_NEW_LEDS is not set |
| 618 | # CONFIG_ACCESSIBILITY is not set | ||
| 606 | # CONFIG_RTC_CLASS is not set | 619 | # CONFIG_RTC_CLASS is not set |
| 607 | # CONFIG_DMADEVICES is not set | 620 | # CONFIG_DMADEVICES is not set |
| 608 | |||
| 609 | # | ||
| 610 | # Userspace I/O | ||
| 611 | # | ||
| 612 | # CONFIG_UIO is not set | 621 | # CONFIG_UIO is not set |
| 613 | 622 | ||
| 614 | # | 623 | # |
| @@ -675,7 +684,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 675 | CONFIG_NFS_FS=y | 684 | CONFIG_NFS_FS=y |
| 676 | CONFIG_NFS_V3=y | 685 | CONFIG_NFS_V3=y |
| 677 | # CONFIG_NFS_V3_ACL is not set | 686 | # CONFIG_NFS_V3_ACL is not set |
| 678 | # CONFIG_NFS_DIRECTIO is not set | ||
| 679 | # CONFIG_NFSD is not set | 687 | # CONFIG_NFSD is not set |
| 680 | CONFIG_ROOT_NFS=y | 688 | CONFIG_ROOT_NFS=y |
| 681 | CONFIG_LOCKD=y | 689 | CONFIG_LOCKD=y |
| @@ -752,6 +760,7 @@ CONFIG_NLS_UTF8=y | |||
| 752 | # | 760 | # |
| 753 | # Library routines | 761 | # Library routines |
| 754 | # | 762 | # |
| 763 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 755 | # CONFIG_CRC_CCITT is not set | 764 | # CONFIG_CRC_CCITT is not set |
| 756 | # CONFIG_CRC16 is not set | 765 | # CONFIG_CRC16 is not set |
| 757 | # CONFIG_CRC_ITU_T is not set | 766 | # CONFIG_CRC_ITU_T is not set |
| @@ -763,6 +772,7 @@ CONFIG_PLIST=y | |||
| 763 | CONFIG_HAS_IOMEM=y | 772 | CONFIG_HAS_IOMEM=y |
| 764 | CONFIG_HAS_IOPORT=y | 773 | CONFIG_HAS_IOPORT=y |
| 765 | CONFIG_HAS_DMA=y | 774 | CONFIG_HAS_DMA=y |
| 775 | CONFIG_HAVE_LMB=y | ||
| 766 | 776 | ||
| 767 | # | 777 | # |
| 768 | # Kernel hacking | 778 | # Kernel hacking |
| @@ -770,6 +780,7 @@ CONFIG_HAS_DMA=y | |||
| 770 | # CONFIG_PRINTK_TIME is not set | 780 | # CONFIG_PRINTK_TIME is not set |
| 771 | CONFIG_ENABLE_WARN_DEPRECATED=y | 781 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 772 | CONFIG_ENABLE_MUST_CHECK=y | 782 | CONFIG_ENABLE_MUST_CHECK=y |
| 783 | CONFIG_FRAME_WARN=1024 | ||
| 773 | CONFIG_MAGIC_SYSRQ=y | 784 | CONFIG_MAGIC_SYSRQ=y |
| 774 | # CONFIG_UNUSED_SYMBOLS is not set | 785 | # CONFIG_UNUSED_SYMBOLS is not set |
| 775 | # CONFIG_DEBUG_FS is not set | 786 | # CONFIG_DEBUG_FS is not set |
| @@ -780,6 +791,7 @@ CONFIG_DEBUG_KERNEL=y | |||
| 780 | # CONFIG_SCHED_DEBUG is not set | 791 | # CONFIG_SCHED_DEBUG is not set |
| 781 | # CONFIG_SCHEDSTATS is not set | 792 | # CONFIG_SCHEDSTATS is not set |
| 782 | # CONFIG_TIMER_STATS is not set | 793 | # CONFIG_TIMER_STATS is not set |
| 794 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 783 | # CONFIG_DEBUG_SLAB is not set | 795 | # CONFIG_DEBUG_SLAB is not set |
| 784 | # CONFIG_DEBUG_RT_MUTEXES is not set | 796 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 785 | # CONFIG_RT_MUTEX_TESTER is not set | 797 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -791,6 +803,7 @@ CONFIG_DEBUG_KERNEL=y | |||
| 791 | CONFIG_DEBUG_BUGVERBOSE=y | 803 | CONFIG_DEBUG_BUGVERBOSE=y |
| 792 | CONFIG_DEBUG_INFO=y | 804 | CONFIG_DEBUG_INFO=y |
| 793 | # CONFIG_DEBUG_VM is not set | 805 | # CONFIG_DEBUG_VM is not set |
| 806 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 794 | # CONFIG_DEBUG_LIST is not set | 807 | # CONFIG_DEBUG_LIST is not set |
| 795 | # CONFIG_DEBUG_SG is not set | 808 | # CONFIG_DEBUG_SG is not set |
| 796 | # CONFIG_BOOT_PRINTK_DELAY is not set | 809 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -802,6 +815,7 @@ CONFIG_DEBUG_INFO=y | |||
| 802 | # CONFIG_DEBUG_PAGEALLOC is not set | 815 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 803 | # CONFIG_DEBUGGER is not set | 816 | # CONFIG_DEBUGGER is not set |
| 804 | # CONFIG_KGDB_CONSOLE is not set | 817 | # CONFIG_KGDB_CONSOLE is not set |
| 818 | # CONFIG_IRQSTACKS is not set | ||
| 805 | CONFIG_BDI_SWITCH=y | 819 | CONFIG_BDI_SWITCH=y |
| 806 | # CONFIG_PPC_EARLY_DEBUG is not set | 820 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 807 | 821 | ||
| @@ -811,45 +825,75 @@ CONFIG_BDI_SWITCH=y | |||
| 811 | # CONFIG_KEYS is not set | 825 | # CONFIG_KEYS is not set |
| 812 | # CONFIG_SECURITY is not set | 826 | # CONFIG_SECURITY is not set |
| 813 | CONFIG_CRYPTO=y | 827 | CONFIG_CRYPTO=y |
| 828 | |||
| 829 | # | ||
| 830 | # Crypto core or helper | ||
| 831 | # | ||
| 814 | CONFIG_CRYPTO_ALGAPI=y | 832 | CONFIG_CRYPTO_ALGAPI=y |
| 815 | CONFIG_CRYPTO_BLKCIPHER=y | 833 | CONFIG_CRYPTO_BLKCIPHER=y |
| 816 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 817 | CONFIG_CRYPTO_MANAGER=y | 834 | CONFIG_CRYPTO_MANAGER=y |
| 818 | # CONFIG_CRYPTO_HMAC is not set | ||
| 819 | # CONFIG_CRYPTO_NULL is not set | 835 | # CONFIG_CRYPTO_NULL is not set |
| 836 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 837 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 838 | |||
| 839 | # | ||
| 840 | # Authenticated Encryption with Associated Data | ||
| 841 | # | ||
| 842 | # CONFIG_CRYPTO_CCM is not set | ||
| 843 | # CONFIG_CRYPTO_GCM is not set | ||
| 844 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 845 | |||
| 846 | # | ||
| 847 | # Block modes | ||
| 848 | # | ||
| 849 | CONFIG_CRYPTO_CBC=y | ||
| 850 | # CONFIG_CRYPTO_CTR is not set | ||
| 851 | # CONFIG_CRYPTO_CTS is not set | ||
| 852 | CONFIG_CRYPTO_ECB=y | ||
| 853 | CONFIG_CRYPTO_PCBC=y | ||
| 854 | |||
| 855 | # | ||
| 856 | # Hash modes | ||
| 857 | # | ||
| 858 | # CONFIG_CRYPTO_HMAC is not set | ||
| 859 | |||
| 860 | # | ||
| 861 | # Digest | ||
| 862 | # | ||
| 863 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 820 | # CONFIG_CRYPTO_MD4 is not set | 864 | # CONFIG_CRYPTO_MD4 is not set |
| 821 | CONFIG_CRYPTO_MD5=y | 865 | CONFIG_CRYPTO_MD5=y |
| 866 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 822 | # CONFIG_CRYPTO_SHA1 is not set | 867 | # CONFIG_CRYPTO_SHA1 is not set |
| 823 | # CONFIG_CRYPTO_SHA256 is not set | 868 | # CONFIG_CRYPTO_SHA256 is not set |
| 824 | # CONFIG_CRYPTO_SHA512 is not set | 869 | # CONFIG_CRYPTO_SHA512 is not set |
| 825 | # CONFIG_CRYPTO_WP512 is not set | ||
| 826 | # CONFIG_CRYPTO_TGR192 is not set | 870 | # CONFIG_CRYPTO_TGR192 is not set |
| 827 | CONFIG_CRYPTO_ECB=y | 871 | # CONFIG_CRYPTO_WP512 is not set |
| 828 | CONFIG_CRYPTO_CBC=y | 872 | |
| 829 | CONFIG_CRYPTO_PCBC=y | 873 | # |
| 830 | # CONFIG_CRYPTO_CTR is not set | 874 | # Ciphers |
| 831 | # CONFIG_CRYPTO_GCM is not set | 875 | # |
| 832 | # CONFIG_CRYPTO_CCM is not set | ||
| 833 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 834 | CONFIG_CRYPTO_DES=y | ||
| 835 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 836 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 837 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 838 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 839 | # CONFIG_CRYPTO_AES is not set | 876 | # CONFIG_CRYPTO_AES is not set |
| 877 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 878 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 879 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 880 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 840 | # CONFIG_CRYPTO_CAST5 is not set | 881 | # CONFIG_CRYPTO_CAST5 is not set |
| 841 | # CONFIG_CRYPTO_CAST6 is not set | 882 | # CONFIG_CRYPTO_CAST6 is not set |
| 842 | # CONFIG_CRYPTO_TEA is not set | 883 | CONFIG_CRYPTO_DES=y |
| 843 | # CONFIG_CRYPTO_ARC4 is not set | 884 | # CONFIG_CRYPTO_FCRYPT is not set |
| 844 | # CONFIG_CRYPTO_KHAZAD is not set | 885 | # CONFIG_CRYPTO_KHAZAD is not set |
| 845 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 846 | # CONFIG_CRYPTO_SEED is not set | 886 | # CONFIG_CRYPTO_SEED is not set |
| 887 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 888 | # CONFIG_CRYPTO_TEA is not set | ||
| 889 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 890 | |||
| 891 | # | ||
| 892 | # Compression | ||
| 893 | # | ||
| 847 | # CONFIG_CRYPTO_DEFLATE is not set | 894 | # CONFIG_CRYPTO_DEFLATE is not set |
| 848 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 849 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 850 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 851 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 852 | # CONFIG_CRYPTO_LZO is not set | 895 | # CONFIG_CRYPTO_LZO is not set |
| 853 | # CONFIG_CRYPTO_HW is not set | 896 | # CONFIG_CRYPTO_HW is not set |
| 854 | # CONFIG_PPC_CLOCK is not set | 897 | # CONFIG_PPC_CLOCK is not set |
| 855 | CONFIG_PPC_LIB_RHEAP=y | 898 | CONFIG_PPC_LIB_RHEAP=y |
| 899 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index 125b4764aadd..ac72b48542dc 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:10 2008 | 4 | # Mon Jun 9 08:52:09 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -108,6 +110,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 110 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 111 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 112 | CONFIG_HAVE_KRETPROBES=y |
| 113 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 114 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
| 113 | # CONFIG_TINY_SHMEM is not set | 116 | # CONFIG_TINY_SHMEM is not set |
| @@ -212,11 +215,13 @@ CONFIG_FLATMEM=y | |||
| 212 | CONFIG_FLAT_NODE_MEM_MAP=y | 215 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 213 | # CONFIG_SPARSEMEM_STATIC is not set | 216 | # CONFIG_SPARSEMEM_STATIC is not set |
| 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 218 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 219 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 216 | # CONFIG_RESOURCES_64BIT is not set | 220 | # CONFIG_RESOURCES_64BIT is not set |
| 217 | CONFIG_ZONE_DMA_FLAG=1 | 221 | CONFIG_ZONE_DMA_FLAG=1 |
| 218 | CONFIG_BOUNCE=y | 222 | CONFIG_BOUNCE=y |
| 219 | CONFIG_VIRT_TO_BUS=y | 223 | CONFIG_VIRT_TO_BUS=y |
| 224 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 220 | CONFIG_PROC_DEVICETREE=y | 225 | CONFIG_PROC_DEVICETREE=y |
| 221 | # CONFIG_CMDLINE_BOOL is not set | 226 | # CONFIG_CMDLINE_BOOL is not set |
| 222 | # CONFIG_PM is not set | 227 | # CONFIG_PM is not set |
| @@ -234,6 +239,7 @@ CONFIG_FSL_SOC=y | |||
| 234 | # CONFIG_PCI_QSPAN is not set | 239 | # CONFIG_PCI_QSPAN is not set |
| 235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 240 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 236 | # CONFIG_PCCARD is not set | 241 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HAS_RAPIDIO is not set | ||
| 237 | 243 | ||
| 238 | # | 244 | # |
| 239 | # Advanced setup | 245 | # Advanced setup |
| @@ -243,13 +249,13 @@ CONFIG_FSL_SOC=y | |||
| 243 | # | 249 | # |
| 244 | # Default settings for advanced configuration options are used | 250 | # Default settings for advanced configuration options are used |
| 245 | # | 251 | # |
| 246 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 247 | CONFIG_LOWMEM_SIZE=0x30000000 | 252 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 253 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 248 | CONFIG_KERNEL_START=0xc0000000 | 254 | CONFIG_KERNEL_START=0xc0000000 |
| 255 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 249 | CONFIG_TASK_SIZE=0x80000000 | 256 | CONFIG_TASK_SIZE=0x80000000 |
| 250 | CONFIG_CONSISTENT_START=0xfd000000 | 257 | CONFIG_CONSISTENT_START=0xfd000000 |
| 251 | CONFIG_CONSISTENT_SIZE=0x00200000 | 258 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 252 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 253 | 259 | ||
| 254 | # | 260 | # |
| 255 | # Networking | 261 | # Networking |
| @@ -292,8 +298,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 292 | CONFIG_DEFAULT_TCP_CONG="cubic" | 298 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 293 | # CONFIG_TCP_MD5SIG is not set | 299 | # CONFIG_TCP_MD5SIG is not set |
| 294 | # CONFIG_IPV6 is not set | 300 | # CONFIG_IPV6 is not set |
| 295 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 296 | # CONFIG_INET6_TUNNEL is not set | ||
| 297 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 298 | # CONFIG_NETFILTER is not set | 302 | # CONFIG_NETFILTER is not set |
| 299 | # CONFIG_IP_DCCP is not set | 303 | # CONFIG_IP_DCCP is not set |
| @@ -481,6 +485,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 481 | # | 485 | # |
| 482 | # CONFIG_WLAN_PRE80211 is not set | 486 | # CONFIG_WLAN_PRE80211 is not set |
| 483 | # CONFIG_WLAN_80211 is not set | 487 | # CONFIG_WLAN_80211 is not set |
| 488 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 484 | # CONFIG_WAN is not set | 489 | # CONFIG_WAN is not set |
| 485 | # CONFIG_PPP is not set | 490 | # CONFIG_PPP is not set |
| 486 | # CONFIG_SLIP is not set | 491 | # CONFIG_SLIP is not set |
| @@ -505,6 +510,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 505 | # Character devices | 510 | # Character devices |
| 506 | # | 511 | # |
| 507 | # CONFIG_VT is not set | 512 | # CONFIG_VT is not set |
| 513 | CONFIG_DEVKMEM=y | ||
| 508 | # CONFIG_SERIAL_NONSTANDARD is not set | 514 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 509 | 515 | ||
| 510 | # | 516 | # |
| @@ -537,12 +543,7 @@ CONFIG_GEN_RTC=y | |||
| 537 | # CONFIG_RAW_DRIVER is not set | 543 | # CONFIG_RAW_DRIVER is not set |
| 538 | # CONFIG_TCG_TPM is not set | 544 | # CONFIG_TCG_TPM is not set |
| 539 | # CONFIG_I2C is not set | 545 | # CONFIG_I2C is not set |
| 540 | |||
| 541 | # | ||
| 542 | # SPI support | ||
| 543 | # | ||
| 544 | # CONFIG_SPI is not set | 546 | # CONFIG_SPI is not set |
| 545 | # CONFIG_SPI_MASTER is not set | ||
| 546 | # CONFIG_W1 is not set | 547 | # CONFIG_W1 is not set |
| 547 | # CONFIG_POWER_SUPPLY is not set | 548 | # CONFIG_POWER_SUPPLY is not set |
| 548 | # CONFIG_HWMON is not set | 549 | # CONFIG_HWMON is not set |
| @@ -559,12 +560,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 559 | # Multifunction device drivers | 560 | # Multifunction device drivers |
| 560 | # | 561 | # |
| 561 | # CONFIG_MFD_SM501 is not set | 562 | # CONFIG_MFD_SM501 is not set |
| 563 | # CONFIG_HTC_PASIC3 is not set | ||
| 562 | 564 | ||
| 563 | # | 565 | # |
| 564 | # Multimedia devices | 566 | # Multimedia devices |
| 565 | # | 567 | # |
| 568 | |||
| 569 | # | ||
| 570 | # Multimedia core support | ||
| 571 | # | ||
| 566 | # CONFIG_VIDEO_DEV is not set | 572 | # CONFIG_VIDEO_DEV is not set |
| 567 | # CONFIG_DVB_CORE is not set | 573 | # CONFIG_DVB_CORE is not set |
| 574 | # CONFIG_VIDEO_MEDIA is not set | ||
| 575 | |||
| 576 | # | ||
| 577 | # Multimedia drivers | ||
| 578 | # | ||
| 568 | CONFIG_DAB=y | 579 | CONFIG_DAB=y |
| 569 | 580 | ||
| 570 | # | 581 | # |
| @@ -588,13 +599,10 @@ CONFIG_DAB=y | |||
| 588 | # CONFIG_MMC is not set | 599 | # CONFIG_MMC is not set |
| 589 | # CONFIG_MEMSTICK is not set | 600 | # CONFIG_MEMSTICK is not set |
| 590 | # CONFIG_NEW_LEDS is not set | 601 | # CONFIG_NEW_LEDS is not set |
| 602 | # CONFIG_ACCESSIBILITY is not set | ||
| 591 | # CONFIG_EDAC is not set | 603 | # CONFIG_EDAC is not set |
| 592 | # CONFIG_RTC_CLASS is not set | 604 | # CONFIG_RTC_CLASS is not set |
| 593 | # CONFIG_DMADEVICES is not set | 605 | # CONFIG_DMADEVICES is not set |
| 594 | |||
| 595 | # | ||
| 596 | # Userspace I/O | ||
| 597 | # | ||
| 598 | # CONFIG_UIO is not set | 606 | # CONFIG_UIO is not set |
| 599 | 607 | ||
| 600 | # | 608 | # |
| @@ -607,7 +615,6 @@ CONFIG_DAB=y | |||
| 607 | # CONFIG_JFS_FS is not set | 615 | # CONFIG_JFS_FS is not set |
| 608 | # CONFIG_FS_POSIX_ACL is not set | 616 | # CONFIG_FS_POSIX_ACL is not set |
| 609 | # CONFIG_XFS_FS is not set | 617 | # CONFIG_XFS_FS is not set |
| 610 | # CONFIG_GFS2_FS is not set | ||
| 611 | # CONFIG_OCFS2_FS is not set | 618 | # CONFIG_OCFS2_FS is not set |
| 612 | # CONFIG_DNOTIFY is not set | 619 | # CONFIG_DNOTIFY is not set |
| 613 | # CONFIG_INOTIFY is not set | 620 | # CONFIG_INOTIFY is not set |
| @@ -665,7 +672,6 @@ CONFIG_NFS_FS=y | |||
| 665 | CONFIG_NFS_V3=y | 672 | CONFIG_NFS_V3=y |
| 666 | # CONFIG_NFS_V3_ACL is not set | 673 | # CONFIG_NFS_V3_ACL is not set |
| 667 | # CONFIG_NFS_V4 is not set | 674 | # CONFIG_NFS_V4 is not set |
| 668 | # CONFIG_NFS_DIRECTIO is not set | ||
| 669 | # CONFIG_NFSD is not set | 675 | # CONFIG_NFSD is not set |
| 670 | CONFIG_ROOT_NFS=y | 676 | CONFIG_ROOT_NFS=y |
| 671 | CONFIG_LOCKD=y | 677 | CONFIG_LOCKD=y |
| @@ -708,6 +714,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 708 | # | 714 | # |
| 709 | # Library routines | 715 | # Library routines |
| 710 | # | 716 | # |
| 717 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 711 | # CONFIG_CRC_CCITT is not set | 718 | # CONFIG_CRC_CCITT is not set |
| 712 | # CONFIG_CRC16 is not set | 719 | # CONFIG_CRC16 is not set |
| 713 | # CONFIG_CRC_ITU_T is not set | 720 | # CONFIG_CRC_ITU_T is not set |
| @@ -718,6 +725,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 718 | CONFIG_HAS_IOMEM=y | 725 | CONFIG_HAS_IOMEM=y |
| 719 | CONFIG_HAS_IOPORT=y | 726 | CONFIG_HAS_IOPORT=y |
| 720 | CONFIG_HAS_DMA=y | 727 | CONFIG_HAS_DMA=y |
| 728 | CONFIG_HAVE_LMB=y | ||
| 721 | 729 | ||
| 722 | # | 730 | # |
| 723 | # Kernel hacking | 731 | # Kernel hacking |
| @@ -725,6 +733,7 @@ CONFIG_HAS_DMA=y | |||
| 725 | # CONFIG_PRINTK_TIME is not set | 733 | # CONFIG_PRINTK_TIME is not set |
| 726 | CONFIG_ENABLE_WARN_DEPRECATED=y | 734 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 727 | CONFIG_ENABLE_MUST_CHECK=y | 735 | CONFIG_ENABLE_MUST_CHECK=y |
| 736 | CONFIG_FRAME_WARN=1024 | ||
| 728 | CONFIG_MAGIC_SYSRQ=y | 737 | CONFIG_MAGIC_SYSRQ=y |
| 729 | # CONFIG_UNUSED_SYMBOLS is not set | 738 | # CONFIG_UNUSED_SYMBOLS is not set |
| 730 | # CONFIG_DEBUG_FS is not set | 739 | # CONFIG_DEBUG_FS is not set |
| @@ -735,6 +744,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 735 | CONFIG_SCHED_DEBUG=y | 744 | CONFIG_SCHED_DEBUG=y |
| 736 | # CONFIG_SCHEDSTATS is not set | 745 | # CONFIG_SCHEDSTATS is not set |
| 737 | # CONFIG_TIMER_STATS is not set | 746 | # CONFIG_TIMER_STATS is not set |
| 747 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 738 | # CONFIG_SLUB_DEBUG_ON is not set | 748 | # CONFIG_SLUB_DEBUG_ON is not set |
| 739 | # CONFIG_SLUB_STATS is not set | 749 | # CONFIG_SLUB_STATS is not set |
| 740 | # CONFIG_DEBUG_SPINLOCK is not set | 750 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -745,6 +755,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 745 | CONFIG_DEBUG_BUGVERBOSE=y | 755 | CONFIG_DEBUG_BUGVERBOSE=y |
| 746 | CONFIG_DEBUG_INFO=y | 756 | CONFIG_DEBUG_INFO=y |
| 747 | # CONFIG_DEBUG_VM is not set | 757 | # CONFIG_DEBUG_VM is not set |
| 758 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 748 | # CONFIG_DEBUG_LIST is not set | 759 | # CONFIG_DEBUG_LIST is not set |
| 749 | # CONFIG_DEBUG_SG is not set | 760 | # CONFIG_DEBUG_SG is not set |
| 750 | # CONFIG_BOOT_PRINTK_DELAY is not set | 761 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -755,6 +766,7 @@ CONFIG_DEBUG_INFO=y | |||
| 755 | # CONFIG_DEBUG_STACK_USAGE is not set | 766 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 756 | # CONFIG_DEBUG_PAGEALLOC is not set | 767 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 757 | # CONFIG_DEBUGGER is not set | 768 | # CONFIG_DEBUGGER is not set |
| 769 | # CONFIG_IRQSTACKS is not set | ||
| 758 | # CONFIG_BDI_SWITCH is not set | 770 | # CONFIG_BDI_SWITCH is not set |
| 759 | # CONFIG_PPC_EARLY_DEBUG is not set | 771 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 760 | 772 | ||
| @@ -767,3 +779,4 @@ CONFIG_DEBUG_INFO=y | |||
| 767 | # CONFIG_CRYPTO is not set | 779 | # CONFIG_CRYPTO is not set |
| 768 | # CONFIG_PPC_CLOCK is not set | 780 | # CONFIG_PPC_CLOCK is not set |
| 769 | CONFIG_PPC_LIB_RHEAP=y | 781 | CONFIG_PPC_LIB_RHEAP=y |
| 782 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 88338a9f5e95..0ccc6e493dcb 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc6 |
| 4 | # Thu Mar 27 13:55:43 2008 | 4 | # Mon Jun 16 21:08:31 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -29,6 +29,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
| 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 31 | CONFIG_IRQ_PER_CPU=y | 31 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 33 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 32 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 33 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U64=y | 37 | CONFIG_ARCH_HAS_ILOG2_U64=y |
| @@ -91,6 +94,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 91 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 92 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 94 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 95 | # CONFIG_KALLSYMS_ALL is not set | 99 | # CONFIG_KALLSYMS_ALL is not set |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -119,12 +123,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 119 | # CONFIG_KPROBES is not set | 123 | # CONFIG_KPROBES is not set |
| 120 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
| 121 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
| 126 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 122 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
| 123 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
| 124 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
| 125 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
| 126 | CONFIG_BASE_SMALL=0 | 131 | CONFIG_BASE_SMALL=0 |
| 127 | CONFIG_MODULES=y | 132 | CONFIG_MODULES=y |
| 133 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 128 | CONFIG_MODULE_UNLOAD=y | 134 | CONFIG_MODULE_UNLOAD=y |
| 129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 135 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 130 | CONFIG_MODVERSIONS=y | 136 | CONFIG_MODVERSIONS=y |
| @@ -165,11 +171,11 @@ CONFIG_PPC_PMAC=y | |||
| 165 | CONFIG_PPC_PMAC64=y | 171 | CONFIG_PPC_PMAC64=y |
| 166 | # CONFIG_PPC_MAPLE is not set | 172 | # CONFIG_PPC_MAPLE is not set |
| 167 | # CONFIG_PPC_PASEMI is not set | 173 | # CONFIG_PPC_PASEMI is not set |
| 168 | # CONFIG_PPC_CELLEB is not set | ||
| 169 | # CONFIG_PPC_PS3 is not set | 174 | # CONFIG_PPC_PS3 is not set |
| 170 | # CONFIG_PPC_CELL is not set | 175 | # CONFIG_PPC_CELL is not set |
| 171 | # CONFIG_PPC_CELL_NATIVE is not set | 176 | # CONFIG_PPC_CELL_NATIVE is not set |
| 172 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 177 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 178 | # CONFIG_PPC_CELLEB is not set | ||
| 173 | # CONFIG_PQ2ADS is not set | 179 | # CONFIG_PQ2ADS is not set |
| 174 | CONFIG_PPC_NATIVE=y | 180 | CONFIG_PPC_NATIVE=y |
| 175 | # CONFIG_IPIC is not set | 181 | # CONFIG_IPIC is not set |
| @@ -190,6 +196,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
| 190 | CONFIG_CPU_FREQ_STAT=y | 196 | CONFIG_CPU_FREQ_STAT=y |
| 191 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 197 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
| 192 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 198 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
| 199 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 193 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 200 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
| 194 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 201 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
| 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 202 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
| @@ -224,7 +231,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 224 | CONFIG_BINFMT_ELF=y | 231 | CONFIG_BINFMT_ELF=y |
| 225 | CONFIG_COMPAT_BINFMT_ELF=y | 232 | CONFIG_COMPAT_BINFMT_ELF=y |
| 226 | # CONFIG_BINFMT_MISC is not set | 233 | # CONFIG_BINFMT_MISC is not set |
| 227 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 228 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 234 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 229 | CONFIG_IOMMU_VMERGE=y | 235 | CONFIG_IOMMU_VMERGE=y |
| 230 | CONFIG_IOMMU_HELPER=y | 236 | CONFIG_IOMMU_HELPER=y |
| @@ -248,12 +254,14 @@ CONFIG_FLATMEM=y | |||
| 248 | CONFIG_FLAT_NODE_MEM_MAP=y | 254 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 249 | # CONFIG_SPARSEMEM_STATIC is not set | 255 | # CONFIG_SPARSEMEM_STATIC is not set |
| 250 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 256 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 257 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 251 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 258 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 252 | CONFIG_RESOURCES_64BIT=y | 259 | CONFIG_RESOURCES_64BIT=y |
| 253 | CONFIG_ZONE_DMA_FLAG=1 | 260 | CONFIG_ZONE_DMA_FLAG=1 |
| 254 | CONFIG_BOUNCE=y | 261 | CONFIG_BOUNCE=y |
| 255 | # CONFIG_PPC_HAS_HASH_64K is not set | 262 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 256 | # CONFIG_PPC_64K_PAGES is not set | 263 | # CONFIG_PPC_64K_PAGES is not set |
| 264 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 257 | # CONFIG_SCHED_SMT is not set | 265 | # CONFIG_SCHED_SMT is not set |
| 258 | CONFIG_PROC_DEVICETREE=y | 266 | CONFIG_PROC_DEVICETREE=y |
| 259 | # CONFIG_CMDLINE_BOOL is not set | 267 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -278,7 +286,10 @@ CONFIG_PCI_MSI=y | |||
| 278 | # CONFIG_PCI_DEBUG is not set | 286 | # CONFIG_PCI_DEBUG is not set |
| 279 | # CONFIG_PCCARD is not set | 287 | # CONFIG_PCCARD is not set |
| 280 | # CONFIG_HOTPLUG_PCI is not set | 288 | # CONFIG_HOTPLUG_PCI is not set |
| 289 | # CONFIG_HAS_RAPIDIO is not set | ||
| 290 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
| 281 | CONFIG_KERNEL_START=0xc000000000000000 | 291 | CONFIG_KERNEL_START=0xc000000000000000 |
| 292 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 282 | 293 | ||
| 283 | # | 294 | # |
| 284 | # Networking | 295 | # Networking |
| @@ -325,8 +336,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 325 | # CONFIG_TCP_MD5SIG is not set | 336 | # CONFIG_TCP_MD5SIG is not set |
| 326 | # CONFIG_IP_VS is not set | 337 | # CONFIG_IP_VS is not set |
| 327 | # CONFIG_IPV6 is not set | 338 | # CONFIG_IPV6 is not set |
| 328 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 329 | # CONFIG_INET6_TUNNEL is not set | ||
| 330 | # CONFIG_NETWORK_SECMARK is not set | 339 | # CONFIG_NETWORK_SECMARK is not set |
| 331 | CONFIG_NETFILTER=y | 340 | CONFIG_NETFILTER=y |
| 332 | # CONFIG_NETFILTER_DEBUG is not set | 341 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -342,6 +351,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 342 | # CONFIG_NF_CT_ACCT is not set | 351 | # CONFIG_NF_CT_ACCT is not set |
| 343 | CONFIG_NF_CONNTRACK_MARK=y | 352 | CONFIG_NF_CONNTRACK_MARK=y |
| 344 | CONFIG_NF_CONNTRACK_EVENTS=y | 353 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 354 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
| 345 | # CONFIG_NF_CT_PROTO_SCTP is not set | 355 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 346 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 356 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
| 347 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 357 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| @@ -418,6 +428,7 @@ CONFIG_FW_LOADER=y | |||
| 418 | # CONFIG_CONNECTOR is not set | 428 | # CONFIG_CONNECTOR is not set |
| 419 | # CONFIG_MTD is not set | 429 | # CONFIG_MTD is not set |
| 420 | CONFIG_OF_DEVICE=y | 430 | CONFIG_OF_DEVICE=y |
| 431 | CONFIG_OF_I2C=y | ||
| 421 | # CONFIG_PARPORT is not set | 432 | # CONFIG_PARPORT is not set |
| 422 | CONFIG_BLK_DEV=y | 433 | CONFIG_BLK_DEV=y |
| 423 | # CONFIG_BLK_DEV_FD is not set | 434 | # CONFIG_BLK_DEV_FD is not set |
| @@ -465,7 +476,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 465 | # | 476 | # |
| 466 | # IDE chipset support/bugfixes | 477 | # IDE chipset support/bugfixes |
| 467 | # | 478 | # |
| 468 | CONFIG_IDE_GENERIC=y | ||
| 469 | # CONFIG_BLK_DEV_PLATFORM is not set | 479 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 470 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 480 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 471 | 481 | ||
| @@ -506,7 +516,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
| 506 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 516 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
| 507 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 517 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
| 508 | CONFIG_BLK_DEV_IDEDMA=y | 518 | CONFIG_BLK_DEV_IDEDMA=y |
| 509 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 519 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 510 | # CONFIG_BLK_DEV_HD is not set | 520 | # CONFIG_BLK_DEV_HD is not set |
| 511 | 521 | ||
| 512 | # | 522 | # |
| @@ -584,7 +594,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 584 | # CONFIG_SCSI_SRP is not set | 594 | # CONFIG_SCSI_SRP is not set |
| 585 | CONFIG_ATA=y | 595 | CONFIG_ATA=y |
| 586 | # CONFIG_ATA_NONSTANDARD is not set | 596 | # CONFIG_ATA_NONSTANDARD is not set |
| 597 | CONFIG_SATA_PMP=y | ||
| 587 | # CONFIG_SATA_AHCI is not set | 598 | # CONFIG_SATA_AHCI is not set |
| 599 | # CONFIG_SATA_SIL24 is not set | ||
| 600 | CONFIG_ATA_SFF=y | ||
| 588 | CONFIG_SATA_SVW=y | 601 | CONFIG_SATA_SVW=y |
| 589 | # CONFIG_ATA_PIIX is not set | 602 | # CONFIG_ATA_PIIX is not set |
| 590 | # CONFIG_SATA_MV is not set | 603 | # CONFIG_SATA_MV is not set |
| @@ -594,7 +607,6 @@ CONFIG_SATA_SVW=y | |||
| 594 | # CONFIG_SATA_PROMISE is not set | 607 | # CONFIG_SATA_PROMISE is not set |
| 595 | # CONFIG_SATA_SX4 is not set | 608 | # CONFIG_SATA_SX4 is not set |
| 596 | # CONFIG_SATA_SIL is not set | 609 | # CONFIG_SATA_SIL is not set |
| 597 | # CONFIG_SATA_SIL24 is not set | ||
| 598 | # CONFIG_SATA_SIS is not set | 610 | # CONFIG_SATA_SIS is not set |
| 599 | # CONFIG_SATA_ULI is not set | 611 | # CONFIG_SATA_ULI is not set |
| 600 | # CONFIG_SATA_VIA is not set | 612 | # CONFIG_SATA_VIA is not set |
| @@ -639,6 +651,7 @@ CONFIG_SATA_SVW=y | |||
| 639 | # CONFIG_PATA_VIA is not set | 651 | # CONFIG_PATA_VIA is not set |
| 640 | # CONFIG_PATA_WINBOND is not set | 652 | # CONFIG_PATA_WINBOND is not set |
| 641 | # CONFIG_PATA_PLATFORM is not set | 653 | # CONFIG_PATA_PLATFORM is not set |
| 654 | # CONFIG_PATA_SCH is not set | ||
| 642 | CONFIG_MD=y | 655 | CONFIG_MD=y |
| 643 | CONFIG_BLK_DEV_MD=y | 656 | CONFIG_BLK_DEV_MD=y |
| 644 | CONFIG_MD_LINEAR=y | 657 | CONFIG_MD_LINEAR=y |
| @@ -740,7 +753,6 @@ CONFIG_E1000=y | |||
| 740 | # CONFIG_SIS190 is not set | 753 | # CONFIG_SIS190 is not set |
| 741 | # CONFIG_SKGE is not set | 754 | # CONFIG_SKGE is not set |
| 742 | # CONFIG_SKY2 is not set | 755 | # CONFIG_SKY2 is not set |
| 743 | # CONFIG_SK98LIN is not set | ||
| 744 | # CONFIG_VIA_VELOCITY is not set | 756 | # CONFIG_VIA_VELOCITY is not set |
| 745 | CONFIG_TIGON3=y | 757 | CONFIG_TIGON3=y |
| 746 | # CONFIG_BNX2 is not set | 758 | # CONFIG_BNX2 is not set |
| @@ -755,10 +767,10 @@ CONFIG_NETDEV_10000=y | |||
| 755 | # CONFIG_MYRI10GE is not set | 767 | # CONFIG_MYRI10GE is not set |
| 756 | # CONFIG_NETXEN_NIC is not set | 768 | # CONFIG_NETXEN_NIC is not set |
| 757 | # CONFIG_NIU is not set | 769 | # CONFIG_NIU is not set |
| 758 | # CONFIG_PASEMI_MAC is not set | ||
| 759 | # CONFIG_MLX4_CORE is not set | 770 | # CONFIG_MLX4_CORE is not set |
| 760 | # CONFIG_TEHUTI is not set | 771 | # CONFIG_TEHUTI is not set |
| 761 | # CONFIG_BNX2X is not set | 772 | # CONFIG_BNX2X is not set |
| 773 | # CONFIG_SFC is not set | ||
| 762 | CONFIG_TR=y | 774 | CONFIG_TR=y |
| 763 | CONFIG_IBMOL=y | 775 | CONFIG_IBMOL=y |
| 764 | # CONFIG_3C359 is not set | 776 | # CONFIG_3C359 is not set |
| @@ -769,6 +781,7 @@ CONFIG_IBMOL=y | |||
| 769 | # | 781 | # |
| 770 | # CONFIG_WLAN_PRE80211 is not set | 782 | # CONFIG_WLAN_PRE80211 is not set |
| 771 | # CONFIG_WLAN_80211 is not set | 783 | # CONFIG_WLAN_80211 is not set |
| 784 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 772 | 785 | ||
| 773 | # | 786 | # |
| 774 | # USB Network Adapters | 787 | # USB Network Adapters |
| @@ -865,6 +878,7 @@ CONFIG_VT=y | |||
| 865 | CONFIG_VT_CONSOLE=y | 878 | CONFIG_VT_CONSOLE=y |
| 866 | CONFIG_HW_CONSOLE=y | 879 | CONFIG_HW_CONSOLE=y |
| 867 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 880 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 881 | CONFIG_DEVKMEM=y | ||
| 868 | # CONFIG_SERIAL_NONSTANDARD is not set | 882 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 869 | # CONFIG_NOZOMI is not set | 883 | # CONFIG_NOZOMI is not set |
| 870 | 884 | ||
| @@ -895,13 +909,7 @@ CONFIG_DEVPORT=y | |||
| 895 | CONFIG_I2C=y | 909 | CONFIG_I2C=y |
| 896 | CONFIG_I2C_BOARDINFO=y | 910 | CONFIG_I2C_BOARDINFO=y |
| 897 | CONFIG_I2C_CHARDEV=y | 911 | CONFIG_I2C_CHARDEV=y |
| 898 | |||
| 899 | # | ||
| 900 | # I2C Algorithms | ||
| 901 | # | ||
| 902 | CONFIG_I2C_ALGOBIT=y | 912 | CONFIG_I2C_ALGOBIT=y |
| 903 | # CONFIG_I2C_ALGOPCF is not set | ||
| 904 | # CONFIG_I2C_ALGOPCA is not set | ||
| 905 | 913 | ||
| 906 | # | 914 | # |
| 907 | # I2C Hardware Bus support | 915 | # I2C Hardware Bus support |
| @@ -930,6 +938,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 930 | # CONFIG_I2C_VIA is not set | 938 | # CONFIG_I2C_VIA is not set |
| 931 | # CONFIG_I2C_VIAPRO is not set | 939 | # CONFIG_I2C_VIAPRO is not set |
| 932 | # CONFIG_I2C_VOODOO3 is not set | 940 | # CONFIG_I2C_VOODOO3 is not set |
| 941 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 933 | 942 | ||
| 934 | # | 943 | # |
| 935 | # Miscellaneous I2C Chip support | 944 | # Miscellaneous I2C Chip support |
| @@ -939,19 +948,13 @@ CONFIG_I2C_POWERMAC=y | |||
| 939 | # CONFIG_SENSORS_PCF8574 is not set | 948 | # CONFIG_SENSORS_PCF8574 is not set |
| 940 | # CONFIG_PCF8575 is not set | 949 | # CONFIG_PCF8575 is not set |
| 941 | # CONFIG_SENSORS_PCF8591 is not set | 950 | # CONFIG_SENSORS_PCF8591 is not set |
| 942 | # CONFIG_TPS65010 is not set | ||
| 943 | # CONFIG_SENSORS_MAX6875 is not set | 951 | # CONFIG_SENSORS_MAX6875 is not set |
| 944 | # CONFIG_SENSORS_TSL2550 is not set | 952 | # CONFIG_SENSORS_TSL2550 is not set |
| 945 | # CONFIG_I2C_DEBUG_CORE is not set | 953 | # CONFIG_I2C_DEBUG_CORE is not set |
| 946 | # CONFIG_I2C_DEBUG_ALGO is not set | 954 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 947 | # CONFIG_I2C_DEBUG_BUS is not set | 955 | # CONFIG_I2C_DEBUG_BUS is not set |
| 948 | # CONFIG_I2C_DEBUG_CHIP is not set | 956 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 949 | |||
| 950 | # | ||
| 951 | # SPI support | ||
| 952 | # | ||
| 953 | # CONFIG_SPI is not set | 957 | # CONFIG_SPI is not set |
| 954 | # CONFIG_SPI_MASTER is not set | ||
| 955 | # CONFIG_W1 is not set | 958 | # CONFIG_W1 is not set |
| 956 | # CONFIG_POWER_SUPPLY is not set | 959 | # CONFIG_POWER_SUPPLY is not set |
| 957 | # CONFIG_HWMON is not set | 960 | # CONFIG_HWMON is not set |
| @@ -968,12 +971,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 968 | # Multifunction device drivers | 971 | # Multifunction device drivers |
| 969 | # | 972 | # |
| 970 | # CONFIG_MFD_SM501 is not set | 973 | # CONFIG_MFD_SM501 is not set |
| 974 | # CONFIG_HTC_PASIC3 is not set | ||
| 971 | 975 | ||
| 972 | # | 976 | # |
| 973 | # Multimedia devices | 977 | # Multimedia devices |
| 974 | # | 978 | # |
| 979 | |||
| 980 | # | ||
| 981 | # Multimedia core support | ||
| 982 | # | ||
| 975 | # CONFIG_VIDEO_DEV is not set | 983 | # CONFIG_VIDEO_DEV is not set |
| 976 | # CONFIG_DVB_CORE is not set | 984 | # CONFIG_DVB_CORE is not set |
| 985 | # CONFIG_VIDEO_MEDIA is not set | ||
| 986 | |||
| 987 | # | ||
| 988 | # Multimedia drivers | ||
| 989 | # | ||
| 977 | CONFIG_DAB=y | 990 | CONFIG_DAB=y |
| 978 | # CONFIG_USB_DABUSB is not set | 991 | # CONFIG_USB_DABUSB is not set |
| 979 | 992 | ||
| @@ -995,8 +1008,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 995 | # CONFIG_FB_SYS_FILLRECT is not set | 1008 | # CONFIG_FB_SYS_FILLRECT is not set |
| 996 | # CONFIG_FB_SYS_COPYAREA is not set | 1009 | # CONFIG_FB_SYS_COPYAREA is not set |
| 997 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1010 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1011 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 998 | # CONFIG_FB_SYS_FOPS is not set | 1012 | # CONFIG_FB_SYS_FOPS is not set |
| 999 | CONFIG_FB_DEFERRED_IO=y | ||
| 1000 | # CONFIG_FB_SVGALIB is not set | 1013 | # CONFIG_FB_SVGALIB is not set |
| 1001 | CONFIG_FB_MACMODES=y | 1014 | CONFIG_FB_MACMODES=y |
| 1002 | CONFIG_FB_BACKLIGHT=y | 1015 | CONFIG_FB_BACKLIGHT=y |
| @@ -1112,6 +1125,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1112 | # CONFIG_SND_AU8810 is not set | 1125 | # CONFIG_SND_AU8810 is not set |
| 1113 | # CONFIG_SND_AU8820 is not set | 1126 | # CONFIG_SND_AU8820 is not set |
| 1114 | # CONFIG_SND_AU8830 is not set | 1127 | # CONFIG_SND_AU8830 is not set |
| 1128 | # CONFIG_SND_AW2 is not set | ||
| 1115 | # CONFIG_SND_AZT3328 is not set | 1129 | # CONFIG_SND_AZT3328 is not set |
| 1116 | # CONFIG_SND_BT87X is not set | 1130 | # CONFIG_SND_BT87X is not set |
| 1117 | # CONFIG_SND_CA0106 is not set | 1131 | # CONFIG_SND_CA0106 is not set |
| @@ -1198,11 +1212,11 @@ CONFIG_SND_USB_AUDIO=m | |||
| 1198 | # CONFIG_SND_SOC is not set | 1212 | # CONFIG_SND_SOC is not set |
| 1199 | 1213 | ||
| 1200 | # | 1214 | # |
| 1201 | # SoC Audio support for SuperH | 1215 | # ALSA SoC audio for Freescale SOCs |
| 1202 | # | 1216 | # |
| 1203 | 1217 | ||
| 1204 | # | 1218 | # |
| 1205 | # ALSA SoC audio for Freescale SOCs | 1219 | # SoC Audio for the Texas Instruments OMAP |
| 1206 | # | 1220 | # |
| 1207 | 1221 | ||
| 1208 | # | 1222 | # |
| @@ -1222,6 +1236,7 @@ CONFIG_USB_HID=y | |||
| 1222 | CONFIG_HID_FF=y | 1236 | CONFIG_HID_FF=y |
| 1223 | CONFIG_HID_PID=y | 1237 | CONFIG_HID_PID=y |
| 1224 | CONFIG_LOGITECH_FF=y | 1238 | CONFIG_LOGITECH_FF=y |
| 1239 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1225 | # CONFIG_PANTHERLORD_FF is not set | 1240 | # CONFIG_PANTHERLORD_FF is not set |
| 1226 | CONFIG_THRUSTMASTER_FF=y | 1241 | CONFIG_THRUSTMASTER_FF=y |
| 1227 | # CONFIG_ZEROPLUS_FF is not set | 1242 | # CONFIG_ZEROPLUS_FF is not set |
| @@ -1245,11 +1260,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1245 | # | 1260 | # |
| 1246 | # USB Host Controller Drivers | 1261 | # USB Host Controller Drivers |
| 1247 | # | 1262 | # |
| 1263 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1248 | CONFIG_USB_EHCI_HCD=y | 1264 | CONFIG_USB_EHCI_HCD=y |
| 1249 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1265 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1250 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1266 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1251 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1267 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 1252 | # CONFIG_USB_ISP116X_HCD is not set | 1268 | # CONFIG_USB_ISP116X_HCD is not set |
| 1269 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1253 | CONFIG_USB_OHCI_HCD=y | 1270 | CONFIG_USB_OHCI_HCD=y |
| 1254 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1271 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1255 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1272 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1267,6 +1284,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1267 | # | 1284 | # |
| 1268 | CONFIG_USB_ACM=m | 1285 | CONFIG_USB_ACM=m |
| 1269 | CONFIG_USB_PRINTER=y | 1286 | CONFIG_USB_PRINTER=y |
| 1287 | # CONFIG_USB_WDM is not set | ||
| 1270 | 1288 | ||
| 1271 | # | 1289 | # |
| 1272 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1290 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1288,6 +1306,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
| 1288 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1306 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1289 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1307 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1290 | # CONFIG_USB_STORAGE_KARMA is not set | 1308 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1309 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1291 | # CONFIG_USB_LIBUSUAL is not set | 1310 | # CONFIG_USB_LIBUSUAL is not set |
| 1292 | 1311 | ||
| 1293 | # | 1312 | # |
| @@ -1342,9 +1361,11 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m | |||
| 1342 | CONFIG_USB_SERIAL_MCT_U232=m | 1361 | CONFIG_USB_SERIAL_MCT_U232=m |
| 1343 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1362 | # CONFIG_USB_SERIAL_MOS7720 is not set |
| 1344 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1363 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1364 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 1345 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1365 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1346 | CONFIG_USB_SERIAL_PL2303=m | 1366 | CONFIG_USB_SERIAL_PL2303=m |
| 1347 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1367 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1368 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
| 1348 | # CONFIG_USB_SERIAL_HP4X is not set | 1369 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1349 | CONFIG_USB_SERIAL_SAFE=m | 1370 | CONFIG_USB_SERIAL_SAFE=m |
| 1350 | CONFIG_USB_SERIAL_SAFE_PADDED=y | 1371 | CONFIG_USB_SERIAL_SAFE_PADDED=y |
| @@ -1379,18 +1400,16 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1379 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1400 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1380 | # CONFIG_USB_IOWARRIOR is not set | 1401 | # CONFIG_USB_IOWARRIOR is not set |
| 1381 | # CONFIG_USB_TEST is not set | 1402 | # CONFIG_USB_TEST is not set |
| 1403 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1382 | # CONFIG_USB_GADGET is not set | 1404 | # CONFIG_USB_GADGET is not set |
| 1383 | # CONFIG_MMC is not set | 1405 | # CONFIG_MMC is not set |
| 1384 | # CONFIG_MEMSTICK is not set | 1406 | # CONFIG_MEMSTICK is not set |
| 1385 | # CONFIG_NEW_LEDS is not set | 1407 | # CONFIG_NEW_LEDS is not set |
| 1408 | # CONFIG_ACCESSIBILITY is not set | ||
| 1386 | # CONFIG_INFINIBAND is not set | 1409 | # CONFIG_INFINIBAND is not set |
| 1387 | # CONFIG_EDAC is not set | 1410 | # CONFIG_EDAC is not set |
| 1388 | # CONFIG_RTC_CLASS is not set | 1411 | # CONFIG_RTC_CLASS is not set |
| 1389 | # CONFIG_DMADEVICES is not set | 1412 | # CONFIG_DMADEVICES is not set |
| 1390 | |||
| 1391 | # | ||
| 1392 | # Userspace I/O | ||
| 1393 | # | ||
| 1394 | # CONFIG_UIO is not set | 1413 | # CONFIG_UIO is not set |
| 1395 | 1414 | ||
| 1396 | # | 1415 | # |
| @@ -1420,9 +1439,9 @@ CONFIG_REISERFS_FS_SECURITY=y | |||
| 1420 | CONFIG_FS_POSIX_ACL=y | 1439 | CONFIG_FS_POSIX_ACL=y |
| 1421 | CONFIG_XFS_FS=m | 1440 | CONFIG_XFS_FS=m |
| 1422 | # CONFIG_XFS_QUOTA is not set | 1441 | # CONFIG_XFS_QUOTA is not set |
| 1423 | CONFIG_XFS_SECURITY=y | ||
| 1424 | CONFIG_XFS_POSIX_ACL=y | 1442 | CONFIG_XFS_POSIX_ACL=y |
| 1425 | # CONFIG_XFS_RT is not set | 1443 | # CONFIG_XFS_RT is not set |
| 1444 | # CONFIG_XFS_DEBUG is not set | ||
| 1426 | # CONFIG_GFS2_FS is not set | 1445 | # CONFIG_GFS2_FS is not set |
| 1427 | # CONFIG_OCFS2_FS is not set | 1446 | # CONFIG_OCFS2_FS is not set |
| 1428 | CONFIG_DNOTIFY=y | 1447 | CONFIG_DNOTIFY=y |
| @@ -1488,13 +1507,11 @@ CONFIG_NFS_FS=y | |||
| 1488 | CONFIG_NFS_V3=y | 1507 | CONFIG_NFS_V3=y |
| 1489 | CONFIG_NFS_V3_ACL=y | 1508 | CONFIG_NFS_V3_ACL=y |
| 1490 | CONFIG_NFS_V4=y | 1509 | CONFIG_NFS_V4=y |
| 1491 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1492 | CONFIG_NFSD=y | 1510 | CONFIG_NFSD=y |
| 1493 | CONFIG_NFSD_V2_ACL=y | 1511 | CONFIG_NFSD_V2_ACL=y |
| 1494 | CONFIG_NFSD_V3=y | 1512 | CONFIG_NFSD_V3=y |
| 1495 | CONFIG_NFSD_V3_ACL=y | 1513 | CONFIG_NFSD_V3_ACL=y |
| 1496 | CONFIG_NFSD_V4=y | 1514 | CONFIG_NFSD_V4=y |
| 1497 | CONFIG_NFSD_TCP=y | ||
| 1498 | CONFIG_LOCKD=y | 1515 | CONFIG_LOCKD=y |
| 1499 | CONFIG_LOCKD_V4=y | 1516 | CONFIG_LOCKD_V4=y |
| 1500 | CONFIG_EXPORTFS=y | 1517 | CONFIG_EXPORTFS=y |
| @@ -1583,9 +1600,10 @@ CONFIG_NLS_UTF8=y | |||
| 1583 | # Library routines | 1600 | # Library routines |
| 1584 | # | 1601 | # |
| 1585 | CONFIG_BITREVERSE=y | 1602 | CONFIG_BITREVERSE=y |
| 1603 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1586 | CONFIG_CRC_CCITT=m | 1604 | CONFIG_CRC_CCITT=m |
| 1587 | # CONFIG_CRC16 is not set | 1605 | # CONFIG_CRC16 is not set |
| 1588 | # CONFIG_CRC_ITU_T is not set | 1606 | CONFIG_CRC_ITU_T=m |
| 1589 | CONFIG_CRC32=y | 1607 | CONFIG_CRC32=y |
| 1590 | # CONFIG_CRC7 is not set | 1608 | # CONFIG_CRC7 is not set |
| 1591 | CONFIG_LIBCRC32C=m | 1609 | CONFIG_LIBCRC32C=m |
| @@ -1603,6 +1621,7 @@ CONFIG_HAVE_LMB=y | |||
| 1603 | # CONFIG_PRINTK_TIME is not set | 1621 | # CONFIG_PRINTK_TIME is not set |
| 1604 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1622 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1605 | CONFIG_ENABLE_MUST_CHECK=y | 1623 | CONFIG_ENABLE_MUST_CHECK=y |
| 1624 | CONFIG_FRAME_WARN=2048 | ||
| 1606 | CONFIG_MAGIC_SYSRQ=y | 1625 | CONFIG_MAGIC_SYSRQ=y |
| 1607 | # CONFIG_UNUSED_SYMBOLS is not set | 1626 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1608 | CONFIG_DEBUG_FS=y | 1627 | CONFIG_DEBUG_FS=y |
| @@ -1613,18 +1632,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1613 | CONFIG_SCHED_DEBUG=y | 1632 | CONFIG_SCHED_DEBUG=y |
| 1614 | # CONFIG_SCHEDSTATS is not set | 1633 | # CONFIG_SCHEDSTATS is not set |
| 1615 | # CONFIG_TIMER_STATS is not set | 1634 | # CONFIG_TIMER_STATS is not set |
| 1635 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1616 | # CONFIG_SLUB_DEBUG_ON is not set | 1636 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1617 | # CONFIG_SLUB_STATS is not set | 1637 | # CONFIG_SLUB_STATS is not set |
| 1618 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1638 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1619 | # CONFIG_RT_MUTEX_TESTER is not set | 1639 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1620 | # CONFIG_DEBUG_SPINLOCK is not set | 1640 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1621 | CONFIG_DEBUG_MUTEXES=y | 1641 | CONFIG_DEBUG_MUTEXES=y |
| 1642 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1643 | # CONFIG_PROVE_LOCKING is not set | ||
| 1644 | # CONFIG_LOCK_STAT is not set | ||
| 1622 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1645 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1623 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1646 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1624 | # CONFIG_DEBUG_KOBJECT is not set | 1647 | # CONFIG_DEBUG_KOBJECT is not set |
| 1625 | CONFIG_DEBUG_BUGVERBOSE=y | 1648 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1626 | # CONFIG_DEBUG_INFO is not set | 1649 | # CONFIG_DEBUG_INFO is not set |
| 1627 | # CONFIG_DEBUG_VM is not set | 1650 | # CONFIG_DEBUG_VM is not set |
| 1651 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1628 | # CONFIG_DEBUG_LIST is not set | 1652 | # CONFIG_DEBUG_LIST is not set |
| 1629 | # CONFIG_DEBUG_SG is not set | 1653 | # CONFIG_DEBUG_SG is not set |
| 1630 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1654 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1648,53 +1672,83 @@ CONFIG_BOOTX_TEXT=y | |||
| 1648 | # CONFIG_SECURITY is not set | 1672 | # CONFIG_SECURITY is not set |
| 1649 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1673 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1650 | CONFIG_CRYPTO=y | 1674 | CONFIG_CRYPTO=y |
| 1675 | |||
| 1676 | # | ||
| 1677 | # Crypto core or helper | ||
| 1678 | # | ||
| 1651 | CONFIG_CRYPTO_ALGAPI=y | 1679 | CONFIG_CRYPTO_ALGAPI=y |
| 1652 | CONFIG_CRYPTO_AEAD=m | 1680 | CONFIG_CRYPTO_AEAD=m |
| 1653 | CONFIG_CRYPTO_BLKCIPHER=y | 1681 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1654 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1655 | CONFIG_CRYPTO_HASH=y | 1682 | CONFIG_CRYPTO_HASH=y |
| 1656 | CONFIG_CRYPTO_MANAGER=y | 1683 | CONFIG_CRYPTO_MANAGER=y |
| 1684 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1685 | CONFIG_CRYPTO_NULL=m | ||
| 1686 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1687 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1688 | CONFIG_CRYPTO_TEST=m | ||
| 1689 | |||
| 1690 | # | ||
| 1691 | # Authenticated Encryption with Associated Data | ||
| 1692 | # | ||
| 1693 | # CONFIG_CRYPTO_CCM is not set | ||
| 1694 | # CONFIG_CRYPTO_GCM is not set | ||
| 1695 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1696 | |||
| 1697 | # | ||
| 1698 | # Block modes | ||
| 1699 | # | ||
| 1700 | CONFIG_CRYPTO_CBC=y | ||
| 1701 | # CONFIG_CRYPTO_CTR is not set | ||
| 1702 | # CONFIG_CRYPTO_CTS is not set | ||
| 1703 | CONFIG_CRYPTO_ECB=m | ||
| 1704 | # CONFIG_CRYPTO_LRW is not set | ||
| 1705 | CONFIG_CRYPTO_PCBC=m | ||
| 1706 | # CONFIG_CRYPTO_XTS is not set | ||
| 1707 | |||
| 1708 | # | ||
| 1709 | # Hash modes | ||
| 1710 | # | ||
| 1657 | CONFIG_CRYPTO_HMAC=y | 1711 | CONFIG_CRYPTO_HMAC=y |
| 1658 | # CONFIG_CRYPTO_XCBC is not set | 1712 | # CONFIG_CRYPTO_XCBC is not set |
| 1659 | CONFIG_CRYPTO_NULL=m | 1713 | |
| 1714 | # | ||
| 1715 | # Digest | ||
| 1716 | # | ||
| 1717 | CONFIG_CRYPTO_CRC32C=m | ||
| 1660 | CONFIG_CRYPTO_MD4=m | 1718 | CONFIG_CRYPTO_MD4=m |
| 1661 | CONFIG_CRYPTO_MD5=y | 1719 | CONFIG_CRYPTO_MD5=y |
| 1720 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1662 | CONFIG_CRYPTO_SHA1=m | 1721 | CONFIG_CRYPTO_SHA1=m |
| 1663 | CONFIG_CRYPTO_SHA256=m | 1722 | CONFIG_CRYPTO_SHA256=m |
| 1664 | CONFIG_CRYPTO_SHA512=m | 1723 | CONFIG_CRYPTO_SHA512=m |
| 1665 | CONFIG_CRYPTO_WP512=m | ||
| 1666 | # CONFIG_CRYPTO_TGR192 is not set | 1724 | # CONFIG_CRYPTO_TGR192 is not set |
| 1667 | # CONFIG_CRYPTO_GF128MUL is not set | 1725 | CONFIG_CRYPTO_WP512=m |
| 1668 | CONFIG_CRYPTO_ECB=m | 1726 | |
| 1669 | CONFIG_CRYPTO_CBC=y | 1727 | # |
| 1670 | CONFIG_CRYPTO_PCBC=m | 1728 | # Ciphers |
| 1671 | # CONFIG_CRYPTO_LRW is not set | 1729 | # |
| 1672 | # CONFIG_CRYPTO_XTS is not set | ||
| 1673 | # CONFIG_CRYPTO_CTR is not set | ||
| 1674 | # CONFIG_CRYPTO_GCM is not set | ||
| 1675 | # CONFIG_CRYPTO_CCM is not set | ||
| 1676 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1677 | CONFIG_CRYPTO_DES=y | ||
| 1678 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1679 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1680 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1681 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1682 | CONFIG_CRYPTO_SERPENT=m | ||
| 1683 | CONFIG_CRYPTO_AES=m | 1730 | CONFIG_CRYPTO_AES=m |
| 1731 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1732 | CONFIG_CRYPTO_ARC4=m | ||
| 1733 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1734 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1684 | CONFIG_CRYPTO_CAST5=m | 1735 | CONFIG_CRYPTO_CAST5=m |
| 1685 | CONFIG_CRYPTO_CAST6=m | 1736 | CONFIG_CRYPTO_CAST6=m |
| 1686 | CONFIG_CRYPTO_TEA=m | 1737 | CONFIG_CRYPTO_DES=y |
| 1687 | CONFIG_CRYPTO_ARC4=m | 1738 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1688 | CONFIG_CRYPTO_KHAZAD=m | 1739 | CONFIG_CRYPTO_KHAZAD=m |
| 1689 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1690 | # CONFIG_CRYPTO_SEED is not set | ||
| 1691 | # CONFIG_CRYPTO_SALSA20 is not set | 1740 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1741 | # CONFIG_CRYPTO_SEED is not set | ||
| 1742 | CONFIG_CRYPTO_SERPENT=m | ||
| 1743 | CONFIG_CRYPTO_TEA=m | ||
| 1744 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1745 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1746 | |||
| 1747 | # | ||
| 1748 | # Compression | ||
| 1749 | # | ||
| 1692 | CONFIG_CRYPTO_DEFLATE=m | 1750 | CONFIG_CRYPTO_DEFLATE=m |
| 1693 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1694 | CONFIG_CRYPTO_CRC32C=m | ||
| 1695 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1696 | CONFIG_CRYPTO_TEST=m | ||
| 1697 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1698 | # CONFIG_CRYPTO_LZO is not set | 1751 | # CONFIG_CRYPTO_LZO is not set |
| 1699 | # CONFIG_CRYPTO_HW is not set | 1752 | # CONFIG_CRYPTO_HW is not set |
| 1700 | # CONFIG_PPC_CLOCK is not set | 1753 | # CONFIG_PPC_CLOCK is not set |
| 1754 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index b3128fb7ce7e..63f0bdb6340d 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Thu Mar 27 13:55:45 2008 | 4 | # Tue May 20 20:01:36 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
| @@ -91,6 +94,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 91 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 92 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 94 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 95 | # CONFIG_KALLSYMS_ALL is not set | 99 | # CONFIG_KALLSYMS_ALL is not set |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -118,12 +122,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 118 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
| 119 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 121 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
| 122 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 123 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
| 124 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
| 125 | CONFIG_BASE_SMALL=0 | 130 | CONFIG_BASE_SMALL=0 |
| 126 | CONFIG_MODULES=y | 131 | CONFIG_MODULES=y |
| 132 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 127 | CONFIG_MODULE_UNLOAD=y | 133 | CONFIG_MODULE_UNLOAD=y |
| 128 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 134 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 129 | CONFIG_MODVERSIONS=y | 135 | CONFIG_MODVERSIONS=y |
| @@ -172,11 +178,11 @@ CONFIG_VIOPATH=y | |||
| 172 | # CONFIG_PPC_PMAC is not set | 178 | # CONFIG_PPC_PMAC is not set |
| 173 | # CONFIG_PPC_MAPLE is not set | 179 | # CONFIG_PPC_MAPLE is not set |
| 174 | # CONFIG_PPC_PASEMI is not set | 180 | # CONFIG_PPC_PASEMI is not set |
| 175 | # CONFIG_PPC_CELLEB is not set | ||
| 176 | # CONFIG_PPC_PS3 is not set | 181 | # CONFIG_PPC_PS3 is not set |
| 177 | # CONFIG_PPC_CELL is not set | 182 | # CONFIG_PPC_CELL is not set |
| 178 | # CONFIG_PPC_CELL_NATIVE is not set | 183 | # CONFIG_PPC_CELL_NATIVE is not set |
| 179 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 184 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 185 | # CONFIG_PPC_CELLEB is not set | ||
| 180 | # CONFIG_PQ2ADS is not set | 186 | # CONFIG_PQ2ADS is not set |
| 181 | # CONFIG_IPIC is not set | 187 | # CONFIG_IPIC is not set |
| 182 | # CONFIG_MPIC is not set | 188 | # CONFIG_MPIC is not set |
| @@ -212,7 +218,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 212 | CONFIG_BINFMT_ELF=y | 218 | CONFIG_BINFMT_ELF=y |
| 213 | CONFIG_COMPAT_BINFMT_ELF=y | 219 | CONFIG_COMPAT_BINFMT_ELF=y |
| 214 | # CONFIG_BINFMT_MISC is not set | 220 | # CONFIG_BINFMT_MISC is not set |
| 215 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 216 | CONFIG_IOMMU_VMERGE=y | 221 | CONFIG_IOMMU_VMERGE=y |
| 217 | CONFIG_IOMMU_HELPER=y | 222 | CONFIG_IOMMU_HELPER=y |
| 218 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 223 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -234,12 +239,14 @@ CONFIG_FLATMEM=y | |||
| 234 | CONFIG_FLAT_NODE_MEM_MAP=y | 239 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 235 | # CONFIG_SPARSEMEM_STATIC is not set | 240 | # CONFIG_SPARSEMEM_STATIC is not set |
| 236 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 241 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 242 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 237 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 243 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 238 | CONFIG_RESOURCES_64BIT=y | 244 | CONFIG_RESOURCES_64BIT=y |
| 239 | CONFIG_ZONE_DMA_FLAG=1 | 245 | CONFIG_ZONE_DMA_FLAG=1 |
| 240 | CONFIG_BOUNCE=y | 246 | CONFIG_BOUNCE=y |
| 241 | # CONFIG_PPC_HAS_HASH_64K is not set | 247 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 242 | # CONFIG_PPC_64K_PAGES is not set | 248 | # CONFIG_PPC_64K_PAGES is not set |
| 249 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 243 | # CONFIG_SCHED_SMT is not set | 250 | # CONFIG_SCHED_SMT is not set |
| 244 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
| 245 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -263,7 +270,10 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 263 | # CONFIG_PCI_DEBUG is not set | 270 | # CONFIG_PCI_DEBUG is not set |
| 264 | # CONFIG_PCCARD is not set | 271 | # CONFIG_PCCARD is not set |
| 265 | # CONFIG_HOTPLUG_PCI is not set | 272 | # CONFIG_HOTPLUG_PCI is not set |
| 273 | # CONFIG_HAS_RAPIDIO is not set | ||
| 274 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
| 266 | CONFIG_KERNEL_START=0xc000000000000000 | 275 | CONFIG_KERNEL_START=0xc000000000000000 |
| 276 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 267 | 277 | ||
| 268 | # | 278 | # |
| 269 | # Networking | 279 | # Networking |
| @@ -310,8 +320,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 310 | # CONFIG_TCP_MD5SIG is not set | 320 | # CONFIG_TCP_MD5SIG is not set |
| 311 | # CONFIG_IP_VS is not set | 321 | # CONFIG_IP_VS is not set |
| 312 | # CONFIG_IPV6 is not set | 322 | # CONFIG_IPV6 is not set |
| 313 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 314 | # CONFIG_INET6_TUNNEL is not set | ||
| 315 | # CONFIG_NETWORK_SECMARK is not set | 323 | # CONFIG_NETWORK_SECMARK is not set |
| 316 | CONFIG_NETFILTER=y | 324 | CONFIG_NETFILTER=y |
| 317 | # CONFIG_NETFILTER_DEBUG is not set | 325 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -327,6 +335,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 327 | # CONFIG_NF_CT_ACCT is not set | 335 | # CONFIG_NF_CT_ACCT is not set |
| 328 | CONFIG_NF_CONNTRACK_MARK=y | 336 | CONFIG_NF_CONNTRACK_MARK=y |
| 329 | CONFIG_NF_CONNTRACK_EVENTS=y | 337 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 338 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
| 330 | # CONFIG_NF_CT_PROTO_SCTP is not set | 339 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 331 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 340 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
| 332 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 341 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| @@ -631,7 +640,6 @@ CONFIG_MII=y | |||
| 631 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 640 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 632 | CONFIG_NET_PCI=y | 641 | CONFIG_NET_PCI=y |
| 633 | CONFIG_PCNET32=y | 642 | CONFIG_PCNET32=y |
| 634 | CONFIG_PCNET32_NAPI=y | ||
| 635 | # CONFIG_AMD8111_ETH is not set | 643 | # CONFIG_AMD8111_ETH is not set |
| 636 | # CONFIG_ADAPTEC_STARFIRE is not set | 644 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 637 | # CONFIG_B44 is not set | 645 | # CONFIG_B44 is not set |
| @@ -667,7 +675,6 @@ CONFIG_E1000=m | |||
| 667 | # CONFIG_SIS190 is not set | 675 | # CONFIG_SIS190 is not set |
| 668 | # CONFIG_SKGE is not set | 676 | # CONFIG_SKGE is not set |
| 669 | # CONFIG_SKY2 is not set | 677 | # CONFIG_SKY2 is not set |
| 670 | # CONFIG_SK98LIN is not set | ||
| 671 | # CONFIG_VIA_VELOCITY is not set | 678 | # CONFIG_VIA_VELOCITY is not set |
| 672 | # CONFIG_TIGON3 is not set | 679 | # CONFIG_TIGON3 is not set |
| 673 | # CONFIG_BNX2 is not set | 680 | # CONFIG_BNX2 is not set |
| @@ -682,10 +689,10 @@ CONFIG_NETDEV_10000=y | |||
| 682 | # CONFIG_MYRI10GE is not set | 689 | # CONFIG_MYRI10GE is not set |
| 683 | # CONFIG_NETXEN_NIC is not set | 690 | # CONFIG_NETXEN_NIC is not set |
| 684 | # CONFIG_NIU is not set | 691 | # CONFIG_NIU is not set |
| 685 | # CONFIG_PASEMI_MAC is not set | ||
| 686 | # CONFIG_MLX4_CORE is not set | 692 | # CONFIG_MLX4_CORE is not set |
| 687 | # CONFIG_TEHUTI is not set | 693 | # CONFIG_TEHUTI is not set |
| 688 | # CONFIG_BNX2X is not set | 694 | # CONFIG_BNX2X is not set |
| 695 | # CONFIG_SFC is not set | ||
| 689 | CONFIG_TR=y | 696 | CONFIG_TR=y |
| 690 | CONFIG_IBMOL=y | 697 | CONFIG_IBMOL=y |
| 691 | # CONFIG_3C359 is not set | 698 | # CONFIG_3C359 is not set |
| @@ -696,6 +703,7 @@ CONFIG_IBMOL=y | |||
| 696 | # | 703 | # |
| 697 | # CONFIG_WLAN_PRE80211 is not set | 704 | # CONFIG_WLAN_PRE80211 is not set |
| 698 | # CONFIG_WLAN_80211 is not set | 705 | # CONFIG_WLAN_80211 is not set |
| 706 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 699 | # CONFIG_WAN is not set | 707 | # CONFIG_WAN is not set |
| 700 | CONFIG_ISERIES_VETH=y | 708 | CONFIG_ISERIES_VETH=y |
| 701 | # CONFIG_FDDI is not set | 709 | # CONFIG_FDDI is not set |
| @@ -762,6 +770,7 @@ CONFIG_VT=y | |||
| 762 | CONFIG_VT_CONSOLE=y | 770 | CONFIG_VT_CONSOLE=y |
| 763 | CONFIG_HW_CONSOLE=y | 771 | CONFIG_HW_CONSOLE=y |
| 764 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 772 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 773 | CONFIG_DEVKMEM=y | ||
| 765 | # CONFIG_SERIAL_NONSTANDARD is not set | 774 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 766 | # CONFIG_NOZOMI is not set | 775 | # CONFIG_NOZOMI is not set |
| 767 | 776 | ||
| @@ -793,12 +802,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
| 793 | # CONFIG_TCG_TPM is not set | 802 | # CONFIG_TCG_TPM is not set |
| 794 | CONFIG_DEVPORT=y | 803 | CONFIG_DEVPORT=y |
| 795 | # CONFIG_I2C is not set | 804 | # CONFIG_I2C is not set |
| 796 | |||
| 797 | # | ||
| 798 | # SPI support | ||
| 799 | # | ||
| 800 | # CONFIG_SPI is not set | 805 | # CONFIG_SPI is not set |
| 801 | # CONFIG_SPI_MASTER is not set | ||
| 802 | # CONFIG_W1 is not set | 806 | # CONFIG_W1 is not set |
| 803 | # CONFIG_POWER_SUPPLY is not set | 807 | # CONFIG_POWER_SUPPLY is not set |
| 804 | # CONFIG_HWMON is not set | 808 | # CONFIG_HWMON is not set |
| @@ -815,12 +819,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 815 | # Multifunction device drivers | 819 | # Multifunction device drivers |
| 816 | # | 820 | # |
| 817 | # CONFIG_MFD_SM501 is not set | 821 | # CONFIG_MFD_SM501 is not set |
| 822 | # CONFIG_HTC_PASIC3 is not set | ||
| 818 | 823 | ||
| 819 | # | 824 | # |
| 820 | # Multimedia devices | 825 | # Multimedia devices |
| 821 | # | 826 | # |
| 827 | |||
| 828 | # | ||
| 829 | # Multimedia core support | ||
| 830 | # | ||
| 822 | # CONFIG_VIDEO_DEV is not set | 831 | # CONFIG_VIDEO_DEV is not set |
| 823 | # CONFIG_DVB_CORE is not set | 832 | # CONFIG_DVB_CORE is not set |
| 833 | # CONFIG_VIDEO_MEDIA is not set | ||
| 834 | |||
| 835 | # | ||
| 836 | # Multimedia drivers | ||
| 837 | # | ||
| 824 | # CONFIG_DAB is not set | 838 | # CONFIG_DAB is not set |
| 825 | 839 | ||
| 826 | # | 840 | # |
| @@ -854,14 +868,11 @@ CONFIG_DUMMY_CONSOLE=y | |||
| 854 | # CONFIG_MMC is not set | 868 | # CONFIG_MMC is not set |
| 855 | # CONFIG_MEMSTICK is not set | 869 | # CONFIG_MEMSTICK is not set |
| 856 | # CONFIG_NEW_LEDS is not set | 870 | # CONFIG_NEW_LEDS is not set |
| 871 | # CONFIG_ACCESSIBILITY is not set | ||
| 857 | # CONFIG_INFINIBAND is not set | 872 | # CONFIG_INFINIBAND is not set |
| 858 | # CONFIG_EDAC is not set | 873 | # CONFIG_EDAC is not set |
| 859 | # CONFIG_RTC_CLASS is not set | 874 | # CONFIG_RTC_CLASS is not set |
| 860 | # CONFIG_DMADEVICES is not set | 875 | # CONFIG_DMADEVICES is not set |
| 861 | |||
| 862 | # | ||
| 863 | # Userspace I/O | ||
| 864 | # | ||
| 865 | # CONFIG_UIO is not set | 876 | # CONFIG_UIO is not set |
| 866 | 877 | ||
| 867 | # | 878 | # |
| @@ -895,9 +906,9 @@ CONFIG_JFS_SECURITY=y | |||
| 895 | CONFIG_FS_POSIX_ACL=y | 906 | CONFIG_FS_POSIX_ACL=y |
| 896 | CONFIG_XFS_FS=m | 907 | CONFIG_XFS_FS=m |
| 897 | # CONFIG_XFS_QUOTA is not set | 908 | # CONFIG_XFS_QUOTA is not set |
| 898 | CONFIG_XFS_SECURITY=y | ||
| 899 | CONFIG_XFS_POSIX_ACL=y | 909 | CONFIG_XFS_POSIX_ACL=y |
| 900 | # CONFIG_XFS_RT is not set | 910 | # CONFIG_XFS_RT is not set |
| 911 | # CONFIG_XFS_DEBUG is not set | ||
| 901 | CONFIG_GFS2_FS=m | 912 | CONFIG_GFS2_FS=m |
| 902 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | 913 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m |
| 903 | CONFIG_GFS2_FS_LOCKING_DLM=m | 914 | CONFIG_GFS2_FS_LOCKING_DLM=m |
| @@ -966,13 +977,11 @@ CONFIG_NFS_FS=y | |||
| 966 | CONFIG_NFS_V3=y | 977 | CONFIG_NFS_V3=y |
| 967 | CONFIG_NFS_V3_ACL=y | 978 | CONFIG_NFS_V3_ACL=y |
| 968 | CONFIG_NFS_V4=y | 979 | CONFIG_NFS_V4=y |
| 969 | # CONFIG_NFS_DIRECTIO is not set | ||
| 970 | CONFIG_NFSD=m | 980 | CONFIG_NFSD=m |
| 971 | CONFIG_NFSD_V2_ACL=y | 981 | CONFIG_NFSD_V2_ACL=y |
| 972 | CONFIG_NFSD_V3=y | 982 | CONFIG_NFSD_V3=y |
| 973 | CONFIG_NFSD_V3_ACL=y | 983 | CONFIG_NFSD_V3_ACL=y |
| 974 | CONFIG_NFSD_V4=y | 984 | CONFIG_NFSD_V4=y |
| 975 | CONFIG_NFSD_TCP=y | ||
| 976 | CONFIG_LOCKD=y | 985 | CONFIG_LOCKD=y |
| 977 | CONFIG_LOCKD_V4=y | 986 | CONFIG_LOCKD_V4=y |
| 978 | CONFIG_EXPORTFS=m | 987 | CONFIG_EXPORTFS=m |
| @@ -1047,9 +1056,10 @@ CONFIG_DLM=m | |||
| 1047 | # Library routines | 1056 | # Library routines |
| 1048 | # | 1057 | # |
| 1049 | CONFIG_BITREVERSE=y | 1058 | CONFIG_BITREVERSE=y |
| 1059 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1050 | CONFIG_CRC_CCITT=m | 1060 | CONFIG_CRC_CCITT=m |
| 1051 | # CONFIG_CRC16 is not set | 1061 | # CONFIG_CRC16 is not set |
| 1052 | # CONFIG_CRC_ITU_T is not set | 1062 | CONFIG_CRC_ITU_T=m |
| 1053 | CONFIG_CRC32=y | 1063 | CONFIG_CRC32=y |
| 1054 | # CONFIG_CRC7 is not set | 1064 | # CONFIG_CRC7 is not set |
| 1055 | CONFIG_LIBCRC32C=m | 1065 | CONFIG_LIBCRC32C=m |
| @@ -1071,6 +1081,7 @@ CONFIG_HAVE_LMB=y | |||
| 1071 | # CONFIG_PRINTK_TIME is not set | 1081 | # CONFIG_PRINTK_TIME is not set |
| 1072 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1082 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1073 | CONFIG_ENABLE_MUST_CHECK=y | 1083 | CONFIG_ENABLE_MUST_CHECK=y |
| 1084 | CONFIG_FRAME_WARN=2048 | ||
| 1074 | CONFIG_MAGIC_SYSRQ=y | 1085 | CONFIG_MAGIC_SYSRQ=y |
| 1075 | # CONFIG_UNUSED_SYMBOLS is not set | 1086 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1076 | CONFIG_DEBUG_FS=y | 1087 | CONFIG_DEBUG_FS=y |
| @@ -1081,18 +1092,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1081 | CONFIG_SCHED_DEBUG=y | 1092 | CONFIG_SCHED_DEBUG=y |
| 1082 | # CONFIG_SCHEDSTATS is not set | 1093 | # CONFIG_SCHEDSTATS is not set |
| 1083 | # CONFIG_TIMER_STATS is not set | 1094 | # CONFIG_TIMER_STATS is not set |
| 1095 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1084 | # CONFIG_SLUB_DEBUG_ON is not set | 1096 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1085 | # CONFIG_SLUB_STATS is not set | 1097 | # CONFIG_SLUB_STATS is not set |
| 1086 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1098 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1087 | # CONFIG_RT_MUTEX_TESTER is not set | 1099 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1088 | # CONFIG_DEBUG_SPINLOCK is not set | 1100 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1089 | # CONFIG_DEBUG_MUTEXES is not set | 1101 | # CONFIG_DEBUG_MUTEXES is not set |
| 1102 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1103 | # CONFIG_PROVE_LOCKING is not set | ||
| 1104 | # CONFIG_LOCK_STAT is not set | ||
| 1090 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1105 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1091 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1106 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1092 | # CONFIG_DEBUG_KOBJECT is not set | 1107 | # CONFIG_DEBUG_KOBJECT is not set |
| 1093 | CONFIG_DEBUG_BUGVERBOSE=y | 1108 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1094 | # CONFIG_DEBUG_INFO is not set | 1109 | # CONFIG_DEBUG_INFO is not set |
| 1095 | # CONFIG_DEBUG_VM is not set | 1110 | # CONFIG_DEBUG_VM is not set |
| 1111 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1096 | # CONFIG_DEBUG_LIST is not set | 1112 | # CONFIG_DEBUG_LIST is not set |
| 1097 | # CONFIG_DEBUG_SG is not set | 1113 | # CONFIG_DEBUG_SG is not set |
| 1098 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1114 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1116,53 +1132,83 @@ CONFIG_IRQSTACKS=y | |||
| 1116 | # CONFIG_SECURITY is not set | 1132 | # CONFIG_SECURITY is not set |
| 1117 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1133 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1118 | CONFIG_CRYPTO=y | 1134 | CONFIG_CRYPTO=y |
| 1135 | |||
| 1136 | # | ||
| 1137 | # Crypto core or helper | ||
| 1138 | # | ||
| 1119 | CONFIG_CRYPTO_ALGAPI=y | 1139 | CONFIG_CRYPTO_ALGAPI=y |
| 1120 | CONFIG_CRYPTO_AEAD=m | 1140 | CONFIG_CRYPTO_AEAD=m |
| 1121 | CONFIG_CRYPTO_BLKCIPHER=y | 1141 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1122 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1123 | CONFIG_CRYPTO_HASH=y | 1142 | CONFIG_CRYPTO_HASH=y |
| 1124 | CONFIG_CRYPTO_MANAGER=y | 1143 | CONFIG_CRYPTO_MANAGER=y |
| 1144 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1145 | CONFIG_CRYPTO_NULL=m | ||
| 1146 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1147 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1148 | CONFIG_CRYPTO_TEST=m | ||
| 1149 | |||
| 1150 | # | ||
| 1151 | # Authenticated Encryption with Associated Data | ||
| 1152 | # | ||
| 1153 | # CONFIG_CRYPTO_CCM is not set | ||
| 1154 | # CONFIG_CRYPTO_GCM is not set | ||
| 1155 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1156 | |||
| 1157 | # | ||
| 1158 | # Block modes | ||
| 1159 | # | ||
| 1160 | CONFIG_CRYPTO_CBC=y | ||
| 1161 | # CONFIG_CRYPTO_CTR is not set | ||
| 1162 | # CONFIG_CRYPTO_CTS is not set | ||
| 1163 | CONFIG_CRYPTO_ECB=m | ||
| 1164 | # CONFIG_CRYPTO_LRW is not set | ||
| 1165 | CONFIG_CRYPTO_PCBC=m | ||
| 1166 | # CONFIG_CRYPTO_XTS is not set | ||
| 1167 | |||
| 1168 | # | ||
| 1169 | # Hash modes | ||
| 1170 | # | ||
| 1125 | CONFIG_CRYPTO_HMAC=y | 1171 | CONFIG_CRYPTO_HMAC=y |
| 1126 | # CONFIG_CRYPTO_XCBC is not set | 1172 | # CONFIG_CRYPTO_XCBC is not set |
| 1127 | CONFIG_CRYPTO_NULL=m | 1173 | |
| 1174 | # | ||
| 1175 | # Digest | ||
| 1176 | # | ||
| 1177 | CONFIG_CRYPTO_CRC32C=m | ||
| 1128 | CONFIG_CRYPTO_MD4=m | 1178 | CONFIG_CRYPTO_MD4=m |
| 1129 | CONFIG_CRYPTO_MD5=y | 1179 | CONFIG_CRYPTO_MD5=y |
| 1180 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1130 | CONFIG_CRYPTO_SHA1=m | 1181 | CONFIG_CRYPTO_SHA1=m |
| 1131 | CONFIG_CRYPTO_SHA256=m | 1182 | CONFIG_CRYPTO_SHA256=m |
| 1132 | CONFIG_CRYPTO_SHA512=m | 1183 | CONFIG_CRYPTO_SHA512=m |
| 1133 | CONFIG_CRYPTO_WP512=m | ||
| 1134 | CONFIG_CRYPTO_TGR192=m | 1184 | CONFIG_CRYPTO_TGR192=m |
| 1135 | # CONFIG_CRYPTO_GF128MUL is not set | 1185 | CONFIG_CRYPTO_WP512=m |
| 1136 | CONFIG_CRYPTO_ECB=m | 1186 | |
| 1137 | CONFIG_CRYPTO_CBC=y | 1187 | # |
| 1138 | CONFIG_CRYPTO_PCBC=m | 1188 | # Ciphers |
| 1139 | # CONFIG_CRYPTO_LRW is not set | 1189 | # |
| 1140 | # CONFIG_CRYPTO_XTS is not set | ||
| 1141 | # CONFIG_CRYPTO_CTR is not set | ||
| 1142 | # CONFIG_CRYPTO_GCM is not set | ||
| 1143 | # CONFIG_CRYPTO_CCM is not set | ||
| 1144 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1145 | CONFIG_CRYPTO_DES=y | ||
| 1146 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1147 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1148 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1149 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1150 | CONFIG_CRYPTO_SERPENT=m | ||
| 1151 | CONFIG_CRYPTO_AES=m | 1190 | CONFIG_CRYPTO_AES=m |
| 1191 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1192 | CONFIG_CRYPTO_ARC4=m | ||
| 1193 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1194 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1152 | CONFIG_CRYPTO_CAST5=m | 1195 | CONFIG_CRYPTO_CAST5=m |
| 1153 | CONFIG_CRYPTO_CAST6=m | 1196 | CONFIG_CRYPTO_CAST6=m |
| 1154 | CONFIG_CRYPTO_TEA=m | 1197 | CONFIG_CRYPTO_DES=y |
| 1155 | CONFIG_CRYPTO_ARC4=m | 1198 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1156 | CONFIG_CRYPTO_KHAZAD=m | 1199 | CONFIG_CRYPTO_KHAZAD=m |
| 1157 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1158 | CONFIG_CRYPTO_SEED=m | ||
| 1159 | # CONFIG_CRYPTO_SALSA20 is not set | 1200 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1201 | CONFIG_CRYPTO_SEED=m | ||
| 1202 | CONFIG_CRYPTO_SERPENT=m | ||
| 1203 | CONFIG_CRYPTO_TEA=m | ||
| 1204 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1205 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1206 | |||
| 1207 | # | ||
| 1208 | # Compression | ||
| 1209 | # | ||
| 1160 | CONFIG_CRYPTO_DEFLATE=m | 1210 | CONFIG_CRYPTO_DEFLATE=m |
| 1161 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1162 | CONFIG_CRYPTO_CRC32C=m | ||
| 1163 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1164 | CONFIG_CRYPTO_TEST=m | ||
| 1165 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1166 | # CONFIG_CRYPTO_LZO is not set | 1211 | # CONFIG_CRYPTO_LZO is not set |
| 1167 | # CONFIG_CRYPTO_HW is not set | 1212 | # CONFIG_CRYPTO_HW is not set |
| 1168 | # CONFIG_PPC_CLOCK is not set | 1213 | # CONFIG_PPC_CLOCK is not set |
| 1214 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 22a943afc3c0..48434c2c7628 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:10 2008 | 4 | # Mon Jun 9 08:52:10 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -91,6 +93,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 91 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 92 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 94 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 95 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -118,12 +121,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 118 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
| 119 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
| 120 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
| 124 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 121 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
| 122 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
| 123 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
| 124 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
| 125 | CONFIG_BASE_SMALL=0 | 129 | CONFIG_BASE_SMALL=0 |
| 126 | CONFIG_MODULES=y | 130 | CONFIG_MODULES=y |
| 131 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 127 | CONFIG_MODULE_UNLOAD=y | 132 | CONFIG_MODULE_UNLOAD=y |
| 128 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 133 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 129 | # CONFIG_MODVERSIONS is not set | 134 | # CONFIG_MODVERSIONS is not set |
| @@ -223,11 +228,13 @@ CONFIG_FLATMEM=y | |||
| 223 | CONFIG_FLAT_NODE_MEM_MAP=y | 228 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 224 | # CONFIG_SPARSEMEM_STATIC is not set | 229 | # CONFIG_SPARSEMEM_STATIC is not set |
| 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 231 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 227 | # CONFIG_RESOURCES_64BIT is not set | 233 | # CONFIG_RESOURCES_64BIT is not set |
| 228 | CONFIG_ZONE_DMA_FLAG=1 | 234 | CONFIG_ZONE_DMA_FLAG=1 |
| 229 | CONFIG_BOUNCE=y | 235 | CONFIG_BOUNCE=y |
| 230 | CONFIG_VIRT_TO_BUS=y | 236 | CONFIG_VIRT_TO_BUS=y |
| 237 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 231 | CONFIG_PROC_DEVICETREE=y | 238 | CONFIG_PROC_DEVICETREE=y |
| 232 | # CONFIG_CMDLINE_BOOL is not set | 239 | # CONFIG_CMDLINE_BOOL is not set |
| 233 | # CONFIG_PM is not set | 240 | # CONFIG_PM is not set |
| @@ -251,6 +258,7 @@ CONFIG_PCI_LEGACY=y | |||
| 251 | # CONFIG_PCI_DEBUG is not set | 258 | # CONFIG_PCI_DEBUG is not set |
| 252 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
| 253 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
| 261 | # CONFIG_HAS_RAPIDIO is not set | ||
| 254 | 262 | ||
| 255 | # | 263 | # |
| 256 | # Advanced setup | 264 | # Advanced setup |
| @@ -260,11 +268,11 @@ CONFIG_PCI_LEGACY=y | |||
| 260 | # | 268 | # |
| 261 | # Default settings for advanced configuration options are used | 269 | # Default settings for advanced configuration options are used |
| 262 | # | 270 | # |
| 263 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 264 | CONFIG_LOWMEM_SIZE=0x30000000 | 271 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 265 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
| 274 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 266 | CONFIG_TASK_SIZE=0xc0000000 | 275 | CONFIG_TASK_SIZE=0xc0000000 |
| 267 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 268 | 276 | ||
| 269 | # | 277 | # |
| 270 | # Networking | 278 | # Networking |
| @@ -313,8 +321,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 313 | # CONFIG_TCP_MD5SIG is not set | 321 | # CONFIG_TCP_MD5SIG is not set |
| 314 | # CONFIG_IP_VS is not set | 322 | # CONFIG_IP_VS is not set |
| 315 | # CONFIG_IPV6 is not set | 323 | # CONFIG_IPV6 is not set |
| 316 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 317 | # CONFIG_INET6_TUNNEL is not set | ||
| 318 | # CONFIG_NETWORK_SECMARK is not set | 324 | # CONFIG_NETWORK_SECMARK is not set |
| 319 | CONFIG_NETFILTER=y | 325 | CONFIG_NETFILTER=y |
| 320 | # CONFIG_NETFILTER_DEBUG is not set | 326 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -329,6 +335,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 329 | # CONFIG_NF_CT_ACCT is not set | 335 | # CONFIG_NF_CT_ACCT is not set |
| 330 | # CONFIG_NF_CONNTRACK_MARK is not set | 336 | # CONFIG_NF_CONNTRACK_MARK is not set |
| 331 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 337 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
| 338 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
| 332 | CONFIG_NF_CT_PROTO_GRE=m | 339 | CONFIG_NF_CT_PROTO_GRE=m |
| 333 | CONFIG_NF_CT_PROTO_SCTP=m | 340 | CONFIG_NF_CT_PROTO_SCTP=m |
| 334 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 341 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
| @@ -407,6 +414,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m | |||
| 407 | # CONFIG_IP_NF_TARGET_NETMAP is not set | 414 | # CONFIG_IP_NF_TARGET_NETMAP is not set |
| 408 | # CONFIG_NF_NAT_SNMP_BASIC is not set | 415 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
| 409 | CONFIG_NF_NAT_PROTO_GRE=m | 416 | CONFIG_NF_NAT_PROTO_GRE=m |
| 417 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
| 410 | CONFIG_NF_NAT_FTP=m | 418 | CONFIG_NF_NAT_FTP=m |
| 411 | CONFIG_NF_NAT_IRC=m | 419 | CONFIG_NF_NAT_IRC=m |
| 412 | CONFIG_NF_NAT_TFTP=m | 420 | CONFIG_NF_NAT_TFTP=m |
| @@ -459,8 +467,6 @@ CONFIG_IEEE80211_DEBUG=y | |||
| 459 | CONFIG_IEEE80211_CRYPT_WEP=m | 467 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 460 | CONFIG_IEEE80211_CRYPT_CCMP=m | 468 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 461 | CONFIG_IEEE80211_CRYPT_TKIP=m | 469 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 462 | CONFIG_IEEE80211_SOFTMAC=m | ||
| 463 | CONFIG_IEEE80211_SOFTMAC_DEBUG=y | ||
| 464 | # CONFIG_RFKILL is not set | 470 | # CONFIG_RFKILL is not set |
| 465 | # CONFIG_NET_9P is not set | 471 | # CONFIG_NET_9P is not set |
| 466 | 472 | ||
| @@ -486,6 +492,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 486 | # CONFIG_MTD_REDBOOT_PARTS is not set | 492 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 487 | # CONFIG_MTD_CMDLINE_PARTS is not set | 493 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 488 | # CONFIG_MTD_OF_PARTS is not set | 494 | # CONFIG_MTD_OF_PARTS is not set |
| 495 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 489 | 496 | ||
| 490 | # | 497 | # |
| 491 | # User Modules And Translation Layers | 498 | # User Modules And Translation Layers |
| @@ -565,6 +572,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 565 | # | 572 | # |
| 566 | # CONFIG_MTD_UBI is not set | 573 | # CONFIG_MTD_UBI is not set |
| 567 | CONFIG_OF_DEVICE=y | 574 | CONFIG_OF_DEVICE=y |
| 575 | CONFIG_OF_I2C=y | ||
| 568 | # CONFIG_PARPORT is not set | 576 | # CONFIG_PARPORT is not set |
| 569 | CONFIG_BLK_DEV=y | 577 | CONFIG_BLK_DEV=y |
| 570 | # CONFIG_BLK_DEV_FD is not set | 578 | # CONFIG_BLK_DEV_FD is not set |
| @@ -670,7 +678,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 670 | # CONFIG_SCSI_SRP is not set | 678 | # CONFIG_SCSI_SRP is not set |
| 671 | CONFIG_ATA=y | 679 | CONFIG_ATA=y |
| 672 | # CONFIG_ATA_NONSTANDARD is not set | 680 | # CONFIG_ATA_NONSTANDARD is not set |
| 681 | CONFIG_SATA_PMP=y | ||
| 673 | # CONFIG_SATA_AHCI is not set | 682 | # CONFIG_SATA_AHCI is not set |
| 683 | # CONFIG_SATA_SIL24 is not set | ||
| 684 | # CONFIG_SATA_FSL is not set | ||
| 685 | CONFIG_ATA_SFF=y | ||
| 674 | # CONFIG_SATA_SVW is not set | 686 | # CONFIG_SATA_SVW is not set |
| 675 | # CONFIG_ATA_PIIX is not set | 687 | # CONFIG_ATA_PIIX is not set |
| 676 | # CONFIG_SATA_MV is not set | 688 | # CONFIG_SATA_MV is not set |
| @@ -680,13 +692,11 @@ CONFIG_ATA=y | |||
| 680 | # CONFIG_SATA_PROMISE is not set | 692 | # CONFIG_SATA_PROMISE is not set |
| 681 | # CONFIG_SATA_SX4 is not set | 693 | # CONFIG_SATA_SX4 is not set |
| 682 | # CONFIG_SATA_SIL is not set | 694 | # CONFIG_SATA_SIL is not set |
| 683 | # CONFIG_SATA_SIL24 is not set | ||
| 684 | # CONFIG_SATA_SIS is not set | 695 | # CONFIG_SATA_SIS is not set |
| 685 | # CONFIG_SATA_ULI is not set | 696 | # CONFIG_SATA_ULI is not set |
| 686 | # CONFIG_SATA_VIA is not set | 697 | # CONFIG_SATA_VIA is not set |
| 687 | # CONFIG_SATA_VITESSE is not set | 698 | # CONFIG_SATA_VITESSE is not set |
| 688 | # CONFIG_SATA_INIC162X is not set | 699 | # CONFIG_SATA_INIC162X is not set |
| 689 | # CONFIG_SATA_FSL is not set | ||
| 690 | # CONFIG_PATA_ALI is not set | 700 | # CONFIG_PATA_ALI is not set |
| 691 | # CONFIG_PATA_AMD is not set | 701 | # CONFIG_PATA_AMD is not set |
| 692 | # CONFIG_PATA_ARTOP is not set | 702 | # CONFIG_PATA_ARTOP is not set |
| @@ -726,6 +736,7 @@ CONFIG_PATA_SIL680=y | |||
| 726 | # CONFIG_PATA_VIA is not set | 736 | # CONFIG_PATA_VIA is not set |
| 727 | # CONFIG_PATA_WINBOND is not set | 737 | # CONFIG_PATA_WINBOND is not set |
| 728 | # CONFIG_PATA_PLATFORM is not set | 738 | # CONFIG_PATA_PLATFORM is not set |
| 739 | # CONFIG_PATA_SCH is not set | ||
| 729 | # CONFIG_MD is not set | 740 | # CONFIG_MD is not set |
| 730 | # CONFIG_FUSION is not set | 741 | # CONFIG_FUSION is not set |
| 731 | 742 | ||
| @@ -785,7 +796,6 @@ CONFIG_R8169=y | |||
| 785 | # CONFIG_SIS190 is not set | 796 | # CONFIG_SIS190 is not set |
| 786 | # CONFIG_SKGE is not set | 797 | # CONFIG_SKGE is not set |
| 787 | # CONFIG_SKY2 is not set | 798 | # CONFIG_SKY2 is not set |
| 788 | # CONFIG_SK98LIN is not set | ||
| 789 | # CONFIG_VIA_VELOCITY is not set | 799 | # CONFIG_VIA_VELOCITY is not set |
| 790 | # CONFIG_TIGON3 is not set | 800 | # CONFIG_TIGON3 is not set |
| 791 | # CONFIG_BNX2 is not set | 801 | # CONFIG_BNX2 is not set |
| @@ -805,6 +815,7 @@ CONFIG_NETDEV_10000=y | |||
| 805 | # CONFIG_MLX4_CORE is not set | 815 | # CONFIG_MLX4_CORE is not set |
| 806 | # CONFIG_TEHUTI is not set | 816 | # CONFIG_TEHUTI is not set |
| 807 | # CONFIG_BNX2X is not set | 817 | # CONFIG_BNX2X is not set |
| 818 | # CONFIG_SFC is not set | ||
| 808 | # CONFIG_TR is not set | 819 | # CONFIG_TR is not set |
| 809 | 820 | ||
| 810 | # | 821 | # |
| @@ -812,6 +823,7 @@ CONFIG_NETDEV_10000=y | |||
| 812 | # | 823 | # |
| 813 | # CONFIG_WLAN_PRE80211 is not set | 824 | # CONFIG_WLAN_PRE80211 is not set |
| 814 | # CONFIG_WLAN_80211 is not set | 825 | # CONFIG_WLAN_80211 is not set |
| 826 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 815 | 827 | ||
| 816 | # | 828 | # |
| 817 | # USB Network Adapters | 829 | # USB Network Adapters |
| @@ -886,6 +898,7 @@ CONFIG_VT=y | |||
| 886 | CONFIG_VT_CONSOLE=y | 898 | CONFIG_VT_CONSOLE=y |
| 887 | CONFIG_HW_CONSOLE=y | 899 | CONFIG_HW_CONSOLE=y |
| 888 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 900 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 901 | CONFIG_DEVKMEM=y | ||
| 889 | # CONFIG_SERIAL_NONSTANDARD is not set | 902 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 890 | # CONFIG_NOZOMI is not set | 903 | # CONFIG_NOZOMI is not set |
| 891 | 904 | ||
| @@ -913,7 +926,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 913 | # CONFIG_IPMI_HANDLER is not set | 926 | # CONFIG_IPMI_HANDLER is not set |
| 914 | CONFIG_HW_RANDOM=y | 927 | CONFIG_HW_RANDOM=y |
| 915 | # CONFIG_NVRAM is not set | 928 | # CONFIG_NVRAM is not set |
| 916 | # CONFIG_GEN_RTC is not set | ||
| 917 | # CONFIG_R3964 is not set | 929 | # CONFIG_R3964 is not set |
| 918 | # CONFIG_APPLICOM is not set | 930 | # CONFIG_APPLICOM is not set |
| 919 | # CONFIG_RAW_DRIVER is not set | 931 | # CONFIG_RAW_DRIVER is not set |
| @@ -924,13 +936,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 924 | CONFIG_I2C_CHARDEV=y | 936 | CONFIG_I2C_CHARDEV=y |
| 925 | 937 | ||
| 926 | # | 938 | # |
| 927 | # I2C Algorithms | ||
| 928 | # | ||
| 929 | # CONFIG_I2C_ALGOBIT is not set | ||
| 930 | # CONFIG_I2C_ALGOPCF is not set | ||
| 931 | # CONFIG_I2C_ALGOPCA is not set | ||
| 932 | |||
| 933 | # | ||
| 934 | # I2C Hardware Bus support | 939 | # I2C Hardware Bus support |
| 935 | # | 940 | # |
| 936 | # CONFIG_I2C_ALI1535 is not set | 941 | # CONFIG_I2C_ALI1535 is not set |
| @@ -957,6 +962,7 @@ CONFIG_I2C_MPC=y | |||
| 957 | # CONFIG_I2C_VIA is not set | 962 | # CONFIG_I2C_VIA is not set |
| 958 | # CONFIG_I2C_VIAPRO is not set | 963 | # CONFIG_I2C_VIAPRO is not set |
| 959 | # CONFIG_I2C_VOODOO3 is not set | 964 | # CONFIG_I2C_VOODOO3 is not set |
| 965 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 960 | 966 | ||
| 961 | # | 967 | # |
| 962 | # Miscellaneous I2C Chip support | 968 | # Miscellaneous I2C Chip support |
| @@ -966,19 +972,13 @@ CONFIG_SENSORS_EEPROM=m | |||
| 966 | # CONFIG_SENSORS_PCF8574 is not set | 972 | # CONFIG_SENSORS_PCF8574 is not set |
| 967 | # CONFIG_PCF8575 is not set | 973 | # CONFIG_PCF8575 is not set |
| 968 | # CONFIG_SENSORS_PCF8591 is not set | 974 | # CONFIG_SENSORS_PCF8591 is not set |
| 969 | # CONFIG_TPS65010 is not set | ||
| 970 | # CONFIG_SENSORS_MAX6875 is not set | 975 | # CONFIG_SENSORS_MAX6875 is not set |
| 971 | # CONFIG_SENSORS_TSL2550 is not set | 976 | # CONFIG_SENSORS_TSL2550 is not set |
| 972 | # CONFIG_I2C_DEBUG_CORE is not set | 977 | # CONFIG_I2C_DEBUG_CORE is not set |
| 973 | # CONFIG_I2C_DEBUG_ALGO is not set | 978 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 974 | # CONFIG_I2C_DEBUG_BUS is not set | 979 | # CONFIG_I2C_DEBUG_BUS is not set |
| 975 | # CONFIG_I2C_DEBUG_CHIP is not set | 980 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 976 | |||
| 977 | # | ||
| 978 | # SPI support | ||
| 979 | # | ||
| 980 | # CONFIG_SPI is not set | 981 | # CONFIG_SPI is not set |
| 981 | # CONFIG_SPI_MASTER is not set | ||
| 982 | # CONFIG_W1 is not set | 982 | # CONFIG_W1 is not set |
| 983 | # CONFIG_POWER_SUPPLY is not set | 983 | # CONFIG_POWER_SUPPLY is not set |
| 984 | CONFIG_HWMON=y | 984 | CONFIG_HWMON=y |
| @@ -1048,12 +1048,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1048 | # Multifunction device drivers | 1048 | # Multifunction device drivers |
| 1049 | # | 1049 | # |
| 1050 | # CONFIG_MFD_SM501 is not set | 1050 | # CONFIG_MFD_SM501 is not set |
| 1051 | # CONFIG_HTC_PASIC3 is not set | ||
| 1051 | 1052 | ||
| 1052 | # | 1053 | # |
| 1053 | # Multimedia devices | 1054 | # Multimedia devices |
| 1054 | # | 1055 | # |
| 1056 | |||
| 1057 | # | ||
| 1058 | # Multimedia core support | ||
| 1059 | # | ||
| 1055 | # CONFIG_VIDEO_DEV is not set | 1060 | # CONFIG_VIDEO_DEV is not set |
| 1056 | # CONFIG_DVB_CORE is not set | 1061 | # CONFIG_DVB_CORE is not set |
| 1062 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1063 | |||
| 1064 | # | ||
| 1065 | # Multimedia drivers | ||
| 1066 | # | ||
| 1057 | # CONFIG_DAB is not set | 1067 | # CONFIG_DAB is not set |
| 1058 | 1068 | ||
| 1059 | # | 1069 | # |
| @@ -1115,12 +1125,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1115 | # | 1125 | # |
| 1116 | # USB Host Controller Drivers | 1126 | # USB Host Controller Drivers |
| 1117 | # | 1127 | # |
| 1128 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1118 | CONFIG_USB_EHCI_HCD=y | 1129 | CONFIG_USB_EHCI_HCD=y |
| 1119 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1130 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1120 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1131 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1121 | # CONFIG_USB_EHCI_FSL is not set | 1132 | # CONFIG_USB_EHCI_FSL is not set |
| 1122 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1133 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1123 | # CONFIG_USB_ISP116X_HCD is not set | 1134 | # CONFIG_USB_ISP116X_HCD is not set |
| 1135 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1124 | CONFIG_USB_OHCI_HCD=y | 1136 | CONFIG_USB_OHCI_HCD=y |
| 1125 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1137 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1126 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1138 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1138,6 +1150,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1138 | # | 1150 | # |
| 1139 | # CONFIG_USB_ACM is not set | 1151 | # CONFIG_USB_ACM is not set |
| 1140 | CONFIG_USB_PRINTER=m | 1152 | CONFIG_USB_PRINTER=m |
| 1153 | # CONFIG_USB_WDM is not set | ||
| 1141 | 1154 | ||
| 1142 | # | 1155 | # |
| 1143 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1156 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1159,6 +1172,7 @@ CONFIG_USB_STORAGE=m | |||
| 1159 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1172 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1160 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1173 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1161 | # CONFIG_USB_STORAGE_KARMA is not set | 1174 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1175 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1162 | # CONFIG_USB_LIBUSUAL is not set | 1176 | # CONFIG_USB_LIBUSUAL is not set |
| 1163 | 1177 | ||
| 1164 | # | 1178 | # |
| @@ -1202,9 +1216,11 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1202 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1216 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
| 1203 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1217 | # CONFIG_USB_SERIAL_MOS7720 is not set |
| 1204 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1218 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1219 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 1205 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1220 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1206 | # CONFIG_USB_SERIAL_PL2303 is not set | 1221 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 1207 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1222 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1223 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
| 1208 | # CONFIG_USB_SERIAL_HP4X is not set | 1224 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1209 | # CONFIG_USB_SERIAL_SAFE is not set | 1225 | # CONFIG_USB_SERIAL_SAFE is not set |
| 1210 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1226 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
| @@ -1238,10 +1254,12 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
| 1238 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1254 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1239 | # CONFIG_USB_IOWARRIOR is not set | 1255 | # CONFIG_USB_IOWARRIOR is not set |
| 1240 | # CONFIG_USB_TEST is not set | 1256 | # CONFIG_USB_TEST is not set |
| 1257 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1241 | # CONFIG_USB_GADGET is not set | 1258 | # CONFIG_USB_GADGET is not set |
| 1242 | # CONFIG_MMC is not set | 1259 | # CONFIG_MMC is not set |
| 1243 | # CONFIG_MEMSTICK is not set | 1260 | # CONFIG_MEMSTICK is not set |
| 1244 | # CONFIG_NEW_LEDS is not set | 1261 | # CONFIG_NEW_LEDS is not set |
| 1262 | # CONFIG_ACCESSIBILITY is not set | ||
| 1245 | # CONFIG_INFINIBAND is not set | 1263 | # CONFIG_INFINIBAND is not set |
| 1246 | # CONFIG_EDAC is not set | 1264 | # CONFIG_EDAC is not set |
| 1247 | CONFIG_RTC_LIB=y | 1265 | CONFIG_RTC_LIB=y |
| @@ -1293,11 +1311,8 @@ CONFIG_RTC_DRV_RS5C372=y | |||
| 1293 | # | 1311 | # |
| 1294 | # on-CPU RTC drivers | 1312 | # on-CPU RTC drivers |
| 1295 | # | 1313 | # |
| 1314 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1296 | # CONFIG_DMADEVICES is not set | 1315 | # CONFIG_DMADEVICES is not set |
| 1297 | |||
| 1298 | # | ||
| 1299 | # Userspace I/O | ||
| 1300 | # | ||
| 1301 | # CONFIG_UIO is not set | 1316 | # CONFIG_UIO is not set |
| 1302 | 1317 | ||
| 1303 | # | 1318 | # |
| @@ -1318,10 +1333,9 @@ CONFIG_FS_MBCACHE=y | |||
| 1318 | CONFIG_FS_POSIX_ACL=y | 1333 | CONFIG_FS_POSIX_ACL=y |
| 1319 | CONFIG_XFS_FS=m | 1334 | CONFIG_XFS_FS=m |
| 1320 | # CONFIG_XFS_QUOTA is not set | 1335 | # CONFIG_XFS_QUOTA is not set |
| 1321 | # CONFIG_XFS_SECURITY is not set | ||
| 1322 | # CONFIG_XFS_POSIX_ACL is not set | 1336 | # CONFIG_XFS_POSIX_ACL is not set |
| 1323 | # CONFIG_XFS_RT is not set | 1337 | # CONFIG_XFS_RT is not set |
| 1324 | # CONFIG_GFS2_FS is not set | 1338 | # CONFIG_XFS_DEBUG is not set |
| 1325 | # CONFIG_OCFS2_FS is not set | 1339 | # CONFIG_OCFS2_FS is not set |
| 1326 | CONFIG_DNOTIFY=y | 1340 | CONFIG_DNOTIFY=y |
| 1327 | CONFIG_INOTIFY=y | 1341 | CONFIG_INOTIFY=y |
| @@ -1388,12 +1402,10 @@ CONFIG_NFS_FS=y | |||
| 1388 | CONFIG_NFS_V3=y | 1402 | CONFIG_NFS_V3=y |
| 1389 | CONFIG_NFS_V3_ACL=y | 1403 | CONFIG_NFS_V3_ACL=y |
| 1390 | CONFIG_NFS_V4=y | 1404 | CONFIG_NFS_V4=y |
| 1391 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1392 | CONFIG_NFSD=m | 1405 | CONFIG_NFSD=m |
| 1393 | CONFIG_NFSD_V3=y | 1406 | CONFIG_NFSD_V3=y |
| 1394 | # CONFIG_NFSD_V3_ACL is not set | 1407 | # CONFIG_NFSD_V3_ACL is not set |
| 1395 | # CONFIG_NFSD_V4 is not set | 1408 | # CONFIG_NFSD_V4 is not set |
| 1396 | CONFIG_NFSD_TCP=y | ||
| 1397 | CONFIG_ROOT_NFS=y | 1409 | CONFIG_ROOT_NFS=y |
| 1398 | CONFIG_LOCKD=y | 1410 | CONFIG_LOCKD=y |
| 1399 | CONFIG_LOCKD_V4=y | 1411 | CONFIG_LOCKD_V4=y |
| @@ -1467,9 +1479,10 @@ CONFIG_NLS_UTF8=m | |||
| 1467 | # Library routines | 1479 | # Library routines |
| 1468 | # | 1480 | # |
| 1469 | CONFIG_BITREVERSE=y | 1481 | CONFIG_BITREVERSE=y |
| 1482 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1470 | CONFIG_CRC_CCITT=m | 1483 | CONFIG_CRC_CCITT=m |
| 1471 | # CONFIG_CRC16 is not set | 1484 | # CONFIG_CRC16 is not set |
| 1472 | # CONFIG_CRC_ITU_T is not set | 1485 | CONFIG_CRC_ITU_T=m |
| 1473 | CONFIG_CRC32=y | 1486 | CONFIG_CRC32=y |
| 1474 | # CONFIG_CRC7 is not set | 1487 | # CONFIG_CRC7 is not set |
| 1475 | CONFIG_LIBCRC32C=m | 1488 | CONFIG_LIBCRC32C=m |
| @@ -1481,6 +1494,7 @@ CONFIG_PLIST=y | |||
| 1481 | CONFIG_HAS_IOMEM=y | 1494 | CONFIG_HAS_IOMEM=y |
| 1482 | CONFIG_HAS_IOPORT=y | 1495 | CONFIG_HAS_IOPORT=y |
| 1483 | CONFIG_HAS_DMA=y | 1496 | CONFIG_HAS_DMA=y |
| 1497 | CONFIG_HAVE_LMB=y | ||
| 1484 | 1498 | ||
| 1485 | # | 1499 | # |
| 1486 | # Kernel hacking | 1500 | # Kernel hacking |
| @@ -1488,6 +1502,7 @@ CONFIG_HAS_DMA=y | |||
| 1488 | # CONFIG_PRINTK_TIME is not set | 1502 | # CONFIG_PRINTK_TIME is not set |
| 1489 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1503 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1490 | CONFIG_ENABLE_MUST_CHECK=y | 1504 | CONFIG_ENABLE_MUST_CHECK=y |
| 1505 | CONFIG_FRAME_WARN=1024 | ||
| 1491 | CONFIG_MAGIC_SYSRQ=y | 1506 | CONFIG_MAGIC_SYSRQ=y |
| 1492 | # CONFIG_UNUSED_SYMBOLS is not set | 1507 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1493 | # CONFIG_DEBUG_FS is not set | 1508 | # CONFIG_DEBUG_FS is not set |
| @@ -1498,6 +1513,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1498 | CONFIG_SCHED_DEBUG=y | 1513 | CONFIG_SCHED_DEBUG=y |
| 1499 | # CONFIG_SCHEDSTATS is not set | 1514 | # CONFIG_SCHEDSTATS is not set |
| 1500 | # CONFIG_TIMER_STATS is not set | 1515 | # CONFIG_TIMER_STATS is not set |
| 1516 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1501 | # CONFIG_SLUB_DEBUG_ON is not set | 1517 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1502 | # CONFIG_SLUB_STATS is not set | 1518 | # CONFIG_SLUB_STATS is not set |
| 1503 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1519 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1510,6 +1526,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1510 | CONFIG_DEBUG_BUGVERBOSE=y | 1526 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1511 | # CONFIG_DEBUG_INFO is not set | 1527 | # CONFIG_DEBUG_INFO is not set |
| 1512 | # CONFIG_DEBUG_VM is not set | 1528 | # CONFIG_DEBUG_VM is not set |
| 1529 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1513 | # CONFIG_DEBUG_LIST is not set | 1530 | # CONFIG_DEBUG_LIST is not set |
| 1514 | # CONFIG_DEBUG_SG is not set | 1531 | # CONFIG_DEBUG_SG is not set |
| 1515 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1532 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1521,6 +1538,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1521 | # CONFIG_DEBUG_STACK_USAGE is not set | 1538 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1522 | # CONFIG_DEBUG_PAGEALLOC is not set | 1539 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1523 | # CONFIG_DEBUGGER is not set | 1540 | # CONFIG_DEBUGGER is not set |
| 1541 | # CONFIG_IRQSTACKS is not set | ||
| 1524 | # CONFIG_BDI_SWITCH is not set | 1542 | # CONFIG_BDI_SWITCH is not set |
| 1525 | # CONFIG_BOOTX_TEXT is not set | 1543 | # CONFIG_BOOTX_TEXT is not set |
| 1526 | # CONFIG_PPC_EARLY_DEBUG is not set | 1544 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1532,52 +1550,82 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1532 | # CONFIG_SECURITY is not set | 1550 | # CONFIG_SECURITY is not set |
| 1533 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1551 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1534 | CONFIG_CRYPTO=y | 1552 | CONFIG_CRYPTO=y |
| 1553 | |||
| 1554 | # | ||
| 1555 | # Crypto core or helper | ||
| 1556 | # | ||
| 1535 | CONFIG_CRYPTO_ALGAPI=y | 1557 | CONFIG_CRYPTO_ALGAPI=y |
| 1536 | CONFIG_CRYPTO_BLKCIPHER=y | 1558 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1537 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1538 | CONFIG_CRYPTO_MANAGER=y | 1559 | CONFIG_CRYPTO_MANAGER=y |
| 1560 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1561 | # CONFIG_CRYPTO_NULL is not set | ||
| 1562 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1563 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1564 | # CONFIG_CRYPTO_TEST is not set | ||
| 1565 | |||
| 1566 | # | ||
| 1567 | # Authenticated Encryption with Associated Data | ||
| 1568 | # | ||
| 1569 | # CONFIG_CRYPTO_CCM is not set | ||
| 1570 | # CONFIG_CRYPTO_GCM is not set | ||
| 1571 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1572 | |||
| 1573 | # | ||
| 1574 | # Block modes | ||
| 1575 | # | ||
| 1576 | CONFIG_CRYPTO_CBC=y | ||
| 1577 | # CONFIG_CRYPTO_CTR is not set | ||
| 1578 | # CONFIG_CRYPTO_CTS is not set | ||
| 1579 | CONFIG_CRYPTO_ECB=m | ||
| 1580 | # CONFIG_CRYPTO_LRW is not set | ||
| 1581 | CONFIG_CRYPTO_PCBC=m | ||
| 1582 | # CONFIG_CRYPTO_XTS is not set | ||
| 1583 | |||
| 1584 | # | ||
| 1585 | # Hash modes | ||
| 1586 | # | ||
| 1539 | # CONFIG_CRYPTO_HMAC is not set | 1587 | # CONFIG_CRYPTO_HMAC is not set |
| 1540 | # CONFIG_CRYPTO_XCBC is not set | 1588 | # CONFIG_CRYPTO_XCBC is not set |
| 1541 | # CONFIG_CRYPTO_NULL is not set | 1589 | |
| 1590 | # | ||
| 1591 | # Digest | ||
| 1592 | # | ||
| 1593 | CONFIG_CRYPTO_CRC32C=m | ||
| 1542 | CONFIG_CRYPTO_MD4=m | 1594 | CONFIG_CRYPTO_MD4=m |
| 1543 | CONFIG_CRYPTO_MD5=y | 1595 | CONFIG_CRYPTO_MD5=y |
| 1596 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1544 | CONFIG_CRYPTO_SHA1=m | 1597 | CONFIG_CRYPTO_SHA1=m |
| 1545 | # CONFIG_CRYPTO_SHA256 is not set | 1598 | # CONFIG_CRYPTO_SHA256 is not set |
| 1546 | # CONFIG_CRYPTO_SHA512 is not set | 1599 | # CONFIG_CRYPTO_SHA512 is not set |
| 1547 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1548 | # CONFIG_CRYPTO_TGR192 is not set | 1600 | # CONFIG_CRYPTO_TGR192 is not set |
| 1549 | # CONFIG_CRYPTO_GF128MUL is not set | 1601 | # CONFIG_CRYPTO_WP512 is not set |
| 1550 | CONFIG_CRYPTO_ECB=m | 1602 | |
| 1551 | CONFIG_CRYPTO_CBC=y | 1603 | # |
| 1552 | CONFIG_CRYPTO_PCBC=m | 1604 | # Ciphers |
| 1553 | # CONFIG_CRYPTO_LRW is not set | 1605 | # |
| 1554 | # CONFIG_CRYPTO_XTS is not set | ||
| 1555 | # CONFIG_CRYPTO_CTR is not set | ||
| 1556 | # CONFIG_CRYPTO_GCM is not set | ||
| 1557 | # CONFIG_CRYPTO_CCM is not set | ||
| 1558 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1559 | CONFIG_CRYPTO_DES=y | ||
| 1560 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1561 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1562 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1563 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1564 | CONFIG_CRYPTO_SERPENT=m | ||
| 1565 | CONFIG_CRYPTO_AES=m | 1606 | CONFIG_CRYPTO_AES=m |
| 1607 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1608 | CONFIG_CRYPTO_ARC4=m | ||
| 1609 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1610 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1566 | # CONFIG_CRYPTO_CAST5 is not set | 1611 | # CONFIG_CRYPTO_CAST5 is not set |
| 1567 | # CONFIG_CRYPTO_CAST6 is not set | 1612 | # CONFIG_CRYPTO_CAST6 is not set |
| 1568 | # CONFIG_CRYPTO_TEA is not set | 1613 | CONFIG_CRYPTO_DES=y |
| 1569 | CONFIG_CRYPTO_ARC4=m | 1614 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1570 | # CONFIG_CRYPTO_KHAZAD is not set | 1615 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1571 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1572 | # CONFIG_CRYPTO_SEED is not set | ||
| 1573 | # CONFIG_CRYPTO_SALSA20 is not set | 1616 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1617 | # CONFIG_CRYPTO_SEED is not set | ||
| 1618 | CONFIG_CRYPTO_SERPENT=m | ||
| 1619 | # CONFIG_CRYPTO_TEA is not set | ||
| 1620 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1621 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1622 | |||
| 1623 | # | ||
| 1624 | # Compression | ||
| 1625 | # | ||
| 1574 | CONFIG_CRYPTO_DEFLATE=m | 1626 | CONFIG_CRYPTO_DEFLATE=m |
| 1575 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1576 | CONFIG_CRYPTO_CRC32C=m | ||
| 1577 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1578 | # CONFIG_CRYPTO_TEST is not set | ||
| 1579 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1580 | # CONFIG_CRYPTO_LZO is not set | 1627 | # CONFIG_CRYPTO_LZO is not set |
| 1581 | CONFIG_CRYPTO_HW=y | 1628 | CONFIG_CRYPTO_HW=y |
| 1582 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1629 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1583 | # CONFIG_PPC_CLOCK is not set | 1630 | # CONFIG_PPC_CLOCK is not set |
| 1631 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index a3d52e3f2ded..066c583c1f8a 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:11 2008 | 4 | # Mon Jun 9 08:52:11 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,6 +114,7 @@ CONFIG_SLUB=y | |||
| 111 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| @@ -209,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 211 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 212 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 213 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 214 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 215 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 216 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 217 | CONFIG_PROC_DEVICETREE=y | 223 | CONFIG_PROC_DEVICETREE=y |
| 218 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 219 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -235,6 +241,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 235 | CONFIG_PCI_LEGACY=y | 241 | CONFIG_PCI_LEGACY=y |
| 236 | # CONFIG_PCCARD is not set | 242 | # CONFIG_PCCARD is not set |
| 237 | # CONFIG_HOTPLUG_PCI is not set | 243 | # CONFIG_HOTPLUG_PCI is not set |
| 244 | # CONFIG_HAS_RAPIDIO is not set | ||
| 238 | 245 | ||
| 239 | # | 246 | # |
| 240 | # Advanced setup | 247 | # Advanced setup |
| @@ -244,11 +251,11 @@ CONFIG_PCI_LEGACY=y | |||
| 244 | # | 251 | # |
| 245 | # Default settings for advanced configuration options are used | 252 | # Default settings for advanced configuration options are used |
| 246 | # | 253 | # |
| 247 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 248 | CONFIG_LOWMEM_SIZE=0x30000000 | 254 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 255 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 249 | CONFIG_KERNEL_START=0xc0000000 | 256 | CONFIG_KERNEL_START=0xc0000000 |
| 257 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 250 | CONFIG_TASK_SIZE=0xc0000000 | 258 | CONFIG_TASK_SIZE=0xc0000000 |
| 251 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 252 | 259 | ||
| 253 | # | 260 | # |
| 254 | # Networking | 261 | # Networking |
| @@ -296,8 +303,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 296 | CONFIG_DEFAULT_TCP_CONG="cubic" | 303 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 297 | # CONFIG_TCP_MD5SIG is not set | 304 | # CONFIG_TCP_MD5SIG is not set |
| 298 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
| 299 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 300 | # CONFIG_INET6_TUNNEL is not set | ||
| 301 | # CONFIG_NETWORK_SECMARK is not set | 306 | # CONFIG_NETWORK_SECMARK is not set |
| 302 | # CONFIG_NETFILTER is not set | 307 | # CONFIG_NETFILTER is not set |
| 303 | # CONFIG_IP_DCCP is not set | 308 | # CONFIG_IP_DCCP is not set |
| @@ -454,7 +459,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 454 | # CONFIG_SCSI_SRP is not set | 459 | # CONFIG_SCSI_SRP is not set |
| 455 | CONFIG_ATA=y | 460 | CONFIG_ATA=y |
| 456 | # CONFIG_ATA_NONSTANDARD is not set | 461 | # CONFIG_ATA_NONSTANDARD is not set |
| 462 | CONFIG_SATA_PMP=y | ||
| 457 | # CONFIG_SATA_AHCI is not set | 463 | # CONFIG_SATA_AHCI is not set |
| 464 | # CONFIG_SATA_SIL24 is not set | ||
| 465 | CONFIG_ATA_SFF=y | ||
| 458 | # CONFIG_SATA_SVW is not set | 466 | # CONFIG_SATA_SVW is not set |
| 459 | # CONFIG_ATA_PIIX is not set | 467 | # CONFIG_ATA_PIIX is not set |
| 460 | CONFIG_SATA_MV=y | 468 | CONFIG_SATA_MV=y |
| @@ -464,7 +472,6 @@ CONFIG_SATA_MV=y | |||
| 464 | # CONFIG_SATA_PROMISE is not set | 472 | # CONFIG_SATA_PROMISE is not set |
| 465 | # CONFIG_SATA_SX4 is not set | 473 | # CONFIG_SATA_SX4 is not set |
| 466 | # CONFIG_SATA_SIL is not set | 474 | # CONFIG_SATA_SIL is not set |
| 467 | # CONFIG_SATA_SIL24 is not set | ||
| 468 | # CONFIG_SATA_SIS is not set | 475 | # CONFIG_SATA_SIS is not set |
| 469 | # CONFIG_SATA_ULI is not set | 476 | # CONFIG_SATA_ULI is not set |
| 470 | # CONFIG_SATA_VIA is not set | 477 | # CONFIG_SATA_VIA is not set |
| @@ -509,6 +516,7 @@ CONFIG_SATA_MV=y | |||
| 509 | # CONFIG_PATA_VIA is not set | 516 | # CONFIG_PATA_VIA is not set |
| 510 | # CONFIG_PATA_WINBOND is not set | 517 | # CONFIG_PATA_WINBOND is not set |
| 511 | # CONFIG_PATA_PLATFORM is not set | 518 | # CONFIG_PATA_PLATFORM is not set |
| 519 | # CONFIG_PATA_SCH is not set | ||
| 512 | # CONFIG_MD is not set | 520 | # CONFIG_MD is not set |
| 513 | # CONFIG_FUSION is not set | 521 | # CONFIG_FUSION is not set |
| 514 | 522 | ||
| @@ -596,7 +604,6 @@ CONFIG_NETDEV_1000=y | |||
| 596 | # CONFIG_SIS190 is not set | 604 | # CONFIG_SIS190 is not set |
| 597 | # CONFIG_SKGE is not set | 605 | # CONFIG_SKGE is not set |
| 598 | # CONFIG_SKY2 is not set | 606 | # CONFIG_SKY2 is not set |
| 599 | # CONFIG_SK98LIN is not set | ||
| 600 | # CONFIG_VIA_VELOCITY is not set | 607 | # CONFIG_VIA_VELOCITY is not set |
| 601 | # CONFIG_TIGON3 is not set | 608 | # CONFIG_TIGON3 is not set |
| 602 | # CONFIG_BNX2 is not set | 609 | # CONFIG_BNX2 is not set |
| @@ -616,6 +623,7 @@ CONFIG_NETDEV_10000=y | |||
| 616 | # CONFIG_MLX4_CORE is not set | 623 | # CONFIG_MLX4_CORE is not set |
| 617 | # CONFIG_TEHUTI is not set | 624 | # CONFIG_TEHUTI is not set |
| 618 | # CONFIG_BNX2X is not set | 625 | # CONFIG_BNX2X is not set |
| 626 | # CONFIG_SFC is not set | ||
| 619 | # CONFIG_TR is not set | 627 | # CONFIG_TR is not set |
| 620 | 628 | ||
| 621 | # | 629 | # |
| @@ -623,6 +631,7 @@ CONFIG_NETDEV_10000=y | |||
| 623 | # | 631 | # |
| 624 | # CONFIG_WLAN_PRE80211 is not set | 632 | # CONFIG_WLAN_PRE80211 is not set |
| 625 | # CONFIG_WLAN_80211 is not set | 633 | # CONFIG_WLAN_80211 is not set |
| 634 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 626 | # CONFIG_WAN is not set | 635 | # CONFIG_WAN is not set |
| 627 | # CONFIG_FDDI is not set | 636 | # CONFIG_FDDI is not set |
| 628 | # CONFIG_HIPPI is not set | 637 | # CONFIG_HIPPI is not set |
| @@ -670,6 +679,7 @@ CONFIG_INPUT=y | |||
| 670 | # Character devices | 679 | # Character devices |
| 671 | # | 680 | # |
| 672 | # CONFIG_VT is not set | 681 | # CONFIG_VT is not set |
| 682 | CONFIG_DEVKMEM=y | ||
| 673 | # CONFIG_SERIAL_NONSTANDARD is not set | 683 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 674 | # CONFIG_NOZOMI is not set | 684 | # CONFIG_NOZOMI is not set |
| 675 | 685 | ||
| @@ -705,12 +715,7 @@ CONFIG_GEN_RTC=y | |||
| 705 | # CONFIG_TCG_TPM is not set | 715 | # CONFIG_TCG_TPM is not set |
| 706 | CONFIG_DEVPORT=y | 716 | CONFIG_DEVPORT=y |
| 707 | # CONFIG_I2C is not set | 717 | # CONFIG_I2C is not set |
| 708 | |||
| 709 | # | ||
| 710 | # SPI support | ||
| 711 | # | ||
| 712 | # CONFIG_SPI is not set | 718 | # CONFIG_SPI is not set |
| 713 | # CONFIG_SPI_MASTER is not set | ||
| 714 | # CONFIG_W1 is not set | 719 | # CONFIG_W1 is not set |
| 715 | # CONFIG_POWER_SUPPLY is not set | 720 | # CONFIG_POWER_SUPPLY is not set |
| 716 | CONFIG_HWMON=y | 721 | CONFIG_HWMON=y |
| @@ -743,12 +748,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 743 | # Multifunction device drivers | 748 | # Multifunction device drivers |
| 744 | # | 749 | # |
| 745 | # CONFIG_MFD_SM501 is not set | 750 | # CONFIG_MFD_SM501 is not set |
| 751 | # CONFIG_HTC_PASIC3 is not set | ||
| 746 | 752 | ||
| 747 | # | 753 | # |
| 748 | # Multimedia devices | 754 | # Multimedia devices |
| 749 | # | 755 | # |
| 756 | |||
| 757 | # | ||
| 758 | # Multimedia core support | ||
| 759 | # | ||
| 750 | # CONFIG_VIDEO_DEV is not set | 760 | # CONFIG_VIDEO_DEV is not set |
| 751 | # CONFIG_DVB_CORE is not set | 761 | # CONFIG_DVB_CORE is not set |
| 762 | # CONFIG_VIDEO_MEDIA is not set | ||
| 763 | |||
| 764 | # | ||
| 765 | # Multimedia drivers | ||
| 766 | # | ||
| 752 | CONFIG_DAB=y | 767 | CONFIG_DAB=y |
| 753 | 768 | ||
| 754 | # | 769 | # |
| @@ -779,6 +794,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 779 | CONFIG_USB_ARCH_HAS_OHCI=y | 794 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 780 | CONFIG_USB_ARCH_HAS_EHCI=y | 795 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 781 | # CONFIG_USB is not set | 796 | # CONFIG_USB is not set |
| 797 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 798 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 782 | 799 | ||
| 783 | # | 800 | # |
| 784 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 801 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -787,14 +804,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 787 | # CONFIG_MMC is not set | 804 | # CONFIG_MMC is not set |
| 788 | # CONFIG_MEMSTICK is not set | 805 | # CONFIG_MEMSTICK is not set |
| 789 | # CONFIG_NEW_LEDS is not set | 806 | # CONFIG_NEW_LEDS is not set |
| 807 | # CONFIG_ACCESSIBILITY is not set | ||
| 790 | # CONFIG_INFINIBAND is not set | 808 | # CONFIG_INFINIBAND is not set |
| 791 | # CONFIG_EDAC is not set | 809 | # CONFIG_EDAC is not set |
| 792 | # CONFIG_RTC_CLASS is not set | 810 | # CONFIG_RTC_CLASS is not set |
| 793 | # CONFIG_DMADEVICES is not set | 811 | # CONFIG_DMADEVICES is not set |
| 794 | |||
| 795 | # | ||
| 796 | # Userspace I/O | ||
| 797 | # | ||
| 798 | # CONFIG_UIO is not set | 812 | # CONFIG_UIO is not set |
| 799 | 813 | ||
| 800 | # | 814 | # |
| @@ -814,7 +828,6 @@ CONFIG_FS_MBCACHE=y | |||
| 814 | # CONFIG_JFS_FS is not set | 828 | # CONFIG_JFS_FS is not set |
| 815 | # CONFIG_FS_POSIX_ACL is not set | 829 | # CONFIG_FS_POSIX_ACL is not set |
| 816 | # CONFIG_XFS_FS is not set | 830 | # CONFIG_XFS_FS is not set |
| 817 | # CONFIG_GFS2_FS is not set | ||
| 818 | # CONFIG_OCFS2_FS is not set | 831 | # CONFIG_OCFS2_FS is not set |
| 819 | CONFIG_DNOTIFY=y | 832 | CONFIG_DNOTIFY=y |
| 820 | CONFIG_INOTIFY=y | 833 | CONFIG_INOTIFY=y |
| @@ -871,7 +884,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 871 | CONFIG_NFS_FS=y | 884 | CONFIG_NFS_FS=y |
| 872 | # CONFIG_NFS_V3 is not set | 885 | # CONFIG_NFS_V3 is not set |
| 873 | # CONFIG_NFS_V4 is not set | 886 | # CONFIG_NFS_V4 is not set |
| 874 | # CONFIG_NFS_DIRECTIO is not set | ||
| 875 | # CONFIG_NFSD is not set | 887 | # CONFIG_NFSD is not set |
| 876 | CONFIG_ROOT_NFS=y | 888 | CONFIG_ROOT_NFS=y |
| 877 | CONFIG_LOCKD=y | 889 | CONFIG_LOCKD=y |
| @@ -914,6 +926,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 914 | # Library routines | 926 | # Library routines |
| 915 | # | 927 | # |
| 916 | CONFIG_BITREVERSE=y | 928 | CONFIG_BITREVERSE=y |
| 929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 917 | # CONFIG_CRC_CCITT is not set | 930 | # CONFIG_CRC_CCITT is not set |
| 918 | # CONFIG_CRC16 is not set | 931 | # CONFIG_CRC16 is not set |
| 919 | # CONFIG_CRC_ITU_T is not set | 932 | # CONFIG_CRC_ITU_T is not set |
| @@ -924,6 +937,7 @@ CONFIG_PLIST=y | |||
| 924 | CONFIG_HAS_IOMEM=y | 937 | CONFIG_HAS_IOMEM=y |
| 925 | CONFIG_HAS_IOPORT=y | 938 | CONFIG_HAS_IOPORT=y |
| 926 | CONFIG_HAS_DMA=y | 939 | CONFIG_HAS_DMA=y |
| 940 | CONFIG_HAVE_LMB=y | ||
| 927 | 941 | ||
| 928 | # | 942 | # |
| 929 | # Kernel hacking | 943 | # Kernel hacking |
| @@ -931,6 +945,7 @@ CONFIG_HAS_DMA=y | |||
| 931 | # CONFIG_PRINTK_TIME is not set | 945 | # CONFIG_PRINTK_TIME is not set |
| 932 | CONFIG_ENABLE_WARN_DEPRECATED=y | 946 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 933 | CONFIG_ENABLE_MUST_CHECK=y | 947 | CONFIG_ENABLE_MUST_CHECK=y |
| 948 | CONFIG_FRAME_WARN=1024 | ||
| 934 | # CONFIG_MAGIC_SYSRQ is not set | 949 | # CONFIG_MAGIC_SYSRQ is not set |
| 935 | # CONFIG_UNUSED_SYMBOLS is not set | 950 | # CONFIG_UNUSED_SYMBOLS is not set |
| 936 | # CONFIG_DEBUG_FS is not set | 951 | # CONFIG_DEBUG_FS is not set |
| @@ -940,6 +955,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 940 | # CONFIG_SLUB_STATS is not set | 955 | # CONFIG_SLUB_STATS is not set |
| 941 | # CONFIG_DEBUG_BUGVERBOSE is not set | 956 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 942 | # CONFIG_SAMPLES is not set | 957 | # CONFIG_SAMPLES is not set |
| 958 | # CONFIG_IRQSTACKS is not set | ||
| 943 | # CONFIG_BOOTX_TEXT is not set | 959 | # CONFIG_BOOTX_TEXT is not set |
| 944 | # CONFIG_PPC_EARLY_DEBUG is not set | 960 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 945 | 961 | ||
| @@ -950,48 +966,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 950 | # CONFIG_SECURITY is not set | 966 | # CONFIG_SECURITY is not set |
| 951 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 967 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 952 | CONFIG_CRYPTO=y | 968 | CONFIG_CRYPTO=y |
| 953 | # CONFIG_CRYPTO_SEQIV is not set | 969 | |
| 970 | # | ||
| 971 | # Crypto core or helper | ||
| 972 | # | ||
| 954 | # CONFIG_CRYPTO_MANAGER is not set | 973 | # CONFIG_CRYPTO_MANAGER is not set |
| 974 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 975 | # CONFIG_CRYPTO_NULL is not set | ||
| 976 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 977 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 978 | |||
| 979 | # | ||
| 980 | # Authenticated Encryption with Associated Data | ||
| 981 | # | ||
| 982 | # CONFIG_CRYPTO_CCM is not set | ||
| 983 | # CONFIG_CRYPTO_GCM is not set | ||
| 984 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 985 | |||
| 986 | # | ||
| 987 | # Block modes | ||
| 988 | # | ||
| 989 | # CONFIG_CRYPTO_CBC is not set | ||
| 990 | # CONFIG_CRYPTO_CTR is not set | ||
| 991 | # CONFIG_CRYPTO_CTS is not set | ||
| 992 | # CONFIG_CRYPTO_ECB is not set | ||
| 993 | # CONFIG_CRYPTO_LRW is not set | ||
| 994 | # CONFIG_CRYPTO_PCBC is not set | ||
| 995 | # CONFIG_CRYPTO_XTS is not set | ||
| 996 | |||
| 997 | # | ||
| 998 | # Hash modes | ||
| 999 | # | ||
| 955 | # CONFIG_CRYPTO_HMAC is not set | 1000 | # CONFIG_CRYPTO_HMAC is not set |
| 956 | # CONFIG_CRYPTO_XCBC is not set | 1001 | # CONFIG_CRYPTO_XCBC is not set |
| 957 | # CONFIG_CRYPTO_NULL is not set | 1002 | |
| 1003 | # | ||
| 1004 | # Digest | ||
| 1005 | # | ||
| 1006 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 958 | # CONFIG_CRYPTO_MD4 is not set | 1007 | # CONFIG_CRYPTO_MD4 is not set |
| 959 | # CONFIG_CRYPTO_MD5 is not set | 1008 | # CONFIG_CRYPTO_MD5 is not set |
| 1009 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 960 | # CONFIG_CRYPTO_SHA1 is not set | 1010 | # CONFIG_CRYPTO_SHA1 is not set |
| 961 | # CONFIG_CRYPTO_SHA256 is not set | 1011 | # CONFIG_CRYPTO_SHA256 is not set |
| 962 | # CONFIG_CRYPTO_SHA512 is not set | 1012 | # CONFIG_CRYPTO_SHA512 is not set |
| 963 | # CONFIG_CRYPTO_WP512 is not set | ||
| 964 | # CONFIG_CRYPTO_TGR192 is not set | 1013 | # CONFIG_CRYPTO_TGR192 is not set |
| 965 | # CONFIG_CRYPTO_GF128MUL is not set | 1014 | # CONFIG_CRYPTO_WP512 is not set |
| 966 | # CONFIG_CRYPTO_ECB is not set | 1015 | |
| 967 | # CONFIG_CRYPTO_CBC is not set | 1016 | # |
| 968 | # CONFIG_CRYPTO_PCBC is not set | 1017 | # Ciphers |
| 969 | # CONFIG_CRYPTO_LRW is not set | 1018 | # |
| 970 | # CONFIG_CRYPTO_XTS is not set | ||
| 971 | # CONFIG_CRYPTO_CTR is not set | ||
| 972 | # CONFIG_CRYPTO_GCM is not set | ||
| 973 | # CONFIG_CRYPTO_CCM is not set | ||
| 974 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 975 | # CONFIG_CRYPTO_DES is not set | ||
| 976 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 977 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 978 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 979 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 980 | # CONFIG_CRYPTO_AES is not set | 1019 | # CONFIG_CRYPTO_AES is not set |
| 1020 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1021 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1022 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1023 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 981 | # CONFIG_CRYPTO_CAST5 is not set | 1024 | # CONFIG_CRYPTO_CAST5 is not set |
| 982 | # CONFIG_CRYPTO_CAST6 is not set | 1025 | # CONFIG_CRYPTO_CAST6 is not set |
| 983 | # CONFIG_CRYPTO_TEA is not set | 1026 | # CONFIG_CRYPTO_DES is not set |
| 984 | # CONFIG_CRYPTO_ARC4 is not set | 1027 | # CONFIG_CRYPTO_FCRYPT is not set |
| 985 | # CONFIG_CRYPTO_KHAZAD is not set | 1028 | # CONFIG_CRYPTO_KHAZAD is not set |
| 986 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 987 | # CONFIG_CRYPTO_SEED is not set | ||
| 988 | # CONFIG_CRYPTO_SALSA20 is not set | 1029 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1030 | # CONFIG_CRYPTO_SEED is not set | ||
| 1031 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1032 | # CONFIG_CRYPTO_TEA is not set | ||
| 1033 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1034 | |||
| 1035 | # | ||
| 1036 | # Compression | ||
| 1037 | # | ||
| 989 | # CONFIG_CRYPTO_DEFLATE is not set | 1038 | # CONFIG_CRYPTO_DEFLATE is not set |
| 990 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 991 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 992 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 993 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 994 | # CONFIG_CRYPTO_LZO is not set | 1039 | # CONFIG_CRYPTO_LZO is not set |
| 995 | CONFIG_CRYPTO_HW=y | 1040 | CONFIG_CRYPTO_HW=y |
| 996 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1041 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 997 | # CONFIG_PPC_CLOCK is not set | 1042 | # CONFIG_PPC_CLOCK is not set |
| 1043 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 0264c5757f78..30d7834b7db1 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:13 2008 | 4 | # Mon Jun 9 08:52:12 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,18 +72,16 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | # CONFIG_BLK_DEV_INITRD is not set | 79 | # CONFIG_BLK_DEV_INITRD is not set |
| 80 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 82 | CONFIG_SYSCTL=y | 81 | CONFIG_SYSCTL=y |
| 83 | CONFIG_EMBEDDED=y | 82 | CONFIG_EMBEDDED=y |
| 84 | CONFIG_SYSCTL_SYSCALL=y | 83 | CONFIG_SYSCTL_SYSCALL=y |
| 84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 85 | CONFIG_KALLSYMS=y | 85 | CONFIG_KALLSYMS=y |
| 86 | CONFIG_KALLSYMS_ALL=y | 86 | CONFIG_KALLSYMS_ALL=y |
| 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -108,6 +108,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 108 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 109 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 110 | CONFIG_HAVE_KRETPROBES=y |
| 111 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 112 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 113 | CONFIG_SLABINFO=y |
| 113 | CONFIG_RT_MUTEXES=y | 114 | CONFIG_RT_MUTEXES=y |
| @@ -196,11 +197,13 @@ CONFIG_FLATMEM=y | |||
| 196 | CONFIG_FLAT_NODE_MEM_MAP=y | 197 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 197 | # CONFIG_SPARSEMEM_STATIC is not set | 198 | # CONFIG_SPARSEMEM_STATIC is not set |
| 198 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 200 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 200 | # CONFIG_RESOURCES_64BIT is not set | 202 | # CONFIG_RESOURCES_64BIT is not set |
| 201 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
| 202 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
| 203 | CONFIG_VIRT_TO_BUS=y | 205 | CONFIG_VIRT_TO_BUS=y |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 204 | CONFIG_PROC_DEVICETREE=y | 207 | CONFIG_PROC_DEVICETREE=y |
| 205 | # CONFIG_CMDLINE_BOOL is not set | 208 | # CONFIG_CMDLINE_BOOL is not set |
| 206 | # CONFIG_PM is not set | 209 | # CONFIG_PM is not set |
| @@ -224,6 +227,7 @@ CONFIG_PCI_LEGACY=y | |||
| 224 | # CONFIG_PCI_DEBUG is not set | 227 | # CONFIG_PCI_DEBUG is not set |
| 225 | # CONFIG_PCCARD is not set | 228 | # CONFIG_PCCARD is not set |
| 226 | # CONFIG_HOTPLUG_PCI is not set | 229 | # CONFIG_HOTPLUG_PCI is not set |
| 230 | # CONFIG_HAS_RAPIDIO is not set | ||
| 227 | 231 | ||
| 228 | # | 232 | # |
| 229 | # Advanced setup | 233 | # Advanced setup |
| @@ -233,11 +237,11 @@ CONFIG_PCI_LEGACY=y | |||
| 233 | # | 237 | # |
| 234 | # Default settings for advanced configuration options are used | 238 | # Default settings for advanced configuration options are used |
| 235 | # | 239 | # |
| 236 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 237 | CONFIG_LOWMEM_SIZE=0x30000000 | 240 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 241 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 238 | CONFIG_KERNEL_START=0xc0000000 | 242 | CONFIG_KERNEL_START=0xc0000000 |
| 243 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 239 | CONFIG_TASK_SIZE=0xc0000000 | 244 | CONFIG_TASK_SIZE=0xc0000000 |
| 240 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 241 | 245 | ||
| 242 | # | 246 | # |
| 243 | # Networking | 247 | # Networking |
| @@ -292,6 +296,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 292 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 296 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 293 | CONFIG_INET6_XFRM_MODE_BEET=y | 297 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 294 | CONFIG_IPV6_SIT=y | 298 | CONFIG_IPV6_SIT=y |
| 299 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 295 | # CONFIG_IPV6_TUNNEL is not set | 300 | # CONFIG_IPV6_TUNNEL is not set |
| 296 | # CONFIG_NETWORK_SECMARK is not set | 301 | # CONFIG_NETWORK_SECMARK is not set |
| 297 | CONFIG_NETFILTER=y | 302 | CONFIG_NETFILTER=y |
| @@ -536,7 +541,6 @@ CONFIG_NETDEV_1000=y | |||
| 536 | # CONFIG_SIS190 is not set | 541 | # CONFIG_SIS190 is not set |
| 537 | # CONFIG_SKGE is not set | 542 | # CONFIG_SKGE is not set |
| 538 | # CONFIG_SKY2 is not set | 543 | # CONFIG_SKY2 is not set |
| 539 | # CONFIG_SK98LIN is not set | ||
| 540 | # CONFIG_VIA_VELOCITY is not set | 544 | # CONFIG_VIA_VELOCITY is not set |
| 541 | # CONFIG_TIGON3 is not set | 545 | # CONFIG_TIGON3 is not set |
| 542 | # CONFIG_BNX2 is not set | 546 | # CONFIG_BNX2 is not set |
| @@ -554,6 +558,7 @@ CONFIG_NETDEV_10000=y | |||
| 554 | # CONFIG_MLX4_CORE is not set | 558 | # CONFIG_MLX4_CORE is not set |
| 555 | # CONFIG_TEHUTI is not set | 559 | # CONFIG_TEHUTI is not set |
| 556 | # CONFIG_BNX2X is not set | 560 | # CONFIG_BNX2X is not set |
| 561 | # CONFIG_SFC is not set | ||
| 557 | # CONFIG_TR is not set | 562 | # CONFIG_TR is not set |
| 558 | 563 | ||
| 559 | # | 564 | # |
| @@ -561,6 +566,7 @@ CONFIG_NETDEV_10000=y | |||
| 561 | # | 566 | # |
| 562 | # CONFIG_WLAN_PRE80211 is not set | 567 | # CONFIG_WLAN_PRE80211 is not set |
| 563 | # CONFIG_WLAN_80211 is not set | 568 | # CONFIG_WLAN_80211 is not set |
| 569 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 564 | # CONFIG_WAN is not set | 570 | # CONFIG_WAN is not set |
| 565 | # CONFIG_FDDI is not set | 571 | # CONFIG_FDDI is not set |
| 566 | CONFIG_PPP=y | 572 | CONFIG_PPP=y |
| @@ -634,6 +640,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 634 | # Character devices | 640 | # Character devices |
| 635 | # | 641 | # |
| 636 | # CONFIG_VT is not set | 642 | # CONFIG_VT is not set |
| 643 | CONFIG_DEVKMEM=y | ||
| 637 | # CONFIG_SERIAL_NONSTANDARD is not set | 644 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 638 | 645 | ||
| 639 | # | 646 | # |
| @@ -668,12 +675,7 @@ CONFIG_HW_RANDOM=y | |||
| 668 | # CONFIG_RAW_DRIVER is not set | 675 | # CONFIG_RAW_DRIVER is not set |
| 669 | CONFIG_DEVPORT=y | 676 | CONFIG_DEVPORT=y |
| 670 | # CONFIG_I2C is not set | 677 | # CONFIG_I2C is not set |
| 671 | |||
| 672 | # | ||
| 673 | # SPI support | ||
| 674 | # | ||
| 675 | # CONFIG_SPI is not set | 678 | # CONFIG_SPI is not set |
| 676 | # CONFIG_SPI_MASTER is not set | ||
| 677 | # CONFIG_W1 is not set | 679 | # CONFIG_W1 is not set |
| 678 | # CONFIG_POWER_SUPPLY is not set | 680 | # CONFIG_POWER_SUPPLY is not set |
| 679 | # CONFIG_HWMON is not set | 681 | # CONFIG_HWMON is not set |
| @@ -690,12 +692,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 690 | # Multifunction device drivers | 692 | # Multifunction device drivers |
| 691 | # | 693 | # |
| 692 | # CONFIG_MFD_SM501 is not set | 694 | # CONFIG_MFD_SM501 is not set |
| 695 | # CONFIG_HTC_PASIC3 is not set | ||
| 693 | 696 | ||
| 694 | # | 697 | # |
| 695 | # Multimedia devices | 698 | # Multimedia devices |
| 696 | # | 699 | # |
| 700 | |||
| 701 | # | ||
| 702 | # Multimedia core support | ||
| 703 | # | ||
| 697 | # CONFIG_VIDEO_DEV is not set | 704 | # CONFIG_VIDEO_DEV is not set |
| 698 | # CONFIG_DVB_CORE is not set | 705 | # CONFIG_DVB_CORE is not set |
| 706 | # CONFIG_VIDEO_MEDIA is not set | ||
| 707 | |||
| 708 | # | ||
| 709 | # Multimedia drivers | ||
| 710 | # | ||
| 699 | CONFIG_DAB=y | 711 | CONFIG_DAB=y |
| 700 | 712 | ||
| 701 | # | 713 | # |
| @@ -722,13 +734,10 @@ CONFIG_DAB=y | |||
| 722 | # CONFIG_MMC is not set | 734 | # CONFIG_MMC is not set |
| 723 | # CONFIG_MEMSTICK is not set | 735 | # CONFIG_MEMSTICK is not set |
| 724 | # CONFIG_NEW_LEDS is not set | 736 | # CONFIG_NEW_LEDS is not set |
| 737 | # CONFIG_ACCESSIBILITY is not set | ||
| 725 | # CONFIG_INFINIBAND is not set | 738 | # CONFIG_INFINIBAND is not set |
| 726 | # CONFIG_RTC_CLASS is not set | 739 | # CONFIG_RTC_CLASS is not set |
| 727 | # CONFIG_DMADEVICES is not set | 740 | # CONFIG_DMADEVICES is not set |
| 728 | |||
| 729 | # | ||
| 730 | # Userspace I/O | ||
| 731 | # | ||
| 732 | # CONFIG_UIO is not set | 741 | # CONFIG_UIO is not set |
| 733 | 742 | ||
| 734 | # | 743 | # |
| @@ -798,7 +807,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 798 | CONFIG_NFS_FS=y | 807 | CONFIG_NFS_FS=y |
| 799 | CONFIG_NFS_V3=y | 808 | CONFIG_NFS_V3=y |
| 800 | CONFIG_NFS_V3_ACL=y | 809 | CONFIG_NFS_V3_ACL=y |
| 801 | # CONFIG_NFS_DIRECTIO is not set | ||
| 802 | # CONFIG_NFSD is not set | 810 | # CONFIG_NFSD is not set |
| 803 | CONFIG_ROOT_NFS=y | 811 | CONFIG_ROOT_NFS=y |
| 804 | CONFIG_LOCKD=y | 812 | CONFIG_LOCKD=y |
| @@ -877,6 +885,7 @@ CONFIG_NLS_UTF8=y | |||
| 877 | # Library routines | 885 | # Library routines |
| 878 | # | 886 | # |
| 879 | CONFIG_BITREVERSE=y | 887 | CONFIG_BITREVERSE=y |
| 888 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 880 | CONFIG_CRC_CCITT=y | 889 | CONFIG_CRC_CCITT=y |
| 881 | # CONFIG_CRC16 is not set | 890 | # CONFIG_CRC16 is not set |
| 882 | # CONFIG_CRC_ITU_T is not set | 891 | # CONFIG_CRC_ITU_T is not set |
| @@ -889,6 +898,7 @@ CONFIG_PLIST=y | |||
| 889 | CONFIG_HAS_IOMEM=y | 898 | CONFIG_HAS_IOMEM=y |
| 890 | CONFIG_HAS_IOPORT=y | 899 | CONFIG_HAS_IOPORT=y |
| 891 | CONFIG_HAS_DMA=y | 900 | CONFIG_HAS_DMA=y |
| 901 | CONFIG_HAVE_LMB=y | ||
| 892 | 902 | ||
| 893 | # | 903 | # |
| 894 | # Kernel hacking | 904 | # Kernel hacking |
| @@ -896,6 +906,7 @@ CONFIG_HAS_DMA=y | |||
| 896 | # CONFIG_PRINTK_TIME is not set | 906 | # CONFIG_PRINTK_TIME is not set |
| 897 | CONFIG_ENABLE_WARN_DEPRECATED=y | 907 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 898 | CONFIG_ENABLE_MUST_CHECK=y | 908 | CONFIG_ENABLE_MUST_CHECK=y |
| 909 | CONFIG_FRAME_WARN=1024 | ||
| 899 | CONFIG_MAGIC_SYSRQ=y | 910 | CONFIG_MAGIC_SYSRQ=y |
| 900 | # CONFIG_UNUSED_SYMBOLS is not set | 911 | # CONFIG_UNUSED_SYMBOLS is not set |
| 901 | # CONFIG_DEBUG_FS is not set | 912 | # CONFIG_DEBUG_FS is not set |
| @@ -906,6 +917,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 906 | CONFIG_SCHED_DEBUG=y | 917 | CONFIG_SCHED_DEBUG=y |
| 907 | # CONFIG_SCHEDSTATS is not set | 918 | # CONFIG_SCHEDSTATS is not set |
| 908 | # CONFIG_TIMER_STATS is not set | 919 | # CONFIG_TIMER_STATS is not set |
| 920 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 909 | # CONFIG_SLUB_DEBUG_ON is not set | 921 | # CONFIG_SLUB_DEBUG_ON is not set |
| 910 | # CONFIG_SLUB_STATS is not set | 922 | # CONFIG_SLUB_STATS is not set |
| 911 | # CONFIG_DEBUG_RT_MUTEXES is not set | 923 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -918,6 +930,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 918 | CONFIG_DEBUG_BUGVERBOSE=y | 930 | CONFIG_DEBUG_BUGVERBOSE=y |
| 919 | CONFIG_DEBUG_INFO=y | 931 | CONFIG_DEBUG_INFO=y |
| 920 | # CONFIG_DEBUG_VM is not set | 932 | # CONFIG_DEBUG_VM is not set |
| 933 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 921 | # CONFIG_DEBUG_LIST is not set | 934 | # CONFIG_DEBUG_LIST is not set |
| 922 | # CONFIG_DEBUG_SG is not set | 935 | # CONFIG_DEBUG_SG is not set |
| 923 | # CONFIG_BOOT_PRINTK_DELAY is not set | 936 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -929,6 +942,7 @@ CONFIG_DEBUG_INFO=y | |||
| 929 | # CONFIG_DEBUG_PAGEALLOC is not set | 942 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 930 | # CONFIG_DEBUGGER is not set | 943 | # CONFIG_DEBUGGER is not set |
| 931 | # CONFIG_KGDB_CONSOLE is not set | 944 | # CONFIG_KGDB_CONSOLE is not set |
| 945 | # CONFIG_IRQSTACKS is not set | ||
| 932 | CONFIG_BDI_SWITCH=y | 946 | CONFIG_BDI_SWITCH=y |
| 933 | # CONFIG_PPC_EARLY_DEBUG is not set | 947 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 934 | 948 | ||
| @@ -938,45 +952,75 @@ CONFIG_BDI_SWITCH=y | |||
| 938 | # CONFIG_KEYS is not set | 952 | # CONFIG_KEYS is not set |
| 939 | # CONFIG_SECURITY is not set | 953 | # CONFIG_SECURITY is not set |
| 940 | CONFIG_CRYPTO=y | 954 | CONFIG_CRYPTO=y |
| 955 | |||
| 956 | # | ||
| 957 | # Crypto core or helper | ||
| 958 | # | ||
| 941 | CONFIG_CRYPTO_ALGAPI=y | 959 | CONFIG_CRYPTO_ALGAPI=y |
| 942 | CONFIG_CRYPTO_BLKCIPHER=y | 960 | CONFIG_CRYPTO_BLKCIPHER=y |
| 943 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 944 | CONFIG_CRYPTO_MANAGER=y | 961 | CONFIG_CRYPTO_MANAGER=y |
| 945 | # CONFIG_CRYPTO_HMAC is not set | ||
| 946 | # CONFIG_CRYPTO_NULL is not set | 962 | # CONFIG_CRYPTO_NULL is not set |
| 963 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 964 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 965 | |||
| 966 | # | ||
| 967 | # Authenticated Encryption with Associated Data | ||
| 968 | # | ||
| 969 | # CONFIG_CRYPTO_CCM is not set | ||
| 970 | # CONFIG_CRYPTO_GCM is not set | ||
| 971 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 972 | |||
| 973 | # | ||
| 974 | # Block modes | ||
| 975 | # | ||
| 976 | CONFIG_CRYPTO_CBC=y | ||
| 977 | # CONFIG_CRYPTO_CTR is not set | ||
| 978 | # CONFIG_CRYPTO_CTS is not set | ||
| 979 | CONFIG_CRYPTO_ECB=y | ||
| 980 | CONFIG_CRYPTO_PCBC=y | ||
| 981 | |||
| 982 | # | ||
| 983 | # Hash modes | ||
| 984 | # | ||
| 985 | # CONFIG_CRYPTO_HMAC is not set | ||
| 986 | |||
| 987 | # | ||
| 988 | # Digest | ||
| 989 | # | ||
| 990 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 947 | # CONFIG_CRYPTO_MD4 is not set | 991 | # CONFIG_CRYPTO_MD4 is not set |
| 948 | CONFIG_CRYPTO_MD5=y | 992 | CONFIG_CRYPTO_MD5=y |
| 993 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 949 | # CONFIG_CRYPTO_SHA1 is not set | 994 | # CONFIG_CRYPTO_SHA1 is not set |
| 950 | # CONFIG_CRYPTO_SHA256 is not set | 995 | # CONFIG_CRYPTO_SHA256 is not set |
| 951 | # CONFIG_CRYPTO_SHA512 is not set | 996 | # CONFIG_CRYPTO_SHA512 is not set |
| 952 | # CONFIG_CRYPTO_WP512 is not set | ||
| 953 | # CONFIG_CRYPTO_TGR192 is not set | 997 | # CONFIG_CRYPTO_TGR192 is not set |
| 954 | CONFIG_CRYPTO_ECB=y | 998 | # CONFIG_CRYPTO_WP512 is not set |
| 955 | CONFIG_CRYPTO_CBC=y | 999 | |
| 956 | CONFIG_CRYPTO_PCBC=y | 1000 | # |
| 957 | # CONFIG_CRYPTO_CTR is not set | 1001 | # Ciphers |
| 958 | # CONFIG_CRYPTO_GCM is not set | 1002 | # |
| 959 | # CONFIG_CRYPTO_CCM is not set | ||
| 960 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 961 | CONFIG_CRYPTO_DES=y | ||
| 962 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 963 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 964 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 965 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 966 | # CONFIG_CRYPTO_AES is not set | 1003 | # CONFIG_CRYPTO_AES is not set |
| 1004 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1005 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1006 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1007 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 967 | # CONFIG_CRYPTO_CAST5 is not set | 1008 | # CONFIG_CRYPTO_CAST5 is not set |
| 968 | # CONFIG_CRYPTO_CAST6 is not set | 1009 | # CONFIG_CRYPTO_CAST6 is not set |
| 969 | # CONFIG_CRYPTO_TEA is not set | 1010 | CONFIG_CRYPTO_DES=y |
| 970 | # CONFIG_CRYPTO_ARC4 is not set | 1011 | # CONFIG_CRYPTO_FCRYPT is not set |
| 971 | # CONFIG_CRYPTO_KHAZAD is not set | 1012 | # CONFIG_CRYPTO_KHAZAD is not set |
| 972 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 973 | # CONFIG_CRYPTO_SEED is not set | 1013 | # CONFIG_CRYPTO_SEED is not set |
| 1014 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1015 | # CONFIG_CRYPTO_TEA is not set | ||
| 1016 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1017 | |||
| 1018 | # | ||
| 1019 | # Compression | ||
| 1020 | # | ||
| 974 | # CONFIG_CRYPTO_DEFLATE is not set | 1021 | # CONFIG_CRYPTO_DEFLATE is not set |
| 975 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 976 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 977 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 978 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 979 | # CONFIG_CRYPTO_LZO is not set | 1022 | # CONFIG_CRYPTO_LZO is not set |
| 980 | # CONFIG_CRYPTO_HW is not set | 1023 | # CONFIG_CRYPTO_HW is not set |
| 981 | # CONFIG_PPC_CLOCK is not set | 1024 | # CONFIG_PPC_CLOCK is not set |
| 982 | CONFIG_PPC_LIB_RHEAP=y | 1025 | CONFIG_PPC_LIB_RHEAP=y |
| 1026 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 9e0dd8201691..4293c8be06e1 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_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.25-rc9 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Tue Apr 15 18:07:36 2008 | 4 | # Mon Jun 9 08:52:14 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -86,6 +88,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
| 91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 91 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
| @@ -111,12 +114,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 111 | # CONFIG_KPROBES is not set | 114 | # CONFIG_KPROBES is not set |
| 112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
| 113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
| 117 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 114 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
| 115 | CONFIG_SLABINFO=y | 119 | CONFIG_SLABINFO=y |
| 116 | CONFIG_RT_MUTEXES=y | 120 | CONFIG_RT_MUTEXES=y |
| 117 | # CONFIG_TINY_SHMEM is not set | 121 | # CONFIG_TINY_SHMEM is not set |
| 118 | CONFIG_BASE_SMALL=0 | 122 | CONFIG_BASE_SMALL=0 |
| 119 | CONFIG_MODULES=y | 123 | CONFIG_MODULES=y |
| 124 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 120 | CONFIG_MODULE_UNLOAD=y | 125 | CONFIG_MODULE_UNLOAD=y |
| 121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 122 | # CONFIG_MODVERSIONS is not set | 127 | # CONFIG_MODVERSIONS is not set |
| @@ -201,7 +206,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 201 | # CONFIG_PREEMPT is not set | 206 | # CONFIG_PREEMPT is not set |
| 202 | CONFIG_BINFMT_ELF=y | 207 | CONFIG_BINFMT_ELF=y |
| 203 | # CONFIG_BINFMT_MISC is not set | 208 | # CONFIG_BINFMT_MISC is not set |
| 204 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 205 | CONFIG_MATH_EMULATION=y | 209 | CONFIG_MATH_EMULATION=y |
| 206 | # CONFIG_IOMMU_HELPER is not set | 210 | # CONFIG_IOMMU_HELPER is not set |
| 207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 211 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| @@ -217,11 +221,13 @@ CONFIG_FLATMEM=y | |||
| 217 | CONFIG_FLAT_NODE_MEM_MAP=y | 221 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 218 | # CONFIG_SPARSEMEM_STATIC is not set | 222 | # CONFIG_SPARSEMEM_STATIC is not set |
| 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 224 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 221 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
| 222 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
| 223 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
| 224 | CONFIG_VIRT_TO_BUS=y | 229 | CONFIG_VIRT_TO_BUS=y |
| 230 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 225 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
| 226 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
| 227 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
| @@ -240,6 +246,7 @@ CONFIG_FSL_SOC=y | |||
| 240 | # CONFIG_PCI_SYSCALL is not set | 246 | # CONFIG_PCI_SYSCALL is not set |
| 241 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 242 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 243 | 250 | ||
| 244 | # | 251 | # |
| 245 | # Advanced setup | 252 | # Advanced setup |
| @@ -249,11 +256,11 @@ CONFIG_FSL_SOC=y | |||
| 249 | # | 256 | # |
| 250 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 251 | # | 258 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 264 | ||
| 258 | # | 265 | # |
| 259 | # Networking | 266 | # Networking |
| @@ -301,8 +308,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 301 | CONFIG_DEFAULT_TCP_CONG="cubic" | 308 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 302 | # CONFIG_TCP_MD5SIG is not set | 309 | # CONFIG_TCP_MD5SIG is not set |
| 303 | # CONFIG_IPV6 is not set | 310 | # CONFIG_IPV6 is not set |
| 304 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 305 | # CONFIG_INET6_TUNNEL is not set | ||
| 306 | # CONFIG_NETWORK_SECMARK is not set | 311 | # CONFIG_NETWORK_SECMARK is not set |
| 307 | # CONFIG_NETFILTER is not set | 312 | # CONFIG_NETFILTER is not set |
| 308 | # CONFIG_IP_DCCP is not set | 313 | # CONFIG_IP_DCCP is not set |
| @@ -361,6 +366,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 361 | # CONFIG_MTD_REDBOOT_PARTS is not set | 366 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 362 | # CONFIG_MTD_CMDLINE_PARTS is not set | 367 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 363 | CONFIG_MTD_OF_PARTS=y | 368 | CONFIG_MTD_OF_PARTS=y |
| 369 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 364 | 370 | ||
| 365 | # | 371 | # |
| 366 | # User Modules And Translation Layers | 372 | # User Modules And Translation Layers |
| @@ -439,6 +445,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 439 | # | 445 | # |
| 440 | # CONFIG_MTD_UBI is not set | 446 | # CONFIG_MTD_UBI is not set |
| 441 | CONFIG_OF_DEVICE=y | 447 | CONFIG_OF_DEVICE=y |
| 448 | CONFIG_OF_I2C=y | ||
| 442 | # CONFIG_PARPORT is not set | 449 | # CONFIG_PARPORT is not set |
| 443 | CONFIG_BLK_DEV=y | 450 | CONFIG_BLK_DEV=y |
| 444 | # CONFIG_BLK_DEV_FD is not set | 451 | # CONFIG_BLK_DEV_FD is not set |
| @@ -501,8 +508,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 501 | # CONFIG_SCSI_DEBUG is not set | 508 | # CONFIG_SCSI_DEBUG is not set |
| 502 | CONFIG_ATA=y | 509 | CONFIG_ATA=y |
| 503 | # CONFIG_ATA_NONSTANDARD is not set | 510 | # CONFIG_ATA_NONSTANDARD is not set |
| 504 | # CONFIG_SATA_MV is not set | 511 | CONFIG_SATA_PMP=y |
| 505 | CONFIG_SATA_FSL=y | 512 | CONFIG_SATA_FSL=y |
| 513 | CONFIG_ATA_SFF=y | ||
| 514 | # CONFIG_SATA_MV is not set | ||
| 506 | # CONFIG_PATA_PLATFORM is not set | 515 | # CONFIG_PATA_PLATFORM is not set |
| 507 | # CONFIG_MD is not set | 516 | # CONFIG_MD is not set |
| 508 | # CONFIG_MACINTOSH_DRIVERS is not set | 517 | # CONFIG_MACINTOSH_DRIVERS is not set |
| @@ -554,6 +563,7 @@ CONFIG_NETDEV_10000=y | |||
| 554 | # | 563 | # |
| 555 | # CONFIG_WLAN_PRE80211 is not set | 564 | # CONFIG_WLAN_PRE80211 is not set |
| 556 | # CONFIG_WLAN_80211 is not set | 565 | # CONFIG_WLAN_80211 is not set |
| 566 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 557 | 567 | ||
| 558 | # | 568 | # |
| 559 | # USB Network Adapters | 569 | # USB Network Adapters |
| @@ -607,6 +617,7 @@ CONFIG_INPUT=y | |||
| 607 | # Character devices | 617 | # Character devices |
| 608 | # | 618 | # |
| 609 | # CONFIG_VT is not set | 619 | # CONFIG_VT is not set |
| 620 | CONFIG_DEVKMEM=y | ||
| 610 | # CONFIG_SERIAL_NONSTANDARD is not set | 621 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 611 | 622 | ||
| 612 | # | 623 | # |
| @@ -642,13 +653,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 642 | CONFIG_I2C_CHARDEV=y | 653 | CONFIG_I2C_CHARDEV=y |
| 643 | 654 | ||
| 644 | # | 655 | # |
| 645 | # I2C Algorithms | ||
| 646 | # | ||
| 647 | # CONFIG_I2C_ALGOBIT is not set | ||
| 648 | # CONFIG_I2C_ALGOPCF is not set | ||
| 649 | # CONFIG_I2C_ALGOPCA is not set | ||
| 650 | |||
| 651 | # | ||
| 652 | # I2C Hardware Bus support | 656 | # I2C Hardware Bus support |
| 653 | # | 657 | # |
| 654 | CONFIG_I2C_MPC=y | 658 | CONFIG_I2C_MPC=y |
| @@ -658,6 +662,7 @@ CONFIG_I2C_MPC=y | |||
| 658 | # CONFIG_I2C_TAOS_EVM is not set | 662 | # CONFIG_I2C_TAOS_EVM is not set |
| 659 | # CONFIG_I2C_STUB is not set | 663 | # CONFIG_I2C_STUB is not set |
| 660 | # CONFIG_I2C_TINY_USB is not set | 664 | # CONFIG_I2C_TINY_USB is not set |
| 665 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 661 | 666 | ||
| 662 | # | 667 | # |
| 663 | # Miscellaneous I2C Chip support | 668 | # Miscellaneous I2C Chip support |
| @@ -667,19 +672,13 @@ CONFIG_I2C_MPC=y | |||
| 667 | # CONFIG_SENSORS_PCF8574 is not set | 672 | # CONFIG_SENSORS_PCF8574 is not set |
| 668 | # CONFIG_PCF8575 is not set | 673 | # CONFIG_PCF8575 is not set |
| 669 | # CONFIG_SENSORS_PCF8591 is not set | 674 | # CONFIG_SENSORS_PCF8591 is not set |
| 670 | # CONFIG_TPS65010 is not set | ||
| 671 | # CONFIG_SENSORS_MAX6875 is not set | 675 | # CONFIG_SENSORS_MAX6875 is not set |
| 672 | # CONFIG_SENSORS_TSL2550 is not set | 676 | # CONFIG_SENSORS_TSL2550 is not set |
| 673 | # CONFIG_I2C_DEBUG_CORE is not set | 677 | # CONFIG_I2C_DEBUG_CORE is not set |
| 674 | # CONFIG_I2C_DEBUG_ALGO is not set | 678 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 675 | # CONFIG_I2C_DEBUG_BUS is not set | 679 | # CONFIG_I2C_DEBUG_BUS is not set |
| 676 | # CONFIG_I2C_DEBUG_CHIP is not set | 680 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 677 | |||
| 678 | # | ||
| 679 | # SPI support | ||
| 680 | # | ||
| 681 | # CONFIG_SPI is not set | 681 | # CONFIG_SPI is not set |
| 682 | # CONFIG_SPI_MASTER is not set | ||
| 683 | # CONFIG_W1 is not set | 682 | # CONFIG_W1 is not set |
| 684 | # CONFIG_POWER_SUPPLY is not set | 683 | # CONFIG_POWER_SUPPLY is not set |
| 685 | CONFIG_HWMON=y | 684 | CONFIG_HWMON=y |
| @@ -757,12 +756,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 757 | # Multifunction device drivers | 756 | # Multifunction device drivers |
| 758 | # | 757 | # |
| 759 | # CONFIG_MFD_SM501 is not set | 758 | # CONFIG_MFD_SM501 is not set |
| 759 | # CONFIG_HTC_PASIC3 is not set | ||
| 760 | 760 | ||
| 761 | # | 761 | # |
| 762 | # Multimedia devices | 762 | # Multimedia devices |
| 763 | # | 763 | # |
| 764 | |||
| 765 | # | ||
| 766 | # Multimedia core support | ||
| 767 | # | ||
| 764 | # CONFIG_VIDEO_DEV is not set | 768 | # CONFIG_VIDEO_DEV is not set |
| 765 | # CONFIG_DVB_CORE is not set | 769 | # CONFIG_DVB_CORE is not set |
| 770 | # CONFIG_VIDEO_MEDIA is not set | ||
| 771 | |||
| 772 | # | ||
| 773 | # Multimedia drivers | ||
| 774 | # | ||
| 766 | CONFIG_DAB=y | 775 | CONFIG_DAB=y |
| 767 | # CONFIG_USB_DABUSB is not set | 776 | # CONFIG_USB_DABUSB is not set |
| 768 | 777 | ||
| @@ -810,16 +819,20 @@ CONFIG_USB=y | |||
| 810 | CONFIG_USB_DEVICE_CLASS=y | 819 | CONFIG_USB_DEVICE_CLASS=y |
| 811 | # CONFIG_USB_DYNAMIC_MINORS is not set | 820 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 812 | # CONFIG_USB_OTG is not set | 821 | # CONFIG_USB_OTG is not set |
| 822 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 823 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 813 | 824 | ||
| 814 | # | 825 | # |
| 815 | # USB Host Controller Drivers | 826 | # USB Host Controller Drivers |
| 816 | # | 827 | # |
| 828 | # CONFIG_USB_C67X00_HCD is not set | ||
| 817 | CONFIG_USB_EHCI_HCD=y | 829 | CONFIG_USB_EHCI_HCD=y |
| 818 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 830 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 819 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 831 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 820 | CONFIG_USB_EHCI_FSL=y | 832 | CONFIG_USB_EHCI_FSL=y |
| 821 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 833 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 822 | # CONFIG_USB_ISP116X_HCD is not set | 834 | # CONFIG_USB_ISP116X_HCD is not set |
| 835 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 823 | # CONFIG_USB_SL811_HCD is not set | 836 | # CONFIG_USB_SL811_HCD is not set |
| 824 | # CONFIG_USB_R8A66597_HCD is not set | 837 | # CONFIG_USB_R8A66597_HCD is not set |
| 825 | 838 | ||
| @@ -828,6 +841,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
| 828 | # | 841 | # |
| 829 | # CONFIG_USB_ACM is not set | 842 | # CONFIG_USB_ACM is not set |
| 830 | # CONFIG_USB_PRINTER is not set | 843 | # CONFIG_USB_PRINTER is not set |
| 844 | # CONFIG_USB_WDM is not set | ||
| 831 | 845 | ||
| 832 | # | 846 | # |
| 833 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 847 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -873,17 +887,15 @@ CONFIG_USB_MON=y | |||
| 873 | # CONFIG_USB_LD is not set | 887 | # CONFIG_USB_LD is not set |
| 874 | # CONFIG_USB_TRANCEVIBRATOR is not set | 888 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 875 | # CONFIG_USB_IOWARRIOR is not set | 889 | # CONFIG_USB_IOWARRIOR is not set |
| 890 | # CONFIG_USB_ISIGHTFW is not set | ||
| 876 | # CONFIG_USB_GADGET is not set | 891 | # CONFIG_USB_GADGET is not set |
| 877 | # CONFIG_MMC is not set | 892 | # CONFIG_MMC is not set |
| 878 | # CONFIG_MEMSTICK is not set | 893 | # CONFIG_MEMSTICK is not set |
| 879 | # CONFIG_NEW_LEDS is not set | 894 | # CONFIG_NEW_LEDS is not set |
| 895 | # CONFIG_ACCESSIBILITY is not set | ||
| 880 | # CONFIG_EDAC is not set | 896 | # CONFIG_EDAC is not set |
| 881 | # CONFIG_RTC_CLASS is not set | 897 | # CONFIG_RTC_CLASS is not set |
| 882 | # CONFIG_DMADEVICES is not set | 898 | # CONFIG_DMADEVICES is not set |
| 883 | |||
| 884 | # | ||
| 885 | # Userspace I/O | ||
| 886 | # | ||
| 887 | # CONFIG_UIO is not set | 899 | # CONFIG_UIO is not set |
| 888 | 900 | ||
| 889 | # | 901 | # |
| @@ -903,7 +915,6 @@ CONFIG_FS_MBCACHE=y | |||
| 903 | # CONFIG_JFS_FS is not set | 915 | # CONFIG_JFS_FS is not set |
| 904 | # CONFIG_FS_POSIX_ACL is not set | 916 | # CONFIG_FS_POSIX_ACL is not set |
| 905 | # CONFIG_XFS_FS is not set | 917 | # CONFIG_XFS_FS is not set |
| 906 | # CONFIG_GFS2_FS is not set | ||
| 907 | # CONFIG_OCFS2_FS is not set | 918 | # CONFIG_OCFS2_FS is not set |
| 908 | CONFIG_DNOTIFY=y | 919 | CONFIG_DNOTIFY=y |
| 909 | CONFIG_INOTIFY=y | 920 | CONFIG_INOTIFY=y |
| @@ -962,7 +973,6 @@ CONFIG_NFS_FS=y | |||
| 962 | CONFIG_NFS_V3=y | 973 | CONFIG_NFS_V3=y |
| 963 | # CONFIG_NFS_V3_ACL is not set | 974 | # CONFIG_NFS_V3_ACL is not set |
| 964 | CONFIG_NFS_V4=y | 975 | CONFIG_NFS_V4=y |
| 965 | # CONFIG_NFS_DIRECTIO is not set | ||
| 966 | # CONFIG_NFSD is not set | 976 | # CONFIG_NFSD is not set |
| 967 | CONFIG_ROOT_NFS=y | 977 | CONFIG_ROOT_NFS=y |
| 968 | CONFIG_LOCKD=y | 978 | CONFIG_LOCKD=y |
| @@ -1009,6 +1019,7 @@ CONFIG_UCC=y | |||
| 1009 | # Library routines | 1019 | # Library routines |
| 1010 | # | 1020 | # |
| 1011 | CONFIG_BITREVERSE=y | 1021 | CONFIG_BITREVERSE=y |
| 1022 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1012 | # CONFIG_CRC_CCITT is not set | 1023 | # CONFIG_CRC_CCITT is not set |
| 1013 | # CONFIG_CRC16 is not set | 1024 | # CONFIG_CRC16 is not set |
| 1014 | # CONFIG_CRC_ITU_T is not set | 1025 | # CONFIG_CRC_ITU_T is not set |
| @@ -1027,6 +1038,7 @@ CONFIG_HAVE_LMB=y | |||
| 1027 | # CONFIG_PRINTK_TIME is not set | 1038 | # CONFIG_PRINTK_TIME is not set |
| 1028 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1039 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1029 | CONFIG_ENABLE_MUST_CHECK=y | 1040 | CONFIG_ENABLE_MUST_CHECK=y |
| 1041 | CONFIG_FRAME_WARN=1024 | ||
| 1030 | # CONFIG_MAGIC_SYSRQ is not set | 1042 | # CONFIG_MAGIC_SYSRQ is not set |
| 1031 | # CONFIG_UNUSED_SYMBOLS is not set | 1043 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1032 | # CONFIG_DEBUG_FS is not set | 1044 | # CONFIG_DEBUG_FS is not set |
| @@ -1034,6 +1046,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1034 | # CONFIG_DEBUG_KERNEL is not set | 1046 | # CONFIG_DEBUG_KERNEL is not set |
| 1035 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1047 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1036 | # CONFIG_SAMPLES is not set | 1048 | # CONFIG_SAMPLES is not set |
| 1049 | # CONFIG_IRQSTACKS is not set | ||
| 1037 | # CONFIG_PPC_EARLY_DEBUG is not set | 1050 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1038 | 1051 | ||
| 1039 | # | 1052 | # |
| @@ -1043,51 +1056,81 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1043 | # CONFIG_SECURITY is not set | 1056 | # CONFIG_SECURITY is not set |
| 1044 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1057 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1045 | CONFIG_CRYPTO=y | 1058 | CONFIG_CRYPTO=y |
| 1059 | |||
| 1060 | # | ||
| 1061 | # Crypto core or helper | ||
| 1062 | # | ||
| 1046 | CONFIG_CRYPTO_ALGAPI=y | 1063 | CONFIG_CRYPTO_ALGAPI=y |
| 1047 | CONFIG_CRYPTO_BLKCIPHER=y | 1064 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1048 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1049 | CONFIG_CRYPTO_MANAGER=y | 1065 | CONFIG_CRYPTO_MANAGER=y |
| 1066 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1067 | # CONFIG_CRYPTO_NULL is not set | ||
| 1068 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1069 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1070 | # CONFIG_CRYPTO_TEST is not set | ||
| 1071 | |||
| 1072 | # | ||
| 1073 | # Authenticated Encryption with Associated Data | ||
| 1074 | # | ||
| 1075 | # CONFIG_CRYPTO_CCM is not set | ||
| 1076 | # CONFIG_CRYPTO_GCM is not set | ||
| 1077 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1078 | |||
| 1079 | # | ||
| 1080 | # Block modes | ||
| 1081 | # | ||
| 1082 | CONFIG_CRYPTO_CBC=y | ||
| 1083 | # CONFIG_CRYPTO_CTR is not set | ||
| 1084 | # CONFIG_CRYPTO_CTS is not set | ||
| 1085 | CONFIG_CRYPTO_ECB=m | ||
| 1086 | # CONFIG_CRYPTO_LRW is not set | ||
| 1087 | CONFIG_CRYPTO_PCBC=m | ||
| 1088 | # CONFIG_CRYPTO_XTS is not set | ||
| 1089 | |||
| 1090 | # | ||
| 1091 | # Hash modes | ||
| 1092 | # | ||
| 1050 | # CONFIG_CRYPTO_HMAC is not set | 1093 | # CONFIG_CRYPTO_HMAC is not set |
| 1051 | # CONFIG_CRYPTO_XCBC is not set | 1094 | # CONFIG_CRYPTO_XCBC is not set |
| 1052 | # CONFIG_CRYPTO_NULL is not set | 1095 | |
| 1096 | # | ||
| 1097 | # Digest | ||
| 1098 | # | ||
| 1099 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1053 | # CONFIG_CRYPTO_MD4 is not set | 1100 | # CONFIG_CRYPTO_MD4 is not set |
| 1054 | CONFIG_CRYPTO_MD5=y | 1101 | CONFIG_CRYPTO_MD5=y |
| 1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1055 | # CONFIG_CRYPTO_SHA1 is not set | 1103 | # CONFIG_CRYPTO_SHA1 is not set |
| 1056 | # CONFIG_CRYPTO_SHA256 is not set | 1104 | # CONFIG_CRYPTO_SHA256 is not set |
| 1057 | # CONFIG_CRYPTO_SHA512 is not set | 1105 | # CONFIG_CRYPTO_SHA512 is not set |
| 1058 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1059 | # CONFIG_CRYPTO_TGR192 is not set | 1106 | # CONFIG_CRYPTO_TGR192 is not set |
| 1060 | # CONFIG_CRYPTO_GF128MUL is not set | 1107 | # CONFIG_CRYPTO_WP512 is not set |
| 1061 | CONFIG_CRYPTO_ECB=m | 1108 | |
| 1062 | CONFIG_CRYPTO_CBC=y | 1109 | # |
| 1063 | CONFIG_CRYPTO_PCBC=m | 1110 | # Ciphers |
| 1064 | # CONFIG_CRYPTO_LRW is not set | 1111 | # |
| 1065 | # CONFIG_CRYPTO_XTS is not set | ||
| 1066 | # CONFIG_CRYPTO_CTR is not set | ||
| 1067 | # CONFIG_CRYPTO_GCM is not set | ||
| 1068 | # CONFIG_CRYPTO_CCM is not set | ||
| 1069 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1070 | CONFIG_CRYPTO_DES=y | ||
| 1071 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1072 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1073 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1074 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1075 | # CONFIG_CRYPTO_AES is not set | 1112 | # CONFIG_CRYPTO_AES is not set |
| 1113 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1114 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1115 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1116 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1076 | # CONFIG_CRYPTO_CAST5 is not set | 1117 | # CONFIG_CRYPTO_CAST5 is not set |
| 1077 | # CONFIG_CRYPTO_CAST6 is not set | 1118 | # CONFIG_CRYPTO_CAST6 is not set |
| 1078 | # CONFIG_CRYPTO_TEA is not set | 1119 | CONFIG_CRYPTO_DES=y |
| 1079 | # CONFIG_CRYPTO_ARC4 is not set | 1120 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1080 | # CONFIG_CRYPTO_KHAZAD is not set | 1121 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1081 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1082 | # CONFIG_CRYPTO_SEED is not set | ||
| 1083 | # CONFIG_CRYPTO_SALSA20 is not set | 1122 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1123 | # CONFIG_CRYPTO_SEED is not set | ||
| 1124 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1125 | # CONFIG_CRYPTO_TEA is not set | ||
| 1126 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1127 | |||
| 1128 | # | ||
| 1129 | # Compression | ||
| 1130 | # | ||
| 1084 | # CONFIG_CRYPTO_DEFLATE is not set | 1131 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1085 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1086 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1087 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1088 | # CONFIG_CRYPTO_TEST is not set | ||
| 1089 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1090 | # CONFIG_CRYPTO_LZO is not set | 1132 | # CONFIG_CRYPTO_LZO is not set |
| 1091 | CONFIG_CRYPTO_HW=y | 1133 | CONFIG_CRYPTO_HW=y |
| 1092 | # CONFIG_PPC_CLOCK is not set | 1134 | # CONFIG_PPC_CLOCK is not set |
| 1093 | CONFIG_PPC_LIB_RHEAP=y | 1135 | CONFIG_PPC_LIB_RHEAP=y |
| 1136 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 2075722911bb..3efab71a603b 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:08 2008 | 4 | # Mon Jun 9 09:03:46 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_MPC8560_ADS=y | |||
| 162 | CONFIG_MPC85xx_CDS=y | 167 | CONFIG_MPC85xx_CDS=y |
| 163 | CONFIG_MPC85xx_MDS=y | 168 | CONFIG_MPC85xx_MDS=y |
| 164 | CONFIG_MPC85xx_DS=y | 169 | CONFIG_MPC85xx_DS=y |
| 170 | CONFIG_KSI8560=y | ||
| 165 | # CONFIG_STX_GP3 is not set | 171 | # CONFIG_STX_GP3 is not set |
| 166 | CONFIG_TQM8540=y | 172 | CONFIG_TQM8540=y |
| 167 | CONFIG_TQM8541=y | 173 | CONFIG_TQM8541=y |
| @@ -221,11 +227,13 @@ CONFIG_FLATMEM=y | |||
| 221 | CONFIG_FLAT_NODE_MEM_MAP=y | 227 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 222 | # CONFIG_SPARSEMEM_STATIC is not set | 228 | # CONFIG_SPARSEMEM_STATIC is not set |
| 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 230 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 231 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 225 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
| 226 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
| 227 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
| 228 | CONFIG_VIRT_TO_BUS=y | 235 | CONFIG_VIRT_TO_BUS=y |
| 236 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 229 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
| 230 | # CONFIG_CMDLINE_BOOL is not set | 238 | # CONFIG_CMDLINE_BOOL is not set |
| 231 | # CONFIG_PM is not set | 239 | # CONFIG_PM is not set |
| @@ -250,6 +258,7 @@ CONFIG_PCI_LEGACY=y | |||
| 250 | # CONFIG_PCI_DEBUG is not set | 258 | # CONFIG_PCI_DEBUG is not set |
| 251 | # CONFIG_PCCARD is not set | 259 | # CONFIG_PCCARD is not set |
| 252 | # CONFIG_HOTPLUG_PCI is not set | 260 | # CONFIG_HOTPLUG_PCI is not set |
| 261 | # CONFIG_HAS_RAPIDIO is not set | ||
| 253 | 262 | ||
| 254 | # | 263 | # |
| 255 | # Advanced setup | 264 | # Advanced setup |
| @@ -259,11 +268,12 @@ CONFIG_PCI_LEGACY=y | |||
| 259 | # | 268 | # |
| 260 | # Default settings for advanced configuration options are used | 269 | # Default settings for advanced configuration options are used |
| 261 | # | 270 | # |
| 262 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 263 | CONFIG_LOWMEM_SIZE=0x30000000 | 271 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 272 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 264 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
| 274 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 275 | CONFIG_PHYSICAL_ALIGN=0x10000000 | ||
| 265 | CONFIG_TASK_SIZE=0xc0000000 | 276 | CONFIG_TASK_SIZE=0xc0000000 |
| 266 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 267 | 277 | ||
| 268 | # | 278 | # |
| 269 | # Networking | 279 | # Networking |
| @@ -334,8 +344,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 334 | CONFIG_INET6_XFRM_MODE_BEET=y | 344 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 345 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 336 | CONFIG_IPV6_SIT=y | 346 | CONFIG_IPV6_SIT=y |
| 347 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 337 | # CONFIG_IPV6_TUNNEL is not set | 348 | # CONFIG_IPV6_TUNNEL is not set |
| 338 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 349 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 350 | # CONFIG_IPV6_MROUTE is not set | ||
| 339 | # CONFIG_NETWORK_SECMARK is not set | 351 | # CONFIG_NETWORK_SECMARK is not set |
| 340 | # CONFIG_NETFILTER is not set | 352 | # CONFIG_NETFILTER is not set |
| 341 | # CONFIG_IP_DCCP is not set | 353 | # CONFIG_IP_DCCP is not set |
| @@ -397,6 +409,7 @@ CONFIG_FW_LOADER=y | |||
| 397 | # CONFIG_CONNECTOR is not set | 409 | # CONFIG_CONNECTOR is not set |
| 398 | # CONFIG_MTD is not set | 410 | # CONFIG_MTD is not set |
| 399 | CONFIG_OF_DEVICE=y | 411 | CONFIG_OF_DEVICE=y |
| 412 | CONFIG_OF_I2C=y | ||
| 400 | # CONFIG_PARPORT is not set | 413 | # CONFIG_PARPORT is not set |
| 401 | CONFIG_BLK_DEV=y | 414 | CONFIG_BLK_DEV=y |
| 402 | # CONFIG_BLK_DEV_FD is not set | 415 | # CONFIG_BLK_DEV_FD is not set |
| @@ -503,7 +516,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 503 | # CONFIG_SCSI_SRP is not set | 516 | # CONFIG_SCSI_SRP is not set |
| 504 | CONFIG_ATA=y | 517 | CONFIG_ATA=y |
| 505 | # CONFIG_ATA_NONSTANDARD is not set | 518 | # CONFIG_ATA_NONSTANDARD is not set |
| 519 | CONFIG_SATA_PMP=y | ||
| 506 | CONFIG_SATA_AHCI=y | 520 | CONFIG_SATA_AHCI=y |
| 521 | # CONFIG_SATA_SIL24 is not set | ||
| 522 | CONFIG_SATA_FSL=y | ||
| 523 | CONFIG_ATA_SFF=y | ||
| 507 | # CONFIG_SATA_SVW is not set | 524 | # CONFIG_SATA_SVW is not set |
| 508 | # CONFIG_ATA_PIIX is not set | 525 | # CONFIG_ATA_PIIX is not set |
| 509 | # CONFIG_SATA_MV is not set | 526 | # CONFIG_SATA_MV is not set |
| @@ -513,13 +530,11 @@ CONFIG_SATA_AHCI=y | |||
| 513 | # CONFIG_SATA_PROMISE is not set | 530 | # CONFIG_SATA_PROMISE is not set |
| 514 | # CONFIG_SATA_SX4 is not set | 531 | # CONFIG_SATA_SX4 is not set |
| 515 | # CONFIG_SATA_SIL is not set | 532 | # CONFIG_SATA_SIL is not set |
| 516 | # CONFIG_SATA_SIL24 is not set | ||
| 517 | # CONFIG_SATA_SIS is not set | 533 | # CONFIG_SATA_SIS is not set |
| 518 | # CONFIG_SATA_ULI is not set | 534 | # CONFIG_SATA_ULI is not set |
| 519 | # CONFIG_SATA_VIA is not set | 535 | # CONFIG_SATA_VIA is not set |
| 520 | # CONFIG_SATA_VITESSE is not set | 536 | # CONFIG_SATA_VITESSE is not set |
| 521 | # CONFIG_SATA_INIC162X is not set | 537 | # CONFIG_SATA_INIC162X is not set |
| 522 | # CONFIG_SATA_FSL is not set | ||
| 523 | CONFIG_PATA_ALI=y | 538 | CONFIG_PATA_ALI=y |
| 524 | # CONFIG_PATA_AMD is not set | 539 | # CONFIG_PATA_AMD is not set |
| 525 | # CONFIG_PATA_ARTOP is not set | 540 | # CONFIG_PATA_ARTOP is not set |
| @@ -559,6 +574,7 @@ CONFIG_PATA_ALI=y | |||
| 559 | # CONFIG_PATA_VIA is not set | 574 | # CONFIG_PATA_VIA is not set |
| 560 | # CONFIG_PATA_WINBOND is not set | 575 | # CONFIG_PATA_WINBOND is not set |
| 561 | # CONFIG_PATA_PLATFORM is not set | 576 | # CONFIG_PATA_PLATFORM is not set |
| 577 | # CONFIG_PATA_SCH is not set | ||
| 562 | # CONFIG_MD is not set | 578 | # CONFIG_MD is not set |
| 563 | # CONFIG_FUSION is not set | 579 | # CONFIG_FUSION is not set |
| 564 | 580 | ||
| @@ -625,7 +641,6 @@ CONFIG_NETDEV_1000=y | |||
| 625 | # CONFIG_SIS190 is not set | 641 | # CONFIG_SIS190 is not set |
| 626 | # CONFIG_SKGE is not set | 642 | # CONFIG_SKGE is not set |
| 627 | # CONFIG_SKY2 is not set | 643 | # CONFIG_SKY2 is not set |
| 628 | # CONFIG_SK98LIN is not set | ||
| 629 | # CONFIG_VIA_VELOCITY is not set | 644 | # CONFIG_VIA_VELOCITY is not set |
| 630 | # CONFIG_TIGON3 is not set | 645 | # CONFIG_TIGON3 is not set |
| 631 | # CONFIG_BNX2 is not set | 646 | # CONFIG_BNX2 is not set |
| @@ -646,6 +661,7 @@ CONFIG_NETDEV_10000=y | |||
| 646 | # CONFIG_MLX4_CORE is not set | 661 | # CONFIG_MLX4_CORE is not set |
| 647 | # CONFIG_TEHUTI is not set | 662 | # CONFIG_TEHUTI is not set |
| 648 | # CONFIG_BNX2X is not set | 663 | # CONFIG_BNX2X is not set |
| 664 | # CONFIG_SFC is not set | ||
| 649 | # CONFIG_TR is not set | 665 | # CONFIG_TR is not set |
| 650 | 666 | ||
| 651 | # | 667 | # |
| @@ -653,6 +669,7 @@ CONFIG_NETDEV_10000=y | |||
| 653 | # | 669 | # |
| 654 | # CONFIG_WLAN_PRE80211 is not set | 670 | # CONFIG_WLAN_PRE80211 is not set |
| 655 | # CONFIG_WLAN_80211 is not set | 671 | # CONFIG_WLAN_80211 is not set |
| 672 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 656 | 673 | ||
| 657 | # | 674 | # |
| 658 | # USB Network Adapters | 675 | # USB Network Adapters |
| @@ -717,6 +734,7 @@ CONFIG_VT=y | |||
| 717 | CONFIG_VT_CONSOLE=y | 734 | CONFIG_VT_CONSOLE=y |
| 718 | CONFIG_HW_CONSOLE=y | 735 | CONFIG_HW_CONSOLE=y |
| 719 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 736 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 737 | CONFIG_DEVKMEM=y | ||
| 720 | # CONFIG_SERIAL_NONSTANDARD is not set | 738 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 721 | # CONFIG_NOZOMI is not set | 739 | # CONFIG_NOZOMI is not set |
| 722 | 740 | ||
| @@ -750,7 +768,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 750 | # CONFIG_IPMI_HANDLER is not set | 768 | # CONFIG_IPMI_HANDLER is not set |
| 751 | # CONFIG_HW_RANDOM is not set | 769 | # CONFIG_HW_RANDOM is not set |
| 752 | CONFIG_NVRAM=y | 770 | CONFIG_NVRAM=y |
| 753 | # CONFIG_GEN_RTC is not set | ||
| 754 | # CONFIG_R3964 is not set | 771 | # CONFIG_R3964 is not set |
| 755 | # CONFIG_APPLICOM is not set | 772 | # CONFIG_APPLICOM is not set |
| 756 | # CONFIG_RAW_DRIVER is not set | 773 | # CONFIG_RAW_DRIVER is not set |
| @@ -761,13 +778,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 761 | # CONFIG_I2C_CHARDEV is not set | 778 | # CONFIG_I2C_CHARDEV is not set |
| 762 | 779 | ||
| 763 | # | 780 | # |
| 764 | # I2C Algorithms | ||
| 765 | # | ||
| 766 | # CONFIG_I2C_ALGOBIT is not set | ||
| 767 | # CONFIG_I2C_ALGOPCF is not set | ||
| 768 | # CONFIG_I2C_ALGOPCA is not set | ||
| 769 | |||
| 770 | # | ||
| 771 | # I2C Hardware Bus support | 781 | # I2C Hardware Bus support |
| 772 | # | 782 | # |
| 773 | # CONFIG_I2C_ALI1535 is not set | 783 | # CONFIG_I2C_ALI1535 is not set |
| @@ -794,6 +804,7 @@ CONFIG_I2C_MPC=y | |||
| 794 | # CONFIG_I2C_VIA is not set | 804 | # CONFIG_I2C_VIA is not set |
| 795 | # CONFIG_I2C_VIAPRO is not set | 805 | # CONFIG_I2C_VIAPRO is not set |
| 796 | # CONFIG_I2C_VOODOO3 is not set | 806 | # CONFIG_I2C_VOODOO3 is not set |
| 807 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 797 | 808 | ||
| 798 | # | 809 | # |
| 799 | # Miscellaneous I2C Chip support | 810 | # Miscellaneous I2C Chip support |
| @@ -803,19 +814,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 803 | # CONFIG_SENSORS_PCF8574 is not set | 814 | # CONFIG_SENSORS_PCF8574 is not set |
| 804 | # CONFIG_PCF8575 is not set | 815 | # CONFIG_PCF8575 is not set |
| 805 | # CONFIG_SENSORS_PCF8591 is not set | 816 | # CONFIG_SENSORS_PCF8591 is not set |
| 806 | # CONFIG_TPS65010 is not set | ||
| 807 | # CONFIG_SENSORS_MAX6875 is not set | 817 | # CONFIG_SENSORS_MAX6875 is not set |
| 808 | # CONFIG_SENSORS_TSL2550 is not set | 818 | # CONFIG_SENSORS_TSL2550 is not set |
| 809 | # CONFIG_I2C_DEBUG_CORE is not set | 819 | # CONFIG_I2C_DEBUG_CORE is not set |
| 810 | # CONFIG_I2C_DEBUG_ALGO is not set | 820 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 811 | # CONFIG_I2C_DEBUG_BUS is not set | 821 | # CONFIG_I2C_DEBUG_BUS is not set |
| 812 | # CONFIG_I2C_DEBUG_CHIP is not set | 822 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 813 | |||
| 814 | # | ||
| 815 | # SPI support | ||
| 816 | # | ||
| 817 | # CONFIG_SPI is not set | 823 | # CONFIG_SPI is not set |
| 818 | # CONFIG_SPI_MASTER is not set | ||
| 819 | # CONFIG_W1 is not set | 824 | # CONFIG_W1 is not set |
| 820 | # CONFIG_POWER_SUPPLY is not set | 825 | # CONFIG_POWER_SUPPLY is not set |
| 821 | # CONFIG_HWMON is not set | 826 | # CONFIG_HWMON is not set |
| @@ -832,13 +837,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 832 | # Multifunction device drivers | 837 | # Multifunction device drivers |
| 833 | # | 838 | # |
| 834 | # CONFIG_MFD_SM501 is not set | 839 | # CONFIG_MFD_SM501 is not set |
| 840 | # CONFIG_HTC_PASIC3 is not set | ||
| 835 | 841 | ||
| 836 | # | 842 | # |
| 837 | # Multimedia devices | 843 | # Multimedia devices |
| 838 | # | 844 | # |
| 845 | |||
| 846 | # | ||
| 847 | # Multimedia core support | ||
| 848 | # | ||
| 839 | # CONFIG_VIDEO_DEV is not set | 849 | # CONFIG_VIDEO_DEV is not set |
| 840 | CONFIG_DVB_CORE=m | 850 | CONFIG_DVB_CORE=m |
| 841 | # CONFIG_DVB_CORE_ATTACH is not set | 851 | CONFIG_VIDEO_MEDIA=m |
| 852 | |||
| 853 | # | ||
| 854 | # Multimedia drivers | ||
| 855 | # | ||
| 856 | # CONFIG_MEDIA_ATTACH is not set | ||
| 857 | CONFIG_MEDIA_TUNER=m | ||
| 858 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 859 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 860 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 861 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 862 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 863 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 864 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 865 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 866 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 842 | CONFIG_DVB_CAPTURE_DRIVERS=y | 867 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 843 | 868 | ||
| 844 | # | 869 | # |
| @@ -881,14 +906,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 881 | # | 906 | # |
| 882 | # DVB-S (satellite) frontends | 907 | # DVB-S (satellite) frontends |
| 883 | # | 908 | # |
| 884 | # CONFIG_DVB_STV0299 is not set | ||
| 885 | # CONFIG_DVB_CX24110 is not set | 909 | # CONFIG_DVB_CX24110 is not set |
| 886 | # CONFIG_DVB_CX24123 is not set | 910 | # CONFIG_DVB_CX24123 is not set |
| 887 | # CONFIG_DVB_TDA8083 is not set | ||
| 888 | # CONFIG_DVB_MT312 is not set | 911 | # CONFIG_DVB_MT312 is not set |
| 889 | # CONFIG_DVB_VES1X93 is not set | ||
| 890 | # CONFIG_DVB_S5H1420 is not set | 912 | # CONFIG_DVB_S5H1420 is not set |
| 913 | # CONFIG_DVB_STV0299 is not set | ||
| 914 | # CONFIG_DVB_TDA8083 is not set | ||
| 891 | # CONFIG_DVB_TDA10086 is not set | 915 | # CONFIG_DVB_TDA10086 is not set |
| 916 | # CONFIG_DVB_VES1X93 is not set | ||
| 917 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 918 | # CONFIG_DVB_TDA826X is not set | ||
| 919 | # CONFIG_DVB_TUA6100 is not set | ||
| 892 | 920 | ||
| 893 | # | 921 | # |
| 894 | # DVB-T (terrestrial) frontends | 922 | # DVB-T (terrestrial) frontends |
| @@ -906,6 +934,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 906 | # CONFIG_DVB_DIB3000MC is not set | 934 | # CONFIG_DVB_DIB3000MC is not set |
| 907 | # CONFIG_DVB_DIB7000M is not set | 935 | # CONFIG_DVB_DIB7000M is not set |
| 908 | # CONFIG_DVB_DIB7000P is not set | 936 | # CONFIG_DVB_DIB7000P is not set |
| 937 | # CONFIG_DVB_TDA10048 is not set | ||
| 909 | 938 | ||
| 910 | # | 939 | # |
| 911 | # DVB-C (cable) frontends | 940 | # DVB-C (cable) frontends |
| @@ -924,27 +953,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 924 | # CONFIG_DVB_BCM3510 is not set | 953 | # CONFIG_DVB_BCM3510 is not set |
| 925 | # CONFIG_DVB_LGDT330X is not set | 954 | # CONFIG_DVB_LGDT330X is not set |
| 926 | # CONFIG_DVB_S5H1409 is not set | 955 | # CONFIG_DVB_S5H1409 is not set |
| 956 | # CONFIG_DVB_AU8522 is not set | ||
| 957 | # CONFIG_DVB_S5H1411 is not set | ||
| 927 | 958 | ||
| 928 | # | 959 | # |
| 929 | # Tuners/PLL support | 960 | # Digital terrestrial only tuners/PLL |
| 930 | # | 961 | # |
| 931 | # CONFIG_DVB_PLL is not set | 962 | # CONFIG_DVB_PLL is not set |
| 932 | # CONFIG_DVB_TDA826X is not set | ||
| 933 | # CONFIG_DVB_TDA827X is not set | ||
| 934 | # CONFIG_DVB_TDA18271 is not set | ||
| 935 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 936 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 937 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 938 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 939 | # CONFIG_DVB_TUNER_DIB0070 is not set | 963 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 940 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 941 | 964 | ||
| 942 | # | 965 | # |
| 943 | # Miscellaneous devices | 966 | # SEC control devices for DVB-S |
| 944 | # | 967 | # |
| 945 | # CONFIG_DVB_LNBP21 is not set | 968 | # CONFIG_DVB_LNBP21 is not set |
| 969 | # CONFIG_DVB_ISL6405 is not set | ||
| 946 | # CONFIG_DVB_ISL6421 is not set | 970 | # CONFIG_DVB_ISL6421 is not set |
| 947 | # CONFIG_DVB_TUA6100 is not set | ||
| 948 | CONFIG_DAB=y | 971 | CONFIG_DAB=y |
| 949 | # CONFIG_USB_DABUSB is not set | 972 | # CONFIG_USB_DABUSB is not set |
| 950 | 973 | ||
| @@ -1011,6 +1034,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 1011 | # CONFIG_SND_AU8810 is not set | 1034 | # CONFIG_SND_AU8810 is not set |
| 1012 | # CONFIG_SND_AU8820 is not set | 1035 | # CONFIG_SND_AU8820 is not set |
| 1013 | # CONFIG_SND_AU8830 is not set | 1036 | # CONFIG_SND_AU8830 is not set |
| 1037 | # CONFIG_SND_AW2 is not set | ||
| 1014 | # CONFIG_SND_AZT3328 is not set | 1038 | # CONFIG_SND_AZT3328 is not set |
| 1015 | # CONFIG_SND_BT87X is not set | 1039 | # CONFIG_SND_BT87X is not set |
| 1016 | # CONFIG_SND_CA0106 is not set | 1040 | # CONFIG_SND_CA0106 is not set |
| @@ -1085,11 +1109,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1085 | # CONFIG_SND_SOC is not set | 1109 | # CONFIG_SND_SOC is not set |
| 1086 | 1110 | ||
| 1087 | # | 1111 | # |
| 1088 | # SoC Audio support for SuperH | 1112 | # ALSA SoC audio for Freescale SOCs |
| 1089 | # | 1113 | # |
| 1090 | 1114 | ||
| 1091 | # | 1115 | # |
| 1092 | # ALSA SoC audio for Freescale SOCs | 1116 | # SoC Audio for the Texas Instruments OMAP |
| 1093 | # | 1117 | # |
| 1094 | 1118 | ||
| 1095 | # | 1119 | # |
| @@ -1124,16 +1148,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1124 | CONFIG_USB_DEVICE_CLASS=y | 1148 | CONFIG_USB_DEVICE_CLASS=y |
| 1125 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1149 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1126 | # CONFIG_USB_OTG is not set | 1150 | # CONFIG_USB_OTG is not set |
| 1151 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1152 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1127 | 1153 | ||
| 1128 | # | 1154 | # |
| 1129 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
| 1130 | # | 1156 | # |
| 1157 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1131 | CONFIG_USB_EHCI_HCD=y | 1158 | CONFIG_USB_EHCI_HCD=y |
| 1132 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1159 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1133 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1160 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1134 | # CONFIG_USB_EHCI_FSL is not set | 1161 | CONFIG_USB_EHCI_FSL=y |
| 1135 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1162 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1136 | # CONFIG_USB_ISP116X_HCD is not set | 1163 | # CONFIG_USB_ISP116X_HCD is not set |
| 1164 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1137 | CONFIG_USB_OHCI_HCD=y | 1165 | CONFIG_USB_OHCI_HCD=y |
| 1138 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1166 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1139 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1167 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1151,6 +1179,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1151 | # | 1179 | # |
| 1152 | # CONFIG_USB_ACM is not set | 1180 | # CONFIG_USB_ACM is not set |
| 1153 | # CONFIG_USB_PRINTER is not set | 1181 | # CONFIG_USB_PRINTER is not set |
| 1182 | # CONFIG_USB_WDM is not set | ||
| 1154 | 1183 | ||
| 1155 | # | 1184 | # |
| 1156 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1185 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1170,7 +1199,9 @@ CONFIG_USB_STORAGE=y | |||
| 1170 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1199 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1171 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1200 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1172 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1173 | # CONFIG_USB_STORAGE_KARMA is not set | 1203 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1204 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1174 | # CONFIG_USB_LIBUSUAL is not set | 1205 | # CONFIG_USB_LIBUSUAL is not set |
| 1175 | 1206 | ||
| 1176 | # | 1207 | # |
| @@ -1208,12 +1239,21 @@ CONFIG_USB_MON=y | |||
| 1208 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1239 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1209 | # CONFIG_USB_IOWARRIOR is not set | 1240 | # CONFIG_USB_IOWARRIOR is not set |
| 1210 | # CONFIG_USB_TEST is not set | 1241 | # CONFIG_USB_TEST is not set |
| 1242 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1211 | # CONFIG_USB_GADGET is not set | 1243 | # CONFIG_USB_GADGET is not set |
| 1212 | # CONFIG_MMC is not set | 1244 | # CONFIG_MMC is not set |
| 1213 | # CONFIG_MEMSTICK is not set | 1245 | # CONFIG_MEMSTICK is not set |
| 1214 | # CONFIG_NEW_LEDS is not set | 1246 | # CONFIG_NEW_LEDS is not set |
| 1247 | # CONFIG_ACCESSIBILITY is not set | ||
| 1215 | # CONFIG_INFINIBAND is not set | 1248 | # CONFIG_INFINIBAND is not set |
| 1216 | # CONFIG_EDAC is not set | 1249 | CONFIG_EDAC=y |
| 1250 | |||
| 1251 | # | ||
| 1252 | # Reporting subsystems | ||
| 1253 | # | ||
| 1254 | # CONFIG_EDAC_DEBUG is not set | ||
| 1255 | CONFIG_EDAC_MM_EDAC=y | ||
| 1256 | CONFIG_EDAC_MPC85XX=y | ||
| 1217 | CONFIG_RTC_LIB=y | 1257 | CONFIG_RTC_LIB=y |
| 1218 | CONFIG_RTC_CLASS=y | 1258 | CONFIG_RTC_CLASS=y |
| 1219 | CONFIG_RTC_HCTOSYS=y | 1259 | CONFIG_RTC_HCTOSYS=y |
| @@ -1263,11 +1303,19 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1263 | # | 1303 | # |
| 1264 | # on-CPU RTC drivers | 1304 | # on-CPU RTC drivers |
| 1265 | # | 1305 | # |
| 1266 | # CONFIG_DMADEVICES is not set | 1306 | # CONFIG_RTC_DRV_PPC is not set |
| 1307 | CONFIG_DMADEVICES=y | ||
| 1267 | 1308 | ||
| 1268 | # | 1309 | # |
| 1269 | # Userspace I/O | 1310 | # DMA Devices |
| 1270 | # | 1311 | # |
| 1312 | CONFIG_FSL_DMA=y | ||
| 1313 | CONFIG_DMA_ENGINE=y | ||
| 1314 | |||
| 1315 | # | ||
| 1316 | # DMA Clients | ||
| 1317 | # | ||
| 1318 | # CONFIG_NET_DMA is not set | ||
| 1271 | # CONFIG_UIO is not set | 1319 | # CONFIG_UIO is not set |
| 1272 | 1320 | ||
| 1273 | # | 1321 | # |
| @@ -1287,7 +1335,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1287 | # CONFIG_JFS_FS is not set | 1335 | # CONFIG_JFS_FS is not set |
| 1288 | # CONFIG_FS_POSIX_ACL is not set | 1336 | # CONFIG_FS_POSIX_ACL is not set |
| 1289 | # CONFIG_XFS_FS is not set | 1337 | # CONFIG_XFS_FS is not set |
| 1290 | # CONFIG_GFS2_FS is not set | ||
| 1291 | # CONFIG_OCFS2_FS is not set | 1338 | # CONFIG_OCFS2_FS is not set |
| 1292 | CONFIG_DNOTIFY=y | 1339 | CONFIG_DNOTIFY=y |
| 1293 | CONFIG_INOTIFY=y | 1340 | CONFIG_INOTIFY=y |
| @@ -1357,10 +1404,9 @@ CONFIG_NFS_FS=y | |||
| 1357 | CONFIG_NFS_V3=y | 1404 | CONFIG_NFS_V3=y |
| 1358 | # CONFIG_NFS_V3_ACL is not set | 1405 | # CONFIG_NFS_V3_ACL is not set |
| 1359 | CONFIG_NFS_V4=y | 1406 | CONFIG_NFS_V4=y |
| 1360 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1361 | CONFIG_NFSD=y | 1407 | CONFIG_NFSD=y |
| 1362 | # CONFIG_NFSD_V3 is not set | 1408 | # CONFIG_NFSD_V3 is not set |
| 1363 | CONFIG_NFSD_TCP=y | 1409 | # CONFIG_NFSD_V4 is not set |
| 1364 | CONFIG_ROOT_NFS=y | 1410 | CONFIG_ROOT_NFS=y |
| 1365 | CONFIG_LOCKD=y | 1411 | CONFIG_LOCKD=y |
| 1366 | CONFIG_LOCKD_V4=y | 1412 | CONFIG_LOCKD_V4=y |
| @@ -1444,9 +1490,10 @@ CONFIG_NLS_UTF8=m | |||
| 1444 | # Library routines | 1490 | # Library routines |
| 1445 | # | 1491 | # |
| 1446 | CONFIG_BITREVERSE=y | 1492 | CONFIG_BITREVERSE=y |
| 1493 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1447 | # CONFIG_CRC_CCITT is not set | 1494 | # CONFIG_CRC_CCITT is not set |
| 1448 | # CONFIG_CRC16 is not set | 1495 | # CONFIG_CRC16 is not set |
| 1449 | # CONFIG_CRC_ITU_T is not set | 1496 | CONFIG_CRC_ITU_T=m |
| 1450 | CONFIG_CRC32=y | 1497 | CONFIG_CRC32=y |
| 1451 | # CONFIG_CRC7 is not set | 1498 | # CONFIG_CRC7 is not set |
| 1452 | CONFIG_LIBCRC32C=m | 1499 | CONFIG_LIBCRC32C=m |
| @@ -1455,6 +1502,7 @@ CONFIG_PLIST=y | |||
| 1455 | CONFIG_HAS_IOMEM=y | 1502 | CONFIG_HAS_IOMEM=y |
| 1456 | CONFIG_HAS_IOPORT=y | 1503 | CONFIG_HAS_IOPORT=y |
| 1457 | CONFIG_HAS_DMA=y | 1504 | CONFIG_HAS_DMA=y |
| 1505 | CONFIG_HAVE_LMB=y | ||
| 1458 | 1506 | ||
| 1459 | # | 1507 | # |
| 1460 | # Kernel hacking | 1508 | # Kernel hacking |
| @@ -1462,6 +1510,7 @@ CONFIG_HAS_DMA=y | |||
| 1462 | # CONFIG_PRINTK_TIME is not set | 1510 | # CONFIG_PRINTK_TIME is not set |
| 1463 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1511 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1464 | CONFIG_ENABLE_MUST_CHECK=y | 1512 | CONFIG_ENABLE_MUST_CHECK=y |
| 1513 | CONFIG_FRAME_WARN=1024 | ||
| 1465 | # CONFIG_MAGIC_SYSRQ is not set | 1514 | # CONFIG_MAGIC_SYSRQ is not set |
| 1466 | # CONFIG_UNUSED_SYMBOLS is not set | 1515 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1467 | # CONFIG_DEBUG_FS is not set | 1516 | # CONFIG_DEBUG_FS is not set |
| @@ -1472,6 +1521,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1472 | CONFIG_SCHED_DEBUG=y | 1521 | CONFIG_SCHED_DEBUG=y |
| 1473 | # CONFIG_SCHEDSTATS is not set | 1522 | # CONFIG_SCHEDSTATS is not set |
| 1474 | # CONFIG_TIMER_STATS is not set | 1523 | # CONFIG_TIMER_STATS is not set |
| 1524 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1475 | # CONFIG_SLUB_DEBUG_ON is not set | 1525 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1476 | # CONFIG_SLUB_STATS is not set | 1526 | # CONFIG_SLUB_STATS is not set |
| 1477 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1527 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1485,6 +1535,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1485 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1535 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1486 | CONFIG_DEBUG_INFO=y | 1536 | CONFIG_DEBUG_INFO=y |
| 1487 | # CONFIG_DEBUG_VM is not set | 1537 | # CONFIG_DEBUG_VM is not set |
| 1538 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1488 | # CONFIG_DEBUG_LIST is not set | 1539 | # CONFIG_DEBUG_LIST is not set |
| 1489 | # CONFIG_DEBUG_SG is not set | 1540 | # CONFIG_DEBUG_SG is not set |
| 1490 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1541 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1497,6 +1548,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1497 | # CONFIG_DEBUG_PAGEALLOC is not set | 1548 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1498 | # CONFIG_DEBUGGER is not set | 1549 | # CONFIG_DEBUGGER is not set |
| 1499 | # CONFIG_KGDB_CONSOLE is not set | 1550 | # CONFIG_KGDB_CONSOLE is not set |
| 1551 | # CONFIG_IRQSTACKS is not set | ||
| 1500 | # CONFIG_BDI_SWITCH is not set | 1552 | # CONFIG_BDI_SWITCH is not set |
| 1501 | # CONFIG_PPC_EARLY_DEBUG is not set | 1553 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1502 | 1554 | ||
| @@ -1507,53 +1559,83 @@ CONFIG_DEBUG_INFO=y | |||
| 1507 | # CONFIG_SECURITY is not set | 1559 | # CONFIG_SECURITY is not set |
| 1508 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1560 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1509 | CONFIG_CRYPTO=y | 1561 | CONFIG_CRYPTO=y |
| 1562 | |||
| 1563 | # | ||
| 1564 | # Crypto core or helper | ||
| 1565 | # | ||
| 1510 | CONFIG_CRYPTO_ALGAPI=y | 1566 | CONFIG_CRYPTO_ALGAPI=y |
| 1511 | CONFIG_CRYPTO_BLKCIPHER=y | 1567 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1512 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1513 | CONFIG_CRYPTO_HASH=y | 1568 | CONFIG_CRYPTO_HASH=y |
| 1514 | CONFIG_CRYPTO_MANAGER=y | 1569 | CONFIG_CRYPTO_MANAGER=y |
| 1570 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1571 | # CONFIG_CRYPTO_NULL is not set | ||
| 1572 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1573 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1574 | # CONFIG_CRYPTO_TEST is not set | ||
| 1575 | |||
| 1576 | # | ||
| 1577 | # Authenticated Encryption with Associated Data | ||
| 1578 | # | ||
| 1579 | # CONFIG_CRYPTO_CCM is not set | ||
| 1580 | # CONFIG_CRYPTO_GCM is not set | ||
| 1581 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1582 | |||
| 1583 | # | ||
| 1584 | # Block modes | ||
| 1585 | # | ||
| 1586 | CONFIG_CRYPTO_CBC=y | ||
| 1587 | # CONFIG_CRYPTO_CTR is not set | ||
| 1588 | # CONFIG_CRYPTO_CTS is not set | ||
| 1589 | # CONFIG_CRYPTO_ECB is not set | ||
| 1590 | # CONFIG_CRYPTO_LRW is not set | ||
| 1591 | CONFIG_CRYPTO_PCBC=m | ||
| 1592 | # CONFIG_CRYPTO_XTS is not set | ||
| 1593 | |||
| 1594 | # | ||
| 1595 | # Hash modes | ||
| 1596 | # | ||
| 1515 | CONFIG_CRYPTO_HMAC=y | 1597 | CONFIG_CRYPTO_HMAC=y |
| 1516 | # CONFIG_CRYPTO_XCBC is not set | 1598 | # CONFIG_CRYPTO_XCBC is not set |
| 1517 | # CONFIG_CRYPTO_NULL is not set | 1599 | |
| 1600 | # | ||
| 1601 | # Digest | ||
| 1602 | # | ||
| 1603 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1518 | # CONFIG_CRYPTO_MD4 is not set | 1604 | # CONFIG_CRYPTO_MD4 is not set |
| 1519 | CONFIG_CRYPTO_MD5=y | 1605 | CONFIG_CRYPTO_MD5=y |
| 1606 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1520 | CONFIG_CRYPTO_SHA1=m | 1607 | CONFIG_CRYPTO_SHA1=m |
| 1521 | # CONFIG_CRYPTO_SHA256 is not set | 1608 | # CONFIG_CRYPTO_SHA256 is not set |
| 1522 | # CONFIG_CRYPTO_SHA512 is not set | 1609 | # CONFIG_CRYPTO_SHA512 is not set |
| 1523 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1524 | # CONFIG_CRYPTO_TGR192 is not set | 1610 | # CONFIG_CRYPTO_TGR192 is not set |
| 1525 | # CONFIG_CRYPTO_GF128MUL is not set | 1611 | # CONFIG_CRYPTO_WP512 is not set |
| 1526 | # CONFIG_CRYPTO_ECB is not set | 1612 | |
| 1527 | CONFIG_CRYPTO_CBC=y | 1613 | # |
| 1528 | CONFIG_CRYPTO_PCBC=m | 1614 | # Ciphers |
| 1529 | # CONFIG_CRYPTO_LRW is not set | 1615 | # |
| 1530 | # CONFIG_CRYPTO_XTS is not set | ||
| 1531 | # CONFIG_CRYPTO_CTR is not set | ||
| 1532 | # CONFIG_CRYPTO_GCM is not set | ||
| 1533 | # CONFIG_CRYPTO_CCM is not set | ||
| 1534 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1535 | CONFIG_CRYPTO_DES=y | ||
| 1536 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1537 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1538 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1539 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1540 | # CONFIG_CRYPTO_AES is not set | 1616 | # CONFIG_CRYPTO_AES is not set |
| 1617 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1618 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1619 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1620 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1541 | # CONFIG_CRYPTO_CAST5 is not set | 1621 | # CONFIG_CRYPTO_CAST5 is not set |
| 1542 | # CONFIG_CRYPTO_CAST6 is not set | 1622 | # CONFIG_CRYPTO_CAST6 is not set |
| 1543 | # CONFIG_CRYPTO_TEA is not set | 1623 | CONFIG_CRYPTO_DES=y |
| 1544 | # CONFIG_CRYPTO_ARC4 is not set | 1624 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1545 | # CONFIG_CRYPTO_KHAZAD is not set | 1625 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1546 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1547 | # CONFIG_CRYPTO_SEED is not set | ||
| 1548 | # CONFIG_CRYPTO_SALSA20 is not set | 1626 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1627 | # CONFIG_CRYPTO_SEED is not set | ||
| 1628 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1629 | # CONFIG_CRYPTO_TEA is not set | ||
| 1630 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1631 | |||
| 1632 | # | ||
| 1633 | # Compression | ||
| 1634 | # | ||
| 1549 | # CONFIG_CRYPTO_DEFLATE is not set | 1635 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1550 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1551 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1552 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1553 | # CONFIG_CRYPTO_TEST is not set | ||
| 1554 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1555 | # CONFIG_CRYPTO_LZO is not set | 1636 | # CONFIG_CRYPTO_LZO is not set |
| 1556 | CONFIG_CRYPTO_HW=y | 1637 | CONFIG_CRYPTO_HW=y |
| 1557 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1638 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1558 | # CONFIG_PPC_CLOCK is not set | 1639 | # CONFIG_PPC_CLOCK is not set |
| 1559 | CONFIG_PPC_LIB_RHEAP=y | 1640 | CONFIG_PPC_LIB_RHEAP=y |
| 1641 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig index 7e5b9ce58d89..5612d40d0463 100644 --- a/arch/powerpc/configs/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/mpc8610_hpcd_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:33 2008 | 4 | # Mon Jun 9 08:50:24 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -60,9 +62,10 @@ CONFIG_EXPERIMENTAL=y | |||
| 60 | CONFIG_BROKEN_ON_SMP=y | 62 | CONFIG_BROKEN_ON_SMP=y |
| 61 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 63 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 62 | CONFIG_LOCALVERSION="" | 64 | CONFIG_LOCALVERSION="" |
| 63 | # CONFIG_LOCALVERSION_AUTO is not set | 65 | CONFIG_LOCALVERSION_AUTO=y |
| 64 | # CONFIG_SWAP is not set | 66 | # CONFIG_SWAP is not set |
| 65 | # CONFIG_SYSVIPC is not set | 67 | CONFIG_SYSVIPC=y |
| 68 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 66 | # CONFIG_POSIX_MQUEUE is not set | 69 | # CONFIG_POSIX_MQUEUE is not set |
| 67 | # CONFIG_BSD_PROCESS_ACCT is not set | 70 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 68 | # CONFIG_TASKSTATS is not set | 71 | # CONFIG_TASKSTATS is not set |
| @@ -86,6 +89,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 86 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
| 87 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
| 88 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
| 92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 89 | CONFIG_KALLSYMS=y | 93 | CONFIG_KALLSYMS=y |
| 90 | # CONFIG_KALLSYMS_ALL is not set | 94 | # CONFIG_KALLSYMS_ALL is not set |
| 91 | CONFIG_KALLSYMS_EXTRA_PASS=y | 95 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -110,14 +114,22 @@ CONFIG_SLUB=y | |||
| 110 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
| 111 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
| 112 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
| 117 | # CONFIG_KPROBES is not set | ||
| 113 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
| 114 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
| 120 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 115 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
| 116 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
| 117 | CONFIG_RT_MUTEXES=y | 123 | CONFIG_RT_MUTEXES=y |
| 118 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
| 119 | CONFIG_BASE_SMALL=0 | 125 | CONFIG_BASE_SMALL=0 |
| 120 | # CONFIG_MODULES is not set | 126 | CONFIG_MODULES=y |
| 127 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 128 | CONFIG_MODULE_UNLOAD=y | ||
| 129 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 130 | # CONFIG_MODVERSIONS is not set | ||
| 131 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 132 | CONFIG_KMOD=y | ||
| 121 | CONFIG_BLOCK=y | 133 | CONFIG_BLOCK=y |
| 122 | # CONFIG_LBD is not set | 134 | # CONFIG_LBD is not set |
| 123 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| @@ -151,6 +163,7 @@ CONFIG_PPC_86xx=y | |||
| 151 | # CONFIG_PPC_CELL_NATIVE is not set | 163 | # CONFIG_PPC_CELL_NATIVE is not set |
| 152 | # CONFIG_PQ2ADS is not set | 164 | # CONFIG_PQ2ADS is not set |
| 153 | # CONFIG_MPC8641_HPCN is not set | 165 | # CONFIG_MPC8641_HPCN is not set |
| 166 | # CONFIG_SBC8641D is not set | ||
| 154 | CONFIG_MPC8610_HPCD=y | 167 | CONFIG_MPC8610_HPCD=y |
| 155 | CONFIG_MPC8610=y | 168 | CONFIG_MPC8610=y |
| 156 | # CONFIG_IPIC is not set | 169 | # CONFIG_IPIC is not set |
| @@ -199,11 +212,13 @@ CONFIG_FLATMEM=y | |||
| 199 | CONFIG_FLAT_NODE_MEM_MAP=y | 212 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 200 | # CONFIG_SPARSEMEM_STATIC is not set | 213 | # CONFIG_SPARSEMEM_STATIC is not set |
| 201 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 215 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 202 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 203 | # CONFIG_RESOURCES_64BIT is not set | 217 | # CONFIG_RESOURCES_64BIT is not set |
| 204 | CONFIG_ZONE_DMA_FLAG=1 | 218 | CONFIG_ZONE_DMA_FLAG=1 |
| 205 | CONFIG_BOUNCE=y | 219 | CONFIG_BOUNCE=y |
| 206 | CONFIG_VIRT_TO_BUS=y | 220 | CONFIG_VIRT_TO_BUS=y |
| 221 | CONFIG_FORCE_MAX_ZONEORDER=12 | ||
| 207 | CONFIG_PROC_DEVICETREE=y | 222 | CONFIG_PROC_DEVICETREE=y |
| 208 | # CONFIG_CMDLINE_BOOL is not set | 223 | # CONFIG_CMDLINE_BOOL is not set |
| 209 | # CONFIG_PM is not set | 224 | # CONFIG_PM is not set |
| @@ -223,12 +238,14 @@ CONFIG_PCI_DOMAINS=y | |||
| 223 | CONFIG_PCI_SYSCALL=y | 238 | CONFIG_PCI_SYSCALL=y |
| 224 | CONFIG_PCIEPORTBUS=y | 239 | CONFIG_PCIEPORTBUS=y |
| 225 | CONFIG_PCIEAER=y | 240 | CONFIG_PCIEAER=y |
| 241 | # CONFIG_PCIEASPM is not set | ||
| 226 | CONFIG_ARCH_SUPPORTS_MSI=y | 242 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 227 | # CONFIG_PCI_MSI is not set | 243 | # CONFIG_PCI_MSI is not set |
| 228 | CONFIG_PCI_LEGACY=y | 244 | CONFIG_PCI_LEGACY=y |
| 229 | CONFIG_PCI_DEBUG=y | 245 | CONFIG_PCI_DEBUG=y |
| 230 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
| 231 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
| 248 | # CONFIG_HAS_RAPIDIO is not set | ||
| 232 | 249 | ||
| 233 | # | 250 | # |
| 234 | # Advanced setup | 251 | # Advanced setup |
| @@ -238,11 +255,11 @@ CONFIG_PCI_DEBUG=y | |||
| 238 | # | 255 | # |
| 239 | # Default settings for advanced configuration options are used | 256 | # Default settings for advanced configuration options are used |
| 240 | # | 257 | # |
| 241 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 242 | CONFIG_LOWMEM_SIZE=0x30000000 | 258 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 259 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 243 | CONFIG_KERNEL_START=0xc0000000 | 260 | CONFIG_KERNEL_START=0xc0000000 |
| 261 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 244 | CONFIG_TASK_SIZE=0xc0000000 | 262 | CONFIG_TASK_SIZE=0xc0000000 |
| 245 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 246 | 263 | ||
| 247 | # | 264 | # |
| 248 | # Networking | 265 | # Networking |
| @@ -303,8 +320,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 303 | CONFIG_INET6_XFRM_MODE_BEET=y | 320 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 304 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 321 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 305 | CONFIG_IPV6_SIT=y | 322 | CONFIG_IPV6_SIT=y |
| 323 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 306 | # CONFIG_IPV6_TUNNEL is not set | 324 | # CONFIG_IPV6_TUNNEL is not set |
| 307 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 325 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 326 | # CONFIG_IPV6_MROUTE is not set | ||
| 308 | # CONFIG_NETWORK_SECMARK is not set | 327 | # CONFIG_NETWORK_SECMARK is not set |
| 309 | # CONFIG_NETFILTER is not set | 328 | # CONFIG_NETFILTER is not set |
| 310 | # CONFIG_IP_DCCP is not set | 329 | # CONFIG_IP_DCCP is not set |
| @@ -446,6 +465,7 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
| 446 | # | 465 | # |
| 447 | # CONFIG_MTD_UBI is not set | 466 | # CONFIG_MTD_UBI is not set |
| 448 | CONFIG_OF_DEVICE=y | 467 | CONFIG_OF_DEVICE=y |
| 468 | CONFIG_OF_I2C=y | ||
| 449 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
| 450 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
| 451 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
| @@ -504,6 +524,7 @@ CONFIG_CHR_DEV_SG=y | |||
| 504 | # CONFIG_SCSI_CONSTANTS is not set | 524 | # CONFIG_SCSI_CONSTANTS is not set |
| 505 | # CONFIG_SCSI_LOGGING is not set | 525 | # CONFIG_SCSI_LOGGING is not set |
| 506 | # CONFIG_SCSI_SCAN_ASYNC is not set | 526 | # CONFIG_SCSI_SCAN_ASYNC is not set |
| 527 | CONFIG_SCSI_WAIT_SCAN=m | ||
| 507 | 528 | ||
| 508 | # | 529 | # |
| 509 | # SCSI Transports | 530 | # SCSI Transports |
| @@ -553,7 +574,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 553 | # CONFIG_SCSI_SRP is not set | 574 | # CONFIG_SCSI_SRP is not set |
| 554 | CONFIG_ATA=y | 575 | CONFIG_ATA=y |
| 555 | # CONFIG_ATA_NONSTANDARD is not set | 576 | # CONFIG_ATA_NONSTANDARD is not set |
| 577 | CONFIG_SATA_PMP=y | ||
| 556 | CONFIG_SATA_AHCI=y | 578 | CONFIG_SATA_AHCI=y |
| 579 | # CONFIG_SATA_SIL24 is not set | ||
| 580 | # CONFIG_SATA_FSL is not set | ||
| 581 | CONFIG_ATA_SFF=y | ||
| 557 | # CONFIG_SATA_SVW is not set | 582 | # CONFIG_SATA_SVW is not set |
| 558 | # CONFIG_ATA_PIIX is not set | 583 | # CONFIG_ATA_PIIX is not set |
| 559 | # CONFIG_SATA_MV is not set | 584 | # CONFIG_SATA_MV is not set |
| @@ -563,13 +588,11 @@ CONFIG_SATA_AHCI=y | |||
| 563 | # CONFIG_SATA_PROMISE is not set | 588 | # CONFIG_SATA_PROMISE is not set |
| 564 | # CONFIG_SATA_SX4 is not set | 589 | # CONFIG_SATA_SX4 is not set |
| 565 | # CONFIG_SATA_SIL is not set | 590 | # CONFIG_SATA_SIL is not set |
| 566 | # CONFIG_SATA_SIL24 is not set | ||
| 567 | # CONFIG_SATA_SIS is not set | 591 | # CONFIG_SATA_SIS is not set |
| 568 | # CONFIG_SATA_ULI is not set | 592 | # CONFIG_SATA_ULI is not set |
| 569 | # CONFIG_SATA_VIA is not set | 593 | # CONFIG_SATA_VIA is not set |
| 570 | # CONFIG_SATA_VITESSE is not set | 594 | # CONFIG_SATA_VITESSE is not set |
| 571 | # CONFIG_SATA_INIC162X is not set | 595 | # CONFIG_SATA_INIC162X is not set |
| 572 | # CONFIG_SATA_FSL is not set | ||
| 573 | CONFIG_PATA_ALI=y | 596 | CONFIG_PATA_ALI=y |
| 574 | # CONFIG_PATA_AMD is not set | 597 | # CONFIG_PATA_AMD is not set |
| 575 | # CONFIG_PATA_ARTOP is not set | 598 | # CONFIG_PATA_ARTOP is not set |
| @@ -609,6 +632,7 @@ CONFIG_PATA_ALI=y | |||
| 609 | # CONFIG_PATA_VIA is not set | 632 | # CONFIG_PATA_VIA is not set |
| 610 | # CONFIG_PATA_WINBOND is not set | 633 | # CONFIG_PATA_WINBOND is not set |
| 611 | # CONFIG_PATA_PLATFORM is not set | 634 | # CONFIG_PATA_PLATFORM is not set |
| 635 | # CONFIG_PATA_SCH is not set | ||
| 612 | # CONFIG_MD is not set | 636 | # CONFIG_MD is not set |
| 613 | # CONFIG_FUSION is not set | 637 | # CONFIG_FUSION is not set |
| 614 | 638 | ||
| @@ -628,25 +652,9 @@ CONFIG_DUMMY=y | |||
| 628 | # CONFIG_TUN is not set | 652 | # CONFIG_TUN is not set |
| 629 | # CONFIG_VETH is not set | 653 | # CONFIG_VETH is not set |
| 630 | # CONFIG_ARCNET is not set | 654 | # CONFIG_ARCNET is not set |
| 631 | CONFIG_PHYLIB=y | 655 | # CONFIG_PHYLIB is not set |
| 632 | |||
| 633 | # | ||
| 634 | # MII PHY device drivers | ||
| 635 | # | ||
| 636 | # CONFIG_MARVELL_PHY is not set | ||
| 637 | # CONFIG_DAVICOM_PHY is not set | ||
| 638 | # CONFIG_QSEMI_PHY is not set | ||
| 639 | # CONFIG_LXT_PHY is not set | ||
| 640 | # CONFIG_CICADA_PHY is not set | ||
| 641 | # CONFIG_VITESSE_PHY is not set | ||
| 642 | # CONFIG_SMSC_PHY is not set | ||
| 643 | # CONFIG_BROADCOM_PHY is not set | ||
| 644 | # CONFIG_ICPLUS_PHY is not set | ||
| 645 | # CONFIG_REALTEK_PHY is not set | ||
| 646 | # CONFIG_FIXED_PHY is not set | ||
| 647 | # CONFIG_MDIO_BITBANG is not set | ||
| 648 | CONFIG_NET_ETHERNET=y | 656 | CONFIG_NET_ETHERNET=y |
| 649 | CONFIG_MII=y | 657 | # CONFIG_MII is not set |
| 650 | # CONFIG_HAPPYMEAL is not set | 658 | # CONFIG_HAPPYMEAL is not set |
| 651 | # CONFIG_SUNGEM is not set | 659 | # CONFIG_SUNGEM is not set |
| 652 | # CONFIG_CASSINI is not set | 660 | # CONFIG_CASSINI is not set |
| @@ -663,64 +671,10 @@ CONFIG_ULI526X=y | |||
| 663 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 671 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 664 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 672 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
| 665 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 673 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 666 | CONFIG_NET_PCI=y | 674 | # CONFIG_NET_PCI is not set |
| 667 | # CONFIG_PCNET32 is not set | ||
| 668 | # CONFIG_AMD8111_ETH is not set | ||
| 669 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
| 670 | # CONFIG_B44 is not set | 675 | # CONFIG_B44 is not set |
| 671 | # CONFIG_FORCEDETH is not set | 676 | # CONFIG_NETDEV_1000 is not set |
| 672 | # CONFIG_EEPRO100 is not set | 677 | # CONFIG_NETDEV_10000 is not set |
| 673 | # CONFIG_E100 is not set | ||
| 674 | # CONFIG_FEALNX is not set | ||
| 675 | # CONFIG_NATSEMI is not set | ||
| 676 | # CONFIG_NE2K_PCI is not set | ||
| 677 | # CONFIG_8139CP is not set | ||
| 678 | CONFIG_8139TOO=y | ||
| 679 | CONFIG_8139TOO_PIO=y | ||
| 680 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
| 681 | # CONFIG_8139TOO_8129 is not set | ||
| 682 | # CONFIG_8139_OLD_RX_RESET is not set | ||
| 683 | # CONFIG_R6040 is not set | ||
| 684 | # CONFIG_SIS900 is not set | ||
| 685 | # CONFIG_EPIC100 is not set | ||
| 686 | # CONFIG_SUNDANCE is not set | ||
| 687 | # CONFIG_TLAN is not set | ||
| 688 | # CONFIG_VIA_RHINE is not set | ||
| 689 | # CONFIG_SC92031 is not set | ||
| 690 | CONFIG_NETDEV_1000=y | ||
| 691 | # CONFIG_ACENIC is not set | ||
| 692 | # CONFIG_DL2K is not set | ||
| 693 | # CONFIG_E1000 is not set | ||
| 694 | # CONFIG_E1000E is not set | ||
| 695 | # CONFIG_E1000E_ENABLED is not set | ||
| 696 | # CONFIG_IP1000 is not set | ||
| 697 | # CONFIG_IGB is not set | ||
| 698 | # CONFIG_NS83820 is not set | ||
| 699 | # CONFIG_HAMACHI is not set | ||
| 700 | # CONFIG_YELLOWFIN is not set | ||
| 701 | # CONFIG_R8169 is not set | ||
| 702 | # CONFIG_SIS190 is not set | ||
| 703 | # CONFIG_SKGE is not set | ||
| 704 | # CONFIG_SKY2 is not set | ||
| 705 | # CONFIG_SK98LIN is not set | ||
| 706 | # CONFIG_VIA_VELOCITY is not set | ||
| 707 | # CONFIG_TIGON3 is not set | ||
| 708 | # CONFIG_BNX2 is not set | ||
| 709 | # CONFIG_GIANFAR is not set | ||
| 710 | # CONFIG_QLA3XXX is not set | ||
| 711 | # CONFIG_ATL1 is not set | ||
| 712 | CONFIG_NETDEV_10000=y | ||
| 713 | # CONFIG_CHELSIO_T1 is not set | ||
| 714 | # CONFIG_CHELSIO_T3 is not set | ||
| 715 | # CONFIG_IXGBE is not set | ||
| 716 | # CONFIG_IXGB is not set | ||
| 717 | # CONFIG_S2IO is not set | ||
| 718 | # CONFIG_MYRI10GE is not set | ||
| 719 | # CONFIG_NETXEN_NIC is not set | ||
| 720 | # CONFIG_NIU is not set | ||
| 721 | # CONFIG_MLX4_CORE is not set | ||
| 722 | # CONFIG_TEHUTI is not set | ||
| 723 | # CONFIG_BNX2X is not set | ||
| 724 | # CONFIG_TR is not set | 678 | # CONFIG_TR is not set |
| 725 | 679 | ||
| 726 | # | 680 | # |
| @@ -728,6 +682,7 @@ CONFIG_NETDEV_10000=y | |||
| 728 | # | 682 | # |
| 729 | # CONFIG_WLAN_PRE80211 is not set | 683 | # CONFIG_WLAN_PRE80211 is not set |
| 730 | # CONFIG_WLAN_80211 is not set | 684 | # CONFIG_WLAN_80211 is not set |
| 685 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 731 | # CONFIG_WAN is not set | 686 | # CONFIG_WAN is not set |
| 732 | # CONFIG_FDDI is not set | 687 | # CONFIG_FDDI is not set |
| 733 | # CONFIG_HIPPI is not set | 688 | # CONFIG_HIPPI is not set |
| @@ -783,6 +738,7 @@ CONFIG_VT=y | |||
| 783 | CONFIG_VT_CONSOLE=y | 738 | CONFIG_VT_CONSOLE=y |
| 784 | CONFIG_HW_CONSOLE=y | 739 | CONFIG_HW_CONSOLE=y |
| 785 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 740 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 741 | CONFIG_DEVKMEM=y | ||
| 786 | # CONFIG_SERIAL_NONSTANDARD is not set | 742 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 787 | # CONFIG_NOZOMI is not set | 743 | # CONFIG_NOZOMI is not set |
| 788 | 744 | ||
| @@ -824,13 +780,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 824 | # CONFIG_I2C_CHARDEV is not set | 780 | # CONFIG_I2C_CHARDEV is not set |
| 825 | 781 | ||
| 826 | # | 782 | # |
| 827 | # I2C Algorithms | ||
| 828 | # | ||
| 829 | # CONFIG_I2C_ALGOBIT is not set | ||
| 830 | # CONFIG_I2C_ALGOPCF is not set | ||
| 831 | # CONFIG_I2C_ALGOPCA is not set | ||
| 832 | |||
| 833 | # | ||
| 834 | # I2C Hardware Bus support | 783 | # I2C Hardware Bus support |
| 835 | # | 784 | # |
| 836 | # CONFIG_I2C_ALI1535 is not set | 785 | # CONFIG_I2C_ALI1535 is not set |
| @@ -852,9 +801,11 @@ CONFIG_I2C_MPC=y | |||
| 852 | # CONFIG_I2C_SIS630 is not set | 801 | # CONFIG_I2C_SIS630 is not set |
| 853 | # CONFIG_I2C_SIS96X is not set | 802 | # CONFIG_I2C_SIS96X is not set |
| 854 | # CONFIG_I2C_TAOS_EVM is not set | 803 | # CONFIG_I2C_TAOS_EVM is not set |
| 804 | # CONFIG_I2C_STUB is not set | ||
| 855 | # CONFIG_I2C_VIA is not set | 805 | # CONFIG_I2C_VIA is not set |
| 856 | # CONFIG_I2C_VIAPRO is not set | 806 | # CONFIG_I2C_VIAPRO is not set |
| 857 | # CONFIG_I2C_VOODOO3 is not set | 807 | # CONFIG_I2C_VOODOO3 is not set |
| 808 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 858 | 809 | ||
| 859 | # | 810 | # |
| 860 | # Miscellaneous I2C Chip support | 811 | # Miscellaneous I2C Chip support |
| @@ -864,19 +815,13 @@ CONFIG_I2C_MPC=y | |||
| 864 | # CONFIG_SENSORS_PCF8574 is not set | 815 | # CONFIG_SENSORS_PCF8574 is not set |
| 865 | # CONFIG_PCF8575 is not set | 816 | # CONFIG_PCF8575 is not set |
| 866 | # CONFIG_SENSORS_PCF8591 is not set | 817 | # CONFIG_SENSORS_PCF8591 is not set |
| 867 | # CONFIG_TPS65010 is not set | ||
| 868 | # CONFIG_SENSORS_MAX6875 is not set | 818 | # CONFIG_SENSORS_MAX6875 is not set |
| 869 | # CONFIG_SENSORS_TSL2550 is not set | 819 | # CONFIG_SENSORS_TSL2550 is not set |
| 870 | # CONFIG_I2C_DEBUG_CORE is not set | 820 | # CONFIG_I2C_DEBUG_CORE is not set |
| 871 | # CONFIG_I2C_DEBUG_ALGO is not set | 821 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 872 | # CONFIG_I2C_DEBUG_BUS is not set | 822 | # CONFIG_I2C_DEBUG_BUS is not set |
| 873 | # CONFIG_I2C_DEBUG_CHIP is not set | 823 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 874 | |||
| 875 | # | ||
| 876 | # SPI support | ||
| 877 | # | ||
| 878 | # CONFIG_SPI is not set | 824 | # CONFIG_SPI is not set |
| 879 | # CONFIG_SPI_MASTER is not set | ||
| 880 | # CONFIG_W1 is not set | 825 | # CONFIG_W1 is not set |
| 881 | # CONFIG_POWER_SUPPLY is not set | 826 | # CONFIG_POWER_SUPPLY is not set |
| 882 | # CONFIG_HWMON is not set | 827 | # CONFIG_HWMON is not set |
| @@ -893,12 +838,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 893 | # Multifunction device drivers | 838 | # Multifunction device drivers |
| 894 | # | 839 | # |
| 895 | # CONFIG_MFD_SM501 is not set | 840 | # CONFIG_MFD_SM501 is not set |
| 841 | # CONFIG_HTC_PASIC3 is not set | ||
| 896 | 842 | ||
| 897 | # | 843 | # |
| 898 | # Multimedia devices | 844 | # Multimedia devices |
| 899 | # | 845 | # |
| 846 | |||
| 847 | # | ||
| 848 | # Multimedia core support | ||
| 849 | # | ||
| 900 | # CONFIG_VIDEO_DEV is not set | 850 | # CONFIG_VIDEO_DEV is not set |
| 901 | # CONFIG_DVB_CORE is not set | 851 | # CONFIG_DVB_CORE is not set |
| 852 | # CONFIG_VIDEO_MEDIA is not set | ||
| 853 | |||
| 854 | # | ||
| 855 | # Multimedia drivers | ||
| 856 | # | ||
| 902 | CONFIG_DAB=y | 857 | CONFIG_DAB=y |
| 903 | 858 | ||
| 904 | # | 859 | # |
| @@ -908,7 +863,56 @@ CONFIG_DAB=y | |||
| 908 | # CONFIG_DRM is not set | 863 | # CONFIG_DRM is not set |
| 909 | # CONFIG_VGASTATE is not set | 864 | # CONFIG_VGASTATE is not set |
| 910 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 865 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
| 911 | # CONFIG_FB is not set | 866 | CONFIG_FB=y |
| 867 | # CONFIG_FIRMWARE_EDID is not set | ||
| 868 | # CONFIG_FB_DDC is not set | ||
| 869 | CONFIG_FB_CFB_FILLRECT=y | ||
| 870 | CONFIG_FB_CFB_COPYAREA=y | ||
| 871 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 872 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 873 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 874 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 875 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 876 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 877 | # CONFIG_FB_SYS_FOPS is not set | ||
| 878 | # CONFIG_FB_SVGALIB is not set | ||
| 879 | # CONFIG_FB_MACMODES is not set | ||
| 880 | # CONFIG_FB_BACKLIGHT is not set | ||
| 881 | # CONFIG_FB_MODE_HELPERS is not set | ||
| 882 | # CONFIG_FB_TILEBLITTING is not set | ||
| 883 | |||
| 884 | # | ||
| 885 | # Frame buffer hardware drivers | ||
| 886 | # | ||
| 887 | # CONFIG_FB_CIRRUS is not set | ||
| 888 | # CONFIG_FB_PM2 is not set | ||
| 889 | # CONFIG_FB_CYBER2000 is not set | ||
| 890 | # CONFIG_FB_OF is not set | ||
| 891 | # CONFIG_FB_CT65550 is not set | ||
| 892 | # CONFIG_FB_ASILIANT is not set | ||
| 893 | # CONFIG_FB_IMSTT is not set | ||
| 894 | # CONFIG_FB_VGA16 is not set | ||
| 895 | # CONFIG_FB_S1D13XXX is not set | ||
| 896 | # CONFIG_FB_NVIDIA is not set | ||
| 897 | # CONFIG_FB_RIVA is not set | ||
| 898 | # CONFIG_FB_MATROX is not set | ||
| 899 | # CONFIG_FB_RADEON is not set | ||
| 900 | # CONFIG_FB_ATY128 is not set | ||
| 901 | # CONFIG_FB_ATY is not set | ||
| 902 | # CONFIG_FB_S3 is not set | ||
| 903 | # CONFIG_FB_SAVAGE is not set | ||
| 904 | # CONFIG_FB_SIS is not set | ||
| 905 | # CONFIG_FB_NEOMAGIC is not set | ||
| 906 | # CONFIG_FB_KYRO is not set | ||
| 907 | # CONFIG_FB_3DFX is not set | ||
| 908 | # CONFIG_FB_VOODOO1 is not set | ||
| 909 | # CONFIG_FB_VT8623 is not set | ||
| 910 | # CONFIG_FB_TRIDENT is not set | ||
| 911 | # CONFIG_FB_ARK is not set | ||
| 912 | # CONFIG_FB_PM3 is not set | ||
| 913 | CONFIG_FB_FSL_DIU=y | ||
| 914 | # CONFIG_FB_IBM_GXT4500 is not set | ||
| 915 | # CONFIG_FB_VIRTUAL is not set | ||
| 912 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 916 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 913 | 917 | ||
| 914 | # | 918 | # |
| @@ -922,6 +926,8 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
| 922 | CONFIG_VGA_CONSOLE=y | 926 | CONFIG_VGA_CONSOLE=y |
| 923 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 927 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
| 924 | CONFIG_DUMMY_CONSOLE=y | 928 | CONFIG_DUMMY_CONSOLE=y |
| 929 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 930 | # CONFIG_LOGO is not set | ||
| 925 | 931 | ||
| 926 | # | 932 | # |
| 927 | # Sound | 933 | # Sound |
| @@ -938,7 +944,7 @@ CONFIG_SND_PCM=y | |||
| 938 | CONFIG_SND_OSSEMUL=y | 944 | CONFIG_SND_OSSEMUL=y |
| 939 | CONFIG_SND_MIXER_OSS=y | 945 | CONFIG_SND_MIXER_OSS=y |
| 940 | CONFIG_SND_PCM_OSS=y | 946 | CONFIG_SND_PCM_OSS=y |
| 941 | # CONFIG_SND_PCM_OSS_PLUGINS is not set | 947 | CONFIG_SND_PCM_OSS_PLUGINS=y |
| 942 | # CONFIG_SND_DYNAMIC_MINORS is not set | 948 | # CONFIG_SND_DYNAMIC_MINORS is not set |
| 943 | # CONFIG_SND_SUPPORT_OLD_API is not set | 949 | # CONFIG_SND_SUPPORT_OLD_API is not set |
| 944 | CONFIG_SND_VERBOSE_PROCFS=y | 950 | CONFIG_SND_VERBOSE_PROCFS=y |
| @@ -965,6 +971,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 965 | # CONFIG_SND_AU8810 is not set | 971 | # CONFIG_SND_AU8810 is not set |
| 966 | # CONFIG_SND_AU8820 is not set | 972 | # CONFIG_SND_AU8820 is not set |
| 967 | # CONFIG_SND_AU8830 is not set | 973 | # CONFIG_SND_AU8830 is not set |
| 974 | # CONFIG_SND_AW2 is not set | ||
| 968 | # CONFIG_SND_AZT3328 is not set | 975 | # CONFIG_SND_AZT3328 is not set |
| 969 | # CONFIG_SND_BT87X is not set | 976 | # CONFIG_SND_BT87X is not set |
| 970 | # CONFIG_SND_CA0106 is not set | 977 | # CONFIG_SND_CA0106 is not set |
| @@ -1031,14 +1038,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1031 | CONFIG_SND_SOC=y | 1038 | CONFIG_SND_SOC=y |
| 1032 | 1039 | ||
| 1033 | # | 1040 | # |
| 1034 | # SoC Audio support for SuperH | ||
| 1035 | # | ||
| 1036 | |||
| 1037 | # | ||
| 1038 | # ALSA SoC audio for Freescale SOCs | 1041 | # ALSA SoC audio for Freescale SOCs |
| 1039 | # | 1042 | # |
| 1040 | CONFIG_SND_SOC_MPC8610=y | 1043 | CONFIG_SND_SOC_MPC8610=y |
| 1041 | CONFIG_SND_SOC_MPC8610_HPCD=y | 1044 | CONFIG_SND_SOC_MPC8610_HPCD=y |
| 1045 | |||
| 1046 | # | ||
| 1047 | # SoC Audio for the Texas Instruments OMAP | ||
| 1048 | # | ||
| 1042 | CONFIG_SND_SOC_CS4270=y | 1049 | CONFIG_SND_SOC_CS4270=y |
| 1043 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y | 1050 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y |
| 1044 | 1051 | ||
| @@ -1055,6 +1062,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 1055 | CONFIG_USB_ARCH_HAS_OHCI=y | 1062 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1056 | CONFIG_USB_ARCH_HAS_EHCI=y | 1063 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1057 | # CONFIG_USB is not set | 1064 | # CONFIG_USB is not set |
| 1065 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1066 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1058 | 1067 | ||
| 1059 | # | 1068 | # |
| 1060 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1069 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1063,14 +1072,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 1063 | # CONFIG_MMC is not set | 1072 | # CONFIG_MMC is not set |
| 1064 | # CONFIG_MEMSTICK is not set | 1073 | # CONFIG_MEMSTICK is not set |
| 1065 | # CONFIG_NEW_LEDS is not set | 1074 | # CONFIG_NEW_LEDS is not set |
| 1075 | # CONFIG_ACCESSIBILITY is not set | ||
| 1066 | # CONFIG_INFINIBAND is not set | 1076 | # CONFIG_INFINIBAND is not set |
| 1067 | # CONFIG_EDAC is not set | 1077 | # CONFIG_EDAC is not set |
| 1068 | # CONFIG_RTC_CLASS is not set | 1078 | # CONFIG_RTC_CLASS is not set |
| 1069 | # CONFIG_DMADEVICES is not set | 1079 | # CONFIG_DMADEVICES is not set |
| 1070 | |||
| 1071 | # | ||
| 1072 | # Userspace I/O | ||
| 1073 | # | ||
| 1074 | # CONFIG_UIO is not set | 1080 | # CONFIG_UIO is not set |
| 1075 | 1081 | ||
| 1076 | # | 1082 | # |
| @@ -1090,7 +1096,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1090 | # CONFIG_JFS_FS is not set | 1096 | # CONFIG_JFS_FS is not set |
| 1091 | # CONFIG_FS_POSIX_ACL is not set | 1097 | # CONFIG_FS_POSIX_ACL is not set |
| 1092 | # CONFIG_XFS_FS is not set | 1098 | # CONFIG_XFS_FS is not set |
| 1093 | # CONFIG_GFS2_FS is not set | ||
| 1094 | # CONFIG_OCFS2_FS is not set | 1099 | # CONFIG_OCFS2_FS is not set |
| 1095 | # CONFIG_DNOTIFY is not set | 1100 | # CONFIG_DNOTIFY is not set |
| 1096 | # CONFIG_INOTIFY is not set | 1101 | # CONFIG_INOTIFY is not set |
| @@ -1134,6 +1139,7 @@ CONFIG_TMPFS=y | |||
| 1134 | # CONFIG_BEFS_FS is not set | 1139 | # CONFIG_BEFS_FS is not set |
| 1135 | # CONFIG_BFS_FS is not set | 1140 | # CONFIG_BFS_FS is not set |
| 1136 | # CONFIG_EFS_FS is not set | 1141 | # CONFIG_EFS_FS is not set |
| 1142 | # CONFIG_JFFS2_FS is not set | ||
| 1137 | # CONFIG_CRAMFS is not set | 1143 | # CONFIG_CRAMFS is not set |
| 1138 | # CONFIG_VXFS_FS is not set | 1144 | # CONFIG_VXFS_FS is not set |
| 1139 | # CONFIG_MINIX_FS is not set | 1145 | # CONFIG_MINIX_FS is not set |
| @@ -1147,10 +1153,9 @@ CONFIG_NFS_FS=y | |||
| 1147 | CONFIG_NFS_V3=y | 1153 | CONFIG_NFS_V3=y |
| 1148 | # CONFIG_NFS_V3_ACL is not set | 1154 | # CONFIG_NFS_V3_ACL is not set |
| 1149 | # CONFIG_NFS_V4 is not set | 1155 | # CONFIG_NFS_V4 is not set |
| 1150 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1151 | CONFIG_NFSD=y | 1156 | CONFIG_NFSD=y |
| 1152 | # CONFIG_NFSD_V3 is not set | 1157 | # CONFIG_NFSD_V3 is not set |
| 1153 | CONFIG_NFSD_TCP=y | 1158 | # CONFIG_NFSD_V4 is not set |
| 1154 | CONFIG_ROOT_NFS=y | 1159 | CONFIG_ROOT_NFS=y |
| 1155 | CONFIG_LOCKD=y | 1160 | CONFIG_LOCKD=y |
| 1156 | CONFIG_LOCKD_V4=y | 1161 | CONFIG_LOCKD_V4=y |
| @@ -1234,6 +1239,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
| 1234 | # Library routines | 1239 | # Library routines |
| 1235 | # | 1240 | # |
| 1236 | CONFIG_BITREVERSE=y | 1241 | CONFIG_BITREVERSE=y |
| 1242 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1237 | # CONFIG_CRC_CCITT is not set | 1243 | # CONFIG_CRC_CCITT is not set |
| 1238 | # CONFIG_CRC16 is not set | 1244 | # CONFIG_CRC16 is not set |
| 1239 | # CONFIG_CRC_ITU_T is not set | 1245 | # CONFIG_CRC_ITU_T is not set |
| @@ -1244,6 +1250,7 @@ CONFIG_PLIST=y | |||
| 1244 | CONFIG_HAS_IOMEM=y | 1250 | CONFIG_HAS_IOMEM=y |
| 1245 | CONFIG_HAS_IOPORT=y | 1251 | CONFIG_HAS_IOPORT=y |
| 1246 | CONFIG_HAS_DMA=y | 1252 | CONFIG_HAS_DMA=y |
| 1253 | CONFIG_HAVE_LMB=y | ||
| 1247 | 1254 | ||
| 1248 | # | 1255 | # |
| 1249 | # Kernel hacking | 1256 | # Kernel hacking |
| @@ -1251,6 +1258,7 @@ CONFIG_HAS_DMA=y | |||
| 1251 | # CONFIG_PRINTK_TIME is not set | 1258 | # CONFIG_PRINTK_TIME is not set |
| 1252 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1259 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1253 | CONFIG_ENABLE_MUST_CHECK=y | 1260 | CONFIG_ENABLE_MUST_CHECK=y |
| 1261 | CONFIG_FRAME_WARN=1024 | ||
| 1254 | # CONFIG_MAGIC_SYSRQ is not set | 1262 | # CONFIG_MAGIC_SYSRQ is not set |
| 1255 | # CONFIG_UNUSED_SYMBOLS is not set | 1263 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1256 | # CONFIG_DEBUG_FS is not set | 1264 | # CONFIG_DEBUG_FS is not set |
| @@ -1261,6 +1269,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1261 | CONFIG_SCHED_DEBUG=y | 1269 | CONFIG_SCHED_DEBUG=y |
| 1262 | # CONFIG_SCHEDSTATS is not set | 1270 | # CONFIG_SCHEDSTATS is not set |
| 1263 | # CONFIG_TIMER_STATS is not set | 1271 | # CONFIG_TIMER_STATS is not set |
| 1272 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1264 | # CONFIG_SLUB_DEBUG_ON is not set | 1273 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1265 | # CONFIG_SLUB_STATS is not set | 1274 | # CONFIG_SLUB_STATS is not set |
| 1266 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1275 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1274,9 +1283,11 @@ CONFIG_SCHED_DEBUG=y | |||
| 1274 | CONFIG_DEBUG_BUGVERBOSE=y | 1283 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1275 | CONFIG_DEBUG_INFO=y | 1284 | CONFIG_DEBUG_INFO=y |
| 1276 | # CONFIG_DEBUG_VM is not set | 1285 | # CONFIG_DEBUG_VM is not set |
| 1286 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1277 | # CONFIG_DEBUG_LIST is not set | 1287 | # CONFIG_DEBUG_LIST is not set |
| 1278 | # CONFIG_DEBUG_SG is not set | 1288 | # CONFIG_DEBUG_SG is not set |
| 1279 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1289 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 1290 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 1280 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1291 | # CONFIG_BACKTRACE_SELF_TEST is not set |
| 1281 | # CONFIG_FAULT_INJECTION is not set | 1292 | # CONFIG_FAULT_INJECTION is not set |
| 1282 | # CONFIG_SAMPLES is not set | 1293 | # CONFIG_SAMPLES is not set |
| @@ -1284,6 +1295,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1284 | # CONFIG_DEBUG_STACK_USAGE is not set | 1295 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1285 | # CONFIG_DEBUG_PAGEALLOC is not set | 1296 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1286 | # CONFIG_DEBUGGER is not set | 1297 | # CONFIG_DEBUGGER is not set |
| 1298 | # CONFIG_IRQSTACKS is not set | ||
| 1287 | # CONFIG_BDI_SWITCH is not set | 1299 | # CONFIG_BDI_SWITCH is not set |
| 1288 | # CONFIG_PPC_EARLY_DEBUG is not set | 1300 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1289 | 1301 | ||
| @@ -1294,48 +1306,80 @@ CONFIG_DEBUG_INFO=y | |||
| 1294 | # CONFIG_SECURITY is not set | 1306 | # CONFIG_SECURITY is not set |
| 1295 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1307 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1296 | CONFIG_CRYPTO=y | 1308 | CONFIG_CRYPTO=y |
| 1297 | # CONFIG_CRYPTO_SEQIV is not set | 1309 | |
| 1310 | # | ||
| 1311 | # Crypto core or helper | ||
| 1312 | # | ||
| 1298 | # CONFIG_CRYPTO_MANAGER is not set | 1313 | # CONFIG_CRYPTO_MANAGER is not set |
| 1314 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1315 | # CONFIG_CRYPTO_NULL is not set | ||
| 1316 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1317 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1318 | # CONFIG_CRYPTO_TEST is not set | ||
| 1319 | |||
| 1320 | # | ||
| 1321 | # Authenticated Encryption with Associated Data | ||
| 1322 | # | ||
| 1323 | # CONFIG_CRYPTO_CCM is not set | ||
| 1324 | # CONFIG_CRYPTO_GCM is not set | ||
| 1325 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1326 | |||
| 1327 | # | ||
| 1328 | # Block modes | ||
| 1329 | # | ||
| 1330 | # CONFIG_CRYPTO_CBC is not set | ||
| 1331 | # CONFIG_CRYPTO_CTR is not set | ||
| 1332 | # CONFIG_CRYPTO_CTS is not set | ||
| 1333 | # CONFIG_CRYPTO_ECB is not set | ||
| 1334 | # CONFIG_CRYPTO_LRW is not set | ||
| 1335 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1336 | # CONFIG_CRYPTO_XTS is not set | ||
| 1337 | |||
| 1338 | # | ||
| 1339 | # Hash modes | ||
| 1340 | # | ||
| 1299 | # CONFIG_CRYPTO_HMAC is not set | 1341 | # CONFIG_CRYPTO_HMAC is not set |
| 1300 | # CONFIG_CRYPTO_XCBC is not set | 1342 | # CONFIG_CRYPTO_XCBC is not set |
| 1301 | # CONFIG_CRYPTO_NULL is not set | 1343 | |
| 1344 | # | ||
| 1345 | # Digest | ||
| 1346 | # | ||
| 1347 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1302 | # CONFIG_CRYPTO_MD4 is not set | 1348 | # CONFIG_CRYPTO_MD4 is not set |
| 1303 | # CONFIG_CRYPTO_MD5 is not set | 1349 | # CONFIG_CRYPTO_MD5 is not set |
| 1350 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1304 | # CONFIG_CRYPTO_SHA1 is not set | 1351 | # CONFIG_CRYPTO_SHA1 is not set |
| 1305 | # CONFIG_CRYPTO_SHA256 is not set | 1352 | # CONFIG_CRYPTO_SHA256 is not set |
| 1306 | # CONFIG_CRYPTO_SHA512 is not set | 1353 | # CONFIG_CRYPTO_SHA512 is not set |
| 1307 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1308 | # CONFIG_CRYPTO_TGR192 is not set | 1354 | # CONFIG_CRYPTO_TGR192 is not set |
| 1309 | # CONFIG_CRYPTO_GF128MUL is not set | 1355 | # CONFIG_CRYPTO_WP512 is not set |
| 1310 | # CONFIG_CRYPTO_ECB is not set | 1356 | |
| 1311 | # CONFIG_CRYPTO_CBC is not set | 1357 | # |
| 1312 | # CONFIG_CRYPTO_PCBC is not set | 1358 | # Ciphers |
| 1313 | # CONFIG_CRYPTO_LRW is not set | 1359 | # |
| 1314 | # CONFIG_CRYPTO_XTS is not set | ||
| 1315 | # CONFIG_CRYPTO_CTR is not set | ||
| 1316 | # CONFIG_CRYPTO_GCM is not set | ||
| 1317 | # CONFIG_CRYPTO_CCM is not set | ||
| 1318 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1319 | # CONFIG_CRYPTO_DES is not set | ||
| 1320 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1321 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1322 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1323 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1324 | # CONFIG_CRYPTO_AES is not set | 1360 | # CONFIG_CRYPTO_AES is not set |
| 1361 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1362 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1363 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1364 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1325 | # CONFIG_CRYPTO_CAST5 is not set | 1365 | # CONFIG_CRYPTO_CAST5 is not set |
| 1326 | # CONFIG_CRYPTO_CAST6 is not set | 1366 | # CONFIG_CRYPTO_CAST6 is not set |
| 1327 | # CONFIG_CRYPTO_TEA is not set | 1367 | # CONFIG_CRYPTO_DES is not set |
| 1328 | # CONFIG_CRYPTO_ARC4 is not set | 1368 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1329 | # CONFIG_CRYPTO_KHAZAD is not set | 1369 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1330 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1331 | # CONFIG_CRYPTO_SEED is not set | ||
| 1332 | # CONFIG_CRYPTO_SALSA20 is not set | 1370 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1371 | # CONFIG_CRYPTO_SEED is not set | ||
| 1372 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1373 | # CONFIG_CRYPTO_TEA is not set | ||
| 1374 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1375 | |||
| 1376 | # | ||
| 1377 | # Compression | ||
| 1378 | # | ||
| 1333 | # CONFIG_CRYPTO_DEFLATE is not set | 1379 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1334 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1335 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1336 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1337 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1338 | # CONFIG_CRYPTO_LZO is not set | 1380 | # CONFIG_CRYPTO_LZO is not set |
| 1339 | CONFIG_CRYPTO_HW=y | 1381 | CONFIG_CRYPTO_HW=y |
| 1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1382 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1341 | # CONFIG_PPC_CLOCK is not set | 1383 | # CONFIG_PPC_CLOCK is not set |
| 1384 | CONFIG_PPC_LIB_RHEAP=y | ||
| 1385 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index d01dcdb70bd7..4a8171507391 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:11 2008 | 4 | # Mon Jun 9 08:52:15 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
| 95 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| @@ -117,12 +120,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 117 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| 123 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
| 124 | CONFIG_BASE_SMALL=0 | 128 | CONFIG_BASE_SMALL=0 |
| 125 | CONFIG_MODULES=y | 129 | CONFIG_MODULES=y |
| 130 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 126 | CONFIG_MODULE_UNLOAD=y | 131 | CONFIG_MODULE_UNLOAD=y |
| 127 | CONFIG_MODULE_FORCE_UNLOAD=y | 132 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 128 | CONFIG_MODVERSIONS=y | 133 | CONFIG_MODVERSIONS=y |
| @@ -162,6 +167,7 @@ CONFIG_PPC_86xx=y | |||
| 162 | # CONFIG_PPC_CELL_NATIVE is not set | 167 | # CONFIG_PPC_CELL_NATIVE is not set |
| 163 | # CONFIG_PQ2ADS is not set | 168 | # CONFIG_PQ2ADS is not set |
| 164 | CONFIG_MPC8641_HPCN=y | 169 | CONFIG_MPC8641_HPCN=y |
| 170 | # CONFIG_SBC8641D is not set | ||
| 165 | # CONFIG_MPC8610_HPCD is not set | 171 | # CONFIG_MPC8610_HPCD is not set |
| 166 | CONFIG_MPC8641=y | 172 | CONFIG_MPC8641=y |
| 167 | # CONFIG_IPIC is not set | 173 | # CONFIG_IPIC is not set |
| @@ -211,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 211 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 212 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 214 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 215 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 216 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 217 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 218 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 219 | CONFIG_PROC_DEVICETREE=y | 227 | CONFIG_PROC_DEVICETREE=y |
| 220 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 221 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -240,6 +248,8 @@ CONFIG_PCI_LEGACY=y | |||
| 240 | # CONFIG_PCI_DEBUG is not set | 248 | # CONFIG_PCI_DEBUG is not set |
| 241 | # CONFIG_PCCARD is not set | 249 | # CONFIG_PCCARD is not set |
| 242 | # CONFIG_HOTPLUG_PCI is not set | 250 | # CONFIG_HOTPLUG_PCI is not set |
| 251 | CONFIG_HAS_RAPIDIO=y | ||
| 252 | # CONFIG_RAPIDIO is not set | ||
| 243 | 253 | ||
| 244 | # | 254 | # |
| 245 | # Advanced setup | 255 | # Advanced setup |
| @@ -249,11 +259,11 @@ CONFIG_PCI_LEGACY=y | |||
| 249 | # | 259 | # |
| 250 | # Default settings for advanced configuration options are used | 260 | # Default settings for advanced configuration options are used |
| 251 | # | 261 | # |
| 252 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 253 | CONFIG_LOWMEM_SIZE=0x30000000 | 262 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 263 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 254 | CONFIG_KERNEL_START=0xc0000000 | 264 | CONFIG_KERNEL_START=0xc0000000 |
| 265 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 255 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 256 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 257 | 267 | ||
| 258 | # | 268 | # |
| 259 | # Networking | 269 | # Networking |
| @@ -324,8 +334,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y | |||
| 324 | CONFIG_INET6_XFRM_MODE_BEET=y | 334 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 325 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 326 | CONFIG_IPV6_SIT=y | 336 | CONFIG_IPV6_SIT=y |
| 337 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 327 | # CONFIG_IPV6_TUNNEL is not set | 338 | # CONFIG_IPV6_TUNNEL is not set |
| 328 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 339 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 340 | # CONFIG_IPV6_MROUTE is not set | ||
| 329 | # CONFIG_NETWORK_SECMARK is not set | 341 | # CONFIG_NETWORK_SECMARK is not set |
| 330 | # CONFIG_NETFILTER is not set | 342 | # CONFIG_NETFILTER is not set |
| 331 | # CONFIG_IP_DCCP is not set | 343 | # CONFIG_IP_DCCP is not set |
| @@ -387,6 +399,7 @@ CONFIG_FW_LOADER=y | |||
| 387 | # CONFIG_CONNECTOR is not set | 399 | # CONFIG_CONNECTOR is not set |
| 388 | # CONFIG_MTD is not set | 400 | # CONFIG_MTD is not set |
| 389 | CONFIG_OF_DEVICE=y | 401 | CONFIG_OF_DEVICE=y |
| 402 | CONFIG_OF_I2C=y | ||
| 390 | # CONFIG_PARPORT is not set | 403 | # CONFIG_PARPORT is not set |
| 391 | CONFIG_BLK_DEV=y | 404 | CONFIG_BLK_DEV=y |
| 392 | # CONFIG_BLK_DEV_FD is not set | 405 | # CONFIG_BLK_DEV_FD is not set |
| @@ -493,7 +506,11 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 493 | # CONFIG_SCSI_SRP is not set | 506 | # CONFIG_SCSI_SRP is not set |
| 494 | CONFIG_ATA=y | 507 | CONFIG_ATA=y |
| 495 | # CONFIG_ATA_NONSTANDARD is not set | 508 | # CONFIG_ATA_NONSTANDARD is not set |
| 509 | CONFIG_SATA_PMP=y | ||
| 496 | CONFIG_SATA_AHCI=y | 510 | CONFIG_SATA_AHCI=y |
| 511 | # CONFIG_SATA_SIL24 is not set | ||
| 512 | # CONFIG_SATA_FSL is not set | ||
| 513 | CONFIG_ATA_SFF=y | ||
| 497 | # CONFIG_SATA_SVW is not set | 514 | # CONFIG_SATA_SVW is not set |
| 498 | # CONFIG_ATA_PIIX is not set | 515 | # CONFIG_ATA_PIIX is not set |
| 499 | # CONFIG_SATA_MV is not set | 516 | # CONFIG_SATA_MV is not set |
| @@ -503,13 +520,11 @@ CONFIG_SATA_AHCI=y | |||
| 503 | # CONFIG_SATA_PROMISE is not set | 520 | # CONFIG_SATA_PROMISE is not set |
| 504 | # CONFIG_SATA_SX4 is not set | 521 | # CONFIG_SATA_SX4 is not set |
| 505 | # CONFIG_SATA_SIL is not set | 522 | # CONFIG_SATA_SIL is not set |
| 506 | # CONFIG_SATA_SIL24 is not set | ||
| 507 | # CONFIG_SATA_SIS is not set | 523 | # CONFIG_SATA_SIS is not set |
| 508 | # CONFIG_SATA_ULI is not set | 524 | # CONFIG_SATA_ULI is not set |
| 509 | # CONFIG_SATA_VIA is not set | 525 | # CONFIG_SATA_VIA is not set |
| 510 | # CONFIG_SATA_VITESSE is not set | 526 | # CONFIG_SATA_VITESSE is not set |
| 511 | # CONFIG_SATA_INIC162X is not set | 527 | # CONFIG_SATA_INIC162X is not set |
| 512 | # CONFIG_SATA_FSL is not set | ||
| 513 | CONFIG_PATA_ALI=y | 528 | CONFIG_PATA_ALI=y |
| 514 | # CONFIG_PATA_AMD is not set | 529 | # CONFIG_PATA_AMD is not set |
| 515 | # CONFIG_PATA_ARTOP is not set | 530 | # CONFIG_PATA_ARTOP is not set |
| @@ -549,6 +564,7 @@ CONFIG_PATA_ALI=y | |||
| 549 | # CONFIG_PATA_VIA is not set | 564 | # CONFIG_PATA_VIA is not set |
| 550 | # CONFIG_PATA_WINBOND is not set | 565 | # CONFIG_PATA_WINBOND is not set |
| 551 | # CONFIG_PATA_PLATFORM is not set | 566 | # CONFIG_PATA_PLATFORM is not set |
| 567 | # CONFIG_PATA_SCH is not set | ||
| 552 | # CONFIG_MD is not set | 568 | # CONFIG_MD is not set |
| 553 | # CONFIG_FUSION is not set | 569 | # CONFIG_FUSION is not set |
| 554 | 570 | ||
| @@ -614,7 +630,6 @@ CONFIG_NETDEV_1000=y | |||
| 614 | # CONFIG_SIS190 is not set | 630 | # CONFIG_SIS190 is not set |
| 615 | # CONFIG_SKGE is not set | 631 | # CONFIG_SKGE is not set |
| 616 | # CONFIG_SKY2 is not set | 632 | # CONFIG_SKY2 is not set |
| 617 | # CONFIG_SK98LIN is not set | ||
| 618 | # CONFIG_VIA_VELOCITY is not set | 633 | # CONFIG_VIA_VELOCITY is not set |
| 619 | # CONFIG_TIGON3 is not set | 634 | # CONFIG_TIGON3 is not set |
| 620 | # CONFIG_BNX2 is not set | 635 | # CONFIG_BNX2 is not set |
| @@ -634,6 +649,7 @@ CONFIG_NETDEV_10000=y | |||
| 634 | # CONFIG_MLX4_CORE is not set | 649 | # CONFIG_MLX4_CORE is not set |
| 635 | # CONFIG_TEHUTI is not set | 650 | # CONFIG_TEHUTI is not set |
| 636 | # CONFIG_BNX2X is not set | 651 | # CONFIG_BNX2X is not set |
| 652 | # CONFIG_SFC is not set | ||
| 637 | # CONFIG_TR is not set | 653 | # CONFIG_TR is not set |
| 638 | 654 | ||
| 639 | # | 655 | # |
| @@ -641,6 +657,7 @@ CONFIG_NETDEV_10000=y | |||
| 641 | # | 657 | # |
| 642 | # CONFIG_WLAN_PRE80211 is not set | 658 | # CONFIG_WLAN_PRE80211 is not set |
| 643 | # CONFIG_WLAN_80211 is not set | 659 | # CONFIG_WLAN_80211 is not set |
| 660 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 644 | 661 | ||
| 645 | # | 662 | # |
| 646 | # USB Network Adapters | 663 | # USB Network Adapters |
| @@ -705,6 +722,7 @@ CONFIG_VT=y | |||
| 705 | CONFIG_VT_CONSOLE=y | 722 | CONFIG_VT_CONSOLE=y |
| 706 | CONFIG_HW_CONSOLE=y | 723 | CONFIG_HW_CONSOLE=y |
| 707 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 724 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 725 | CONFIG_DEVKMEM=y | ||
| 708 | # CONFIG_SERIAL_NONSTANDARD is not set | 726 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 709 | # CONFIG_NOZOMI is not set | 727 | # CONFIG_NOZOMI is not set |
| 710 | 728 | ||
| @@ -736,7 +754,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 736 | # CONFIG_IPMI_HANDLER is not set | 754 | # CONFIG_IPMI_HANDLER is not set |
| 737 | # CONFIG_HW_RANDOM is not set | 755 | # CONFIG_HW_RANDOM is not set |
| 738 | CONFIG_NVRAM=y | 756 | CONFIG_NVRAM=y |
| 739 | # CONFIG_GEN_RTC is not set | ||
| 740 | # CONFIG_R3964 is not set | 757 | # CONFIG_R3964 is not set |
| 741 | # CONFIG_APPLICOM is not set | 758 | # CONFIG_APPLICOM is not set |
| 742 | # CONFIG_RAW_DRIVER is not set | 759 | # CONFIG_RAW_DRIVER is not set |
| @@ -747,13 +764,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 747 | # CONFIG_I2C_CHARDEV is not set | 764 | # CONFIG_I2C_CHARDEV is not set |
| 748 | 765 | ||
| 749 | # | 766 | # |
| 750 | # I2C Algorithms | ||
| 751 | # | ||
| 752 | # CONFIG_I2C_ALGOBIT is not set | ||
| 753 | # CONFIG_I2C_ALGOPCF is not set | ||
| 754 | # CONFIG_I2C_ALGOPCA is not set | ||
| 755 | |||
| 756 | # | ||
| 757 | # I2C Hardware Bus support | 767 | # I2C Hardware Bus support |
| 758 | # | 768 | # |
| 759 | # CONFIG_I2C_ALI1535 is not set | 769 | # CONFIG_I2C_ALI1535 is not set |
| @@ -780,6 +790,7 @@ CONFIG_I2C_MPC=y | |||
| 780 | # CONFIG_I2C_VIA is not set | 790 | # CONFIG_I2C_VIA is not set |
| 781 | # CONFIG_I2C_VIAPRO is not set | 791 | # CONFIG_I2C_VIAPRO is not set |
| 782 | # CONFIG_I2C_VOODOO3 is not set | 792 | # CONFIG_I2C_VOODOO3 is not set |
| 793 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 783 | 794 | ||
| 784 | # | 795 | # |
| 785 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
| @@ -789,19 +800,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 789 | # CONFIG_SENSORS_PCF8574 is not set | 800 | # CONFIG_SENSORS_PCF8574 is not set |
| 790 | # CONFIG_PCF8575 is not set | 801 | # CONFIG_PCF8575 is not set |
| 791 | # CONFIG_SENSORS_PCF8591 is not set | 802 | # CONFIG_SENSORS_PCF8591 is not set |
| 792 | # CONFIG_TPS65010 is not set | ||
| 793 | # CONFIG_SENSORS_MAX6875 is not set | 803 | # CONFIG_SENSORS_MAX6875 is not set |
| 794 | # CONFIG_SENSORS_TSL2550 is not set | 804 | # CONFIG_SENSORS_TSL2550 is not set |
| 795 | # CONFIG_I2C_DEBUG_CORE is not set | 805 | # CONFIG_I2C_DEBUG_CORE is not set |
| 796 | # CONFIG_I2C_DEBUG_ALGO is not set | 806 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 797 | # CONFIG_I2C_DEBUG_BUS is not set | 807 | # CONFIG_I2C_DEBUG_BUS is not set |
| 798 | # CONFIG_I2C_DEBUG_CHIP is not set | 808 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 799 | |||
| 800 | # | ||
| 801 | # SPI support | ||
| 802 | # | ||
| 803 | # CONFIG_SPI is not set | 809 | # CONFIG_SPI is not set |
| 804 | # CONFIG_SPI_MASTER is not set | ||
| 805 | # CONFIG_W1 is not set | 810 | # CONFIG_W1 is not set |
| 806 | # CONFIG_POWER_SUPPLY is not set | 811 | # CONFIG_POWER_SUPPLY is not set |
| 807 | # CONFIG_HWMON is not set | 812 | # CONFIG_HWMON is not set |
| @@ -818,13 +823,33 @@ CONFIG_SSB_POSSIBLE=y | |||
| 818 | # Multifunction device drivers | 823 | # Multifunction device drivers |
| 819 | # | 824 | # |
| 820 | # CONFIG_MFD_SM501 is not set | 825 | # CONFIG_MFD_SM501 is not set |
| 826 | # CONFIG_HTC_PASIC3 is not set | ||
| 821 | 827 | ||
| 822 | # | 828 | # |
| 823 | # Multimedia devices | 829 | # Multimedia devices |
| 824 | # | 830 | # |
| 831 | |||
| 832 | # | ||
| 833 | # Multimedia core support | ||
| 834 | # | ||
| 825 | # CONFIG_VIDEO_DEV is not set | 835 | # CONFIG_VIDEO_DEV is not set |
| 826 | CONFIG_DVB_CORE=m | 836 | CONFIG_DVB_CORE=m |
| 827 | # CONFIG_DVB_CORE_ATTACH is not set | 837 | CONFIG_VIDEO_MEDIA=m |
| 838 | |||
| 839 | # | ||
| 840 | # Multimedia drivers | ||
| 841 | # | ||
| 842 | # CONFIG_MEDIA_ATTACH is not set | ||
| 843 | CONFIG_MEDIA_TUNER=m | ||
| 844 | # CONFIG_MEDIA_TUNER_CUSTOMIZE is not set | ||
| 845 | CONFIG_MEDIA_TUNER_SIMPLE=m | ||
| 846 | CONFIG_MEDIA_TUNER_TDA8290=m | ||
| 847 | CONFIG_MEDIA_TUNER_TDA9887=m | ||
| 848 | CONFIG_MEDIA_TUNER_TEA5761=m | ||
| 849 | CONFIG_MEDIA_TUNER_TEA5767=m | ||
| 850 | CONFIG_MEDIA_TUNER_MT20XX=m | ||
| 851 | CONFIG_MEDIA_TUNER_XC2028=m | ||
| 852 | CONFIG_MEDIA_TUNER_XC5000=m | ||
| 828 | CONFIG_DVB_CAPTURE_DRIVERS=y | 853 | CONFIG_DVB_CAPTURE_DRIVERS=y |
| 829 | 854 | ||
| 830 | # | 855 | # |
| @@ -867,14 +892,17 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 867 | # | 892 | # |
| 868 | # DVB-S (satellite) frontends | 893 | # DVB-S (satellite) frontends |
| 869 | # | 894 | # |
| 870 | # CONFIG_DVB_STV0299 is not set | ||
| 871 | # CONFIG_DVB_CX24110 is not set | 895 | # CONFIG_DVB_CX24110 is not set |
| 872 | # CONFIG_DVB_CX24123 is not set | 896 | # CONFIG_DVB_CX24123 is not set |
| 873 | # CONFIG_DVB_TDA8083 is not set | ||
| 874 | # CONFIG_DVB_MT312 is not set | 897 | # CONFIG_DVB_MT312 is not set |
| 875 | # CONFIG_DVB_VES1X93 is not set | ||
| 876 | # CONFIG_DVB_S5H1420 is not set | 898 | # CONFIG_DVB_S5H1420 is not set |
| 899 | # CONFIG_DVB_STV0299 is not set | ||
| 900 | # CONFIG_DVB_TDA8083 is not set | ||
| 877 | # CONFIG_DVB_TDA10086 is not set | 901 | # CONFIG_DVB_TDA10086 is not set |
| 902 | # CONFIG_DVB_VES1X93 is not set | ||
| 903 | # CONFIG_DVB_TUNER_ITD1000 is not set | ||
| 904 | # CONFIG_DVB_TDA826X is not set | ||
| 905 | # CONFIG_DVB_TUA6100 is not set | ||
| 878 | 906 | ||
| 879 | # | 907 | # |
| 880 | # DVB-T (terrestrial) frontends | 908 | # DVB-T (terrestrial) frontends |
| @@ -892,6 +920,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 892 | # CONFIG_DVB_DIB3000MC is not set | 920 | # CONFIG_DVB_DIB3000MC is not set |
| 893 | # CONFIG_DVB_DIB7000M is not set | 921 | # CONFIG_DVB_DIB7000M is not set |
| 894 | # CONFIG_DVB_DIB7000P is not set | 922 | # CONFIG_DVB_DIB7000P is not set |
| 923 | # CONFIG_DVB_TDA10048 is not set | ||
| 895 | 924 | ||
| 896 | # | 925 | # |
| 897 | # DVB-C (cable) frontends | 926 | # DVB-C (cable) frontends |
| @@ -910,27 +939,21 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
| 910 | # CONFIG_DVB_BCM3510 is not set | 939 | # CONFIG_DVB_BCM3510 is not set |
| 911 | # CONFIG_DVB_LGDT330X is not set | 940 | # CONFIG_DVB_LGDT330X is not set |
| 912 | # CONFIG_DVB_S5H1409 is not set | 941 | # CONFIG_DVB_S5H1409 is not set |
| 942 | # CONFIG_DVB_AU8522 is not set | ||
| 943 | # CONFIG_DVB_S5H1411 is not set | ||
| 913 | 944 | ||
| 914 | # | 945 | # |
| 915 | # Tuners/PLL support | 946 | # Digital terrestrial only tuners/PLL |
| 916 | # | 947 | # |
| 917 | # CONFIG_DVB_PLL is not set | 948 | # CONFIG_DVB_PLL is not set |
| 918 | # CONFIG_DVB_TDA826X is not set | ||
| 919 | # CONFIG_DVB_TDA827X is not set | ||
| 920 | # CONFIG_DVB_TDA18271 is not set | ||
| 921 | # CONFIG_DVB_TUNER_QT1010 is not set | ||
| 922 | # CONFIG_DVB_TUNER_MT2060 is not set | ||
| 923 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
| 924 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
| 925 | # CONFIG_DVB_TUNER_DIB0070 is not set | 949 | # CONFIG_DVB_TUNER_DIB0070 is not set |
| 926 | # CONFIG_DVB_TUNER_XC5000 is not set | ||
| 927 | 950 | ||
| 928 | # | 951 | # |
| 929 | # Miscellaneous devices | 952 | # SEC control devices for DVB-S |
| 930 | # | 953 | # |
| 931 | # CONFIG_DVB_LNBP21 is not set | 954 | # CONFIG_DVB_LNBP21 is not set |
| 955 | # CONFIG_DVB_ISL6405 is not set | ||
| 932 | # CONFIG_DVB_ISL6421 is not set | 956 | # CONFIG_DVB_ISL6421 is not set |
| 933 | # CONFIG_DVB_TUA6100 is not set | ||
| 934 | CONFIG_DAB=y | 957 | CONFIG_DAB=y |
| 935 | # CONFIG_USB_DABUSB is not set | 958 | # CONFIG_USB_DABUSB is not set |
| 936 | 959 | ||
| @@ -997,6 +1020,7 @@ CONFIG_SND_AC97_CODEC=y | |||
| 997 | # CONFIG_SND_AU8810 is not set | 1020 | # CONFIG_SND_AU8810 is not set |
| 998 | # CONFIG_SND_AU8820 is not set | 1021 | # CONFIG_SND_AU8820 is not set |
| 999 | # CONFIG_SND_AU8830 is not set | 1022 | # CONFIG_SND_AU8830 is not set |
| 1023 | # CONFIG_SND_AW2 is not set | ||
| 1000 | # CONFIG_SND_AZT3328 is not set | 1024 | # CONFIG_SND_AZT3328 is not set |
| 1001 | # CONFIG_SND_BT87X is not set | 1025 | # CONFIG_SND_BT87X is not set |
| 1002 | # CONFIG_SND_CA0106 is not set | 1026 | # CONFIG_SND_CA0106 is not set |
| @@ -1071,11 +1095,11 @@ CONFIG_SND_INTEL8X0=y | |||
| 1071 | # CONFIG_SND_SOC is not set | 1095 | # CONFIG_SND_SOC is not set |
| 1072 | 1096 | ||
| 1073 | # | 1097 | # |
| 1074 | # SoC Audio support for SuperH | 1098 | # ALSA SoC audio for Freescale SOCs |
| 1075 | # | 1099 | # |
| 1076 | 1100 | ||
| 1077 | # | 1101 | # |
| 1078 | # ALSA SoC audio for Freescale SOCs | 1102 | # SoC Audio for the Texas Instruments OMAP |
| 1079 | # | 1103 | # |
| 1080 | 1104 | ||
| 1081 | # | 1105 | # |
| @@ -1110,16 +1134,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 1110 | CONFIG_USB_DEVICE_CLASS=y | 1134 | CONFIG_USB_DEVICE_CLASS=y |
| 1111 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1135 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1112 | # CONFIG_USB_OTG is not set | 1136 | # CONFIG_USB_OTG is not set |
| 1137 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1138 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1113 | 1139 | ||
| 1114 | # | 1140 | # |
| 1115 | # USB Host Controller Drivers | 1141 | # USB Host Controller Drivers |
| 1116 | # | 1142 | # |
| 1143 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1117 | CONFIG_USB_EHCI_HCD=y | 1144 | CONFIG_USB_EHCI_HCD=y |
| 1118 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1145 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1119 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1146 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1120 | # CONFIG_USB_EHCI_FSL is not set | 1147 | # CONFIG_USB_EHCI_FSL is not set |
| 1121 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1148 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1122 | # CONFIG_USB_ISP116X_HCD is not set | 1149 | # CONFIG_USB_ISP116X_HCD is not set |
| 1150 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1123 | CONFIG_USB_OHCI_HCD=y | 1151 | CONFIG_USB_OHCI_HCD=y |
| 1124 | CONFIG_USB_OHCI_HCD_PPC_OF=y | 1152 | CONFIG_USB_OHCI_HCD_PPC_OF=y |
| 1125 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 1153 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| @@ -1137,6 +1165,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1137 | # | 1165 | # |
| 1138 | # CONFIG_USB_ACM is not set | 1166 | # CONFIG_USB_ACM is not set |
| 1139 | # CONFIG_USB_PRINTER is not set | 1167 | # CONFIG_USB_PRINTER is not set |
| 1168 | # CONFIG_USB_WDM is not set | ||
| 1140 | 1169 | ||
| 1141 | # | 1170 | # |
| 1142 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1171 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1156,7 +1185,9 @@ CONFIG_USB_STORAGE=y | |||
| 1156 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1185 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1157 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1186 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1158 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1187 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1188 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1159 | # CONFIG_USB_STORAGE_KARMA is not set | 1189 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1190 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1160 | # CONFIG_USB_LIBUSUAL is not set | 1191 | # CONFIG_USB_LIBUSUAL is not set |
| 1161 | 1192 | ||
| 1162 | # | 1193 | # |
| @@ -1194,10 +1225,12 @@ CONFIG_USB_MON=y | |||
| 1194 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1225 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1195 | # CONFIG_USB_IOWARRIOR is not set | 1226 | # CONFIG_USB_IOWARRIOR is not set |
| 1196 | # CONFIG_USB_TEST is not set | 1227 | # CONFIG_USB_TEST is not set |
| 1228 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1197 | # CONFIG_USB_GADGET is not set | 1229 | # CONFIG_USB_GADGET is not set |
| 1198 | # CONFIG_MMC is not set | 1230 | # CONFIG_MMC is not set |
| 1199 | # CONFIG_MEMSTICK is not set | 1231 | # CONFIG_MEMSTICK is not set |
| 1200 | # CONFIG_NEW_LEDS is not set | 1232 | # CONFIG_NEW_LEDS is not set |
| 1233 | # CONFIG_ACCESSIBILITY is not set | ||
| 1201 | # CONFIG_INFINIBAND is not set | 1234 | # CONFIG_INFINIBAND is not set |
| 1202 | # CONFIG_EDAC is not set | 1235 | # CONFIG_EDAC is not set |
| 1203 | CONFIG_RTC_LIB=y | 1236 | CONFIG_RTC_LIB=y |
| @@ -1249,11 +1282,8 @@ CONFIG_RTC_DRV_CMOS=y | |||
| 1249 | # | 1282 | # |
| 1250 | # on-CPU RTC drivers | 1283 | # on-CPU RTC drivers |
| 1251 | # | 1284 | # |
| 1285 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1252 | # CONFIG_DMADEVICES is not set | 1286 | # CONFIG_DMADEVICES is not set |
| 1253 | |||
| 1254 | # | ||
| 1255 | # Userspace I/O | ||
| 1256 | # | ||
| 1257 | # CONFIG_UIO is not set | 1287 | # CONFIG_UIO is not set |
| 1258 | 1288 | ||
| 1259 | # | 1289 | # |
| @@ -1273,7 +1303,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1273 | # CONFIG_JFS_FS is not set | 1303 | # CONFIG_JFS_FS is not set |
| 1274 | # CONFIG_FS_POSIX_ACL is not set | 1304 | # CONFIG_FS_POSIX_ACL is not set |
| 1275 | # CONFIG_XFS_FS is not set | 1305 | # CONFIG_XFS_FS is not set |
| 1276 | # CONFIG_GFS2_FS is not set | ||
| 1277 | # CONFIG_OCFS2_FS is not set | 1306 | # CONFIG_OCFS2_FS is not set |
| 1278 | CONFIG_DNOTIFY=y | 1307 | CONFIG_DNOTIFY=y |
| 1279 | CONFIG_INOTIFY=y | 1308 | CONFIG_INOTIFY=y |
| @@ -1343,10 +1372,9 @@ CONFIG_NFS_FS=y | |||
| 1343 | CONFIG_NFS_V3=y | 1372 | CONFIG_NFS_V3=y |
| 1344 | # CONFIG_NFS_V3_ACL is not set | 1373 | # CONFIG_NFS_V3_ACL is not set |
| 1345 | CONFIG_NFS_V4=y | 1374 | CONFIG_NFS_V4=y |
| 1346 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1347 | CONFIG_NFSD=y | 1375 | CONFIG_NFSD=y |
| 1348 | # CONFIG_NFSD_V3 is not set | 1376 | # CONFIG_NFSD_V3 is not set |
| 1349 | CONFIG_NFSD_TCP=y | 1377 | # CONFIG_NFSD_V4 is not set |
| 1350 | CONFIG_ROOT_NFS=y | 1378 | CONFIG_ROOT_NFS=y |
| 1351 | CONFIG_LOCKD=y | 1379 | CONFIG_LOCKD=y |
| 1352 | CONFIG_LOCKD_V4=y | 1380 | CONFIG_LOCKD_V4=y |
| @@ -1430,9 +1458,10 @@ CONFIG_NLS_UTF8=m | |||
| 1430 | # Library routines | 1458 | # Library routines |
| 1431 | # | 1459 | # |
| 1432 | CONFIG_BITREVERSE=y | 1460 | CONFIG_BITREVERSE=y |
| 1461 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1433 | # CONFIG_CRC_CCITT is not set | 1462 | # CONFIG_CRC_CCITT is not set |
| 1434 | # CONFIG_CRC16 is not set | 1463 | # CONFIG_CRC16 is not set |
| 1435 | # CONFIG_CRC_ITU_T is not set | 1464 | CONFIG_CRC_ITU_T=m |
| 1436 | CONFIG_CRC32=y | 1465 | CONFIG_CRC32=y |
| 1437 | # CONFIG_CRC7 is not set | 1466 | # CONFIG_CRC7 is not set |
| 1438 | CONFIG_LIBCRC32C=m | 1467 | CONFIG_LIBCRC32C=m |
| @@ -1441,6 +1470,7 @@ CONFIG_PLIST=y | |||
| 1441 | CONFIG_HAS_IOMEM=y | 1470 | CONFIG_HAS_IOMEM=y |
| 1442 | CONFIG_HAS_IOPORT=y | 1471 | CONFIG_HAS_IOPORT=y |
| 1443 | CONFIG_HAS_DMA=y | 1472 | CONFIG_HAS_DMA=y |
| 1473 | CONFIG_HAVE_LMB=y | ||
| 1444 | 1474 | ||
| 1445 | # | 1475 | # |
| 1446 | # Kernel hacking | 1476 | # Kernel hacking |
| @@ -1448,6 +1478,7 @@ CONFIG_HAS_DMA=y | |||
| 1448 | # CONFIG_PRINTK_TIME is not set | 1478 | # CONFIG_PRINTK_TIME is not set |
| 1449 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1479 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1450 | CONFIG_ENABLE_MUST_CHECK=y | 1480 | CONFIG_ENABLE_MUST_CHECK=y |
| 1481 | CONFIG_FRAME_WARN=1024 | ||
| 1451 | # CONFIG_MAGIC_SYSRQ is not set | 1482 | # CONFIG_MAGIC_SYSRQ is not set |
| 1452 | # CONFIG_UNUSED_SYMBOLS is not set | 1483 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1453 | # CONFIG_DEBUG_FS is not set | 1484 | # CONFIG_DEBUG_FS is not set |
| @@ -1458,6 +1489,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1458 | CONFIG_SCHED_DEBUG=y | 1489 | CONFIG_SCHED_DEBUG=y |
| 1459 | # CONFIG_SCHEDSTATS is not set | 1490 | # CONFIG_SCHEDSTATS is not set |
| 1460 | # CONFIG_TIMER_STATS is not set | 1491 | # CONFIG_TIMER_STATS is not set |
| 1492 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1461 | # CONFIG_SLUB_DEBUG_ON is not set | 1493 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1462 | # CONFIG_SLUB_STATS is not set | 1494 | # CONFIG_SLUB_STATS is not set |
| 1463 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1495 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1471,6 +1503,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1471 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1503 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1472 | CONFIG_DEBUG_INFO=y | 1504 | CONFIG_DEBUG_INFO=y |
| 1473 | # CONFIG_DEBUG_VM is not set | 1505 | # CONFIG_DEBUG_VM is not set |
| 1506 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1474 | # CONFIG_DEBUG_LIST is not set | 1507 | # CONFIG_DEBUG_LIST is not set |
| 1475 | # CONFIG_DEBUG_SG is not set | 1508 | # CONFIG_DEBUG_SG is not set |
| 1476 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1509 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1482,6 +1515,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1482 | # CONFIG_DEBUG_STACK_USAGE is not set | 1515 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 1483 | # CONFIG_DEBUG_PAGEALLOC is not set | 1516 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1484 | # CONFIG_DEBUGGER is not set | 1517 | # CONFIG_DEBUGGER is not set |
| 1518 | # CONFIG_IRQSTACKS is not set | ||
| 1485 | # CONFIG_BDI_SWITCH is not set | 1519 | # CONFIG_BDI_SWITCH is not set |
| 1486 | # CONFIG_PPC_EARLY_DEBUG is not set | 1520 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1487 | 1521 | ||
| @@ -1492,52 +1526,82 @@ CONFIG_DEBUG_INFO=y | |||
| 1492 | # CONFIG_SECURITY is not set | 1526 | # CONFIG_SECURITY is not set |
| 1493 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1527 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1494 | CONFIG_CRYPTO=y | 1528 | CONFIG_CRYPTO=y |
| 1529 | |||
| 1530 | # | ||
| 1531 | # Crypto core or helper | ||
| 1532 | # | ||
| 1495 | CONFIG_CRYPTO_ALGAPI=y | 1533 | CONFIG_CRYPTO_ALGAPI=y |
| 1496 | CONFIG_CRYPTO_BLKCIPHER=y | 1534 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1497 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1498 | CONFIG_CRYPTO_HASH=y | 1535 | CONFIG_CRYPTO_HASH=y |
| 1499 | CONFIG_CRYPTO_MANAGER=y | 1536 | CONFIG_CRYPTO_MANAGER=y |
| 1537 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1538 | # CONFIG_CRYPTO_NULL is not set | ||
| 1539 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1540 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1541 | # CONFIG_CRYPTO_TEST is not set | ||
| 1542 | |||
| 1543 | # | ||
| 1544 | # Authenticated Encryption with Associated Data | ||
| 1545 | # | ||
| 1546 | # CONFIG_CRYPTO_CCM is not set | ||
| 1547 | # CONFIG_CRYPTO_GCM is not set | ||
| 1548 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1549 | |||
| 1550 | # | ||
| 1551 | # Block modes | ||
| 1552 | # | ||
| 1553 | CONFIG_CRYPTO_CBC=y | ||
| 1554 | # CONFIG_CRYPTO_CTR is not set | ||
| 1555 | # CONFIG_CRYPTO_CTS is not set | ||
| 1556 | # CONFIG_CRYPTO_ECB is not set | ||
| 1557 | # CONFIG_CRYPTO_LRW is not set | ||
| 1558 | CONFIG_CRYPTO_PCBC=m | ||
| 1559 | # CONFIG_CRYPTO_XTS is not set | ||
| 1560 | |||
| 1561 | # | ||
| 1562 | # Hash modes | ||
| 1563 | # | ||
| 1500 | CONFIG_CRYPTO_HMAC=y | 1564 | CONFIG_CRYPTO_HMAC=y |
| 1501 | # CONFIG_CRYPTO_XCBC is not set | 1565 | # CONFIG_CRYPTO_XCBC is not set |
| 1502 | # CONFIG_CRYPTO_NULL is not set | 1566 | |
| 1567 | # | ||
| 1568 | # Digest | ||
| 1569 | # | ||
| 1570 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1503 | # CONFIG_CRYPTO_MD4 is not set | 1571 | # CONFIG_CRYPTO_MD4 is not set |
| 1504 | CONFIG_CRYPTO_MD5=y | 1572 | CONFIG_CRYPTO_MD5=y |
| 1573 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1505 | CONFIG_CRYPTO_SHA1=m | 1574 | CONFIG_CRYPTO_SHA1=m |
| 1506 | # CONFIG_CRYPTO_SHA256 is not set | 1575 | # CONFIG_CRYPTO_SHA256 is not set |
| 1507 | # CONFIG_CRYPTO_SHA512 is not set | 1576 | # CONFIG_CRYPTO_SHA512 is not set |
| 1508 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1509 | # CONFIG_CRYPTO_TGR192 is not set | 1577 | # CONFIG_CRYPTO_TGR192 is not set |
| 1510 | # CONFIG_CRYPTO_GF128MUL is not set | 1578 | # CONFIG_CRYPTO_WP512 is not set |
| 1511 | # CONFIG_CRYPTO_ECB is not set | 1579 | |
| 1512 | CONFIG_CRYPTO_CBC=y | 1580 | # |
| 1513 | CONFIG_CRYPTO_PCBC=m | 1581 | # Ciphers |
| 1514 | # CONFIG_CRYPTO_LRW is not set | 1582 | # |
| 1515 | # CONFIG_CRYPTO_XTS is not set | ||
| 1516 | # CONFIG_CRYPTO_CTR is not set | ||
| 1517 | # CONFIG_CRYPTO_GCM is not set | ||
| 1518 | # CONFIG_CRYPTO_CCM is not set | ||
| 1519 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1520 | CONFIG_CRYPTO_DES=y | ||
| 1521 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1522 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1523 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1524 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1525 | # CONFIG_CRYPTO_AES is not set | 1583 | # CONFIG_CRYPTO_AES is not set |
| 1584 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1585 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1586 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1587 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1526 | # CONFIG_CRYPTO_CAST5 is not set | 1588 | # CONFIG_CRYPTO_CAST5 is not set |
| 1527 | # CONFIG_CRYPTO_CAST6 is not set | 1589 | # CONFIG_CRYPTO_CAST6 is not set |
| 1528 | # CONFIG_CRYPTO_TEA is not set | 1590 | CONFIG_CRYPTO_DES=y |
| 1529 | # CONFIG_CRYPTO_ARC4 is not set | 1591 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1530 | # CONFIG_CRYPTO_KHAZAD is not set | 1592 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1531 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1532 | # CONFIG_CRYPTO_SEED is not set | ||
| 1533 | # CONFIG_CRYPTO_SALSA20 is not set | 1593 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1594 | # CONFIG_CRYPTO_SEED is not set | ||
| 1595 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1596 | # CONFIG_CRYPTO_TEA is not set | ||
| 1597 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1598 | |||
| 1599 | # | ||
| 1600 | # Compression | ||
| 1601 | # | ||
| 1534 | # CONFIG_CRYPTO_DEFLATE is not set | 1602 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1535 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1536 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1537 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1538 | # CONFIG_CRYPTO_TEST is not set | ||
| 1539 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1540 | # CONFIG_CRYPTO_LZO is not set | 1603 | # CONFIG_CRYPTO_LZO is not set |
| 1541 | CONFIG_CRYPTO_HW=y | 1604 | CONFIG_CRYPTO_HW=y |
| 1542 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1605 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1543 | # CONFIG_PPC_CLOCK is not set | 1606 | # CONFIG_PPC_CLOCK is not set |
| 1607 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 2d831db9ae5b..46fffbcd3f99 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:35 2008 | 4 | # Mon Jun 9 08:52:16 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -106,6 +108,7 @@ CONFIG_SLUB=y | |||
| 106 | CONFIG_HAVE_OPROFILE=y | 108 | CONFIG_HAVE_OPROFILE=y |
| 107 | CONFIG_HAVE_KPROBES=y | 109 | CONFIG_HAVE_KPROBES=y |
| 108 | CONFIG_HAVE_KRETPROBES=y | 110 | CONFIG_HAVE_KRETPROBES=y |
| 111 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 109 | CONFIG_PROC_PAGE_MONITOR=y | 112 | CONFIG_PROC_PAGE_MONITOR=y |
| 110 | CONFIG_SLABINFO=y | 113 | CONFIG_SLABINFO=y |
| 111 | CONFIG_RT_MUTEXES=y | 114 | CONFIG_RT_MUTEXES=y |
| @@ -210,11 +213,13 @@ CONFIG_FLATMEM=y | |||
| 210 | CONFIG_FLAT_NODE_MEM_MAP=y | 213 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 211 | # CONFIG_SPARSEMEM_STATIC is not set | 214 | # CONFIG_SPARSEMEM_STATIC is not set |
| 212 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 216 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 213 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 214 | # CONFIG_RESOURCES_64BIT is not set | 218 | # CONFIG_RESOURCES_64BIT is not set |
| 215 | CONFIG_ZONE_DMA_FLAG=1 | 219 | CONFIG_ZONE_DMA_FLAG=1 |
| 216 | CONFIG_BOUNCE=y | 220 | CONFIG_BOUNCE=y |
| 217 | CONFIG_VIRT_TO_BUS=y | 221 | CONFIG_VIRT_TO_BUS=y |
| 222 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 218 | # CONFIG_PROC_DEVICETREE is not set | 223 | # CONFIG_PROC_DEVICETREE is not set |
| 219 | # CONFIG_CMDLINE_BOOL is not set | 224 | # CONFIG_CMDLINE_BOOL is not set |
| 220 | # CONFIG_PM is not set | 225 | # CONFIG_PM is not set |
| @@ -231,6 +236,7 @@ CONFIG_FSL_SOC=y | |||
| 231 | # CONFIG_PCI_SYSCALL is not set | 236 | # CONFIG_PCI_SYSCALL is not set |
| 232 | # CONFIG_PCI_QSPAN is not set | 237 | # CONFIG_PCI_QSPAN is not set |
| 233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 238 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 239 | # CONFIG_HAS_RAPIDIO is not set | ||
| 234 | 240 | ||
| 235 | # | 241 | # |
| 236 | # Advanced setup | 242 | # Advanced setup |
| @@ -240,13 +246,13 @@ CONFIG_FSL_SOC=y | |||
| 240 | # | 246 | # |
| 241 | # Default settings for advanced configuration options are used | 247 | # Default settings for advanced configuration options are used |
| 242 | # | 248 | # |
| 243 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 244 | CONFIG_LOWMEM_SIZE=0x30000000 | 249 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 250 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 245 | CONFIG_KERNEL_START=0xc0000000 | 251 | CONFIG_KERNEL_START=0xc0000000 |
| 252 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 246 | CONFIG_TASK_SIZE=0x80000000 | 253 | CONFIG_TASK_SIZE=0x80000000 |
| 247 | CONFIG_CONSISTENT_START=0xfd000000 | 254 | CONFIG_CONSISTENT_START=0xfd000000 |
| 248 | CONFIG_CONSISTENT_SIZE=0x00200000 | 255 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 249 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 250 | 256 | ||
| 251 | # | 257 | # |
| 252 | # Networking | 258 | # Networking |
| @@ -294,8 +300,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 300 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 295 | # CONFIG_TCP_MD5SIG is not set | 301 | # CONFIG_TCP_MD5SIG is not set |
| 296 | # CONFIG_IPV6 is not set | 302 | # CONFIG_IPV6 is not set |
| 297 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 298 | # CONFIG_INET6_TUNNEL is not set | ||
| 299 | # CONFIG_NETWORK_SECMARK is not set | 303 | # CONFIG_NETWORK_SECMARK is not set |
| 300 | # CONFIG_NETFILTER is not set | 304 | # CONFIG_NETFILTER is not set |
| 301 | # CONFIG_IP_DCCP is not set | 305 | # CONFIG_IP_DCCP is not set |
| @@ -419,6 +423,7 @@ CONFIG_NETDEV_10000=y | |||
| 419 | # | 423 | # |
| 420 | # CONFIG_WLAN_PRE80211 is not set | 424 | # CONFIG_WLAN_PRE80211 is not set |
| 421 | # CONFIG_WLAN_80211 is not set | 425 | # CONFIG_WLAN_80211 is not set |
| 426 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 422 | # CONFIG_WAN is not set | 427 | # CONFIG_WAN is not set |
| 423 | # CONFIG_PPP is not set | 428 | # CONFIG_PPP is not set |
| 424 | # CONFIG_SLIP is not set | 429 | # CONFIG_SLIP is not set |
| @@ -485,6 +490,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 485 | # Character devices | 490 | # Character devices |
| 486 | # | 491 | # |
| 487 | # CONFIG_VT is not set | 492 | # CONFIG_VT is not set |
| 493 | CONFIG_DEVKMEM=y | ||
| 488 | # CONFIG_SERIAL_NONSTANDARD is not set | 494 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 489 | 495 | ||
| 490 | # | 496 | # |
| @@ -517,12 +523,7 @@ CONFIG_GEN_RTC=y | |||
| 517 | # CONFIG_RAW_DRIVER is not set | 523 | # CONFIG_RAW_DRIVER is not set |
| 518 | # CONFIG_TCG_TPM is not set | 524 | # CONFIG_TCG_TPM is not set |
| 519 | # CONFIG_I2C is not set | 525 | # CONFIG_I2C is not set |
| 520 | |||
| 521 | # | ||
| 522 | # SPI support | ||
| 523 | # | ||
| 524 | # CONFIG_SPI is not set | 526 | # CONFIG_SPI is not set |
| 525 | # CONFIG_SPI_MASTER is not set | ||
| 526 | # CONFIG_W1 is not set | 527 | # CONFIG_W1 is not set |
| 527 | # CONFIG_POWER_SUPPLY is not set | 528 | # CONFIG_POWER_SUPPLY is not set |
| 528 | CONFIG_HWMON=y | 529 | CONFIG_HWMON=y |
| @@ -551,12 +552,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 551 | # Multifunction device drivers | 552 | # Multifunction device drivers |
| 552 | # | 553 | # |
| 553 | # CONFIG_MFD_SM501 is not set | 554 | # CONFIG_MFD_SM501 is not set |
| 555 | # CONFIG_HTC_PASIC3 is not set | ||
| 554 | 556 | ||
| 555 | # | 557 | # |
| 556 | # Multimedia devices | 558 | # Multimedia devices |
| 557 | # | 559 | # |
| 560 | |||
| 561 | # | ||
| 562 | # Multimedia core support | ||
| 563 | # | ||
| 558 | # CONFIG_VIDEO_DEV is not set | 564 | # CONFIG_VIDEO_DEV is not set |
| 559 | # CONFIG_DVB_CORE is not set | 565 | # CONFIG_DVB_CORE is not set |
| 566 | # CONFIG_VIDEO_MEDIA is not set | ||
| 567 | |||
| 568 | # | ||
| 569 | # Multimedia drivers | ||
| 570 | # | ||
| 560 | CONFIG_DAB=y | 571 | CONFIG_DAB=y |
| 561 | 572 | ||
| 562 | # | 573 | # |
| @@ -584,6 +595,8 @@ CONFIG_USB_SUPPORT=y | |||
| 584 | # CONFIG_USB_ARCH_HAS_HCD is not set | 595 | # CONFIG_USB_ARCH_HAS_HCD is not set |
| 585 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 596 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 586 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 597 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 598 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 599 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 587 | 600 | ||
| 588 | # | 601 | # |
| 589 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 602 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -592,13 +605,10 @@ CONFIG_USB_SUPPORT=y | |||
| 592 | # CONFIG_MMC is not set | 605 | # CONFIG_MMC is not set |
| 593 | # CONFIG_MEMSTICK is not set | 606 | # CONFIG_MEMSTICK is not set |
| 594 | # CONFIG_NEW_LEDS is not set | 607 | # CONFIG_NEW_LEDS is not set |
| 608 | # CONFIG_ACCESSIBILITY is not set | ||
| 595 | # CONFIG_EDAC is not set | 609 | # CONFIG_EDAC is not set |
| 596 | # CONFIG_RTC_CLASS is not set | 610 | # CONFIG_RTC_CLASS is not set |
| 597 | # CONFIG_DMADEVICES is not set | 611 | # CONFIG_DMADEVICES is not set |
| 598 | |||
| 599 | # | ||
| 600 | # Userspace I/O | ||
| 601 | # | ||
| 602 | # CONFIG_UIO is not set | 612 | # CONFIG_UIO is not set |
| 603 | 613 | ||
| 604 | # | 614 | # |
| @@ -620,7 +630,6 @@ CONFIG_FS_MBCACHE=y | |||
| 620 | # CONFIG_JFS_FS is not set | 630 | # CONFIG_JFS_FS is not set |
| 621 | # CONFIG_FS_POSIX_ACL is not set | 631 | # CONFIG_FS_POSIX_ACL is not set |
| 622 | # CONFIG_XFS_FS is not set | 632 | # CONFIG_XFS_FS is not set |
| 623 | # CONFIG_GFS2_FS is not set | ||
| 624 | # CONFIG_OCFS2_FS is not set | 633 | # CONFIG_OCFS2_FS is not set |
| 625 | CONFIG_DNOTIFY=y | 634 | CONFIG_DNOTIFY=y |
| 626 | CONFIG_INOTIFY=y | 635 | CONFIG_INOTIFY=y |
| @@ -678,7 +687,6 @@ CONFIG_NFS_FS=y | |||
| 678 | CONFIG_NFS_V3=y | 687 | CONFIG_NFS_V3=y |
| 679 | # CONFIG_NFS_V3_ACL is not set | 688 | # CONFIG_NFS_V3_ACL is not set |
| 680 | # CONFIG_NFS_V4 is not set | 689 | # CONFIG_NFS_V4 is not set |
| 681 | # CONFIG_NFS_DIRECTIO is not set | ||
| 682 | # CONFIG_NFSD is not set | 690 | # CONFIG_NFSD is not set |
| 683 | CONFIG_ROOT_NFS=y | 691 | CONFIG_ROOT_NFS=y |
| 684 | CONFIG_LOCKD=y | 692 | CONFIG_LOCKD=y |
| @@ -722,6 +730,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 722 | # Library routines | 730 | # Library routines |
| 723 | # | 731 | # |
| 724 | CONFIG_BITREVERSE=y | 732 | CONFIG_BITREVERSE=y |
| 733 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 725 | CONFIG_CRC_CCITT=y | 734 | CONFIG_CRC_CCITT=y |
| 726 | # CONFIG_CRC16 is not set | 735 | # CONFIG_CRC16 is not set |
| 727 | # CONFIG_CRC_ITU_T is not set | 736 | # CONFIG_CRC_ITU_T is not set |
| @@ -733,6 +742,7 @@ CONFIG_PLIST=y | |||
| 733 | CONFIG_HAS_IOMEM=y | 742 | CONFIG_HAS_IOMEM=y |
| 734 | CONFIG_HAS_IOPORT=y | 743 | CONFIG_HAS_IOPORT=y |
| 735 | CONFIG_HAS_DMA=y | 744 | CONFIG_HAS_DMA=y |
| 745 | CONFIG_HAVE_LMB=y | ||
| 736 | 746 | ||
| 737 | # | 747 | # |
| 738 | # Kernel hacking | 748 | # Kernel hacking |
| @@ -740,6 +750,7 @@ CONFIG_HAS_DMA=y | |||
| 740 | # CONFIG_PRINTK_TIME is not set | 750 | # CONFIG_PRINTK_TIME is not set |
| 741 | CONFIG_ENABLE_WARN_DEPRECATED=y | 751 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 742 | CONFIG_ENABLE_MUST_CHECK=y | 752 | CONFIG_ENABLE_MUST_CHECK=y |
| 753 | CONFIG_FRAME_WARN=1024 | ||
| 743 | # CONFIG_MAGIC_SYSRQ is not set | 754 | # CONFIG_MAGIC_SYSRQ is not set |
| 744 | # CONFIG_UNUSED_SYMBOLS is not set | 755 | # CONFIG_UNUSED_SYMBOLS is not set |
| 745 | # CONFIG_DEBUG_FS is not set | 756 | # CONFIG_DEBUG_FS is not set |
| @@ -748,6 +759,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 748 | # CONFIG_SLUB_DEBUG_ON is not set | 759 | # CONFIG_SLUB_DEBUG_ON is not set |
| 749 | # CONFIG_SLUB_STATS is not set | 760 | # CONFIG_SLUB_STATS is not set |
| 750 | # CONFIG_SAMPLES is not set | 761 | # CONFIG_SAMPLES is not set |
| 762 | # CONFIG_IRQSTACKS is not set | ||
| 751 | # CONFIG_PPC_EARLY_DEBUG is not set | 763 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 752 | 764 | ||
| 753 | # | 765 | # |
| @@ -757,48 +769,78 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 757 | # CONFIG_SECURITY is not set | 769 | # CONFIG_SECURITY is not set |
| 758 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 770 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 759 | CONFIG_CRYPTO=y | 771 | CONFIG_CRYPTO=y |
| 760 | # CONFIG_CRYPTO_SEQIV is not set | 772 | |
| 773 | # | ||
| 774 | # Crypto core or helper | ||
| 775 | # | ||
| 761 | # CONFIG_CRYPTO_MANAGER is not set | 776 | # CONFIG_CRYPTO_MANAGER is not set |
| 777 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 778 | # CONFIG_CRYPTO_NULL is not set | ||
| 779 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 780 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 781 | |||
| 782 | # | ||
| 783 | # Authenticated Encryption with Associated Data | ||
| 784 | # | ||
| 785 | # CONFIG_CRYPTO_CCM is not set | ||
| 786 | # CONFIG_CRYPTO_GCM is not set | ||
| 787 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 788 | |||
| 789 | # | ||
| 790 | # Block modes | ||
| 791 | # | ||
| 792 | # CONFIG_CRYPTO_CBC is not set | ||
| 793 | # CONFIG_CRYPTO_CTR is not set | ||
| 794 | # CONFIG_CRYPTO_CTS is not set | ||
| 795 | # CONFIG_CRYPTO_ECB is not set | ||
| 796 | # CONFIG_CRYPTO_LRW is not set | ||
| 797 | # CONFIG_CRYPTO_PCBC is not set | ||
| 798 | # CONFIG_CRYPTO_XTS is not set | ||
| 799 | |||
| 800 | # | ||
| 801 | # Hash modes | ||
| 802 | # | ||
| 762 | # CONFIG_CRYPTO_HMAC is not set | 803 | # CONFIG_CRYPTO_HMAC is not set |
| 763 | # CONFIG_CRYPTO_XCBC is not set | 804 | # CONFIG_CRYPTO_XCBC is not set |
| 764 | # CONFIG_CRYPTO_NULL is not set | 805 | |
| 806 | # | ||
| 807 | # Digest | ||
| 808 | # | ||
| 809 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 765 | # CONFIG_CRYPTO_MD4 is not set | 810 | # CONFIG_CRYPTO_MD4 is not set |
| 766 | # CONFIG_CRYPTO_MD5 is not set | 811 | # CONFIG_CRYPTO_MD5 is not set |
| 812 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 767 | # CONFIG_CRYPTO_SHA1 is not set | 813 | # CONFIG_CRYPTO_SHA1 is not set |
| 768 | # CONFIG_CRYPTO_SHA256 is not set | 814 | # CONFIG_CRYPTO_SHA256 is not set |
| 769 | # CONFIG_CRYPTO_SHA512 is not set | 815 | # CONFIG_CRYPTO_SHA512 is not set |
| 770 | # CONFIG_CRYPTO_WP512 is not set | ||
| 771 | # CONFIG_CRYPTO_TGR192 is not set | 816 | # CONFIG_CRYPTO_TGR192 is not set |
| 772 | # CONFIG_CRYPTO_GF128MUL is not set | 817 | # CONFIG_CRYPTO_WP512 is not set |
| 773 | # CONFIG_CRYPTO_ECB is not set | 818 | |
| 774 | # CONFIG_CRYPTO_CBC is not set | 819 | # |
| 775 | # CONFIG_CRYPTO_PCBC is not set | 820 | # Ciphers |
| 776 | # CONFIG_CRYPTO_LRW is not set | 821 | # |
| 777 | # CONFIG_CRYPTO_XTS is not set | ||
| 778 | # CONFIG_CRYPTO_CTR is not set | ||
| 779 | # CONFIG_CRYPTO_GCM is not set | ||
| 780 | # CONFIG_CRYPTO_CCM is not set | ||
| 781 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 782 | # CONFIG_CRYPTO_DES is not set | ||
| 783 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 784 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 785 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 786 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 787 | # CONFIG_CRYPTO_AES is not set | 822 | # CONFIG_CRYPTO_AES is not set |
| 823 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 824 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 825 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 826 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 788 | # CONFIG_CRYPTO_CAST5 is not set | 827 | # CONFIG_CRYPTO_CAST5 is not set |
| 789 | # CONFIG_CRYPTO_CAST6 is not set | 828 | # CONFIG_CRYPTO_CAST6 is not set |
| 790 | # CONFIG_CRYPTO_TEA is not set | 829 | # CONFIG_CRYPTO_DES is not set |
| 791 | # CONFIG_CRYPTO_ARC4 is not set | 830 | # CONFIG_CRYPTO_FCRYPT is not set |
| 792 | # CONFIG_CRYPTO_KHAZAD is not set | 831 | # CONFIG_CRYPTO_KHAZAD is not set |
| 793 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 794 | # CONFIG_CRYPTO_SEED is not set | ||
| 795 | # CONFIG_CRYPTO_SALSA20 is not set | 832 | # CONFIG_CRYPTO_SALSA20 is not set |
| 833 | # CONFIG_CRYPTO_SEED is not set | ||
| 834 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 835 | # CONFIG_CRYPTO_TEA is not set | ||
| 836 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 837 | |||
| 838 | # | ||
| 839 | # Compression | ||
| 840 | # | ||
| 796 | # CONFIG_CRYPTO_DEFLATE is not set | 841 | # CONFIG_CRYPTO_DEFLATE is not set |
| 797 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 798 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 799 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 800 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 801 | # CONFIG_CRYPTO_LZO is not set | 842 | # CONFIG_CRYPTO_LZO is not set |
| 802 | CONFIG_CRYPTO_HW=y | 843 | CONFIG_CRYPTO_HW=y |
| 803 | # CONFIG_PPC_CLOCK is not set | 844 | # CONFIG_PPC_CLOCK is not set |
| 804 | CONFIG_PPC_LIB_RHEAP=y | 845 | CONFIG_PPC_LIB_RHEAP=y |
| 846 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 82151b9bba26..9df78973005e 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:35 2008 | 4 | # Mon Jun 9 08:52:17 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -28,6 +28,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 28 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
| 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
| 31 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 32 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 34 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 33 | CONFIG_GENERIC_HWEIGHT=y | 35 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -108,6 +110,7 @@ CONFIG_SLUB=y | |||
| 108 | CONFIG_HAVE_OPROFILE=y | 110 | CONFIG_HAVE_OPROFILE=y |
| 109 | CONFIG_HAVE_KPROBES=y | 111 | CONFIG_HAVE_KPROBES=y |
| 110 | CONFIG_HAVE_KRETPROBES=y | 112 | CONFIG_HAVE_KRETPROBES=y |
| 113 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 111 | CONFIG_PROC_PAGE_MONITOR=y | 114 | CONFIG_PROC_PAGE_MONITOR=y |
| 112 | CONFIG_SLABINFO=y | 115 | CONFIG_SLABINFO=y |
| 113 | # CONFIG_TINY_SHMEM is not set | 116 | # CONFIG_TINY_SHMEM is not set |
| @@ -219,11 +222,13 @@ CONFIG_FLATMEM=y | |||
| 219 | CONFIG_FLAT_NODE_MEM_MAP=y | 222 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 220 | # CONFIG_SPARSEMEM_STATIC is not set | 223 | # CONFIG_SPARSEMEM_STATIC is not set |
| 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 225 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 223 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
| 224 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
| 225 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
| 226 | CONFIG_VIRT_TO_BUS=y | 230 | CONFIG_VIRT_TO_BUS=y |
| 231 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 227 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
| 228 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
| 229 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
| @@ -241,6 +246,7 @@ CONFIG_FSL_SOC=y | |||
| 241 | # CONFIG_PCI_QSPAN is not set | 246 | # CONFIG_PCI_QSPAN is not set |
| 242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 247 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 243 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 249 | # CONFIG_HAS_RAPIDIO is not set | ||
| 244 | 250 | ||
| 245 | # | 251 | # |
| 246 | # Advanced setup | 252 | # Advanced setup |
| @@ -250,13 +256,13 @@ CONFIG_FSL_SOC=y | |||
| 250 | # | 256 | # |
| 251 | # Default settings for advanced configuration options are used | 257 | # Default settings for advanced configuration options are used |
| 252 | # | 258 | # |
| 253 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 254 | CONFIG_LOWMEM_SIZE=0x30000000 | 259 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 260 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 255 | CONFIG_KERNEL_START=0xc0000000 | 261 | CONFIG_KERNEL_START=0xc0000000 |
| 262 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_TASK_SIZE=0x80000000 | 263 | CONFIG_TASK_SIZE=0x80000000 |
| 257 | CONFIG_CONSISTENT_START=0xfd000000 | 264 | CONFIG_CONSISTENT_START=0xfd000000 |
| 258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 265 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 259 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 260 | 266 | ||
| 261 | # | 267 | # |
| 262 | # Networking | 268 | # Networking |
| @@ -299,8 +305,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 299 | CONFIG_DEFAULT_TCP_CONG="cubic" | 305 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 300 | # CONFIG_TCP_MD5SIG is not set | 306 | # CONFIG_TCP_MD5SIG is not set |
| 301 | # CONFIG_IPV6 is not set | 307 | # CONFIG_IPV6 is not set |
| 302 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 303 | # CONFIG_INET6_TUNNEL is not set | ||
| 304 | # CONFIG_NETWORK_SECMARK is not set | 308 | # CONFIG_NETWORK_SECMARK is not set |
| 305 | # CONFIG_NETFILTER is not set | 309 | # CONFIG_NETFILTER is not set |
| 306 | # CONFIG_IP_DCCP is not set | 310 | # CONFIG_IP_DCCP is not set |
| @@ -492,6 +496,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 492 | # | 496 | # |
| 493 | # CONFIG_WLAN_PRE80211 is not set | 497 | # CONFIG_WLAN_PRE80211 is not set |
| 494 | # CONFIG_WLAN_80211 is not set | 498 | # CONFIG_WLAN_80211 is not set |
| 499 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 495 | # CONFIG_WAN is not set | 500 | # CONFIG_WAN is not set |
| 496 | # CONFIG_PPP is not set | 501 | # CONFIG_PPP is not set |
| 497 | # CONFIG_SLIP is not set | 502 | # CONFIG_SLIP is not set |
| @@ -516,6 +521,7 @@ CONFIG_FS_ENET_MDIO_FEC=y | |||
| 516 | # Character devices | 521 | # Character devices |
| 517 | # | 522 | # |
| 518 | # CONFIG_VT is not set | 523 | # CONFIG_VT is not set |
| 524 | CONFIG_DEVKMEM=y | ||
| 519 | # CONFIG_SERIAL_NONSTANDARD is not set | 525 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 520 | 526 | ||
| 521 | # | 527 | # |
| @@ -548,12 +554,7 @@ CONFIG_GEN_RTC=y | |||
| 548 | # CONFIG_RAW_DRIVER is not set | 554 | # CONFIG_RAW_DRIVER is not set |
| 549 | # CONFIG_TCG_TPM is not set | 555 | # CONFIG_TCG_TPM is not set |
| 550 | # CONFIG_I2C is not set | 556 | # CONFIG_I2C is not set |
| 551 | |||
| 552 | # | ||
| 553 | # SPI support | ||
| 554 | # | ||
| 555 | # CONFIG_SPI is not set | 557 | # CONFIG_SPI is not set |
| 556 | # CONFIG_SPI_MASTER is not set | ||
| 557 | # CONFIG_W1 is not set | 558 | # CONFIG_W1 is not set |
| 558 | # CONFIG_POWER_SUPPLY is not set | 559 | # CONFIG_POWER_SUPPLY is not set |
| 559 | # CONFIG_HWMON is not set | 560 | # CONFIG_HWMON is not set |
| @@ -570,12 +571,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 570 | # Multifunction device drivers | 571 | # Multifunction device drivers |
| 571 | # | 572 | # |
| 572 | # CONFIG_MFD_SM501 is not set | 573 | # CONFIG_MFD_SM501 is not set |
| 574 | # CONFIG_HTC_PASIC3 is not set | ||
| 573 | 575 | ||
| 574 | # | 576 | # |
| 575 | # Multimedia devices | 577 | # Multimedia devices |
| 576 | # | 578 | # |
| 579 | |||
| 580 | # | ||
| 581 | # Multimedia core support | ||
| 582 | # | ||
| 577 | # CONFIG_VIDEO_DEV is not set | 583 | # CONFIG_VIDEO_DEV is not set |
| 578 | # CONFIG_DVB_CORE is not set | 584 | # CONFIG_DVB_CORE is not set |
| 585 | # CONFIG_VIDEO_MEDIA is not set | ||
| 586 | |||
| 587 | # | ||
| 588 | # Multimedia drivers | ||
| 589 | # | ||
| 579 | CONFIG_DAB=y | 590 | CONFIG_DAB=y |
| 580 | 591 | ||
| 581 | # | 592 | # |
| @@ -599,13 +610,10 @@ CONFIG_DAB=y | |||
| 599 | # CONFIG_MMC is not set | 610 | # CONFIG_MMC is not set |
| 600 | # CONFIG_MEMSTICK is not set | 611 | # CONFIG_MEMSTICK is not set |
| 601 | # CONFIG_NEW_LEDS is not set | 612 | # CONFIG_NEW_LEDS is not set |
| 613 | # CONFIG_ACCESSIBILITY is not set | ||
| 602 | # CONFIG_EDAC is not set | 614 | # CONFIG_EDAC is not set |
| 603 | # CONFIG_RTC_CLASS is not set | 615 | # CONFIG_RTC_CLASS is not set |
| 604 | # CONFIG_DMADEVICES is not set | 616 | # CONFIG_DMADEVICES is not set |
| 605 | |||
| 606 | # | ||
| 607 | # Userspace I/O | ||
| 608 | # | ||
| 609 | # CONFIG_UIO is not set | 617 | # CONFIG_UIO is not set |
| 610 | 618 | ||
| 611 | # | 619 | # |
| @@ -618,7 +626,6 @@ CONFIG_DAB=y | |||
| 618 | # CONFIG_JFS_FS is not set | 626 | # CONFIG_JFS_FS is not set |
| 619 | # CONFIG_FS_POSIX_ACL is not set | 627 | # CONFIG_FS_POSIX_ACL is not set |
| 620 | # CONFIG_XFS_FS is not set | 628 | # CONFIG_XFS_FS is not set |
| 621 | # CONFIG_GFS2_FS is not set | ||
| 622 | # CONFIG_OCFS2_FS is not set | 629 | # CONFIG_OCFS2_FS is not set |
| 623 | # CONFIG_DNOTIFY is not set | 630 | # CONFIG_DNOTIFY is not set |
| 624 | # CONFIG_INOTIFY is not set | 631 | # CONFIG_INOTIFY is not set |
| @@ -676,7 +683,6 @@ CONFIG_NFS_FS=y | |||
| 676 | CONFIG_NFS_V3=y | 683 | CONFIG_NFS_V3=y |
| 677 | # CONFIG_NFS_V3_ACL is not set | 684 | # CONFIG_NFS_V3_ACL is not set |
| 678 | # CONFIG_NFS_V4 is not set | 685 | # CONFIG_NFS_V4 is not set |
| 679 | # CONFIG_NFS_DIRECTIO is not set | ||
| 680 | # CONFIG_NFSD is not set | 686 | # CONFIG_NFSD is not set |
| 681 | CONFIG_ROOT_NFS=y | 687 | CONFIG_ROOT_NFS=y |
| 682 | CONFIG_LOCKD=y | 688 | CONFIG_LOCKD=y |
| @@ -719,6 +725,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 719 | # | 725 | # |
| 720 | # Library routines | 726 | # Library routines |
| 721 | # | 727 | # |
| 728 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 722 | # CONFIG_CRC_CCITT is not set | 729 | # CONFIG_CRC_CCITT is not set |
| 723 | # CONFIG_CRC16 is not set | 730 | # CONFIG_CRC16 is not set |
| 724 | # CONFIG_CRC_ITU_T is not set | 731 | # CONFIG_CRC_ITU_T is not set |
| @@ -729,6 +736,7 @@ CONFIG_ZLIB_INFLATE=y | |||
| 729 | CONFIG_HAS_IOMEM=y | 736 | CONFIG_HAS_IOMEM=y |
| 730 | CONFIG_HAS_IOPORT=y | 737 | CONFIG_HAS_IOPORT=y |
| 731 | CONFIG_HAS_DMA=y | 738 | CONFIG_HAS_DMA=y |
| 739 | CONFIG_HAVE_LMB=y | ||
| 732 | 740 | ||
| 733 | # | 741 | # |
| 734 | # Kernel hacking | 742 | # Kernel hacking |
| @@ -736,6 +744,7 @@ CONFIG_HAS_DMA=y | |||
| 736 | # CONFIG_PRINTK_TIME is not set | 744 | # CONFIG_PRINTK_TIME is not set |
| 737 | CONFIG_ENABLE_WARN_DEPRECATED=y | 745 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 738 | CONFIG_ENABLE_MUST_CHECK=y | 746 | CONFIG_ENABLE_MUST_CHECK=y |
| 747 | CONFIG_FRAME_WARN=1024 | ||
| 739 | CONFIG_MAGIC_SYSRQ=y | 748 | CONFIG_MAGIC_SYSRQ=y |
| 740 | # CONFIG_UNUSED_SYMBOLS is not set | 749 | # CONFIG_UNUSED_SYMBOLS is not set |
| 741 | # CONFIG_DEBUG_FS is not set | 750 | # CONFIG_DEBUG_FS is not set |
| @@ -746,6 +755,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 746 | CONFIG_SCHED_DEBUG=y | 755 | CONFIG_SCHED_DEBUG=y |
| 747 | # CONFIG_SCHEDSTATS is not set | 756 | # CONFIG_SCHEDSTATS is not set |
| 748 | # CONFIG_TIMER_STATS is not set | 757 | # CONFIG_TIMER_STATS is not set |
| 758 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 749 | # CONFIG_SLUB_DEBUG_ON is not set | 759 | # CONFIG_SLUB_DEBUG_ON is not set |
| 750 | # CONFIG_SLUB_STATS is not set | 760 | # CONFIG_SLUB_STATS is not set |
| 751 | # CONFIG_DEBUG_SPINLOCK is not set | 761 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -756,6 +766,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 756 | CONFIG_DEBUG_BUGVERBOSE=y | 766 | CONFIG_DEBUG_BUGVERBOSE=y |
| 757 | CONFIG_DEBUG_INFO=y | 767 | CONFIG_DEBUG_INFO=y |
| 758 | # CONFIG_DEBUG_VM is not set | 768 | # CONFIG_DEBUG_VM is not set |
| 769 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 759 | # CONFIG_DEBUG_LIST is not set | 770 | # CONFIG_DEBUG_LIST is not set |
| 760 | # CONFIG_DEBUG_SG is not set | 771 | # CONFIG_DEBUG_SG is not set |
| 761 | # CONFIG_BOOT_PRINTK_DELAY is not set | 772 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -766,6 +777,7 @@ CONFIG_DEBUG_INFO=y | |||
| 766 | # CONFIG_DEBUG_STACK_USAGE is not set | 777 | # CONFIG_DEBUG_STACK_USAGE is not set |
| 767 | # CONFIG_DEBUG_PAGEALLOC is not set | 778 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 768 | # CONFIG_DEBUGGER is not set | 779 | # CONFIG_DEBUGGER is not set |
| 780 | # CONFIG_IRQSTACKS is not set | ||
| 769 | # CONFIG_BDI_SWITCH is not set | 781 | # CONFIG_BDI_SWITCH is not set |
| 770 | # CONFIG_PPC_EARLY_DEBUG is not set | 782 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 771 | 783 | ||
| @@ -778,3 +790,4 @@ CONFIG_DEBUG_INFO=y | |||
| 778 | # CONFIG_CRYPTO is not set | 790 | # CONFIG_CRYPTO is not set |
| 779 | # CONFIG_PPC_CLOCK is not set | 791 | # CONFIG_PPC_CLOCK is not set |
| 780 | CONFIG_PPC_LIB_RHEAP=y | 792 | CONFIG_PPC_LIB_RHEAP=y |
| 793 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 09f306248f2e..199e5f59d7a6 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Tue Mar 25 10:25:48 2008 | 4 | # Tue May 27 16:08:06 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -29,6 +29,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
| 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 31 | CONFIG_IRQ_PER_CPU=y | 31 | CONFIG_IRQ_PER_CPU=y |
| 32 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 33 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 32 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 33 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U64=y | 37 | CONFIG_ARCH_HAS_ILOG2_U64=y |
| @@ -87,6 +90,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 87 | CONFIG_SYSCTL=y | 90 | CONFIG_SYSCTL=y |
| 88 | # CONFIG_EMBEDDED is not set | 91 | # CONFIG_EMBEDDED is not set |
| 89 | CONFIG_SYSCTL_SYSCALL=y | 92 | CONFIG_SYSCTL_SYSCALL=y |
| 93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 90 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
| 91 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
| 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -115,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 115 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 116 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 117 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 118 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
| 119 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 120 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
| 121 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
| 122 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
| 123 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
| 129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 124 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
| 125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 126 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
| @@ -167,11 +173,11 @@ CONFIG_PPC_PASEMI=y | |||
| 167 | CONFIG_PPC_PASEMI_IOMMU=y | 173 | CONFIG_PPC_PASEMI_IOMMU=y |
| 168 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set | 174 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set |
| 169 | CONFIG_PPC_PASEMI_MDIO=y | 175 | CONFIG_PPC_PASEMI_MDIO=y |
| 170 | # CONFIG_PPC_CELLEB is not set | ||
| 171 | # CONFIG_PPC_PS3 is not set | 176 | # CONFIG_PPC_PS3 is not set |
| 172 | # CONFIG_PPC_CELL is not set | 177 | # CONFIG_PPC_CELL is not set |
| 173 | # CONFIG_PPC_CELL_NATIVE is not set | 178 | # CONFIG_PPC_CELL_NATIVE is not set |
| 174 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 179 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 180 | # CONFIG_PPC_CELLEB is not set | ||
| 175 | # CONFIG_PQ2ADS is not set | 181 | # CONFIG_PQ2ADS is not set |
| 176 | CONFIG_PPC_NATIVE=y | 182 | CONFIG_PPC_NATIVE=y |
| 177 | # CONFIG_IPIC is not set | 183 | # CONFIG_IPIC is not set |
| @@ -192,6 +198,7 @@ CONFIG_CPU_FREQ_DEBUG=y | |||
| 192 | CONFIG_CPU_FREQ_STAT=y | 198 | CONFIG_CPU_FREQ_STAT=y |
| 193 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 199 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
| 194 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 200 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
| 201 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 202 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
| 196 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 203 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
| 197 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 204 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
| @@ -226,7 +233,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 226 | CONFIG_BINFMT_ELF=y | 233 | CONFIG_BINFMT_ELF=y |
| 227 | CONFIG_COMPAT_BINFMT_ELF=y | 234 | CONFIG_COMPAT_BINFMT_ELF=y |
| 228 | # CONFIG_BINFMT_MISC is not set | 235 | # CONFIG_BINFMT_MISC is not set |
| 229 | CONFIG_FORCE_MAX_ZONEORDER=9 | ||
| 230 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 236 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 231 | CONFIG_IOMMU_VMERGE=y | 237 | CONFIG_IOMMU_VMERGE=y |
| 232 | CONFIG_IOMMU_HELPER=y | 238 | CONFIG_IOMMU_HELPER=y |
| @@ -249,12 +255,14 @@ CONFIG_FLATMEM=y | |||
| 249 | CONFIG_FLAT_NODE_MEM_MAP=y | 255 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 250 | # CONFIG_SPARSEMEM_STATIC is not set | 256 | # CONFIG_SPARSEMEM_STATIC is not set |
| 251 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 257 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 258 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 252 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 259 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 253 | CONFIG_RESOURCES_64BIT=y | 260 | CONFIG_RESOURCES_64BIT=y |
| 254 | CONFIG_ZONE_DMA_FLAG=1 | 261 | CONFIG_ZONE_DMA_FLAG=1 |
| 255 | CONFIG_BOUNCE=y | 262 | CONFIG_BOUNCE=y |
| 256 | CONFIG_PPC_HAS_HASH_64K=y | 263 | CONFIG_PPC_HAS_HASH_64K=y |
| 257 | CONFIG_PPC_64K_PAGES=y | 264 | CONFIG_PPC_64K_PAGES=y |
| 265 | CONFIG_FORCE_MAX_ZONEORDER=9 | ||
| 258 | # CONFIG_PPC_SUBPAGE_PROT is not set | 266 | # CONFIG_PPC_SUBPAGE_PROT is not set |
| 259 | # CONFIG_SCHED_SMT is not set | 267 | # CONFIG_SCHED_SMT is not set |
| 260 | CONFIG_PROC_DEVICETREE=y | 268 | CONFIG_PROC_DEVICETREE=y |
| @@ -290,9 +298,12 @@ CONFIG_CARDBUS=y | |||
| 290 | # CONFIG_YENTA is not set | 298 | # CONFIG_YENTA is not set |
| 291 | # CONFIG_PD6729 is not set | 299 | # CONFIG_PD6729 is not set |
| 292 | # CONFIG_I82092 is not set | 300 | # CONFIG_I82092 is not set |
| 293 | # CONFIG_ELECTRA_CF is not set | 301 | CONFIG_ELECTRA_CF=y |
| 294 | # CONFIG_HOTPLUG_PCI is not set | 302 | # CONFIG_HOTPLUG_PCI is not set |
| 303 | # CONFIG_HAS_RAPIDIO is not set | ||
| 304 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
| 295 | CONFIG_KERNEL_START=0xc000000000000000 | 305 | CONFIG_KERNEL_START=0xc000000000000000 |
| 306 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 296 | 307 | ||
| 297 | # | 308 | # |
| 298 | # Networking | 309 | # Networking |
| @@ -341,8 +352,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 341 | CONFIG_DEFAULT_TCP_CONG="cubic" | 352 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 342 | # CONFIG_TCP_MD5SIG is not set | 353 | # CONFIG_TCP_MD5SIG is not set |
| 343 | # CONFIG_IPV6 is not set | 354 | # CONFIG_IPV6 is not set |
| 344 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 345 | # CONFIG_INET6_TUNNEL is not set | ||
| 346 | # CONFIG_NETWORK_SECMARK is not set | 355 | # CONFIG_NETWORK_SECMARK is not set |
| 347 | # CONFIG_NETFILTER is not set | 356 | # CONFIG_NETFILTER is not set |
| 348 | # CONFIG_IP_DCCP is not set | 357 | # CONFIG_IP_DCCP is not set |
| @@ -473,6 +482,7 @@ CONFIG_MTD_NAND_PASEMI=y | |||
| 473 | # | 482 | # |
| 474 | # CONFIG_MTD_UBI is not set | 483 | # CONFIG_MTD_UBI is not set |
| 475 | CONFIG_OF_DEVICE=y | 484 | CONFIG_OF_DEVICE=y |
| 485 | CONFIG_OF_I2C=y | ||
| 476 | # CONFIG_PARPORT is not set | 486 | # CONFIG_PARPORT is not set |
| 477 | CONFIG_BLK_DEV=y | 487 | CONFIG_BLK_DEV=y |
| 478 | # CONFIG_BLK_DEV_FD is not set | 488 | # CONFIG_BLK_DEV_FD is not set |
| @@ -520,7 +530,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 520 | # | 530 | # |
| 521 | # IDE chipset support/bugfixes | 531 | # IDE chipset support/bugfixes |
| 522 | # | 532 | # |
| 523 | # CONFIG_IDE_GENERIC is not set | ||
| 524 | # CONFIG_BLK_DEV_PLATFORM is not set | 533 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 525 | 534 | ||
| 526 | # | 535 | # |
| @@ -554,7 +563,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 554 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 563 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 555 | # CONFIG_BLK_DEV_TC86C001 is not set | 564 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 556 | # CONFIG_BLK_DEV_IDEDMA is not set | 565 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 557 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 566 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 558 | # CONFIG_BLK_DEV_HD is not set | 567 | # CONFIG_BLK_DEV_HD is not set |
| 559 | 568 | ||
| 560 | # | 569 | # |
| @@ -632,7 +641,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 632 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 641 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 633 | CONFIG_ATA=y | 642 | CONFIG_ATA=y |
| 634 | # CONFIG_ATA_NONSTANDARD is not set | 643 | # CONFIG_ATA_NONSTANDARD is not set |
| 644 | CONFIG_SATA_PMP=y | ||
| 635 | # CONFIG_SATA_AHCI is not set | 645 | # CONFIG_SATA_AHCI is not set |
| 646 | CONFIG_SATA_SIL24=y | ||
| 647 | CONFIG_ATA_SFF=y | ||
| 636 | # CONFIG_SATA_SVW is not set | 648 | # CONFIG_SATA_SVW is not set |
| 637 | # CONFIG_ATA_PIIX is not set | 649 | # CONFIG_ATA_PIIX is not set |
| 638 | CONFIG_SATA_MV=y | 650 | CONFIG_SATA_MV=y |
| @@ -642,7 +654,6 @@ CONFIG_SATA_MV=y | |||
| 642 | # CONFIG_SATA_PROMISE is not set | 654 | # CONFIG_SATA_PROMISE is not set |
| 643 | # CONFIG_SATA_SX4 is not set | 655 | # CONFIG_SATA_SX4 is not set |
| 644 | # CONFIG_SATA_SIL is not set | 656 | # CONFIG_SATA_SIL is not set |
| 645 | CONFIG_SATA_SIL24=y | ||
| 646 | # CONFIG_SATA_SIS is not set | 657 | # CONFIG_SATA_SIS is not set |
| 647 | # CONFIG_SATA_ULI is not set | 658 | # CONFIG_SATA_ULI is not set |
| 648 | # CONFIG_SATA_VIA is not set | 659 | # CONFIG_SATA_VIA is not set |
| @@ -689,6 +700,7 @@ CONFIG_PATA_PCMCIA=y | |||
| 689 | # CONFIG_PATA_WINBOND is not set | 700 | # CONFIG_PATA_WINBOND is not set |
| 690 | CONFIG_PATA_PLATFORM=y | 701 | CONFIG_PATA_PLATFORM=y |
| 691 | CONFIG_PATA_OF_PLATFORM=y | 702 | CONFIG_PATA_OF_PLATFORM=y |
| 703 | # CONFIG_PATA_SCH is not set | ||
| 692 | CONFIG_MD=y | 704 | CONFIG_MD=y |
| 693 | CONFIG_BLK_DEV_MD=y | 705 | CONFIG_BLK_DEV_MD=y |
| 694 | CONFIG_MD_LINEAR=y | 706 | CONFIG_MD_LINEAR=y |
| @@ -791,7 +803,6 @@ CONFIG_E1000_NAPI=y | |||
| 791 | # CONFIG_SIS190 is not set | 803 | # CONFIG_SIS190 is not set |
| 792 | # CONFIG_SKGE is not set | 804 | # CONFIG_SKGE is not set |
| 793 | # CONFIG_SKY2 is not set | 805 | # CONFIG_SKY2 is not set |
| 794 | # CONFIG_SK98LIN is not set | ||
| 795 | # CONFIG_VIA_VELOCITY is not set | 806 | # CONFIG_VIA_VELOCITY is not set |
| 796 | CONFIG_TIGON3=y | 807 | CONFIG_TIGON3=y |
| 797 | # CONFIG_BNX2 is not set | 808 | # CONFIG_BNX2 is not set |
| @@ -810,6 +821,7 @@ CONFIG_PASEMI_MAC=y | |||
| 810 | # CONFIG_MLX4_CORE is not set | 821 | # CONFIG_MLX4_CORE is not set |
| 811 | # CONFIG_TEHUTI is not set | 822 | # CONFIG_TEHUTI is not set |
| 812 | # CONFIG_BNX2X is not set | 823 | # CONFIG_BNX2X is not set |
| 824 | # CONFIG_SFC is not set | ||
| 813 | # CONFIG_TR is not set | 825 | # CONFIG_TR is not set |
| 814 | 826 | ||
| 815 | # | 827 | # |
| @@ -817,6 +829,7 @@ CONFIG_PASEMI_MAC=y | |||
| 817 | # | 829 | # |
| 818 | # CONFIG_WLAN_PRE80211 is not set | 830 | # CONFIG_WLAN_PRE80211 is not set |
| 819 | # CONFIG_WLAN_80211 is not set | 831 | # CONFIG_WLAN_80211 is not set |
| 832 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 820 | 833 | ||
| 821 | # | 834 | # |
| 822 | # USB Network Adapters | 835 | # USB Network Adapters |
| @@ -890,6 +903,7 @@ CONFIG_VT=y | |||
| 890 | CONFIG_VT_CONSOLE=y | 903 | CONFIG_VT_CONSOLE=y |
| 891 | CONFIG_HW_CONSOLE=y | 904 | CONFIG_HW_CONSOLE=y |
| 892 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 905 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 906 | CONFIG_DEVKMEM=y | ||
| 893 | # CONFIG_SERIAL_NONSTANDARD is not set | 907 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 894 | # CONFIG_NOZOMI is not set | 908 | # CONFIG_NOZOMI is not set |
| 895 | 909 | ||
| @@ -917,7 +931,6 @@ CONFIG_LEGACY_PTY_COUNT=4 | |||
| 917 | # CONFIG_IPMI_HANDLER is not set | 931 | # CONFIG_IPMI_HANDLER is not set |
| 918 | CONFIG_HW_RANDOM=y | 932 | CONFIG_HW_RANDOM=y |
| 919 | CONFIG_HW_RANDOM_PASEMI=y | 933 | CONFIG_HW_RANDOM_PASEMI=y |
| 920 | # CONFIG_GEN_RTC is not set | ||
| 921 | # CONFIG_R3964 is not set | 934 | # CONFIG_R3964 is not set |
| 922 | # CONFIG_APPLICOM is not set | 935 | # CONFIG_APPLICOM is not set |
| 923 | 936 | ||
| @@ -936,13 +949,7 @@ CONFIG_DEVPORT=y | |||
| 936 | CONFIG_I2C=y | 949 | CONFIG_I2C=y |
| 937 | CONFIG_I2C_BOARDINFO=y | 950 | CONFIG_I2C_BOARDINFO=y |
| 938 | CONFIG_I2C_CHARDEV=y | 951 | CONFIG_I2C_CHARDEV=y |
| 939 | |||
| 940 | # | ||
| 941 | # I2C Algorithms | ||
| 942 | # | ||
| 943 | CONFIG_I2C_ALGOBIT=y | 952 | CONFIG_I2C_ALGOBIT=y |
| 944 | CONFIG_I2C_ALGOPCF=y | ||
| 945 | CONFIG_I2C_ALGOPCA=y | ||
| 946 | 953 | ||
| 947 | # | 954 | # |
| 948 | # I2C Hardware Bus support | 955 | # I2C Hardware Bus support |
| @@ -971,6 +978,7 @@ CONFIG_I2C_PASEMI=y | |||
| 971 | # CONFIG_I2C_VIA is not set | 978 | # CONFIG_I2C_VIA is not set |
| 972 | # CONFIG_I2C_VIAPRO is not set | 979 | # CONFIG_I2C_VIAPRO is not set |
| 973 | # CONFIG_I2C_VOODOO3 is not set | 980 | # CONFIG_I2C_VOODOO3 is not set |
| 981 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 974 | 982 | ||
| 975 | # | 983 | # |
| 976 | # Miscellaneous I2C Chip support | 984 | # Miscellaneous I2C Chip support |
| @@ -980,19 +988,13 @@ CONFIG_SENSORS_EEPROM=y | |||
| 980 | # CONFIG_SENSORS_PCF8574 is not set | 988 | # CONFIG_SENSORS_PCF8574 is not set |
| 981 | # CONFIG_PCF8575 is not set | 989 | # CONFIG_PCF8575 is not set |
| 982 | # CONFIG_SENSORS_PCF8591 is not set | 990 | # CONFIG_SENSORS_PCF8591 is not set |
| 983 | # CONFIG_TPS65010 is not set | ||
| 984 | # CONFIG_SENSORS_MAX6875 is not set | 991 | # CONFIG_SENSORS_MAX6875 is not set |
| 985 | # CONFIG_SENSORS_TSL2550 is not set | 992 | # CONFIG_SENSORS_TSL2550 is not set |
| 986 | # CONFIG_I2C_DEBUG_CORE is not set | 993 | # CONFIG_I2C_DEBUG_CORE is not set |
| 987 | # CONFIG_I2C_DEBUG_ALGO is not set | 994 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 988 | # CONFIG_I2C_DEBUG_BUS is not set | 995 | # CONFIG_I2C_DEBUG_BUS is not set |
| 989 | # CONFIG_I2C_DEBUG_CHIP is not set | 996 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 990 | |||
| 991 | # | ||
| 992 | # SPI support | ||
| 993 | # | ||
| 994 | # CONFIG_SPI is not set | 997 | # CONFIG_SPI is not set |
| 995 | # CONFIG_SPI_MASTER is not set | ||
| 996 | # CONFIG_W1 is not set | 998 | # CONFIG_W1 is not set |
| 997 | # CONFIG_POWER_SUPPLY is not set | 999 | # CONFIG_POWER_SUPPLY is not set |
| 998 | CONFIG_HWMON=y | 1000 | CONFIG_HWMON=y |
| @@ -1062,12 +1064,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1062 | # Multifunction device drivers | 1064 | # Multifunction device drivers |
| 1063 | # | 1065 | # |
| 1064 | # CONFIG_MFD_SM501 is not set | 1066 | # CONFIG_MFD_SM501 is not set |
| 1067 | # CONFIG_HTC_PASIC3 is not set | ||
| 1065 | 1068 | ||
| 1066 | # | 1069 | # |
| 1067 | # Multimedia devices | 1070 | # Multimedia devices |
| 1068 | # | 1071 | # |
| 1072 | |||
| 1073 | # | ||
| 1074 | # Multimedia core support | ||
| 1075 | # | ||
| 1069 | # CONFIG_VIDEO_DEV is not set | 1076 | # CONFIG_VIDEO_DEV is not set |
| 1070 | # CONFIG_DVB_CORE is not set | 1077 | # CONFIG_DVB_CORE is not set |
| 1078 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1079 | |||
| 1080 | # | ||
| 1081 | # Multimedia drivers | ||
| 1082 | # | ||
| 1071 | CONFIG_DAB=y | 1083 | CONFIG_DAB=y |
| 1072 | # CONFIG_USB_DABUSB is not set | 1084 | # CONFIG_USB_DABUSB is not set |
| 1073 | 1085 | ||
| @@ -1094,8 +1106,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 1094 | # CONFIG_FB_SYS_FILLRECT is not set | 1106 | # CONFIG_FB_SYS_FILLRECT is not set |
| 1095 | # CONFIG_FB_SYS_COPYAREA is not set | 1107 | # CONFIG_FB_SYS_COPYAREA is not set |
| 1096 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1108 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1109 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1097 | # CONFIG_FB_SYS_FOPS is not set | 1110 | # CONFIG_FB_SYS_FOPS is not set |
| 1098 | CONFIG_FB_DEFERRED_IO=y | ||
| 1099 | # CONFIG_FB_SVGALIB is not set | 1111 | # CONFIG_FB_SVGALIB is not set |
| 1100 | CONFIG_FB_MACMODES=y | 1112 | CONFIG_FB_MACMODES=y |
| 1101 | CONFIG_FB_BACKLIGHT=y | 1113 | CONFIG_FB_BACKLIGHT=y |
| @@ -1213,6 +1225,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1213 | # CONFIG_SND_AU8810 is not set | 1225 | # CONFIG_SND_AU8810 is not set |
| 1214 | # CONFIG_SND_AU8820 is not set | 1226 | # CONFIG_SND_AU8820 is not set |
| 1215 | # CONFIG_SND_AU8830 is not set | 1227 | # CONFIG_SND_AU8830 is not set |
| 1228 | # CONFIG_SND_AW2 is not set | ||
| 1216 | # CONFIG_SND_AZT3328 is not set | 1229 | # CONFIG_SND_AZT3328 is not set |
| 1217 | # CONFIG_SND_BT87X is not set | 1230 | # CONFIG_SND_BT87X is not set |
| 1218 | # CONFIG_SND_CA0106 is not set | 1231 | # CONFIG_SND_CA0106 is not set |
| @@ -1292,11 +1305,11 @@ CONFIG_SND_USB_USX2Y=y | |||
| 1292 | # CONFIG_SND_SOC is not set | 1305 | # CONFIG_SND_SOC is not set |
| 1293 | 1306 | ||
| 1294 | # | 1307 | # |
| 1295 | # SoC Audio support for SuperH | 1308 | # ALSA SoC audio for Freescale SOCs |
| 1296 | # | 1309 | # |
| 1297 | 1310 | ||
| 1298 | # | 1311 | # |
| 1299 | # ALSA SoC audio for Freescale SOCs | 1312 | # SoC Audio for the Texas Instruments OMAP |
| 1300 | # | 1313 | # |
| 1301 | 1314 | ||
| 1302 | # | 1315 | # |
| @@ -1334,11 +1347,13 @@ CONFIG_USB_DEVICEFS=y | |||
| 1334 | # | 1347 | # |
| 1335 | # USB Host Controller Drivers | 1348 | # USB Host Controller Drivers |
| 1336 | # | 1349 | # |
| 1350 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1337 | CONFIG_USB_EHCI_HCD=y | 1351 | CONFIG_USB_EHCI_HCD=y |
| 1338 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1352 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1339 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1353 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1340 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1354 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1341 | # CONFIG_USB_ISP116X_HCD is not set | 1355 | # CONFIG_USB_ISP116X_HCD is not set |
| 1356 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1342 | CONFIG_USB_OHCI_HCD=y | 1357 | CONFIG_USB_OHCI_HCD=y |
| 1343 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1358 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1344 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1359 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1354,6 +1369,7 @@ CONFIG_USB_SL811_HCD=y | |||
| 1354 | # | 1369 | # |
| 1355 | # CONFIG_USB_ACM is not set | 1370 | # CONFIG_USB_ACM is not set |
| 1356 | # CONFIG_USB_PRINTER is not set | 1371 | # CONFIG_USB_PRINTER is not set |
| 1372 | # CONFIG_USB_WDM is not set | ||
| 1357 | 1373 | ||
| 1358 | # | 1374 | # |
| 1359 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1375 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1375,6 +1391,7 @@ CONFIG_USB_STORAGE=y | |||
| 1375 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1391 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1376 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1392 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1377 | # CONFIG_USB_STORAGE_KARMA is not set | 1393 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1394 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1378 | CONFIG_USB_LIBUSUAL=y | 1395 | CONFIG_USB_LIBUSUAL=y |
| 1379 | 1396 | ||
| 1380 | # | 1397 | # |
| @@ -1416,6 +1433,7 @@ CONFIG_USB_LIBUSUAL=y | |||
| 1416 | # CONFIG_MMC is not set | 1433 | # CONFIG_MMC is not set |
| 1417 | # CONFIG_MEMSTICK is not set | 1434 | # CONFIG_MEMSTICK is not set |
| 1418 | # CONFIG_NEW_LEDS is not set | 1435 | # CONFIG_NEW_LEDS is not set |
| 1436 | # CONFIG_ACCESSIBILITY is not set | ||
| 1419 | # CONFIG_INFINIBAND is not set | 1437 | # CONFIG_INFINIBAND is not set |
| 1420 | CONFIG_EDAC=y | 1438 | CONFIG_EDAC=y |
| 1421 | 1439 | ||
| @@ -1475,10 +1493,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1475 | # on-CPU RTC drivers | 1493 | # on-CPU RTC drivers |
| 1476 | # | 1494 | # |
| 1477 | # CONFIG_DMADEVICES is not set | 1495 | # CONFIG_DMADEVICES is not set |
| 1478 | |||
| 1479 | # | ||
| 1480 | # Userspace I/O | ||
| 1481 | # | ||
| 1482 | # CONFIG_UIO is not set | 1496 | # CONFIG_UIO is not set |
| 1483 | 1497 | ||
| 1484 | # | 1498 | # |
| @@ -1576,12 +1590,10 @@ CONFIG_NFS_FS=y | |||
| 1576 | CONFIG_NFS_V3=y | 1590 | CONFIG_NFS_V3=y |
| 1577 | # CONFIG_NFS_V3_ACL is not set | 1591 | # CONFIG_NFS_V3_ACL is not set |
| 1578 | # CONFIG_NFS_V4 is not set | 1592 | # CONFIG_NFS_V4 is not set |
| 1579 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1580 | CONFIG_NFSD=y | 1593 | CONFIG_NFSD=y |
| 1581 | CONFIG_NFSD_V3=y | 1594 | CONFIG_NFSD_V3=y |
| 1582 | # CONFIG_NFSD_V3_ACL is not set | 1595 | # CONFIG_NFSD_V3_ACL is not set |
| 1583 | CONFIG_NFSD_V4=y | 1596 | CONFIG_NFSD_V4=y |
| 1584 | CONFIG_NFSD_TCP=y | ||
| 1585 | CONFIG_ROOT_NFS=y | 1597 | CONFIG_ROOT_NFS=y |
| 1586 | CONFIG_LOCKD=y | 1598 | CONFIG_LOCKD=y |
| 1587 | CONFIG_LOCKD_V4=y | 1599 | CONFIG_LOCKD_V4=y |
| @@ -1665,9 +1677,10 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1665 | # Library routines | 1677 | # Library routines |
| 1666 | # | 1678 | # |
| 1667 | CONFIG_BITREVERSE=y | 1679 | CONFIG_BITREVERSE=y |
| 1680 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1668 | CONFIG_CRC_CCITT=y | 1681 | CONFIG_CRC_CCITT=y |
| 1669 | # CONFIG_CRC16 is not set | 1682 | # CONFIG_CRC16 is not set |
| 1670 | # CONFIG_CRC_ITU_T is not set | 1683 | CONFIG_CRC_ITU_T=y |
| 1671 | CONFIG_CRC32=y | 1684 | CONFIG_CRC32=y |
| 1672 | # CONFIG_CRC7 is not set | 1685 | # CONFIG_CRC7 is not set |
| 1673 | CONFIG_LIBCRC32C=m | 1686 | CONFIG_LIBCRC32C=m |
| @@ -1677,6 +1690,7 @@ CONFIG_PLIST=y | |||
| 1677 | CONFIG_HAS_IOMEM=y | 1690 | CONFIG_HAS_IOMEM=y |
| 1678 | CONFIG_HAS_IOPORT=y | 1691 | CONFIG_HAS_IOPORT=y |
| 1679 | CONFIG_HAS_DMA=y | 1692 | CONFIG_HAS_DMA=y |
| 1693 | CONFIG_HAVE_LMB=y | ||
| 1680 | 1694 | ||
| 1681 | # | 1695 | # |
| 1682 | # Kernel hacking | 1696 | # Kernel hacking |
| @@ -1684,6 +1698,7 @@ CONFIG_HAS_DMA=y | |||
| 1684 | # CONFIG_PRINTK_TIME is not set | 1698 | # CONFIG_PRINTK_TIME is not set |
| 1685 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1699 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1686 | CONFIG_ENABLE_MUST_CHECK=y | 1700 | CONFIG_ENABLE_MUST_CHECK=y |
| 1701 | CONFIG_FRAME_WARN=2048 | ||
| 1687 | CONFIG_MAGIC_SYSRQ=y | 1702 | CONFIG_MAGIC_SYSRQ=y |
| 1688 | # CONFIG_UNUSED_SYMBOLS is not set | 1703 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1689 | # CONFIG_DEBUG_FS is not set | 1704 | # CONFIG_DEBUG_FS is not set |
| @@ -1694,18 +1709,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1694 | # CONFIG_SCHED_DEBUG is not set | 1709 | # CONFIG_SCHED_DEBUG is not set |
| 1695 | # CONFIG_SCHEDSTATS is not set | 1710 | # CONFIG_SCHEDSTATS is not set |
| 1696 | # CONFIG_TIMER_STATS is not set | 1711 | # CONFIG_TIMER_STATS is not set |
| 1712 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1697 | # CONFIG_SLUB_DEBUG_ON is not set | 1713 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1698 | # CONFIG_SLUB_STATS is not set | 1714 | # CONFIG_SLUB_STATS is not set |
| 1699 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1715 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1700 | # CONFIG_RT_MUTEX_TESTER is not set | 1716 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1701 | # CONFIG_DEBUG_SPINLOCK is not set | 1717 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1702 | # CONFIG_DEBUG_MUTEXES is not set | 1718 | # CONFIG_DEBUG_MUTEXES is not set |
| 1719 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1720 | # CONFIG_PROVE_LOCKING is not set | ||
| 1721 | # CONFIG_LOCK_STAT is not set | ||
| 1703 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1722 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1704 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1723 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1705 | # CONFIG_DEBUG_KOBJECT is not set | 1724 | # CONFIG_DEBUG_KOBJECT is not set |
| 1706 | CONFIG_DEBUG_BUGVERBOSE=y | 1725 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1707 | # CONFIG_DEBUG_INFO is not set | 1726 | # CONFIG_DEBUG_INFO is not set |
| 1708 | # CONFIG_DEBUG_VM is not set | 1727 | # CONFIG_DEBUG_VM is not set |
| 1728 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1709 | # CONFIG_DEBUG_LIST is not set | 1729 | # CONFIG_DEBUG_LIST is not set |
| 1710 | # CONFIG_DEBUG_SG is not set | 1730 | # CONFIG_DEBUG_SG is not set |
| 1711 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1731 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1735,53 +1755,83 @@ CONFIG_ASYNC_CORE=y | |||
| 1735 | CONFIG_ASYNC_MEMCPY=y | 1755 | CONFIG_ASYNC_MEMCPY=y |
| 1736 | CONFIG_ASYNC_XOR=y | 1756 | CONFIG_ASYNC_XOR=y |
| 1737 | CONFIG_CRYPTO=y | 1757 | CONFIG_CRYPTO=y |
| 1758 | |||
| 1759 | # | ||
| 1760 | # Crypto core or helper | ||
| 1761 | # | ||
| 1738 | CONFIG_CRYPTO_ALGAPI=y | 1762 | CONFIG_CRYPTO_ALGAPI=y |
| 1739 | CONFIG_CRYPTO_AEAD=y | 1763 | CONFIG_CRYPTO_AEAD=y |
| 1740 | CONFIG_CRYPTO_BLKCIPHER=y | 1764 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1741 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1742 | CONFIG_CRYPTO_HASH=y | 1765 | CONFIG_CRYPTO_HASH=y |
| 1743 | CONFIG_CRYPTO_MANAGER=y | 1766 | CONFIG_CRYPTO_MANAGER=y |
| 1767 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1768 | # CONFIG_CRYPTO_NULL is not set | ||
| 1769 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1770 | CONFIG_CRYPTO_AUTHENC=y | ||
| 1771 | # CONFIG_CRYPTO_TEST is not set | ||
| 1772 | |||
| 1773 | # | ||
| 1774 | # Authenticated Encryption with Associated Data | ||
| 1775 | # | ||
| 1776 | # CONFIG_CRYPTO_CCM is not set | ||
| 1777 | # CONFIG_CRYPTO_GCM is not set | ||
| 1778 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1779 | |||
| 1780 | # | ||
| 1781 | # Block modes | ||
| 1782 | # | ||
| 1783 | CONFIG_CRYPTO_CBC=y | ||
| 1784 | # CONFIG_CRYPTO_CTR is not set | ||
| 1785 | # CONFIG_CRYPTO_CTS is not set | ||
| 1786 | # CONFIG_CRYPTO_ECB is not set | ||
| 1787 | # CONFIG_CRYPTO_LRW is not set | ||
| 1788 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1789 | # CONFIG_CRYPTO_XTS is not set | ||
| 1790 | |||
| 1791 | # | ||
| 1792 | # Hash modes | ||
| 1793 | # | ||
| 1744 | CONFIG_CRYPTO_HMAC=y | 1794 | CONFIG_CRYPTO_HMAC=y |
| 1745 | # CONFIG_CRYPTO_XCBC is not set | 1795 | # CONFIG_CRYPTO_XCBC is not set |
| 1746 | # CONFIG_CRYPTO_NULL is not set | 1796 | |
| 1797 | # | ||
| 1798 | # Digest | ||
| 1799 | # | ||
| 1800 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1747 | CONFIG_CRYPTO_MD4=y | 1801 | CONFIG_CRYPTO_MD4=y |
| 1748 | CONFIG_CRYPTO_MD5=y | 1802 | CONFIG_CRYPTO_MD5=y |
| 1803 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1749 | CONFIG_CRYPTO_SHA1=y | 1804 | CONFIG_CRYPTO_SHA1=y |
| 1750 | CONFIG_CRYPTO_SHA256=y | 1805 | CONFIG_CRYPTO_SHA256=y |
| 1751 | CONFIG_CRYPTO_SHA512=y | 1806 | CONFIG_CRYPTO_SHA512=y |
| 1752 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1753 | # CONFIG_CRYPTO_TGR192 is not set | 1807 | # CONFIG_CRYPTO_TGR192 is not set |
| 1754 | # CONFIG_CRYPTO_GF128MUL is not set | 1808 | # CONFIG_CRYPTO_WP512 is not set |
| 1755 | # CONFIG_CRYPTO_ECB is not set | 1809 | |
| 1756 | CONFIG_CRYPTO_CBC=y | 1810 | # |
| 1757 | # CONFIG_CRYPTO_PCBC is not set | 1811 | # Ciphers |
| 1758 | # CONFIG_CRYPTO_LRW is not set | 1812 | # |
| 1759 | # CONFIG_CRYPTO_XTS is not set | ||
| 1760 | # CONFIG_CRYPTO_CTR is not set | ||
| 1761 | # CONFIG_CRYPTO_GCM is not set | ||
| 1762 | # CONFIG_CRYPTO_CCM is not set | ||
| 1763 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1764 | CONFIG_CRYPTO_DES=y | ||
| 1765 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1766 | CONFIG_CRYPTO_BLOWFISH=y | ||
| 1767 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1768 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1769 | CONFIG_CRYPTO_AES=y | 1813 | CONFIG_CRYPTO_AES=y |
| 1814 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1815 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1816 | CONFIG_CRYPTO_BLOWFISH=y | ||
| 1817 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1770 | # CONFIG_CRYPTO_CAST5 is not set | 1818 | # CONFIG_CRYPTO_CAST5 is not set |
| 1771 | # CONFIG_CRYPTO_CAST6 is not set | 1819 | # CONFIG_CRYPTO_CAST6 is not set |
| 1772 | # CONFIG_CRYPTO_TEA is not set | 1820 | CONFIG_CRYPTO_DES=y |
| 1773 | # CONFIG_CRYPTO_ARC4 is not set | 1821 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1774 | # CONFIG_CRYPTO_KHAZAD is not set | 1822 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1775 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1776 | # CONFIG_CRYPTO_SEED is not set | ||
| 1777 | # CONFIG_CRYPTO_SALSA20 is not set | 1823 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1824 | # CONFIG_CRYPTO_SEED is not set | ||
| 1825 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1826 | # CONFIG_CRYPTO_TEA is not set | ||
| 1827 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1828 | |||
| 1829 | # | ||
| 1830 | # Compression | ||
| 1831 | # | ||
| 1778 | # CONFIG_CRYPTO_DEFLATE is not set | 1832 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1779 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1780 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1781 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1782 | # CONFIG_CRYPTO_TEST is not set | ||
| 1783 | CONFIG_CRYPTO_AUTHENC=y | ||
| 1784 | # CONFIG_CRYPTO_LZO is not set | 1833 | # CONFIG_CRYPTO_LZO is not set |
| 1785 | CONFIG_CRYPTO_HW=y | 1834 | CONFIG_CRYPTO_HW=y |
| 1786 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1835 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1787 | # CONFIG_PPC_CLOCK is not set | 1836 | # CONFIG_PPC_CLOCK is not set |
| 1837 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index fca114252ac7..3688e4bb6fc2 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Thu Mar 27 13:56:21 2008 | 4 | # Tue May 20 20:02:24 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -91,6 +93,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 91 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
| 92 | # CONFIG_EMBEDDED is not set | 94 | # CONFIG_EMBEDDED is not set |
| 93 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
| 96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 94 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
| 95 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -119,12 +122,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 119 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
| 120 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
| 121 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
| 125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 122 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
| 123 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
| 124 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
| 125 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
| 126 | CONFIG_BASE_SMALL=0 | 130 | CONFIG_BASE_SMALL=0 |
| 127 | CONFIG_MODULES=y | 131 | CONFIG_MODULES=y |
| 132 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 128 | CONFIG_MODULE_UNLOAD=y | 133 | CONFIG_MODULE_UNLOAD=y |
| 129 | CONFIG_MODULE_FORCE_UNLOAD=y | 134 | CONFIG_MODULE_FORCE_UNLOAD=y |
| 130 | # CONFIG_MODVERSIONS is not set | 135 | # CONFIG_MODVERSIONS is not set |
| @@ -185,6 +190,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
| 185 | CONFIG_CPU_FREQ_STAT=y | 190 | CONFIG_CPU_FREQ_STAT=y |
| 186 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 191 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
| 187 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 192 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
| 193 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 188 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 194 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
| 189 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 195 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
| 190 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 196 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
| @@ -236,16 +242,17 @@ CONFIG_FLATMEM=y | |||
| 236 | CONFIG_FLAT_NODE_MEM_MAP=y | 242 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 237 | # CONFIG_SPARSEMEM_STATIC is not set | 243 | # CONFIG_SPARSEMEM_STATIC is not set |
| 238 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 245 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 239 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 246 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 240 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
| 241 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
| 242 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
| 243 | CONFIG_VIRT_TO_BUS=y | 250 | CONFIG_VIRT_TO_BUS=y |
| 251 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 244 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
| 245 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
| 246 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 254 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
| 247 | CONFIG_PM=y | 255 | CONFIG_PM=y |
| 248 | # CONFIG_PM_LEGACY is not set | ||
| 249 | CONFIG_PM_DEBUG=y | 256 | CONFIG_PM_DEBUG=y |
| 250 | # CONFIG_PM_VERBOSE is not set | 257 | # CONFIG_PM_VERBOSE is not set |
| 251 | CONFIG_CAN_PM_TRACE=y | 258 | CONFIG_CAN_PM_TRACE=y |
| @@ -292,6 +299,7 @@ CONFIG_YENTA_TOSHIBA=y | |||
| 292 | # CONFIG_I82092 is not set | 299 | # CONFIG_I82092 is not set |
| 293 | CONFIG_PCCARD_NONSTATIC=m | 300 | CONFIG_PCCARD_NONSTATIC=m |
| 294 | # CONFIG_HOTPLUG_PCI is not set | 301 | # CONFIG_HOTPLUG_PCI is not set |
| 302 | # CONFIG_HAS_RAPIDIO is not set | ||
| 295 | 303 | ||
| 296 | # | 304 | # |
| 297 | # Advanced setup | 305 | # Advanced setup |
| @@ -301,11 +309,11 @@ CONFIG_PCCARD_NONSTATIC=m | |||
| 301 | # | 309 | # |
| 302 | # Default settings for advanced configuration options are used | 310 | # Default settings for advanced configuration options are used |
| 303 | # | 311 | # |
| 304 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 305 | CONFIG_LOWMEM_SIZE=0x30000000 | 312 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 313 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 306 | CONFIG_KERNEL_START=0xc0000000 | 314 | CONFIG_KERNEL_START=0xc0000000 |
| 315 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 307 | CONFIG_TASK_SIZE=0xc0000000 | 316 | CONFIG_TASK_SIZE=0xc0000000 |
| 308 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 309 | 317 | ||
| 310 | # | 318 | # |
| 311 | # Networking | 319 | # Networking |
| @@ -352,8 +360,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 352 | # CONFIG_TCP_MD5SIG is not set | 360 | # CONFIG_TCP_MD5SIG is not set |
| 353 | # CONFIG_IP_VS is not set | 361 | # CONFIG_IP_VS is not set |
| 354 | # CONFIG_IPV6 is not set | 362 | # CONFIG_IPV6 is not set |
| 355 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 356 | # CONFIG_INET6_TUNNEL is not set | ||
| 357 | # CONFIG_NETWORK_SECMARK is not set | 363 | # CONFIG_NETWORK_SECMARK is not set |
| 358 | CONFIG_NETFILTER=y | 364 | CONFIG_NETFILTER=y |
| 359 | # CONFIG_NETFILTER_DEBUG is not set | 365 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -369,6 +375,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 369 | # CONFIG_NF_CT_ACCT is not set | 375 | # CONFIG_NF_CT_ACCT is not set |
| 370 | # CONFIG_NF_CONNTRACK_MARK is not set | 376 | # CONFIG_NF_CONNTRACK_MARK is not set |
| 371 | # CONFIG_NF_CONNTRACK_EVENTS is not set | 377 | # CONFIG_NF_CONNTRACK_EVENTS is not set |
| 378 | CONFIG_NF_CT_PROTO_DCCP=m | ||
| 372 | # CONFIG_NF_CT_PROTO_SCTP is not set | 379 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 373 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 380 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
| 374 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 381 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| @@ -445,6 +452,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m | |||
| 445 | CONFIG_IP_NF_TARGET_REDIRECT=m | 452 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 446 | CONFIG_IP_NF_TARGET_NETMAP=m | 453 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 447 | # CONFIG_NF_NAT_SNMP_BASIC is not set | 454 | # CONFIG_NF_NAT_SNMP_BASIC is not set |
| 455 | CONFIG_NF_NAT_PROTO_DCCP=m | ||
| 448 | CONFIG_NF_NAT_FTP=m | 456 | CONFIG_NF_NAT_FTP=m |
| 449 | CONFIG_NF_NAT_IRC=m | 457 | CONFIG_NF_NAT_IRC=m |
| 450 | CONFIG_NF_NAT_TFTP=m | 458 | CONFIG_NF_NAT_TFTP=m |
| @@ -586,7 +594,6 @@ CONFIG_MAC80211=m | |||
| 586 | # Rate control algorithm selection | 594 | # Rate control algorithm selection |
| 587 | # | 595 | # |
| 588 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 596 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
| 589 | # CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set | ||
| 590 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | 597 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set |
| 591 | 598 | ||
| 592 | # | 599 | # |
| @@ -598,7 +605,7 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y | |||
| 598 | # | 605 | # |
| 599 | CONFIG_MAC80211_RC_DEFAULT="pid" | 606 | CONFIG_MAC80211_RC_DEFAULT="pid" |
| 600 | CONFIG_MAC80211_RC_PID=y | 607 | CONFIG_MAC80211_RC_PID=y |
| 601 | # CONFIG_MAC80211_RC_SIMPLE is not set | 608 | # CONFIG_MAC80211_MESH is not set |
| 602 | CONFIG_MAC80211_LEDS=y | 609 | CONFIG_MAC80211_LEDS=y |
| 603 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 610 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set |
| 604 | # CONFIG_MAC80211_DEBUG is not set | 611 | # CONFIG_MAC80211_DEBUG is not set |
| @@ -607,7 +614,6 @@ CONFIG_IEEE80211=m | |||
| 607 | CONFIG_IEEE80211_CRYPT_WEP=m | 614 | CONFIG_IEEE80211_CRYPT_WEP=m |
| 608 | CONFIG_IEEE80211_CRYPT_CCMP=m | 615 | CONFIG_IEEE80211_CRYPT_CCMP=m |
| 609 | CONFIG_IEEE80211_CRYPT_TKIP=m | 616 | CONFIG_IEEE80211_CRYPT_TKIP=m |
| 610 | # CONFIG_IEEE80211_SOFTMAC is not set | ||
| 611 | # CONFIG_RFKILL is not set | 617 | # CONFIG_RFKILL is not set |
| 612 | # CONFIG_NET_9P is not set | 618 | # CONFIG_NET_9P is not set |
| 613 | 619 | ||
| @@ -629,6 +635,7 @@ CONFIG_CONNECTOR=y | |||
| 629 | CONFIG_PROC_EVENTS=y | 635 | CONFIG_PROC_EVENTS=y |
| 630 | # CONFIG_MTD is not set | 636 | # CONFIG_MTD is not set |
| 631 | CONFIG_OF_DEVICE=y | 637 | CONFIG_OF_DEVICE=y |
| 638 | CONFIG_OF_I2C=y | ||
| 632 | # CONFIG_PARPORT is not set | 639 | # CONFIG_PARPORT is not set |
| 633 | CONFIG_BLK_DEV=y | 640 | CONFIG_BLK_DEV=y |
| 634 | # CONFIG_BLK_DEV_FD is not set | 641 | # CONFIG_BLK_DEV_FD is not set |
| @@ -720,7 +727,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
| 720 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 727 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
| 721 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 728 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
| 722 | CONFIG_BLK_DEV_IDEDMA=y | 729 | CONFIG_BLK_DEV_IDEDMA=y |
| 723 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 730 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 724 | # CONFIG_BLK_DEV_HD is not set | 731 | # CONFIG_BLK_DEV_HD is not set |
| 725 | 732 | ||
| 726 | # | 733 | # |
| @@ -906,7 +913,6 @@ CONFIG_SUNGEM=y | |||
| 906 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 913 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 907 | CONFIG_NET_PCI=y | 914 | CONFIG_NET_PCI=y |
| 908 | CONFIG_PCNET32=y | 915 | CONFIG_PCNET32=y |
| 909 | # CONFIG_PCNET32_NAPI is not set | ||
| 910 | # CONFIG_AMD8111_ETH is not set | 916 | # CONFIG_AMD8111_ETH is not set |
| 911 | # CONFIG_ADAPTEC_STARFIRE is not set | 917 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 912 | # CONFIG_B44 is not set | 918 | # CONFIG_B44 is not set |
| @@ -940,7 +946,6 @@ CONFIG_NETDEV_1000=y | |||
| 940 | # CONFIG_SIS190 is not set | 946 | # CONFIG_SIS190 is not set |
| 941 | # CONFIG_SKGE is not set | 947 | # CONFIG_SKGE is not set |
| 942 | # CONFIG_SKY2 is not set | 948 | # CONFIG_SKY2 is not set |
| 943 | # CONFIG_SK98LIN is not set | ||
| 944 | # CONFIG_VIA_VELOCITY is not set | 949 | # CONFIG_VIA_VELOCITY is not set |
| 945 | # CONFIG_TIGON3 is not set | 950 | # CONFIG_TIGON3 is not set |
| 946 | # CONFIG_BNX2 is not set | 951 | # CONFIG_BNX2 is not set |
| @@ -959,6 +964,7 @@ CONFIG_NETDEV_10000=y | |||
| 959 | # CONFIG_MLX4_CORE is not set | 964 | # CONFIG_MLX4_CORE is not set |
| 960 | # CONFIG_TEHUTI is not set | 965 | # CONFIG_TEHUTI is not set |
| 961 | # CONFIG_BNX2X is not set | 966 | # CONFIG_BNX2X is not set |
| 967 | # CONFIG_SFC is not set | ||
| 962 | # CONFIG_TR is not set | 968 | # CONFIG_TR is not set |
| 963 | 969 | ||
| 964 | # | 970 | # |
| @@ -992,6 +998,8 @@ CONFIG_P54_COMMON=m | |||
| 992 | # CONFIG_P54_USB is not set | 998 | # CONFIG_P54_USB is not set |
| 993 | # CONFIG_P54_PCI is not set | 999 | # CONFIG_P54_PCI is not set |
| 994 | # CONFIG_ATH5K is not set | 1000 | # CONFIG_ATH5K is not set |
| 1001 | # CONFIG_IWLCORE is not set | ||
| 1002 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 995 | # CONFIG_IWL4965 is not set | 1003 | # CONFIG_IWL4965 is not set |
| 996 | # CONFIG_IWL3945 is not set | 1004 | # CONFIG_IWL3945 is not set |
| 997 | # CONFIG_HOSTAP is not set | 1005 | # CONFIG_HOSTAP is not set |
| @@ -1110,6 +1118,7 @@ CONFIG_VT=y | |||
| 1110 | CONFIG_VT_CONSOLE=y | 1118 | CONFIG_VT_CONSOLE=y |
| 1111 | CONFIG_HW_CONSOLE=y | 1119 | CONFIG_HW_CONSOLE=y |
| 1112 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1120 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 1121 | CONFIG_DEVKMEM=y | ||
| 1113 | # CONFIG_SERIAL_NONSTANDARD is not set | 1122 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 1114 | # CONFIG_NOZOMI is not set | 1123 | # CONFIG_NOZOMI is not set |
| 1115 | 1124 | ||
| @@ -1156,13 +1165,7 @@ CONFIG_DEVPORT=y | |||
| 1156 | CONFIG_I2C=y | 1165 | CONFIG_I2C=y |
| 1157 | CONFIG_I2C_BOARDINFO=y | 1166 | CONFIG_I2C_BOARDINFO=y |
| 1158 | CONFIG_I2C_CHARDEV=m | 1167 | CONFIG_I2C_CHARDEV=m |
| 1159 | |||
| 1160 | # | ||
| 1161 | # I2C Algorithms | ||
| 1162 | # | ||
| 1163 | CONFIG_I2C_ALGOBIT=y | 1168 | CONFIG_I2C_ALGOBIT=y |
| 1164 | # CONFIG_I2C_ALGOPCF is not set | ||
| 1165 | # CONFIG_I2C_ALGOPCA is not set | ||
| 1166 | 1169 | ||
| 1167 | # | 1170 | # |
| 1168 | # I2C Hardware Bus support | 1171 | # I2C Hardware Bus support |
| @@ -1192,6 +1195,7 @@ CONFIG_I2C_POWERMAC=y | |||
| 1192 | # CONFIG_I2C_VIA is not set | 1195 | # CONFIG_I2C_VIA is not set |
| 1193 | # CONFIG_I2C_VIAPRO is not set | 1196 | # CONFIG_I2C_VIAPRO is not set |
| 1194 | # CONFIG_I2C_VOODOO3 is not set | 1197 | # CONFIG_I2C_VOODOO3 is not set |
| 1198 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1195 | 1199 | ||
| 1196 | # | 1200 | # |
| 1197 | # Miscellaneous I2C Chip support | 1201 | # Miscellaneous I2C Chip support |
| @@ -1201,19 +1205,13 @@ CONFIG_I2C_POWERMAC=y | |||
| 1201 | # CONFIG_SENSORS_PCF8574 is not set | 1205 | # CONFIG_SENSORS_PCF8574 is not set |
| 1202 | # CONFIG_PCF8575 is not set | 1206 | # CONFIG_PCF8575 is not set |
| 1203 | # CONFIG_SENSORS_PCF8591 is not set | 1207 | # CONFIG_SENSORS_PCF8591 is not set |
| 1204 | # CONFIG_TPS65010 is not set | ||
| 1205 | # CONFIG_SENSORS_MAX6875 is not set | 1208 | # CONFIG_SENSORS_MAX6875 is not set |
| 1206 | # CONFIG_SENSORS_TSL2550 is not set | 1209 | # CONFIG_SENSORS_TSL2550 is not set |
| 1207 | # CONFIG_I2C_DEBUG_CORE is not set | 1210 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1208 | # CONFIG_I2C_DEBUG_ALGO is not set | 1211 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1209 | # CONFIG_I2C_DEBUG_BUS is not set | 1212 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1210 | # CONFIG_I2C_DEBUG_CHIP is not set | 1213 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1211 | |||
| 1212 | # | ||
| 1213 | # SPI support | ||
| 1214 | # | ||
| 1215 | # CONFIG_SPI is not set | 1214 | # CONFIG_SPI is not set |
| 1216 | # CONFIG_SPI_MASTER is not set | ||
| 1217 | # CONFIG_W1 is not set | 1215 | # CONFIG_W1 is not set |
| 1218 | CONFIG_POWER_SUPPLY=y | 1216 | CONFIG_POWER_SUPPLY=y |
| 1219 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1217 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
| @@ -1230,6 +1228,7 @@ CONFIG_BATTERY_PMU=y | |||
| 1230 | # | 1228 | # |
| 1231 | CONFIG_SSB_POSSIBLE=y | 1229 | CONFIG_SSB_POSSIBLE=y |
| 1232 | CONFIG_SSB=m | 1230 | CONFIG_SSB=m |
| 1231 | CONFIG_SSB_SPROM=y | ||
| 1233 | CONFIG_SSB_PCIHOST_POSSIBLE=y | 1232 | CONFIG_SSB_PCIHOST_POSSIBLE=y |
| 1234 | CONFIG_SSB_PCIHOST=y | 1233 | CONFIG_SSB_PCIHOST=y |
| 1235 | CONFIG_SSB_B43_PCI_BRIDGE=y | 1234 | CONFIG_SSB_B43_PCI_BRIDGE=y |
| @@ -1243,12 +1242,22 @@ CONFIG_SSB_DRIVER_PCICORE=y | |||
| 1243 | # Multifunction device drivers | 1242 | # Multifunction device drivers |
| 1244 | # | 1243 | # |
| 1245 | # CONFIG_MFD_SM501 is not set | 1244 | # CONFIG_MFD_SM501 is not set |
| 1245 | # CONFIG_HTC_PASIC3 is not set | ||
| 1246 | 1246 | ||
| 1247 | # | 1247 | # |
| 1248 | # Multimedia devices | 1248 | # Multimedia devices |
| 1249 | # | 1249 | # |
| 1250 | |||
| 1251 | # | ||
| 1252 | # Multimedia core support | ||
| 1253 | # | ||
| 1250 | # CONFIG_VIDEO_DEV is not set | 1254 | # CONFIG_VIDEO_DEV is not set |
| 1251 | # CONFIG_DVB_CORE is not set | 1255 | # CONFIG_DVB_CORE is not set |
| 1256 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1257 | |||
| 1258 | # | ||
| 1259 | # Multimedia drivers | ||
| 1260 | # | ||
| 1252 | # CONFIG_DAB is not set | 1261 | # CONFIG_DAB is not set |
| 1253 | 1262 | ||
| 1254 | # | 1263 | # |
| @@ -1276,8 +1285,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 1276 | # CONFIG_FB_SYS_FILLRECT is not set | 1285 | # CONFIG_FB_SYS_FILLRECT is not set |
| 1277 | # CONFIG_FB_SYS_COPYAREA is not set | 1286 | # CONFIG_FB_SYS_COPYAREA is not set |
| 1278 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1287 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1288 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1279 | # CONFIG_FB_SYS_FOPS is not set | 1289 | # CONFIG_FB_SYS_FOPS is not set |
| 1280 | CONFIG_FB_DEFERRED_IO=y | ||
| 1281 | # CONFIG_FB_SVGALIB is not set | 1290 | # CONFIG_FB_SVGALIB is not set |
| 1282 | CONFIG_FB_MACMODES=y | 1291 | CONFIG_FB_MACMODES=y |
| 1283 | CONFIG_FB_BACKLIGHT=y | 1292 | CONFIG_FB_BACKLIGHT=y |
| @@ -1413,6 +1422,7 @@ CONFIG_SND_DUMMY=m | |||
| 1413 | # CONFIG_SND_AU8810 is not set | 1422 | # CONFIG_SND_AU8810 is not set |
| 1414 | # CONFIG_SND_AU8820 is not set | 1423 | # CONFIG_SND_AU8820 is not set |
| 1415 | # CONFIG_SND_AU8830 is not set | 1424 | # CONFIG_SND_AU8830 is not set |
| 1425 | # CONFIG_SND_AW2 is not set | ||
| 1416 | # CONFIG_SND_AZT3328 is not set | 1426 | # CONFIG_SND_AZT3328 is not set |
| 1417 | # CONFIG_SND_BT87X is not set | 1427 | # CONFIG_SND_BT87X is not set |
| 1418 | # CONFIG_SND_CA0106 is not set | 1428 | # CONFIG_SND_CA0106 is not set |
| @@ -1505,11 +1515,11 @@ CONFIG_SND_USB_AUDIO=m | |||
| 1505 | # CONFIG_SND_SOC is not set | 1515 | # CONFIG_SND_SOC is not set |
| 1506 | 1516 | ||
| 1507 | # | 1517 | # |
| 1508 | # SoC Audio support for SuperH | 1518 | # ALSA SoC audio for Freescale SOCs |
| 1509 | # | 1519 | # |
| 1510 | 1520 | ||
| 1511 | # | 1521 | # |
| 1512 | # ALSA SoC audio for Freescale SOCs | 1522 | # SoC Audio for the Texas Instruments OMAP |
| 1513 | # | 1523 | # |
| 1514 | 1524 | ||
| 1515 | # | 1525 | # |
| @@ -1543,17 +1553,18 @@ CONFIG_USB_DEVICEFS=y | |||
| 1543 | CONFIG_USB_DEVICE_CLASS=y | 1553 | CONFIG_USB_DEVICE_CLASS=y |
| 1544 | CONFIG_USB_DYNAMIC_MINORS=y | 1554 | CONFIG_USB_DYNAMIC_MINORS=y |
| 1545 | # CONFIG_USB_SUSPEND is not set | 1555 | # CONFIG_USB_SUSPEND is not set |
| 1546 | # CONFIG_USB_PERSIST is not set | ||
| 1547 | # CONFIG_USB_OTG is not set | 1556 | # CONFIG_USB_OTG is not set |
| 1548 | 1557 | ||
| 1549 | # | 1558 | # |
| 1550 | # USB Host Controller Drivers | 1559 | # USB Host Controller Drivers |
| 1551 | # | 1560 | # |
| 1561 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1552 | CONFIG_USB_EHCI_HCD=m | 1562 | CONFIG_USB_EHCI_HCD=m |
| 1553 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 1563 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
| 1554 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1564 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1555 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1565 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 1556 | # CONFIG_USB_ISP116X_HCD is not set | 1566 | # CONFIG_USB_ISP116X_HCD is not set |
| 1567 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1557 | CONFIG_USB_OHCI_HCD=y | 1568 | CONFIG_USB_OHCI_HCD=y |
| 1558 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1569 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1559 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1570 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1587,7 +1598,9 @@ CONFIG_USB_STORAGE=m | |||
| 1587 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1598 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1588 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1599 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1589 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1600 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1601 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
| 1590 | # CONFIG_USB_STORAGE_KARMA is not set | 1602 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1603 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1591 | # CONFIG_USB_LIBUSUAL is not set | 1604 | # CONFIG_USB_LIBUSUAL is not set |
| 1592 | 1605 | ||
| 1593 | # | 1606 | # |
| @@ -1642,9 +1655,11 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
| 1642 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1655 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
| 1643 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1656 | # CONFIG_USB_SERIAL_MOS7720 is not set |
| 1644 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1657 | # CONFIG_USB_SERIAL_MOS7840 is not set |
| 1658 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
| 1645 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1659 | # CONFIG_USB_SERIAL_NAVMAN is not set |
| 1646 | # CONFIG_USB_SERIAL_PL2303 is not set | 1660 | # CONFIG_USB_SERIAL_PL2303 is not set |
| 1647 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1661 | # CONFIG_USB_SERIAL_OTI6858 is not set |
| 1662 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
| 1648 | # CONFIG_USB_SERIAL_HP4X is not set | 1663 | # CONFIG_USB_SERIAL_HP4X is not set |
| 1649 | # CONFIG_USB_SERIAL_SAFE is not set | 1664 | # CONFIG_USB_SERIAL_SAFE is not set |
| 1650 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1665 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
| @@ -1695,14 +1710,12 @@ CONFIG_LEDS_TRIGGERS=y | |||
| 1695 | # CONFIG_LEDS_TRIGGER_TIMER is not set | 1710 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
| 1696 | CONFIG_LEDS_TRIGGER_IDE_DISK=y | 1711 | CONFIG_LEDS_TRIGGER_IDE_DISK=y |
| 1697 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 1712 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
| 1713 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
| 1714 | # CONFIG_ACCESSIBILITY is not set | ||
| 1698 | # CONFIG_INFINIBAND is not set | 1715 | # CONFIG_INFINIBAND is not set |
| 1699 | # CONFIG_EDAC is not set | 1716 | # CONFIG_EDAC is not set |
| 1700 | # CONFIG_RTC_CLASS is not set | 1717 | # CONFIG_RTC_CLASS is not set |
| 1701 | # CONFIG_DMADEVICES is not set | 1718 | # CONFIG_DMADEVICES is not set |
| 1702 | |||
| 1703 | # | ||
| 1704 | # Userspace I/O | ||
| 1705 | # | ||
| 1706 | # CONFIG_UIO is not set | 1719 | # CONFIG_UIO is not set |
| 1707 | 1720 | ||
| 1708 | # | 1721 | # |
| @@ -1786,13 +1799,11 @@ CONFIG_NFS_FS=y | |||
| 1786 | CONFIG_NFS_V3=y | 1799 | CONFIG_NFS_V3=y |
| 1787 | CONFIG_NFS_V3_ACL=y | 1800 | CONFIG_NFS_V3_ACL=y |
| 1788 | CONFIG_NFS_V4=y | 1801 | CONFIG_NFS_V4=y |
| 1789 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1790 | CONFIG_NFSD=m | 1802 | CONFIG_NFSD=m |
| 1791 | CONFIG_NFSD_V2_ACL=y | 1803 | CONFIG_NFSD_V2_ACL=y |
| 1792 | CONFIG_NFSD_V3=y | 1804 | CONFIG_NFSD_V3=y |
| 1793 | CONFIG_NFSD_V3_ACL=y | 1805 | CONFIG_NFSD_V3_ACL=y |
| 1794 | CONFIG_NFSD_V4=y | 1806 | CONFIG_NFSD_V4=y |
| 1795 | CONFIG_NFSD_TCP=y | ||
| 1796 | CONFIG_LOCKD=y | 1807 | CONFIG_LOCKD=y |
| 1797 | CONFIG_LOCKD_V4=y | 1808 | CONFIG_LOCKD_V4=y |
| 1798 | CONFIG_EXPORTFS=m | 1809 | CONFIG_EXPORTFS=m |
| @@ -1877,9 +1888,10 @@ CONFIG_NLS_UTF8=m | |||
| 1877 | # Library routines | 1888 | # Library routines |
| 1878 | # | 1889 | # |
| 1879 | CONFIG_BITREVERSE=y | 1890 | CONFIG_BITREVERSE=y |
| 1891 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1880 | CONFIG_CRC_CCITT=y | 1892 | CONFIG_CRC_CCITT=y |
| 1881 | CONFIG_CRC16=y | 1893 | CONFIG_CRC16=y |
| 1882 | # CONFIG_CRC_ITU_T is not set | 1894 | CONFIG_CRC_ITU_T=m |
| 1883 | CONFIG_CRC32=y | 1895 | CONFIG_CRC32=y |
| 1884 | # CONFIG_CRC7 is not set | 1896 | # CONFIG_CRC7 is not set |
| 1885 | CONFIG_LIBCRC32C=m | 1897 | CONFIG_LIBCRC32C=m |
| @@ -1901,6 +1913,7 @@ CONFIG_HAVE_LMB=y | |||
| 1901 | # CONFIG_PRINTK_TIME is not set | 1913 | # CONFIG_PRINTK_TIME is not set |
| 1902 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1914 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1903 | CONFIG_ENABLE_MUST_CHECK=y | 1915 | CONFIG_ENABLE_MUST_CHECK=y |
| 1916 | CONFIG_FRAME_WARN=1024 | ||
| 1904 | CONFIG_MAGIC_SYSRQ=y | 1917 | CONFIG_MAGIC_SYSRQ=y |
| 1905 | # CONFIG_UNUSED_SYMBOLS is not set | 1918 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1906 | # CONFIG_DEBUG_FS is not set | 1919 | # CONFIG_DEBUG_FS is not set |
| @@ -1911,6 +1924,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1911 | CONFIG_SCHED_DEBUG=y | 1924 | CONFIG_SCHED_DEBUG=y |
| 1912 | # CONFIG_SCHEDSTATS is not set | 1925 | # CONFIG_SCHEDSTATS is not set |
| 1913 | # CONFIG_TIMER_STATS is not set | 1926 | # CONFIG_TIMER_STATS is not set |
| 1927 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1914 | # CONFIG_SLUB_DEBUG_ON is not set | 1928 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1915 | # CONFIG_SLUB_STATS is not set | 1929 | # CONFIG_SLUB_STATS is not set |
| 1916 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1930 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1923,6 +1937,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1923 | CONFIG_DEBUG_BUGVERBOSE=y | 1937 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1924 | # CONFIG_DEBUG_INFO is not set | 1938 | # CONFIG_DEBUG_INFO is not set |
| 1925 | # CONFIG_DEBUG_VM is not set | 1939 | # CONFIG_DEBUG_VM is not set |
| 1940 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1926 | # CONFIG_DEBUG_LIST is not set | 1941 | # CONFIG_DEBUG_LIST is not set |
| 1927 | # CONFIG_DEBUG_SG is not set | 1942 | # CONFIG_DEBUG_SG is not set |
| 1928 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1943 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1936,6 +1951,7 @@ CONFIG_DEBUGGER=y | |||
| 1936 | CONFIG_XMON=y | 1951 | CONFIG_XMON=y |
| 1937 | CONFIG_XMON_DEFAULT=y | 1952 | CONFIG_XMON_DEFAULT=y |
| 1938 | CONFIG_XMON_DISASSEMBLY=y | 1953 | CONFIG_XMON_DISASSEMBLY=y |
| 1954 | CONFIG_IRQSTACKS=y | ||
| 1939 | # CONFIG_BDI_SWITCH is not set | 1955 | # CONFIG_BDI_SWITCH is not set |
| 1940 | CONFIG_BOOTX_TEXT=y | 1956 | CONFIG_BOOTX_TEXT=y |
| 1941 | # CONFIG_PPC_EARLY_DEBUG is not set | 1957 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1947,54 +1963,84 @@ CONFIG_BOOTX_TEXT=y | |||
| 1947 | # CONFIG_SECURITY is not set | 1963 | # CONFIG_SECURITY is not set |
| 1948 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1964 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1949 | CONFIG_CRYPTO=y | 1965 | CONFIG_CRYPTO=y |
| 1966 | |||
| 1967 | # | ||
| 1968 | # Crypto core or helper | ||
| 1969 | # | ||
| 1950 | CONFIG_CRYPTO_ALGAPI=y | 1970 | CONFIG_CRYPTO_ALGAPI=y |
| 1951 | CONFIG_CRYPTO_AEAD=y | 1971 | CONFIG_CRYPTO_AEAD=y |
| 1952 | CONFIG_CRYPTO_BLKCIPHER=y | 1972 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1953 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1954 | CONFIG_CRYPTO_HASH=y | 1973 | CONFIG_CRYPTO_HASH=y |
| 1955 | CONFIG_CRYPTO_MANAGER=y | 1974 | CONFIG_CRYPTO_MANAGER=y |
| 1975 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1976 | CONFIG_CRYPTO_NULL=m | ||
| 1977 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1978 | CONFIG_CRYPTO_AUTHENC=y | ||
| 1979 | # CONFIG_CRYPTO_TEST is not set | ||
| 1980 | |||
| 1981 | # | ||
| 1982 | # Authenticated Encryption with Associated Data | ||
| 1983 | # | ||
| 1984 | # CONFIG_CRYPTO_CCM is not set | ||
| 1985 | # CONFIG_CRYPTO_GCM is not set | ||
| 1986 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1987 | |||
| 1988 | # | ||
| 1989 | # Block modes | ||
| 1990 | # | ||
| 1991 | CONFIG_CRYPTO_CBC=y | ||
| 1992 | # CONFIG_CRYPTO_CTR is not set | ||
| 1993 | # CONFIG_CRYPTO_CTS is not set | ||
| 1994 | CONFIG_CRYPTO_ECB=m | ||
| 1995 | # CONFIG_CRYPTO_LRW is not set | ||
| 1996 | CONFIG_CRYPTO_PCBC=m | ||
| 1997 | # CONFIG_CRYPTO_XTS is not set | ||
| 1998 | |||
| 1999 | # | ||
| 2000 | # Hash modes | ||
| 2001 | # | ||
| 1956 | CONFIG_CRYPTO_HMAC=y | 2002 | CONFIG_CRYPTO_HMAC=y |
| 1957 | # CONFIG_CRYPTO_XCBC is not set | 2003 | # CONFIG_CRYPTO_XCBC is not set |
| 1958 | CONFIG_CRYPTO_NULL=m | 2004 | |
| 2005 | # | ||
| 2006 | # Digest | ||
| 2007 | # | ||
| 2008 | CONFIG_CRYPTO_CRC32C=m | ||
| 1959 | CONFIG_CRYPTO_MD4=m | 2009 | CONFIG_CRYPTO_MD4=m |
| 1960 | CONFIG_CRYPTO_MD5=y | 2010 | CONFIG_CRYPTO_MD5=y |
| 2011 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1961 | CONFIG_CRYPTO_SHA1=y | 2012 | CONFIG_CRYPTO_SHA1=y |
| 1962 | CONFIG_CRYPTO_SHA256=m | 2013 | CONFIG_CRYPTO_SHA256=m |
| 1963 | CONFIG_CRYPTO_SHA512=m | 2014 | CONFIG_CRYPTO_SHA512=m |
| 1964 | CONFIG_CRYPTO_WP512=m | ||
| 1965 | CONFIG_CRYPTO_TGR192=m | 2015 | CONFIG_CRYPTO_TGR192=m |
| 1966 | # CONFIG_CRYPTO_GF128MUL is not set | 2016 | CONFIG_CRYPTO_WP512=m |
| 1967 | CONFIG_CRYPTO_ECB=m | 2017 | |
| 1968 | CONFIG_CRYPTO_CBC=y | 2018 | # |
| 1969 | CONFIG_CRYPTO_PCBC=m | 2019 | # Ciphers |
| 1970 | # CONFIG_CRYPTO_LRW is not set | 2020 | # |
| 1971 | # CONFIG_CRYPTO_XTS is not set | ||
| 1972 | # CONFIG_CRYPTO_CTR is not set | ||
| 1973 | # CONFIG_CRYPTO_GCM is not set | ||
| 1974 | # CONFIG_CRYPTO_CCM is not set | ||
| 1975 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1976 | CONFIG_CRYPTO_DES=y | ||
| 1977 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1978 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1979 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1980 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1981 | CONFIG_CRYPTO_SERPENT=m | ||
| 1982 | CONFIG_CRYPTO_AES=m | 2021 | CONFIG_CRYPTO_AES=m |
| 2022 | CONFIG_CRYPTO_ANUBIS=m | ||
| 2023 | CONFIG_CRYPTO_ARC4=m | ||
| 2024 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 2025 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1983 | CONFIG_CRYPTO_CAST5=m | 2026 | CONFIG_CRYPTO_CAST5=m |
| 1984 | CONFIG_CRYPTO_CAST6=m | 2027 | CONFIG_CRYPTO_CAST6=m |
| 1985 | CONFIG_CRYPTO_TEA=m | 2028 | CONFIG_CRYPTO_DES=y |
| 1986 | CONFIG_CRYPTO_ARC4=m | 2029 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1987 | CONFIG_CRYPTO_KHAZAD=m | 2030 | CONFIG_CRYPTO_KHAZAD=m |
| 1988 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1989 | # CONFIG_CRYPTO_SEED is not set | ||
| 1990 | # CONFIG_CRYPTO_SALSA20 is not set | 2031 | # CONFIG_CRYPTO_SALSA20 is not set |
| 2032 | # CONFIG_CRYPTO_SEED is not set | ||
| 2033 | CONFIG_CRYPTO_SERPENT=m | ||
| 2034 | CONFIG_CRYPTO_TEA=m | ||
| 2035 | CONFIG_CRYPTO_TWOFISH=m | ||
| 2036 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 2037 | |||
| 2038 | # | ||
| 2039 | # Compression | ||
| 2040 | # | ||
| 1991 | CONFIG_CRYPTO_DEFLATE=m | 2041 | CONFIG_CRYPTO_DEFLATE=m |
| 1992 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1993 | CONFIG_CRYPTO_CRC32C=m | ||
| 1994 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1995 | # CONFIG_CRYPTO_TEST is not set | ||
| 1996 | CONFIG_CRYPTO_AUTHENC=y | ||
| 1997 | # CONFIG_CRYPTO_LZO is not set | 2042 | # CONFIG_CRYPTO_LZO is not set |
| 1998 | CONFIG_CRYPTO_HW=y | 2043 | CONFIG_CRYPTO_HW=y |
| 1999 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 2044 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 2000 | # CONFIG_PPC_CLOCK is not set | 2045 | # CONFIG_PPC_CLOCK is not set |
| 2046 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 970282b1a004..ce250bc98584 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc6 |
| 4 | # Thu Mar 27 13:56:24 2008 | 4 | # Mon Jun 16 21:11:19 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
| @@ -82,6 +85,7 @@ CONFIG_LOG_BUF_SHIFT=17 | |||
| 82 | CONFIG_CGROUPS=y | 85 | CONFIG_CGROUPS=y |
| 83 | # CONFIG_CGROUP_DEBUG is not set | 86 | # CONFIG_CGROUP_DEBUG is not set |
| 84 | # CONFIG_CGROUP_NS is not set | 87 | # CONFIG_CGROUP_NS is not set |
| 88 | # CONFIG_CGROUP_DEVICE is not set | ||
| 85 | CONFIG_CPUSETS=y | 89 | CONFIG_CPUSETS=y |
| 86 | # CONFIG_GROUP_SCHED is not set | 90 | # CONFIG_GROUP_SCHED is not set |
| 87 | # CONFIG_CGROUP_CPUACCT is not set | 91 | # CONFIG_CGROUP_CPUACCT is not set |
| @@ -101,6 +105,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 101 | CONFIG_SYSCTL=y | 105 | CONFIG_SYSCTL=y |
| 102 | # CONFIG_EMBEDDED is not set | 106 | # CONFIG_EMBEDDED is not set |
| 103 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
| 108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 104 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
| 105 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
| 106 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -108,6 +113,7 @@ CONFIG_HOTPLUG=y | |||
| 108 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
| 109 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
| 110 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
| 116 | CONFIG_PCSPKR_PLATFORM=y | ||
| 111 | # CONFIG_COMPAT_BRK is not set | 117 | # CONFIG_COMPAT_BRK is not set |
| 112 | CONFIG_BASE_FULL=y | 118 | CONFIG_BASE_FULL=y |
| 113 | CONFIG_FUTEX=y | 119 | CONFIG_FUTEX=y |
| @@ -129,12 +135,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 129 | # CONFIG_KPROBES is not set | 135 | # CONFIG_KPROBES is not set |
| 130 | CONFIG_HAVE_KPROBES=y | 136 | CONFIG_HAVE_KPROBES=y |
| 131 | CONFIG_HAVE_KRETPROBES=y | 137 | CONFIG_HAVE_KRETPROBES=y |
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 132 | CONFIG_PROC_PAGE_MONITOR=y | 139 | CONFIG_PROC_PAGE_MONITOR=y |
| 133 | CONFIG_SLABINFO=y | 140 | CONFIG_SLABINFO=y |
| 134 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
| 135 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
| 136 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
| 137 | CONFIG_MODULES=y | 144 | CONFIG_MODULES=y |
| 145 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 138 | CONFIG_MODULE_UNLOAD=y | 146 | CONFIG_MODULE_UNLOAD=y |
| 139 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 147 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 140 | CONFIG_MODVERSIONS=y | 148 | CONFIG_MODVERSIONS=y |
| @@ -194,11 +202,11 @@ CONFIG_PPC_PASEMI=y | |||
| 194 | CONFIG_PPC_PASEMI_IOMMU=y | 202 | CONFIG_PPC_PASEMI_IOMMU=y |
| 195 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set | 203 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set |
| 196 | CONFIG_PPC_PASEMI_MDIO=y | 204 | CONFIG_PPC_PASEMI_MDIO=y |
| 197 | CONFIG_PPC_CELLEB=y | ||
| 198 | # CONFIG_PPC_PS3 is not set | 205 | # CONFIG_PPC_PS3 is not set |
| 199 | CONFIG_PPC_CELL=y | 206 | CONFIG_PPC_CELL=y |
| 200 | CONFIG_PPC_CELL_NATIVE=y | 207 | CONFIG_PPC_CELL_NATIVE=y |
| 201 | CONFIG_PPC_IBM_CELL_BLADE=y | 208 | CONFIG_PPC_IBM_CELL_BLADE=y |
| 209 | CONFIG_PPC_CELLEB=y | ||
| 202 | 210 | ||
| 203 | # | 211 | # |
| 204 | # Cell Broadband Engine options | 212 | # Cell Broadband Engine options |
| @@ -241,6 +249,7 @@ CONFIG_CPU_FREQ_TABLE=y | |||
| 241 | CONFIG_CPU_FREQ_STAT=y | 249 | CONFIG_CPU_FREQ_STAT=y |
| 242 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 250 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
| 243 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 251 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
| 252 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 244 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 253 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
| 245 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | 254 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set |
| 246 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | 255 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |
| @@ -277,7 +286,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 277 | CONFIG_BINFMT_ELF=y | 286 | CONFIG_BINFMT_ELF=y |
| 278 | CONFIG_COMPAT_BINFMT_ELF=y | 287 | CONFIG_COMPAT_BINFMT_ELF=y |
| 279 | CONFIG_BINFMT_MISC=m | 288 | CONFIG_BINFMT_MISC=m |
| 280 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 281 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 289 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 282 | CONFIG_IOMMU_VMERGE=y | 290 | CONFIG_IOMMU_VMERGE=y |
| 283 | CONFIG_IOMMU_HELPER=y | 291 | CONFIG_IOMMU_HELPER=y |
| @@ -307,6 +315,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | |||
| 307 | CONFIG_SPARSEMEM_VMEMMAP=y | 315 | CONFIG_SPARSEMEM_VMEMMAP=y |
| 308 | CONFIG_MEMORY_HOTPLUG=y | 316 | CONFIG_MEMORY_HOTPLUG=y |
| 309 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | 317 | CONFIG_MEMORY_HOTPLUG_SPARSE=y |
| 318 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 310 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 319 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 311 | CONFIG_RESOURCES_64BIT=y | 320 | CONFIG_RESOURCES_64BIT=y |
| 312 | CONFIG_ZONE_DMA_FLAG=1 | 321 | CONFIG_ZONE_DMA_FLAG=1 |
| @@ -314,6 +323,7 @@ CONFIG_BOUNCE=y | |||
| 314 | CONFIG_ARCH_MEMORY_PROBE=y | 323 | CONFIG_ARCH_MEMORY_PROBE=y |
| 315 | CONFIG_PPC_HAS_HASH_64K=y | 324 | CONFIG_PPC_HAS_HASH_64K=y |
| 316 | # CONFIG_PPC_64K_PAGES is not set | 325 | # CONFIG_PPC_64K_PAGES is not set |
| 326 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 317 | # CONFIG_SCHED_SMT is not set | 327 | # CONFIG_SCHED_SMT is not set |
| 318 | CONFIG_PROC_DEVICETREE=y | 328 | CONFIG_PROC_DEVICETREE=y |
| 319 | # CONFIG_CMDLINE_BOOL is not set | 329 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -356,7 +366,10 @@ CONFIG_HOTPLUG_PCI=m | |||
| 356 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 366 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
| 357 | CONFIG_HOTPLUG_PCI_RPA=m | 367 | CONFIG_HOTPLUG_PCI_RPA=m |
| 358 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | 368 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m |
| 369 | # CONFIG_HAS_RAPIDIO is not set | ||
| 370 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
| 359 | CONFIG_KERNEL_START=0xc000000000000000 | 371 | CONFIG_KERNEL_START=0xc000000000000000 |
| 372 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 360 | 373 | ||
| 361 | # | 374 | # |
| 362 | # Networking | 375 | # Networking |
| @@ -406,8 +419,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 406 | # CONFIG_TCP_MD5SIG is not set | 419 | # CONFIG_TCP_MD5SIG is not set |
| 407 | # CONFIG_IP_VS is not set | 420 | # CONFIG_IP_VS is not set |
| 408 | # CONFIG_IPV6 is not set | 421 | # CONFIG_IPV6 is not set |
| 409 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 410 | # CONFIG_INET6_TUNNEL is not set | ||
| 411 | # CONFIG_NETWORK_SECMARK is not set | 422 | # CONFIG_NETWORK_SECMARK is not set |
| 412 | CONFIG_NETFILTER=y | 423 | CONFIG_NETFILTER=y |
| 413 | # CONFIG_NETFILTER_DEBUG is not set | 424 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -423,6 +434,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 423 | CONFIG_NF_CT_ACCT=y | 434 | CONFIG_NF_CT_ACCT=y |
| 424 | CONFIG_NF_CONNTRACK_MARK=y | 435 | CONFIG_NF_CONNTRACK_MARK=y |
| 425 | CONFIG_NF_CONNTRACK_EVENTS=y | 436 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 437 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
| 426 | CONFIG_NF_CT_PROTO_GRE=m | 438 | CONFIG_NF_CT_PROTO_GRE=m |
| 427 | CONFIG_NF_CT_PROTO_SCTP=m | 439 | CONFIG_NF_CT_PROTO_SCTP=m |
| 428 | # CONFIG_NF_CT_PROTO_UDPLITE is not set | 440 | # CONFIG_NF_CT_PROTO_UDPLITE is not set |
| @@ -501,6 +513,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m | |||
| 501 | CONFIG_IP_NF_TARGET_NETMAP=m | 513 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 502 | CONFIG_NF_NAT_SNMP_BASIC=m | 514 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 503 | CONFIG_NF_NAT_PROTO_GRE=m | 515 | CONFIG_NF_NAT_PROTO_GRE=m |
| 516 | CONFIG_NF_NAT_PROTO_SCTP=m | ||
| 504 | CONFIG_NF_NAT_FTP=m | 517 | CONFIG_NF_NAT_FTP=m |
| 505 | CONFIG_NF_NAT_IRC=m | 518 | CONFIG_NF_NAT_IRC=m |
| 506 | CONFIG_NF_NAT_TFTP=m | 519 | CONFIG_NF_NAT_TFTP=m |
| @@ -571,6 +584,7 @@ CONFIG_FW_LOADER=y | |||
| 571 | # CONFIG_CONNECTOR is not set | 584 | # CONFIG_CONNECTOR is not set |
| 572 | # CONFIG_MTD is not set | 585 | # CONFIG_MTD is not set |
| 573 | CONFIG_OF_DEVICE=y | 586 | CONFIG_OF_DEVICE=y |
| 587 | CONFIG_OF_I2C=y | ||
| 574 | # CONFIG_PARPORT is not set | 588 | # CONFIG_PARPORT is not set |
| 575 | CONFIG_BLK_DEV=y | 589 | CONFIG_BLK_DEV=y |
| 576 | CONFIG_BLK_DEV_FD=y | 590 | CONFIG_BLK_DEV_FD=y |
| @@ -618,7 +632,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 618 | # | 632 | # |
| 619 | # IDE chipset support/bugfixes | 633 | # IDE chipset support/bugfixes |
| 620 | # | 634 | # |
| 621 | CONFIG_IDE_GENERIC=y | ||
| 622 | # CONFIG_BLK_DEV_PLATFORM is not set | 635 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 623 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 636 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 624 | 637 | ||
| @@ -661,7 +674,7 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
| 661 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 674 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
| 662 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 675 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
| 663 | CONFIG_BLK_DEV_IDEDMA=y | 676 | CONFIG_BLK_DEV_IDEDMA=y |
| 664 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 677 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 665 | # CONFIG_BLK_DEV_HD is not set | 678 | # CONFIG_BLK_DEV_HD is not set |
| 666 | 679 | ||
| 667 | # | 680 | # |
| @@ -747,17 +760,19 @@ CONFIG_SCSI_DEBUG=m | |||
| 747 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 760 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 748 | CONFIG_ATA=y | 761 | CONFIG_ATA=y |
| 749 | CONFIG_ATA_NONSTANDARD=y | 762 | CONFIG_ATA_NONSTANDARD=y |
| 763 | CONFIG_SATA_PMP=y | ||
| 750 | # CONFIG_SATA_AHCI is not set | 764 | # CONFIG_SATA_AHCI is not set |
| 765 | CONFIG_SATA_SIL24=y | ||
| 766 | CONFIG_ATA_SFF=y | ||
| 751 | CONFIG_SATA_SVW=y | 767 | CONFIG_SATA_SVW=y |
| 752 | # CONFIG_ATA_PIIX is not set | 768 | # CONFIG_ATA_PIIX is not set |
| 753 | CONFIG_SATA_MV=y | 769 | # CONFIG_SATA_MV is not set |
| 754 | # CONFIG_SATA_NV is not set | 770 | # CONFIG_SATA_NV is not set |
| 755 | # CONFIG_PDC_ADMA is not set | 771 | # CONFIG_PDC_ADMA is not set |
| 756 | # CONFIG_SATA_QSTOR is not set | 772 | # CONFIG_SATA_QSTOR is not set |
| 757 | # CONFIG_SATA_PROMISE is not set | 773 | # CONFIG_SATA_PROMISE is not set |
| 758 | # CONFIG_SATA_SX4 is not set | 774 | # CONFIG_SATA_SX4 is not set |
| 759 | # CONFIG_SATA_SIL is not set | 775 | # CONFIG_SATA_SIL is not set |
| 760 | CONFIG_SATA_SIL24=y | ||
| 761 | # CONFIG_SATA_SIS is not set | 776 | # CONFIG_SATA_SIS is not set |
| 762 | # CONFIG_SATA_ULI is not set | 777 | # CONFIG_SATA_ULI is not set |
| 763 | # CONFIG_SATA_VIA is not set | 778 | # CONFIG_SATA_VIA is not set |
| @@ -791,7 +806,7 @@ CONFIG_SATA_SIL24=y | |||
| 791 | # CONFIG_PATA_NS87415 is not set | 806 | # CONFIG_PATA_NS87415 is not set |
| 792 | # CONFIG_PATA_OPTI is not set | 807 | # CONFIG_PATA_OPTI is not set |
| 793 | # CONFIG_PATA_OPTIDMA is not set | 808 | # CONFIG_PATA_OPTIDMA is not set |
| 794 | CONFIG_PATA_PCMCIA=y | 809 | # CONFIG_PATA_PCMCIA is not set |
| 795 | # CONFIG_PATA_PDC_OLD is not set | 810 | # CONFIG_PATA_PDC_OLD is not set |
| 796 | # CONFIG_PATA_RADISYS is not set | 811 | # CONFIG_PATA_RADISYS is not set |
| 797 | # CONFIG_PATA_RZ1000 is not set | 812 | # CONFIG_PATA_RZ1000 is not set |
| @@ -801,10 +816,10 @@ CONFIG_PATA_PCMCIA=y | |||
| 801 | # CONFIG_PATA_SIL680 is not set | 816 | # CONFIG_PATA_SIL680 is not set |
| 802 | # CONFIG_PATA_SIS is not set | 817 | # CONFIG_PATA_SIS is not set |
| 803 | # CONFIG_PATA_VIA is not set | 818 | # CONFIG_PATA_VIA is not set |
| 804 | CONFIG_PATA_WINBOND=y | 819 | # CONFIG_PATA_WINBOND is not set |
| 805 | CONFIG_PATA_PLATFORM=y | 820 | # CONFIG_PATA_PLATFORM is not set |
| 806 | # CONFIG_PATA_OF_PLATFORM is not set | 821 | # CONFIG_PATA_SCC is not set |
| 807 | CONFIG_PATA_SCC=y | 822 | # CONFIG_PATA_SCH is not set |
| 808 | CONFIG_MD=y | 823 | CONFIG_MD=y |
| 809 | CONFIG_BLK_DEV_MD=y | 824 | CONFIG_BLK_DEV_MD=y |
| 810 | CONFIG_MD_LINEAR=y | 825 | CONFIG_MD_LINEAR=y |
| @@ -866,6 +881,7 @@ CONFIG_WINDFARM=y | |||
| 866 | CONFIG_WINDFARM_PM81=y | 881 | CONFIG_WINDFARM_PM81=y |
| 867 | CONFIG_WINDFARM_PM91=y | 882 | CONFIG_WINDFARM_PM91=y |
| 868 | CONFIG_WINDFARM_PM112=y | 883 | CONFIG_WINDFARM_PM112=y |
| 884 | CONFIG_WINDFARM_PM121=y | ||
| 869 | # CONFIG_PMAC_RACKMETER is not set | 885 | # CONFIG_PMAC_RACKMETER is not set |
| 870 | CONFIG_NETDEVICES=y | 886 | CONFIG_NETDEVICES=y |
| 871 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | 887 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
| @@ -911,7 +927,6 @@ CONFIG_IBM_NEW_EMAC_TAH=y | |||
| 911 | CONFIG_IBM_NEW_EMAC_EMAC4=y | 927 | CONFIG_IBM_NEW_EMAC_EMAC4=y |
| 912 | CONFIG_NET_PCI=y | 928 | CONFIG_NET_PCI=y |
| 913 | CONFIG_PCNET32=y | 929 | CONFIG_PCNET32=y |
| 914 | # CONFIG_PCNET32_NAPI is not set | ||
| 915 | # CONFIG_AMD8111_ETH is not set | 930 | # CONFIG_AMD8111_ETH is not set |
| 916 | # CONFIG_ADAPTEC_STARFIRE is not set | 931 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 917 | # CONFIG_B44 is not set | 932 | # CONFIG_B44 is not set |
| @@ -947,7 +962,6 @@ CONFIG_E1000=y | |||
| 947 | # CONFIG_SIS190 is not set | 962 | # CONFIG_SIS190 is not set |
| 948 | # CONFIG_SKGE is not set | 963 | # CONFIG_SKGE is not set |
| 949 | # CONFIG_SKY2 is not set | 964 | # CONFIG_SKY2 is not set |
| 950 | # CONFIG_SK98LIN is not set | ||
| 951 | # CONFIG_VIA_VELOCITY is not set | 965 | # CONFIG_VIA_VELOCITY is not set |
| 952 | CONFIG_TIGON3=y | 966 | CONFIG_TIGON3=y |
| 953 | # CONFIG_BNX2 is not set | 967 | # CONFIG_BNX2 is not set |
| @@ -969,6 +983,7 @@ CONFIG_PASEMI_MAC=y | |||
| 969 | # CONFIG_MLX4_CORE is not set | 983 | # CONFIG_MLX4_CORE is not set |
| 970 | # CONFIG_TEHUTI is not set | 984 | # CONFIG_TEHUTI is not set |
| 971 | # CONFIG_BNX2X is not set | 985 | # CONFIG_BNX2X is not set |
| 986 | # CONFIG_SFC is not set | ||
| 972 | CONFIG_TR=y | 987 | CONFIG_TR=y |
| 973 | CONFIG_IBMOL=y | 988 | CONFIG_IBMOL=y |
| 974 | # CONFIG_3C359 is not set | 989 | # CONFIG_3C359 is not set |
| @@ -979,6 +994,7 @@ CONFIG_IBMOL=y | |||
| 979 | # | 994 | # |
| 980 | # CONFIG_WLAN_PRE80211 is not set | 995 | # CONFIG_WLAN_PRE80211 is not set |
| 981 | # CONFIG_WLAN_80211 is not set | 996 | # CONFIG_WLAN_80211 is not set |
| 997 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 982 | 998 | ||
| 983 | # | 999 | # |
| 984 | # USB Network Adapters | 1000 | # USB Network Adapters |
| @@ -1083,6 +1099,7 @@ CONFIG_VT=y | |||
| 1083 | CONFIG_VT_CONSOLE=y | 1099 | CONFIG_VT_CONSOLE=y |
| 1084 | CONFIG_HW_CONSOLE=y | 1100 | CONFIG_HW_CONSOLE=y |
| 1085 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1101 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 1102 | CONFIG_DEVKMEM=y | ||
| 1086 | # CONFIG_SERIAL_NONSTANDARD is not set | 1103 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 1087 | # CONFIG_NOZOMI is not set | 1104 | # CONFIG_NOZOMI is not set |
| 1088 | 1105 | ||
| @@ -1121,8 +1138,6 @@ CONFIG_HVC_BEAT=y | |||
| 1121 | CONFIG_HVCS=m | 1138 | CONFIG_HVCS=m |
| 1122 | # CONFIG_IPMI_HANDLER is not set | 1139 | # CONFIG_IPMI_HANDLER is not set |
| 1123 | # CONFIG_HW_RANDOM is not set | 1140 | # CONFIG_HW_RANDOM is not set |
| 1124 | CONFIG_GEN_RTC=y | ||
| 1125 | # CONFIG_GEN_RTC_X is not set | ||
| 1126 | # CONFIG_R3964 is not set | 1141 | # CONFIG_R3964 is not set |
| 1127 | # CONFIG_APPLICOM is not set | 1142 | # CONFIG_APPLICOM is not set |
| 1128 | 1143 | ||
| @@ -1141,13 +1156,7 @@ CONFIG_DEVPORT=y | |||
| 1141 | CONFIG_I2C=y | 1156 | CONFIG_I2C=y |
| 1142 | CONFIG_I2C_BOARDINFO=y | 1157 | CONFIG_I2C_BOARDINFO=y |
| 1143 | CONFIG_I2C_CHARDEV=y | 1158 | CONFIG_I2C_CHARDEV=y |
| 1144 | |||
| 1145 | # | ||
| 1146 | # I2C Algorithms | ||
| 1147 | # | ||
| 1148 | CONFIG_I2C_ALGOBIT=y | 1159 | CONFIG_I2C_ALGOBIT=y |
| 1149 | # CONFIG_I2C_ALGOPCF is not set | ||
| 1150 | # CONFIG_I2C_ALGOPCA is not set | ||
| 1151 | 1160 | ||
| 1152 | # | 1161 | # |
| 1153 | # I2C Hardware Bus support | 1162 | # I2C Hardware Bus support |
| @@ -1177,6 +1186,7 @@ CONFIG_I2C_PASEMI=y | |||
| 1177 | # CONFIG_I2C_VIA is not set | 1186 | # CONFIG_I2C_VIA is not set |
| 1178 | # CONFIG_I2C_VIAPRO is not set | 1187 | # CONFIG_I2C_VIAPRO is not set |
| 1179 | # CONFIG_I2C_VOODOO3 is not set | 1188 | # CONFIG_I2C_VOODOO3 is not set |
| 1189 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1180 | 1190 | ||
| 1181 | # | 1191 | # |
| 1182 | # Miscellaneous I2C Chip support | 1192 | # Miscellaneous I2C Chip support |
| @@ -1186,19 +1196,13 @@ CONFIG_I2C_PASEMI=y | |||
| 1186 | # CONFIG_SENSORS_PCF8574 is not set | 1196 | # CONFIG_SENSORS_PCF8574 is not set |
| 1187 | # CONFIG_PCF8575 is not set | 1197 | # CONFIG_PCF8575 is not set |
| 1188 | # CONFIG_SENSORS_PCF8591 is not set | 1198 | # CONFIG_SENSORS_PCF8591 is not set |
| 1189 | # CONFIG_TPS65010 is not set | ||
| 1190 | # CONFIG_SENSORS_MAX6875 is not set | 1199 | # CONFIG_SENSORS_MAX6875 is not set |
| 1191 | # CONFIG_SENSORS_TSL2550 is not set | 1200 | # CONFIG_SENSORS_TSL2550 is not set |
| 1192 | # CONFIG_I2C_DEBUG_CORE is not set | 1201 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1193 | # CONFIG_I2C_DEBUG_ALGO is not set | 1202 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1194 | # CONFIG_I2C_DEBUG_BUS is not set | 1203 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1195 | # CONFIG_I2C_DEBUG_CHIP is not set | 1204 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1196 | |||
| 1197 | # | ||
| 1198 | # SPI support | ||
| 1199 | # | ||
| 1200 | # CONFIG_SPI is not set | 1205 | # CONFIG_SPI is not set |
| 1201 | # CONFIG_SPI_MASTER is not set | ||
| 1202 | # CONFIG_W1 is not set | 1206 | # CONFIG_W1 is not set |
| 1203 | # CONFIG_POWER_SUPPLY is not set | 1207 | # CONFIG_POWER_SUPPLY is not set |
| 1204 | # CONFIG_HWMON is not set | 1208 | # CONFIG_HWMON is not set |
| @@ -1215,12 +1219,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1215 | # Multifunction device drivers | 1219 | # Multifunction device drivers |
| 1216 | # | 1220 | # |
| 1217 | # CONFIG_MFD_SM501 is not set | 1221 | # CONFIG_MFD_SM501 is not set |
| 1222 | # CONFIG_HTC_PASIC3 is not set | ||
| 1218 | 1223 | ||
| 1219 | # | 1224 | # |
| 1220 | # Multimedia devices | 1225 | # Multimedia devices |
| 1221 | # | 1226 | # |
| 1227 | |||
| 1228 | # | ||
| 1229 | # Multimedia core support | ||
| 1230 | # | ||
| 1222 | # CONFIG_VIDEO_DEV is not set | 1231 | # CONFIG_VIDEO_DEV is not set |
| 1223 | # CONFIG_DVB_CORE is not set | 1232 | # CONFIG_DVB_CORE is not set |
| 1233 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1234 | |||
| 1235 | # | ||
| 1236 | # Multimedia drivers | ||
| 1237 | # | ||
| 1224 | # CONFIG_DAB is not set | 1238 | # CONFIG_DAB is not set |
| 1225 | 1239 | ||
| 1226 | # | 1240 | # |
| @@ -1240,8 +1254,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 1240 | # CONFIG_FB_SYS_FILLRECT is not set | 1254 | # CONFIG_FB_SYS_FILLRECT is not set |
| 1241 | # CONFIG_FB_SYS_COPYAREA is not set | 1255 | # CONFIG_FB_SYS_COPYAREA is not set |
| 1242 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1256 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1257 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1243 | # CONFIG_FB_SYS_FOPS is not set | 1258 | # CONFIG_FB_SYS_FOPS is not set |
| 1244 | CONFIG_FB_DEFERRED_IO=y | ||
| 1245 | # CONFIG_FB_SVGALIB is not set | 1259 | # CONFIG_FB_SVGALIB is not set |
| 1246 | CONFIG_FB_MACMODES=y | 1260 | CONFIG_FB_MACMODES=y |
| 1247 | CONFIG_FB_BACKLIGHT=y | 1261 | CONFIG_FB_BACKLIGHT=y |
| @@ -1363,6 +1377,7 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
| 1363 | # CONFIG_SND_AU8810 is not set | 1377 | # CONFIG_SND_AU8810 is not set |
| 1364 | # CONFIG_SND_AU8820 is not set | 1378 | # CONFIG_SND_AU8820 is not set |
| 1365 | # CONFIG_SND_AU8830 is not set | 1379 | # CONFIG_SND_AU8830 is not set |
| 1380 | # CONFIG_SND_AW2 is not set | ||
| 1366 | # CONFIG_SND_AZT3328 is not set | 1381 | # CONFIG_SND_AZT3328 is not set |
| 1367 | # CONFIG_SND_BT87X is not set | 1382 | # CONFIG_SND_BT87X is not set |
| 1368 | # CONFIG_SND_CA0106 is not set | 1383 | # CONFIG_SND_CA0106 is not set |
| @@ -1455,11 +1470,11 @@ CONFIG_SND_AOA_SOUNDBUS_I2S=m | |||
| 1455 | # CONFIG_SND_SOC is not set | 1470 | # CONFIG_SND_SOC is not set |
| 1456 | 1471 | ||
| 1457 | # | 1472 | # |
| 1458 | # SoC Audio support for SuperH | 1473 | # ALSA SoC audio for Freescale SOCs |
| 1459 | # | 1474 | # |
| 1460 | 1475 | ||
| 1461 | # | 1476 | # |
| 1462 | # ALSA SoC audio for Freescale SOCs | 1477 | # SoC Audio for the Texas Instruments OMAP |
| 1463 | # | 1478 | # |
| 1464 | 1479 | ||
| 1465 | # | 1480 | # |
| @@ -1497,12 +1512,14 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1497 | # | 1512 | # |
| 1498 | # USB Host Controller Drivers | 1513 | # USB Host Controller Drivers |
| 1499 | # | 1514 | # |
| 1515 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1500 | CONFIG_USB_EHCI_HCD=y | 1516 | CONFIG_USB_EHCI_HCD=y |
| 1501 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1517 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1502 | CONFIG_USB_EHCI_TT_NEWSCHED=y | 1518 | CONFIG_USB_EHCI_TT_NEWSCHED=y |
| 1503 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | 1519 | CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y |
| 1504 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1520 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 1505 | # CONFIG_USB_ISP116X_HCD is not set | 1521 | # CONFIG_USB_ISP116X_HCD is not set |
| 1522 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1506 | CONFIG_USB_OHCI_HCD=y | 1523 | CONFIG_USB_OHCI_HCD=y |
| 1507 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1524 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1508 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1525 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1517,6 +1534,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1517 | # | 1534 | # |
| 1518 | # CONFIG_USB_ACM is not set | 1535 | # CONFIG_USB_ACM is not set |
| 1519 | # CONFIG_USB_PRINTER is not set | 1536 | # CONFIG_USB_PRINTER is not set |
| 1537 | # CONFIG_USB_WDM is not set | ||
| 1520 | 1538 | ||
| 1521 | # | 1539 | # |
| 1522 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1540 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1538,6 +1556,7 @@ CONFIG_USB_STORAGE=m | |||
| 1538 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1556 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1539 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1557 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
| 1540 | # CONFIG_USB_STORAGE_KARMA is not set | 1558 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1559 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1541 | # CONFIG_USB_LIBUSUAL is not set | 1560 | # CONFIG_USB_LIBUSUAL is not set |
| 1542 | 1561 | ||
| 1543 | # | 1562 | # |
| @@ -1575,10 +1594,12 @@ CONFIG_USB_APPLEDISPLAY=m | |||
| 1575 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1594 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1576 | # CONFIG_USB_IOWARRIOR is not set | 1595 | # CONFIG_USB_IOWARRIOR is not set |
| 1577 | # CONFIG_USB_TEST is not set | 1596 | # CONFIG_USB_TEST is not set |
| 1597 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1578 | # CONFIG_USB_GADGET is not set | 1598 | # CONFIG_USB_GADGET is not set |
| 1579 | # CONFIG_MMC is not set | 1599 | # CONFIG_MMC is not set |
| 1580 | # CONFIG_MEMSTICK is not set | 1600 | # CONFIG_MEMSTICK is not set |
| 1581 | # CONFIG_NEW_LEDS is not set | 1601 | # CONFIG_NEW_LEDS is not set |
| 1602 | # CONFIG_ACCESSIBILITY is not set | ||
| 1582 | CONFIG_INFINIBAND=m | 1603 | CONFIG_INFINIBAND=m |
| 1583 | # CONFIG_INFINIBAND_USER_MAD is not set | 1604 | # CONFIG_INFINIBAND_USER_MAD is not set |
| 1584 | # CONFIG_INFINIBAND_USER_ACCESS is not set | 1605 | # CONFIG_INFINIBAND_USER_ACCESS is not set |
| @@ -1607,10 +1628,6 @@ CONFIG_EDAC_PASEMI=y | |||
| 1607 | # CONFIG_EDAC_CELL is not set | 1628 | # CONFIG_EDAC_CELL is not set |
| 1608 | CONFIG_RTC_LIB=y | 1629 | CONFIG_RTC_LIB=y |
| 1609 | CONFIG_RTC_CLASS=y | 1630 | CONFIG_RTC_CLASS=y |
| 1610 | |||
| 1611 | # | ||
| 1612 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
| 1613 | # | ||
| 1614 | CONFIG_RTC_HCTOSYS=y | 1631 | CONFIG_RTC_HCTOSYS=y |
| 1615 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 1632 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
| 1616 | # CONFIG_RTC_DEBUG is not set | 1633 | # CONFIG_RTC_DEBUG is not set |
| @@ -1638,6 +1655,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1638 | # CONFIG_RTC_DRV_PCF8583 is not set | 1655 | # CONFIG_RTC_DRV_PCF8583 is not set |
| 1639 | # CONFIG_RTC_DRV_M41T80 is not set | 1656 | # CONFIG_RTC_DRV_M41T80 is not set |
| 1640 | # CONFIG_RTC_DRV_S35390A is not set | 1657 | # CONFIG_RTC_DRV_S35390A is not set |
| 1658 | # CONFIG_RTC_DRV_FM3130 is not set | ||
| 1641 | 1659 | ||
| 1642 | # | 1660 | # |
| 1643 | # SPI RTC drivers | 1661 | # SPI RTC drivers |
| @@ -1658,11 +1676,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 1658 | # | 1676 | # |
| 1659 | # on-CPU RTC drivers | 1677 | # on-CPU RTC drivers |
| 1660 | # | 1678 | # |
| 1679 | CONFIG_RTC_DRV_PPC=y | ||
| 1661 | # CONFIG_DMADEVICES is not set | 1680 | # CONFIG_DMADEVICES is not set |
| 1662 | |||
| 1663 | # | ||
| 1664 | # Userspace I/O | ||
| 1665 | # | ||
| 1666 | # CONFIG_UIO is not set | 1681 | # CONFIG_UIO is not set |
| 1667 | 1682 | ||
| 1668 | # | 1683 | # |
| @@ -1696,9 +1711,9 @@ CONFIG_JFS_SECURITY=y | |||
| 1696 | CONFIG_FS_POSIX_ACL=y | 1711 | CONFIG_FS_POSIX_ACL=y |
| 1697 | CONFIG_XFS_FS=m | 1712 | CONFIG_XFS_FS=m |
| 1698 | # CONFIG_XFS_QUOTA is not set | 1713 | # CONFIG_XFS_QUOTA is not set |
| 1699 | CONFIG_XFS_SECURITY=y | ||
| 1700 | CONFIG_XFS_POSIX_ACL=y | 1714 | CONFIG_XFS_POSIX_ACL=y |
| 1701 | # CONFIG_XFS_RT is not set | 1715 | # CONFIG_XFS_RT is not set |
| 1716 | # CONFIG_XFS_DEBUG is not set | ||
| 1702 | # CONFIG_GFS2_FS is not set | 1717 | # CONFIG_GFS2_FS is not set |
| 1703 | # CONFIG_OCFS2_FS is not set | 1718 | # CONFIG_OCFS2_FS is not set |
| 1704 | CONFIG_DNOTIFY=y | 1719 | CONFIG_DNOTIFY=y |
| @@ -1764,13 +1779,11 @@ CONFIG_NFS_FS=y | |||
| 1764 | CONFIG_NFS_V3=y | 1779 | CONFIG_NFS_V3=y |
| 1765 | CONFIG_NFS_V3_ACL=y | 1780 | CONFIG_NFS_V3_ACL=y |
| 1766 | CONFIG_NFS_V4=y | 1781 | CONFIG_NFS_V4=y |
| 1767 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1768 | CONFIG_NFSD=m | 1782 | CONFIG_NFSD=m |
| 1769 | CONFIG_NFSD_V2_ACL=y | 1783 | CONFIG_NFSD_V2_ACL=y |
| 1770 | CONFIG_NFSD_V3=y | 1784 | CONFIG_NFSD_V3=y |
| 1771 | CONFIG_NFSD_V3_ACL=y | 1785 | CONFIG_NFSD_V3_ACL=y |
| 1772 | CONFIG_NFSD_V4=y | 1786 | CONFIG_NFSD_V4=y |
| 1773 | CONFIG_NFSD_TCP=y | ||
| 1774 | CONFIG_ROOT_NFS=y | 1787 | CONFIG_ROOT_NFS=y |
| 1775 | CONFIG_LOCKD=y | 1788 | CONFIG_LOCKD=y |
| 1776 | CONFIG_LOCKD_V4=y | 1789 | CONFIG_LOCKD_V4=y |
| @@ -1862,9 +1875,10 @@ CONFIG_NLS_UTF8=m | |||
| 1862 | # Library routines | 1875 | # Library routines |
| 1863 | # | 1876 | # |
| 1864 | CONFIG_BITREVERSE=y | 1877 | CONFIG_BITREVERSE=y |
| 1878 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1865 | CONFIG_CRC_CCITT=m | 1879 | CONFIG_CRC_CCITT=m |
| 1866 | # CONFIG_CRC16 is not set | 1880 | # CONFIG_CRC16 is not set |
| 1867 | # CONFIG_CRC_ITU_T is not set | 1881 | CONFIG_CRC_ITU_T=m |
| 1868 | CONFIG_CRC32=y | 1882 | CONFIG_CRC32=y |
| 1869 | # CONFIG_CRC7 is not set | 1883 | # CONFIG_CRC7 is not set |
| 1870 | CONFIG_LIBCRC32C=m | 1884 | CONFIG_LIBCRC32C=m |
| @@ -1888,6 +1902,7 @@ CONFIG_HAVE_LMB=y | |||
| 1888 | # CONFIG_PRINTK_TIME is not set | 1902 | # CONFIG_PRINTK_TIME is not set |
| 1889 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1903 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1890 | CONFIG_ENABLE_MUST_CHECK=y | 1904 | CONFIG_ENABLE_MUST_CHECK=y |
| 1905 | CONFIG_FRAME_WARN=2048 | ||
| 1891 | CONFIG_MAGIC_SYSRQ=y | 1906 | CONFIG_MAGIC_SYSRQ=y |
| 1892 | # CONFIG_UNUSED_SYMBOLS is not set | 1907 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1893 | CONFIG_DEBUG_FS=y | 1908 | CONFIG_DEBUG_FS=y |
| @@ -1898,18 +1913,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1898 | CONFIG_SCHED_DEBUG=y | 1913 | CONFIG_SCHED_DEBUG=y |
| 1899 | # CONFIG_SCHEDSTATS is not set | 1914 | # CONFIG_SCHEDSTATS is not set |
| 1900 | # CONFIG_TIMER_STATS is not set | 1915 | # CONFIG_TIMER_STATS is not set |
| 1916 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1901 | # CONFIG_SLUB_DEBUG_ON is not set | 1917 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1902 | # CONFIG_SLUB_STATS is not set | 1918 | # CONFIG_SLUB_STATS is not set |
| 1903 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1919 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1904 | # CONFIG_RT_MUTEX_TESTER is not set | 1920 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1905 | # CONFIG_DEBUG_SPINLOCK is not set | 1921 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1906 | CONFIG_DEBUG_MUTEXES=y | 1922 | CONFIG_DEBUG_MUTEXES=y |
| 1923 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1924 | # CONFIG_PROVE_LOCKING is not set | ||
| 1925 | # CONFIG_LOCK_STAT is not set | ||
| 1907 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1926 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1908 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1927 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1909 | # CONFIG_DEBUG_KOBJECT is not set | 1928 | # CONFIG_DEBUG_KOBJECT is not set |
| 1910 | CONFIG_DEBUG_BUGVERBOSE=y | 1929 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1911 | # CONFIG_DEBUG_INFO is not set | 1930 | # CONFIG_DEBUG_INFO is not set |
| 1912 | # CONFIG_DEBUG_VM is not set | 1931 | # CONFIG_DEBUG_VM is not set |
| 1932 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1913 | # CONFIG_DEBUG_LIST is not set | 1933 | # CONFIG_DEBUG_LIST is not set |
| 1914 | # CONFIG_DEBUG_SG is not set | 1934 | # CONFIG_DEBUG_SG is not set |
| 1915 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1935 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1941,53 +1961,83 @@ CONFIG_ASYNC_CORE=y | |||
| 1941 | CONFIG_ASYNC_MEMCPY=y | 1961 | CONFIG_ASYNC_MEMCPY=y |
| 1942 | CONFIG_ASYNC_XOR=y | 1962 | CONFIG_ASYNC_XOR=y |
| 1943 | CONFIG_CRYPTO=y | 1963 | CONFIG_CRYPTO=y |
| 1964 | |||
| 1965 | # | ||
| 1966 | # Crypto core or helper | ||
| 1967 | # | ||
| 1944 | CONFIG_CRYPTO_ALGAPI=y | 1968 | CONFIG_CRYPTO_ALGAPI=y |
| 1945 | CONFIG_CRYPTO_AEAD=m | 1969 | CONFIG_CRYPTO_AEAD=m |
| 1946 | CONFIG_CRYPTO_BLKCIPHER=y | 1970 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1947 | CONFIG_CRYPTO_SEQIV=m | ||
| 1948 | CONFIG_CRYPTO_HASH=y | 1971 | CONFIG_CRYPTO_HASH=y |
| 1949 | CONFIG_CRYPTO_MANAGER=y | 1972 | CONFIG_CRYPTO_MANAGER=y |
| 1973 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1974 | CONFIG_CRYPTO_NULL=m | ||
| 1975 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1976 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1977 | CONFIG_CRYPTO_TEST=m | ||
| 1978 | |||
| 1979 | # | ||
| 1980 | # Authenticated Encryption with Associated Data | ||
| 1981 | # | ||
| 1982 | CONFIG_CRYPTO_CCM=m | ||
| 1983 | CONFIG_CRYPTO_GCM=m | ||
| 1984 | CONFIG_CRYPTO_SEQIV=m | ||
| 1985 | |||
| 1986 | # | ||
| 1987 | # Block modes | ||
| 1988 | # | ||
| 1989 | CONFIG_CRYPTO_CBC=y | ||
| 1990 | CONFIG_CRYPTO_CTR=m | ||
| 1991 | # CONFIG_CRYPTO_CTS is not set | ||
| 1992 | CONFIG_CRYPTO_ECB=m | ||
| 1993 | # CONFIG_CRYPTO_LRW is not set | ||
| 1994 | CONFIG_CRYPTO_PCBC=m | ||
| 1995 | # CONFIG_CRYPTO_XTS is not set | ||
| 1996 | |||
| 1997 | # | ||
| 1998 | # Hash modes | ||
| 1999 | # | ||
| 1950 | CONFIG_CRYPTO_HMAC=y | 2000 | CONFIG_CRYPTO_HMAC=y |
| 1951 | # CONFIG_CRYPTO_XCBC is not set | 2001 | # CONFIG_CRYPTO_XCBC is not set |
| 1952 | CONFIG_CRYPTO_NULL=m | 2002 | |
| 2003 | # | ||
| 2004 | # Digest | ||
| 2005 | # | ||
| 2006 | CONFIG_CRYPTO_CRC32C=m | ||
| 1953 | CONFIG_CRYPTO_MD4=m | 2007 | CONFIG_CRYPTO_MD4=m |
| 1954 | CONFIG_CRYPTO_MD5=y | 2008 | CONFIG_CRYPTO_MD5=y |
| 2009 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1955 | CONFIG_CRYPTO_SHA1=m | 2010 | CONFIG_CRYPTO_SHA1=m |
| 1956 | CONFIG_CRYPTO_SHA256=m | 2011 | CONFIG_CRYPTO_SHA256=m |
| 1957 | CONFIG_CRYPTO_SHA512=m | 2012 | CONFIG_CRYPTO_SHA512=m |
| 1958 | CONFIG_CRYPTO_WP512=m | ||
| 1959 | CONFIG_CRYPTO_TGR192=m | 2013 | CONFIG_CRYPTO_TGR192=m |
| 1960 | CONFIG_CRYPTO_GF128MUL=m | 2014 | CONFIG_CRYPTO_WP512=m |
| 1961 | CONFIG_CRYPTO_ECB=m | 2015 | |
| 1962 | CONFIG_CRYPTO_CBC=y | 2016 | # |
| 1963 | CONFIG_CRYPTO_PCBC=m | 2017 | # Ciphers |
| 1964 | # CONFIG_CRYPTO_LRW is not set | 2018 | # |
| 1965 | # CONFIG_CRYPTO_XTS is not set | ||
| 1966 | CONFIG_CRYPTO_CTR=m | ||
| 1967 | CONFIG_CRYPTO_GCM=m | ||
| 1968 | CONFIG_CRYPTO_CCM=m | ||
| 1969 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1970 | CONFIG_CRYPTO_DES=y | ||
| 1971 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1972 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1973 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1974 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1975 | CONFIG_CRYPTO_SERPENT=m | ||
| 1976 | CONFIG_CRYPTO_AES=m | 2019 | CONFIG_CRYPTO_AES=m |
| 2020 | CONFIG_CRYPTO_ANUBIS=m | ||
| 2021 | CONFIG_CRYPTO_ARC4=m | ||
| 2022 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 2023 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1977 | CONFIG_CRYPTO_CAST5=m | 2024 | CONFIG_CRYPTO_CAST5=m |
| 1978 | CONFIG_CRYPTO_CAST6=m | 2025 | CONFIG_CRYPTO_CAST6=m |
| 1979 | CONFIG_CRYPTO_TEA=m | 2026 | CONFIG_CRYPTO_DES=y |
| 1980 | CONFIG_CRYPTO_ARC4=m | 2027 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1981 | CONFIG_CRYPTO_KHAZAD=m | 2028 | CONFIG_CRYPTO_KHAZAD=m |
| 1982 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1983 | # CONFIG_CRYPTO_SEED is not set | ||
| 1984 | CONFIG_CRYPTO_SALSA20=m | 2029 | CONFIG_CRYPTO_SALSA20=m |
| 2030 | # CONFIG_CRYPTO_SEED is not set | ||
| 2031 | CONFIG_CRYPTO_SERPENT=m | ||
| 2032 | CONFIG_CRYPTO_TEA=m | ||
| 2033 | CONFIG_CRYPTO_TWOFISH=m | ||
| 2034 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 2035 | |||
| 2036 | # | ||
| 2037 | # Compression | ||
| 2038 | # | ||
| 1985 | CONFIG_CRYPTO_DEFLATE=m | 2039 | CONFIG_CRYPTO_DEFLATE=m |
| 1986 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1987 | CONFIG_CRYPTO_CRC32C=m | ||
| 1988 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1989 | CONFIG_CRYPTO_TEST=m | ||
| 1990 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1991 | CONFIG_CRYPTO_LZO=m | 2040 | CONFIG_CRYPTO_LZO=m |
| 1992 | # CONFIG_CRYPTO_HW is not set | 2041 | # CONFIG_CRYPTO_HW is not set |
| 1993 | # CONFIG_PPC_CLOCK is not set | 2042 | # CONFIG_PPC_CLOCK is not set |
| 2043 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 1383eb696a20..bc3bf62ddc2f 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 24 08:48:36 2008 | 4 | # Mon Jun 9 08:52:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -30,6 +30,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 36 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_GENERIC_HWEIGHT=y | 37 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -70,19 +72,17 @@ CONFIG_IKCONFIG=y | |||
| 70 | CONFIG_IKCONFIG_PROC=y | 72 | CONFIG_IKCONFIG_PROC=y |
| 71 | CONFIG_LOG_BUF_SHIFT=14 | 73 | CONFIG_LOG_BUF_SHIFT=14 |
| 72 | # CONFIG_CGROUPS is not set | 74 | # CONFIG_CGROUPS is not set |
| 73 | CONFIG_GROUP_SCHED=y | ||
| 74 | # CONFIG_FAIR_GROUP_SCHED is not set | ||
| 75 | CONFIG_USER_SCHED=y | ||
| 76 | # CONFIG_CGROUP_SCHED is not set | ||
| 77 | CONFIG_SYSFS_DEPRECATED=y | 75 | CONFIG_SYSFS_DEPRECATED=y |
| 78 | CONFIG_SYSFS_DEPRECATED_V2=y | 76 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 79 | # CONFIG_RELAY is not set | 77 | # CONFIG_RELAY is not set |
| 80 | # CONFIG_NAMESPACES is not set | 78 | # CONFIG_NAMESPACES is not set |
| 81 | CONFIG_BLK_DEV_INITRD=y | 79 | CONFIG_BLK_DEV_INITRD=y |
| 82 | CONFIG_INITRAMFS_SOURCE="" | 80 | CONFIG_INITRAMFS_SOURCE="" |
| 81 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 83 | CONFIG_SYSCTL=y | 82 | CONFIG_SYSCTL=y |
| 84 | CONFIG_EMBEDDED=y | 83 | CONFIG_EMBEDDED=y |
| 85 | CONFIG_SYSCTL_SYSCALL=y | 84 | CONFIG_SYSCTL_SYSCALL=y |
| 85 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 86 | CONFIG_KALLSYMS=y | 86 | CONFIG_KALLSYMS=y |
| 87 | CONFIG_KALLSYMS_ALL=y | 87 | CONFIG_KALLSYMS_ALL=y |
| 88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -109,6 +109,7 @@ CONFIG_SLUB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 109 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 110 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 111 | CONFIG_HAVE_KRETPROBES=y |
| 112 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 113 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 114 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 115 | CONFIG_RT_MUTEXES=y |
| @@ -196,11 +197,13 @@ CONFIG_FLATMEM=y | |||
| 196 | CONFIG_FLAT_NODE_MEM_MAP=y | 197 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 197 | # CONFIG_SPARSEMEM_STATIC is not set | 198 | # CONFIG_SPARSEMEM_STATIC is not set |
| 198 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 200 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 201 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 200 | # CONFIG_RESOURCES_64BIT is not set | 202 | # CONFIG_RESOURCES_64BIT is not set |
| 201 | CONFIG_ZONE_DMA_FLAG=1 | 203 | CONFIG_ZONE_DMA_FLAG=1 |
| 202 | CONFIG_BOUNCE=y | 204 | CONFIG_BOUNCE=y |
| 203 | CONFIG_VIRT_TO_BUS=y | 205 | CONFIG_VIRT_TO_BUS=y |
| 206 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 204 | CONFIG_PROC_DEVICETREE=y | 207 | CONFIG_PROC_DEVICETREE=y |
| 205 | # CONFIG_CMDLINE_BOOL is not set | 208 | # CONFIG_CMDLINE_BOOL is not set |
| 206 | # CONFIG_PM is not set | 209 | # CONFIG_PM is not set |
| @@ -225,6 +228,7 @@ CONFIG_PCI_LEGACY=y | |||
| 225 | # CONFIG_PCI_DEBUG is not set | 228 | # CONFIG_PCI_DEBUG is not set |
| 226 | # CONFIG_PCCARD is not set | 229 | # CONFIG_PCCARD is not set |
| 227 | # CONFIG_HOTPLUG_PCI is not set | 230 | # CONFIG_HOTPLUG_PCI is not set |
| 231 | # CONFIG_HAS_RAPIDIO is not set | ||
| 228 | 232 | ||
| 229 | # | 233 | # |
| 230 | # Advanced setup | 234 | # Advanced setup |
| @@ -234,11 +238,11 @@ CONFIG_PCI_LEGACY=y | |||
| 234 | # | 238 | # |
| 235 | # Default settings for advanced configuration options are used | 239 | # Default settings for advanced configuration options are used |
| 236 | # | 240 | # |
| 237 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 238 | CONFIG_LOWMEM_SIZE=0x30000000 | 241 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 242 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 239 | CONFIG_KERNEL_START=0xc0000000 | 243 | CONFIG_KERNEL_START=0xc0000000 |
| 244 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 240 | CONFIG_TASK_SIZE=0xc0000000 | 245 | CONFIG_TASK_SIZE=0xc0000000 |
| 241 | CONFIG_BOOT_LOAD=0x00400000 | ||
| 242 | 246 | ||
| 243 | # | 247 | # |
| 244 | # Networking | 248 | # Networking |
| @@ -293,6 +297,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=y | |||
| 293 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 297 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 294 | CONFIG_INET6_XFRM_MODE_BEET=y | 298 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 295 | CONFIG_IPV6_SIT=y | 299 | CONFIG_IPV6_SIT=y |
| 300 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 296 | # CONFIG_IPV6_TUNNEL is not set | 301 | # CONFIG_IPV6_TUNNEL is not set |
| 297 | # CONFIG_NETWORK_SECMARK is not set | 302 | # CONFIG_NETWORK_SECMARK is not set |
| 298 | CONFIG_NETFILTER=y | 303 | CONFIG_NETFILTER=y |
| @@ -513,7 +518,7 @@ CONFIG_IDE_PROC_FS=y | |||
| 513 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 518 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 514 | # CONFIG_BLK_DEV_TC86C001 is not set | 519 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 515 | # CONFIG_BLK_DEV_IDEDMA is not set | 520 | # CONFIG_BLK_DEV_IDEDMA is not set |
| 516 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 521 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 517 | # CONFIG_BLK_DEV_HD is not set | 522 | # CONFIG_BLK_DEV_HD is not set |
| 518 | 523 | ||
| 519 | # | 524 | # |
| @@ -593,7 +598,6 @@ CONFIG_NETDEV_1000=y | |||
| 593 | # CONFIG_SIS190 is not set | 598 | # CONFIG_SIS190 is not set |
| 594 | # CONFIG_SKGE is not set | 599 | # CONFIG_SKGE is not set |
| 595 | # CONFIG_SKY2 is not set | 600 | # CONFIG_SKY2 is not set |
| 596 | # CONFIG_SK98LIN is not set | ||
| 597 | # CONFIG_VIA_VELOCITY is not set | 601 | # CONFIG_VIA_VELOCITY is not set |
| 598 | # CONFIG_TIGON3 is not set | 602 | # CONFIG_TIGON3 is not set |
| 599 | # CONFIG_BNX2 is not set | 603 | # CONFIG_BNX2 is not set |
| @@ -611,6 +615,7 @@ CONFIG_NETDEV_10000=y | |||
| 611 | # CONFIG_MLX4_CORE is not set | 615 | # CONFIG_MLX4_CORE is not set |
| 612 | # CONFIG_TEHUTI is not set | 616 | # CONFIG_TEHUTI is not set |
| 613 | # CONFIG_BNX2X is not set | 617 | # CONFIG_BNX2X is not set |
| 618 | # CONFIG_SFC is not set | ||
| 614 | # CONFIG_TR is not set | 619 | # CONFIG_TR is not set |
| 615 | 620 | ||
| 616 | # | 621 | # |
| @@ -618,6 +623,7 @@ CONFIG_NETDEV_10000=y | |||
| 618 | # | 623 | # |
| 619 | # CONFIG_WLAN_PRE80211 is not set | 624 | # CONFIG_WLAN_PRE80211 is not set |
| 620 | # CONFIG_WLAN_80211 is not set | 625 | # CONFIG_WLAN_80211 is not set |
| 626 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 621 | # CONFIG_WAN is not set | 627 | # CONFIG_WAN is not set |
| 622 | # CONFIG_FDDI is not set | 628 | # CONFIG_FDDI is not set |
| 623 | CONFIG_PPP=y | 629 | CONFIG_PPP=y |
| @@ -692,6 +698,7 @@ CONFIG_SERIO_LIBPS2=y | |||
| 692 | # Character devices | 698 | # Character devices |
| 693 | # | 699 | # |
| 694 | # CONFIG_VT is not set | 700 | # CONFIG_VT is not set |
| 701 | CONFIG_DEVKMEM=y | ||
| 695 | # CONFIG_SERIAL_NONSTANDARD is not set | 702 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 696 | 703 | ||
| 697 | # | 704 | # |
| @@ -726,12 +733,7 @@ CONFIG_HW_RANDOM=y | |||
| 726 | # CONFIG_RAW_DRIVER is not set | 733 | # CONFIG_RAW_DRIVER is not set |
| 727 | CONFIG_DEVPORT=y | 734 | CONFIG_DEVPORT=y |
| 728 | # CONFIG_I2C is not set | 735 | # CONFIG_I2C is not set |
| 729 | |||
| 730 | # | ||
| 731 | # SPI support | ||
| 732 | # | ||
| 733 | # CONFIG_SPI is not set | 736 | # CONFIG_SPI is not set |
| 734 | # CONFIG_SPI_MASTER is not set | ||
| 735 | # CONFIG_W1 is not set | 737 | # CONFIG_W1 is not set |
| 736 | # CONFIG_POWER_SUPPLY is not set | 738 | # CONFIG_POWER_SUPPLY is not set |
| 737 | # CONFIG_HWMON is not set | 739 | # CONFIG_HWMON is not set |
| @@ -748,12 +750,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 748 | # Multifunction device drivers | 750 | # Multifunction device drivers |
| 749 | # | 751 | # |
| 750 | # CONFIG_MFD_SM501 is not set | 752 | # CONFIG_MFD_SM501 is not set |
| 753 | # CONFIG_HTC_PASIC3 is not set | ||
| 751 | 754 | ||
| 752 | # | 755 | # |
| 753 | # Multimedia devices | 756 | # Multimedia devices |
| 754 | # | 757 | # |
| 758 | |||
| 759 | # | ||
| 760 | # Multimedia core support | ||
| 761 | # | ||
| 755 | # CONFIG_VIDEO_DEV is not set | 762 | # CONFIG_VIDEO_DEV is not set |
| 756 | # CONFIG_DVB_CORE is not set | 763 | # CONFIG_DVB_CORE is not set |
| 764 | # CONFIG_VIDEO_MEDIA is not set | ||
| 765 | |||
| 766 | # | ||
| 767 | # Multimedia drivers | ||
| 768 | # | ||
| 757 | CONFIG_DAB=y | 769 | CONFIG_DAB=y |
| 758 | 770 | ||
| 759 | # | 771 | # |
| @@ -781,11 +793,14 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 781 | CONFIG_USB_ARCH_HAS_OHCI=y | 793 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 782 | CONFIG_USB_ARCH_HAS_EHCI=y | 794 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 783 | # CONFIG_USB is not set | 795 | # CONFIG_USB is not set |
| 796 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 797 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 784 | 798 | ||
| 785 | # | 799 | # |
| 786 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| 787 | # | 801 | # |
| 788 | CONFIG_USB_GADGET=y | 802 | CONFIG_USB_GADGET=y |
| 803 | # CONFIG_USB_GADGET_DEBUG is not set | ||
| 789 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | 804 | # CONFIG_USB_GADGET_DEBUG_FILES is not set |
| 790 | CONFIG_USB_GADGET_SELECTED=y | 805 | CONFIG_USB_GADGET_SELECTED=y |
| 791 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 806 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
| @@ -795,6 +810,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
| 795 | # CONFIG_USB_GADGET_PXA2XX is not set | 810 | # CONFIG_USB_GADGET_PXA2XX is not set |
| 796 | CONFIG_USB_GADGET_M66592=y | 811 | CONFIG_USB_GADGET_M66592=y |
| 797 | CONFIG_USB_M66592=y | 812 | CONFIG_USB_M66592=y |
| 813 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 798 | # CONFIG_USB_GADGET_GOKU is not set | 814 | # CONFIG_USB_GADGET_GOKU is not set |
| 799 | # CONFIG_USB_GADGET_LH7A40X is not set | 815 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 800 | # CONFIG_USB_GADGET_OMAP is not set | 816 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -804,6 +820,7 @@ CONFIG_USB_M66592=y | |||
| 804 | CONFIG_USB_GADGET_DUALSPEED=y | 820 | CONFIG_USB_GADGET_DUALSPEED=y |
| 805 | # CONFIG_USB_ZERO is not set | 821 | # CONFIG_USB_ZERO is not set |
| 806 | CONFIG_USB_ETH=y | 822 | CONFIG_USB_ETH=y |
| 823 | CONFIG_USB_ETH_RNDIS=y | ||
| 807 | # CONFIG_USB_GADGETFS is not set | 824 | # CONFIG_USB_GADGETFS is not set |
| 808 | # CONFIG_USB_FILE_STORAGE is not set | 825 | # CONFIG_USB_FILE_STORAGE is not set |
| 809 | # CONFIG_USB_G_SERIAL is not set | 826 | # CONFIG_USB_G_SERIAL is not set |
| @@ -812,13 +829,10 @@ CONFIG_USB_ETH=y | |||
| 812 | # CONFIG_MMC is not set | 829 | # CONFIG_MMC is not set |
| 813 | # CONFIG_MEMSTICK is not set | 830 | # CONFIG_MEMSTICK is not set |
| 814 | # CONFIG_NEW_LEDS is not set | 831 | # CONFIG_NEW_LEDS is not set |
| 832 | # CONFIG_ACCESSIBILITY is not set | ||
| 815 | # CONFIG_INFINIBAND is not set | 833 | # CONFIG_INFINIBAND is not set |
| 816 | # CONFIG_RTC_CLASS is not set | 834 | # CONFIG_RTC_CLASS is not set |
| 817 | # CONFIG_DMADEVICES is not set | 835 | # CONFIG_DMADEVICES is not set |
| 818 | |||
| 819 | # | ||
| 820 | # Userspace I/O | ||
| 821 | # | ||
| 822 | # CONFIG_UIO is not set | 836 | # CONFIG_UIO is not set |
| 823 | 837 | ||
| 824 | # | 838 | # |
| @@ -888,7 +902,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 888 | CONFIG_NFS_FS=y | 902 | CONFIG_NFS_FS=y |
| 889 | CONFIG_NFS_V3=y | 903 | CONFIG_NFS_V3=y |
| 890 | CONFIG_NFS_V3_ACL=y | 904 | CONFIG_NFS_V3_ACL=y |
| 891 | # CONFIG_NFS_DIRECTIO is not set | ||
| 892 | # CONFIG_NFSD is not set | 905 | # CONFIG_NFSD is not set |
| 893 | CONFIG_ROOT_NFS=y | 906 | CONFIG_ROOT_NFS=y |
| 894 | CONFIG_LOCKD=y | 907 | CONFIG_LOCKD=y |
| @@ -967,6 +980,7 @@ CONFIG_NLS_UTF8=y | |||
| 967 | # Library routines | 980 | # Library routines |
| 968 | # | 981 | # |
| 969 | CONFIG_BITREVERSE=y | 982 | CONFIG_BITREVERSE=y |
| 983 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 970 | CONFIG_CRC_CCITT=y | 984 | CONFIG_CRC_CCITT=y |
| 971 | # CONFIG_CRC16 is not set | 985 | # CONFIG_CRC16 is not set |
| 972 | # CONFIG_CRC_ITU_T is not set | 986 | # CONFIG_CRC_ITU_T is not set |
| @@ -979,6 +993,7 @@ CONFIG_PLIST=y | |||
| 979 | CONFIG_HAS_IOMEM=y | 993 | CONFIG_HAS_IOMEM=y |
| 980 | CONFIG_HAS_IOPORT=y | 994 | CONFIG_HAS_IOPORT=y |
| 981 | CONFIG_HAS_DMA=y | 995 | CONFIG_HAS_DMA=y |
| 996 | CONFIG_HAVE_LMB=y | ||
| 982 | 997 | ||
| 983 | # | 998 | # |
| 984 | # Kernel hacking | 999 | # Kernel hacking |
| @@ -986,6 +1001,7 @@ CONFIG_HAS_DMA=y | |||
| 986 | # CONFIG_PRINTK_TIME is not set | 1001 | # CONFIG_PRINTK_TIME is not set |
| 987 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1002 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 988 | CONFIG_ENABLE_MUST_CHECK=y | 1003 | CONFIG_ENABLE_MUST_CHECK=y |
| 1004 | CONFIG_FRAME_WARN=1024 | ||
| 989 | CONFIG_MAGIC_SYSRQ=y | 1005 | CONFIG_MAGIC_SYSRQ=y |
| 990 | # CONFIG_UNUSED_SYMBOLS is not set | 1006 | # CONFIG_UNUSED_SYMBOLS is not set |
| 991 | # CONFIG_DEBUG_FS is not set | 1007 | # CONFIG_DEBUG_FS is not set |
| @@ -996,6 +1012,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 996 | # CONFIG_SCHED_DEBUG is not set | 1012 | # CONFIG_SCHED_DEBUG is not set |
| 997 | # CONFIG_SCHEDSTATS is not set | 1013 | # CONFIG_SCHEDSTATS is not set |
| 998 | # CONFIG_TIMER_STATS is not set | 1014 | # CONFIG_TIMER_STATS is not set |
| 1015 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 999 | # CONFIG_SLUB_DEBUG_ON is not set | 1016 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1000 | # CONFIG_SLUB_STATS is not set | 1017 | # CONFIG_SLUB_STATS is not set |
| 1001 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1018 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| @@ -1008,6 +1025,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1008 | CONFIG_DEBUG_BUGVERBOSE=y | 1025 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1009 | CONFIG_DEBUG_INFO=y | 1026 | CONFIG_DEBUG_INFO=y |
| 1010 | # CONFIG_DEBUG_VM is not set | 1027 | # CONFIG_DEBUG_VM is not set |
| 1028 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1011 | # CONFIG_DEBUG_LIST is not set | 1029 | # CONFIG_DEBUG_LIST is not set |
| 1012 | # CONFIG_DEBUG_SG is not set | 1030 | # CONFIG_DEBUG_SG is not set |
| 1013 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1031 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1019,6 +1037,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1019 | # CONFIG_DEBUG_PAGEALLOC is not set | 1037 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1020 | # CONFIG_DEBUGGER is not set | 1038 | # CONFIG_DEBUGGER is not set |
| 1021 | # CONFIG_KGDB_CONSOLE is not set | 1039 | # CONFIG_KGDB_CONSOLE is not set |
| 1040 | # CONFIG_IRQSTACKS is not set | ||
| 1022 | CONFIG_BDI_SWITCH=y | 1041 | CONFIG_BDI_SWITCH=y |
| 1023 | # CONFIG_PPC_EARLY_DEBUG is not set | 1042 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1024 | 1043 | ||
| @@ -1028,46 +1047,76 @@ CONFIG_BDI_SWITCH=y | |||
| 1028 | # CONFIG_KEYS is not set | 1047 | # CONFIG_KEYS is not set |
| 1029 | # CONFIG_SECURITY is not set | 1048 | # CONFIG_SECURITY is not set |
| 1030 | CONFIG_CRYPTO=y | 1049 | CONFIG_CRYPTO=y |
| 1050 | |||
| 1051 | # | ||
| 1052 | # Crypto core or helper | ||
| 1053 | # | ||
| 1031 | CONFIG_CRYPTO_ALGAPI=y | 1054 | CONFIG_CRYPTO_ALGAPI=y |
| 1032 | CONFIG_CRYPTO_BLKCIPHER=y | 1055 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1033 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1034 | CONFIG_CRYPTO_MANAGER=y | 1056 | CONFIG_CRYPTO_MANAGER=y |
| 1035 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1036 | # CONFIG_CRYPTO_NULL is not set | 1057 | # CONFIG_CRYPTO_NULL is not set |
| 1058 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1059 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1060 | |||
| 1061 | # | ||
| 1062 | # Authenticated Encryption with Associated Data | ||
| 1063 | # | ||
| 1064 | # CONFIG_CRYPTO_CCM is not set | ||
| 1065 | # CONFIG_CRYPTO_GCM is not set | ||
| 1066 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1067 | |||
| 1068 | # | ||
| 1069 | # Block modes | ||
| 1070 | # | ||
| 1071 | CONFIG_CRYPTO_CBC=y | ||
| 1072 | # CONFIG_CRYPTO_CTR is not set | ||
| 1073 | # CONFIG_CRYPTO_CTS is not set | ||
| 1074 | CONFIG_CRYPTO_ECB=y | ||
| 1075 | CONFIG_CRYPTO_PCBC=y | ||
| 1076 | |||
| 1077 | # | ||
| 1078 | # Hash modes | ||
| 1079 | # | ||
| 1080 | # CONFIG_CRYPTO_HMAC is not set | ||
| 1081 | |||
| 1082 | # | ||
| 1083 | # Digest | ||
| 1084 | # | ||
| 1085 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1037 | # CONFIG_CRYPTO_MD4 is not set | 1086 | # CONFIG_CRYPTO_MD4 is not set |
| 1038 | CONFIG_CRYPTO_MD5=y | 1087 | CONFIG_CRYPTO_MD5=y |
| 1088 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1039 | # CONFIG_CRYPTO_SHA1 is not set | 1089 | # CONFIG_CRYPTO_SHA1 is not set |
| 1040 | # CONFIG_CRYPTO_SHA256 is not set | 1090 | # CONFIG_CRYPTO_SHA256 is not set |
| 1041 | # CONFIG_CRYPTO_SHA512 is not set | 1091 | # CONFIG_CRYPTO_SHA512 is not set |
| 1042 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1043 | # CONFIG_CRYPTO_TGR192 is not set | 1092 | # CONFIG_CRYPTO_TGR192 is not set |
| 1044 | CONFIG_CRYPTO_ECB=y | 1093 | # CONFIG_CRYPTO_WP512 is not set |
| 1045 | CONFIG_CRYPTO_CBC=y | 1094 | |
| 1046 | CONFIG_CRYPTO_PCBC=y | 1095 | # |
| 1047 | # CONFIG_CRYPTO_CTR is not set | 1096 | # Ciphers |
| 1048 | # CONFIG_CRYPTO_GCM is not set | 1097 | # |
| 1049 | # CONFIG_CRYPTO_CCM is not set | ||
| 1050 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1051 | CONFIG_CRYPTO_DES=y | ||
| 1052 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1053 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1054 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1055 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1056 | # CONFIG_CRYPTO_AES is not set | 1098 | # CONFIG_CRYPTO_AES is not set |
| 1099 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1100 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1101 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1102 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1057 | # CONFIG_CRYPTO_CAST5 is not set | 1103 | # CONFIG_CRYPTO_CAST5 is not set |
| 1058 | # CONFIG_CRYPTO_CAST6 is not set | 1104 | # CONFIG_CRYPTO_CAST6 is not set |
| 1059 | # CONFIG_CRYPTO_TEA is not set | 1105 | CONFIG_CRYPTO_DES=y |
| 1060 | # CONFIG_CRYPTO_ARC4 is not set | 1106 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1061 | # CONFIG_CRYPTO_KHAZAD is not set | 1107 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1062 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1063 | # CONFIG_CRYPTO_SEED is not set | 1108 | # CONFIG_CRYPTO_SEED is not set |
| 1109 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1110 | # CONFIG_CRYPTO_TEA is not set | ||
| 1111 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1112 | |||
| 1113 | # | ||
| 1114 | # Compression | ||
| 1115 | # | ||
| 1064 | # CONFIG_CRYPTO_DEFLATE is not set | 1116 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1065 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1066 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1067 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1068 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1069 | # CONFIG_CRYPTO_LZO is not set | 1117 | # CONFIG_CRYPTO_LZO is not set |
| 1070 | CONFIG_CRYPTO_HW=y | 1118 | CONFIG_CRYPTO_HW=y |
| 1071 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1119 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1072 | # CONFIG_PPC_CLOCK is not set | 1120 | # CONFIG_PPC_CLOCK is not set |
| 1073 | CONFIG_PPC_LIB_RHEAP=y | 1121 | CONFIG_PPC_LIB_RHEAP=y |
| 1122 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index f9121685f11a..c6b83577c055 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:15 2008 | 4 | # Mon Jun 9 08:52:18 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -33,6 +33,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 33 | CONFIG_GENERIC_HARDIRQS=y | 33 | CONFIG_GENERIC_HARDIRQS=y |
| 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
| 36 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 37 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 38 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -92,6 +94,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 92 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
| 93 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
| 94 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
| 97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 95 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
| 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 97 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
| @@ -117,6 +120,7 @@ CONFIG_SLUB=y | |||
| 117 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
| 118 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
| 119 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
| 123 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 120 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
| 121 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
| 122 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
| @@ -215,11 +219,13 @@ CONFIG_FLATMEM=y | |||
| 215 | CONFIG_FLAT_NODE_MEM_MAP=y | 219 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 216 | # CONFIG_SPARSEMEM_STATIC is not set | 220 | # CONFIG_SPARSEMEM_STATIC is not set |
| 217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 219 | # CONFIG_RESOURCES_64BIT is not set | 224 | # CONFIG_RESOURCES_64BIT is not set |
| 220 | CONFIG_ZONE_DMA_FLAG=1 | 225 | CONFIG_ZONE_DMA_FLAG=1 |
| 221 | CONFIG_BOUNCE=y | 226 | CONFIG_BOUNCE=y |
| 222 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 223 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
| 224 | # CONFIG_CMDLINE_BOOL is not set | 230 | # CONFIG_CMDLINE_BOOL is not set |
| 225 | # CONFIG_PM is not set | 231 | # CONFIG_PM is not set |
| @@ -241,6 +247,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 241 | CONFIG_PCI_LEGACY=y | 247 | CONFIG_PCI_LEGACY=y |
| 242 | # CONFIG_PCCARD is not set | 248 | # CONFIG_PCCARD is not set |
| 243 | # CONFIG_HOTPLUG_PCI is not set | 249 | # CONFIG_HOTPLUG_PCI is not set |
| 250 | # CONFIG_HAS_RAPIDIO is not set | ||
| 244 | 251 | ||
| 245 | # | 252 | # |
| 246 | # Advanced setup | 253 | # Advanced setup |
| @@ -250,13 +257,13 @@ CONFIG_PCI_LEGACY=y | |||
| 250 | # | 257 | # |
| 251 | # Default settings for advanced configuration options are used | 258 | # Default settings for advanced configuration options are used |
| 252 | # | 259 | # |
| 253 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 254 | CONFIG_LOWMEM_SIZE=0x30000000 | 260 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 261 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 255 | CONFIG_KERNEL_START=0xc0000000 | 262 | CONFIG_KERNEL_START=0xc0000000 |
| 263 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 256 | CONFIG_TASK_SIZE=0xc0000000 | 264 | CONFIG_TASK_SIZE=0xc0000000 |
| 257 | CONFIG_CONSISTENT_START=0xff100000 | 265 | CONFIG_CONSISTENT_START=0xff100000 |
| 258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 266 | CONFIG_CONSISTENT_SIZE=0x00200000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 267 | ||
| 261 | # | 268 | # |
| 262 | # Networking | 269 | # Networking |
| @@ -304,8 +311,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 304 | CONFIG_DEFAULT_TCP_CONG="cubic" | 311 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 305 | # CONFIG_TCP_MD5SIG is not set | 312 | # CONFIG_TCP_MD5SIG is not set |
| 306 | # CONFIG_IPV6 is not set | 313 | # CONFIG_IPV6 is not set |
| 307 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 308 | # CONFIG_INET6_TUNNEL is not set | ||
| 309 | # CONFIG_NETWORK_SECMARK is not set | 314 | # CONFIG_NETWORK_SECMARK is not set |
| 310 | # CONFIG_NETFILTER is not set | 315 | # CONFIG_NETFILTER is not set |
| 311 | # CONFIG_IP_DCCP is not set | 316 | # CONFIG_IP_DCCP is not set |
| @@ -364,6 +369,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 364 | # CONFIG_MTD_REDBOOT_PARTS is not set | 369 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 365 | # CONFIG_MTD_CMDLINE_PARTS is not set | 370 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 366 | # CONFIG_MTD_OF_PARTS is not set | 371 | # CONFIG_MTD_OF_PARTS is not set |
| 372 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 367 | 373 | ||
| 368 | # | 374 | # |
| 369 | # User Modules And Translation Layers | 375 | # User Modules And Translation Layers |
| @@ -435,6 +441,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 435 | # | 441 | # |
| 436 | # CONFIG_MTD_UBI is not set | 442 | # CONFIG_MTD_UBI is not set |
| 437 | CONFIG_OF_DEVICE=y | 443 | CONFIG_OF_DEVICE=y |
| 444 | CONFIG_OF_I2C=y | ||
| 438 | # CONFIG_PARPORT is not set | 445 | # CONFIG_PARPORT is not set |
| 439 | CONFIG_BLK_DEV=y | 446 | CONFIG_BLK_DEV=y |
| 440 | # CONFIG_BLK_DEV_FD is not set | 447 | # CONFIG_BLK_DEV_FD is not set |
| @@ -519,7 +526,7 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y | |||
| 519 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 526 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 520 | # CONFIG_BLK_DEV_TC86C001 is not set | 527 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 521 | CONFIG_BLK_DEV_IDEDMA=y | 528 | CONFIG_BLK_DEV_IDEDMA=y |
| 522 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 529 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 523 | # CONFIG_BLK_DEV_HD is not set | 530 | # CONFIG_BLK_DEV_HD is not set |
| 524 | 531 | ||
| 525 | # | 532 | # |
| @@ -598,7 +605,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
| 598 | # CONFIG_SCSI_SRP is not set | 605 | # CONFIG_SCSI_SRP is not set |
| 599 | CONFIG_ATA=y | 606 | CONFIG_ATA=y |
| 600 | # CONFIG_ATA_NONSTANDARD is not set | 607 | # CONFIG_ATA_NONSTANDARD is not set |
| 608 | CONFIG_SATA_PMP=y | ||
| 601 | # CONFIG_SATA_AHCI is not set | 609 | # CONFIG_SATA_AHCI is not set |
| 610 | # CONFIG_SATA_SIL24 is not set | ||
| 611 | CONFIG_ATA_SFF=y | ||
| 602 | # CONFIG_SATA_SVW is not set | 612 | # CONFIG_SATA_SVW is not set |
| 603 | # CONFIG_ATA_PIIX is not set | 613 | # CONFIG_ATA_PIIX is not set |
| 604 | CONFIG_SATA_MV=y | 614 | CONFIG_SATA_MV=y |
| @@ -608,7 +618,6 @@ CONFIG_SATA_MV=y | |||
| 608 | # CONFIG_SATA_PROMISE is not set | 618 | # CONFIG_SATA_PROMISE is not set |
| 609 | # CONFIG_SATA_SX4 is not set | 619 | # CONFIG_SATA_SX4 is not set |
| 610 | # CONFIG_SATA_SIL is not set | 620 | # CONFIG_SATA_SIL is not set |
| 611 | # CONFIG_SATA_SIL24 is not set | ||
| 612 | # CONFIG_SATA_SIS is not set | 621 | # CONFIG_SATA_SIS is not set |
| 613 | # CONFIG_SATA_ULI is not set | 622 | # CONFIG_SATA_ULI is not set |
| 614 | # CONFIG_SATA_VIA is not set | 623 | # CONFIG_SATA_VIA is not set |
| @@ -653,6 +662,7 @@ CONFIG_SATA_MV=y | |||
| 653 | # CONFIG_PATA_VIA is not set | 662 | # CONFIG_PATA_VIA is not set |
| 654 | # CONFIG_PATA_WINBOND is not set | 663 | # CONFIG_PATA_WINBOND is not set |
| 655 | # CONFIG_PATA_PLATFORM is not set | 664 | # CONFIG_PATA_PLATFORM is not set |
| 665 | # CONFIG_PATA_SCH is not set | ||
| 656 | # CONFIG_MD is not set | 666 | # CONFIG_MD is not set |
| 657 | # CONFIG_FUSION is not set | 667 | # CONFIG_FUSION is not set |
| 658 | 668 | ||
| @@ -744,7 +754,6 @@ CONFIG_E1000=y | |||
| 744 | # CONFIG_SIS190 is not set | 754 | # CONFIG_SIS190 is not set |
| 745 | # CONFIG_SKGE is not set | 755 | # CONFIG_SKGE is not set |
| 746 | # CONFIG_SKY2 is not set | 756 | # CONFIG_SKY2 is not set |
| 747 | # CONFIG_SK98LIN is not set | ||
| 748 | # CONFIG_VIA_VELOCITY is not set | 757 | # CONFIG_VIA_VELOCITY is not set |
| 749 | # CONFIG_TIGON3 is not set | 758 | # CONFIG_TIGON3 is not set |
| 750 | # CONFIG_BNX2 is not set | 759 | # CONFIG_BNX2 is not set |
| @@ -763,6 +772,7 @@ CONFIG_NETDEV_10000=y | |||
| 763 | # CONFIG_MLX4_CORE is not set | 772 | # CONFIG_MLX4_CORE is not set |
| 764 | # CONFIG_TEHUTI is not set | 773 | # CONFIG_TEHUTI is not set |
| 765 | # CONFIG_BNX2X is not set | 774 | # CONFIG_BNX2X is not set |
| 775 | # CONFIG_SFC is not set | ||
| 766 | # CONFIG_TR is not set | 776 | # CONFIG_TR is not set |
| 767 | 777 | ||
| 768 | # | 778 | # |
| @@ -770,6 +780,7 @@ CONFIG_NETDEV_10000=y | |||
| 770 | # | 780 | # |
| 771 | # CONFIG_WLAN_PRE80211 is not set | 781 | # CONFIG_WLAN_PRE80211 is not set |
| 772 | # CONFIG_WLAN_80211 is not set | 782 | # CONFIG_WLAN_80211 is not set |
| 783 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 773 | 784 | ||
| 774 | # | 785 | # |
| 775 | # USB Network Adapters | 786 | # USB Network Adapters |
| @@ -832,6 +843,7 @@ CONFIG_VT=y | |||
| 832 | CONFIG_VT_CONSOLE=y | 843 | CONFIG_VT_CONSOLE=y |
| 833 | CONFIG_HW_CONSOLE=y | 844 | CONFIG_HW_CONSOLE=y |
| 834 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 845 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 846 | CONFIG_DEVKMEM=y | ||
| 835 | # CONFIG_SERIAL_NONSTANDARD is not set | 847 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 836 | # CONFIG_NOZOMI is not set | 848 | # CONFIG_NOZOMI is not set |
| 837 | 849 | ||
| @@ -855,7 +867,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 855 | # CONFIG_IPMI_HANDLER is not set | 867 | # CONFIG_IPMI_HANDLER is not set |
| 856 | # CONFIG_HW_RANDOM is not set | 868 | # CONFIG_HW_RANDOM is not set |
| 857 | # CONFIG_NVRAM is not set | 869 | # CONFIG_NVRAM is not set |
| 858 | # CONFIG_GEN_RTC is not set | ||
| 859 | # CONFIG_R3964 is not set | 870 | # CONFIG_R3964 is not set |
| 860 | # CONFIG_APPLICOM is not set | 871 | # CONFIG_APPLICOM is not set |
| 861 | # CONFIG_RAW_DRIVER is not set | 872 | # CONFIG_RAW_DRIVER is not set |
| @@ -866,13 +877,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 866 | CONFIG_I2C_CHARDEV=y | 877 | CONFIG_I2C_CHARDEV=y |
| 867 | 878 | ||
| 868 | # | 879 | # |
| 869 | # I2C Algorithms | ||
| 870 | # | ||
| 871 | # CONFIG_I2C_ALGOBIT is not set | ||
| 872 | # CONFIG_I2C_ALGOPCF is not set | ||
| 873 | # CONFIG_I2C_ALGOPCA is not set | ||
| 874 | |||
| 875 | # | ||
| 876 | # I2C Hardware Bus support | 880 | # I2C Hardware Bus support |
| 877 | # | 881 | # |
| 878 | # CONFIG_I2C_ALI1535 is not set | 882 | # CONFIG_I2C_ALI1535 is not set |
| @@ -898,6 +902,7 @@ CONFIG_I2C_CHARDEV=y | |||
| 898 | # CONFIG_I2C_VIA is not set | 902 | # CONFIG_I2C_VIA is not set |
| 899 | # CONFIG_I2C_VIAPRO is not set | 903 | # CONFIG_I2C_VIAPRO is not set |
| 900 | # CONFIG_I2C_VOODOO3 is not set | 904 | # CONFIG_I2C_VOODOO3 is not set |
| 905 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 901 | CONFIG_I2C_MV64XXX=y | 906 | CONFIG_I2C_MV64XXX=y |
| 902 | 907 | ||
| 903 | # | 908 | # |
| @@ -908,19 +913,13 @@ CONFIG_I2C_MV64XXX=y | |||
| 908 | # CONFIG_SENSORS_PCF8574 is not set | 913 | # CONFIG_SENSORS_PCF8574 is not set |
| 909 | # CONFIG_PCF8575 is not set | 914 | # CONFIG_PCF8575 is not set |
| 910 | # CONFIG_SENSORS_PCF8591 is not set | 915 | # CONFIG_SENSORS_PCF8591 is not set |
| 911 | # CONFIG_TPS65010 is not set | ||
| 912 | # CONFIG_SENSORS_MAX6875 is not set | 916 | # CONFIG_SENSORS_MAX6875 is not set |
| 913 | # CONFIG_SENSORS_TSL2550 is not set | 917 | # CONFIG_SENSORS_TSL2550 is not set |
| 914 | # CONFIG_I2C_DEBUG_CORE is not set | 918 | # CONFIG_I2C_DEBUG_CORE is not set |
| 915 | # CONFIG_I2C_DEBUG_ALGO is not set | 919 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 916 | # CONFIG_I2C_DEBUG_BUS is not set | 920 | # CONFIG_I2C_DEBUG_BUS is not set |
| 917 | # CONFIG_I2C_DEBUG_CHIP is not set | 921 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 918 | |||
| 919 | # | ||
| 920 | # SPI support | ||
| 921 | # | ||
| 922 | # CONFIG_SPI is not set | 922 | # CONFIG_SPI is not set |
| 923 | # CONFIG_SPI_MASTER is not set | ||
| 924 | # CONFIG_W1 is not set | 923 | # CONFIG_W1 is not set |
| 925 | # CONFIG_POWER_SUPPLY is not set | 924 | # CONFIG_POWER_SUPPLY is not set |
| 926 | CONFIG_HWMON=y | 925 | CONFIG_HWMON=y |
| @@ -990,12 +989,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 990 | # Multifunction device drivers | 989 | # Multifunction device drivers |
| 991 | # | 990 | # |
| 992 | # CONFIG_MFD_SM501 is not set | 991 | # CONFIG_MFD_SM501 is not set |
| 992 | # CONFIG_HTC_PASIC3 is not set | ||
| 993 | 993 | ||
| 994 | # | 994 | # |
| 995 | # Multimedia devices | 995 | # Multimedia devices |
| 996 | # | 996 | # |
| 997 | |||
| 998 | # | ||
| 999 | # Multimedia core support | ||
| 1000 | # | ||
| 997 | # CONFIG_VIDEO_DEV is not set | 1001 | # CONFIG_VIDEO_DEV is not set |
| 998 | # CONFIG_DVB_CORE is not set | 1002 | # CONFIG_DVB_CORE is not set |
| 1003 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1004 | |||
| 1005 | # | ||
| 1006 | # Multimedia drivers | ||
| 1007 | # | ||
| 999 | # CONFIG_DAB is not set | 1008 | # CONFIG_DAB is not set |
| 1000 | 1009 | ||
| 1001 | # | 1010 | # |
| @@ -1055,11 +1064,13 @@ CONFIG_USB_DEVICEFS=y | |||
| 1055 | # | 1064 | # |
| 1056 | # USB Host Controller Drivers | 1065 | # USB Host Controller Drivers |
| 1057 | # | 1066 | # |
| 1067 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1058 | CONFIG_USB_EHCI_HCD=y | 1068 | CONFIG_USB_EHCI_HCD=y |
| 1059 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1069 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1060 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1070 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1061 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1071 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 1062 | # CONFIG_USB_ISP116X_HCD is not set | 1072 | # CONFIG_USB_ISP116X_HCD is not set |
| 1073 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1063 | CONFIG_USB_OHCI_HCD=y | 1074 | CONFIG_USB_OHCI_HCD=y |
| 1064 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1075 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1065 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1076 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1074,6 +1085,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 1074 | # | 1085 | # |
| 1075 | # CONFIG_USB_ACM is not set | 1086 | # CONFIG_USB_ACM is not set |
| 1076 | # CONFIG_USB_PRINTER is not set | 1087 | # CONFIG_USB_PRINTER is not set |
| 1088 | # CONFIG_USB_WDM is not set | ||
| 1077 | 1089 | ||
| 1078 | # | 1090 | # |
| 1079 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1091 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1120,10 +1132,12 @@ CONFIG_USB_MON=y | |||
| 1120 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1132 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1121 | # CONFIG_USB_IOWARRIOR is not set | 1133 | # CONFIG_USB_IOWARRIOR is not set |
| 1122 | # CONFIG_USB_TEST is not set | 1134 | # CONFIG_USB_TEST is not set |
| 1135 | # CONFIG_USB_ISIGHTFW is not set | ||
| 1123 | # CONFIG_USB_GADGET is not set | 1136 | # CONFIG_USB_GADGET is not set |
| 1124 | # CONFIG_MMC is not set | 1137 | # CONFIG_MMC is not set |
| 1125 | # CONFIG_MEMSTICK is not set | 1138 | # CONFIG_MEMSTICK is not set |
| 1126 | # CONFIG_NEW_LEDS is not set | 1139 | # CONFIG_NEW_LEDS is not set |
| 1140 | # CONFIG_ACCESSIBILITY is not set | ||
| 1127 | # CONFIG_INFINIBAND is not set | 1141 | # CONFIG_INFINIBAND is not set |
| 1128 | # CONFIG_EDAC is not set | 1142 | # CONFIG_EDAC is not set |
| 1129 | CONFIG_RTC_LIB=y | 1143 | CONFIG_RTC_LIB=y |
| @@ -1175,11 +1189,8 @@ CONFIG_RTC_DRV_MAX6900=y | |||
| 1175 | # | 1189 | # |
| 1176 | # on-CPU RTC drivers | 1190 | # on-CPU RTC drivers |
| 1177 | # | 1191 | # |
| 1192 | # CONFIG_RTC_DRV_PPC is not set | ||
| 1178 | # CONFIG_DMADEVICES is not set | 1193 | # CONFIG_DMADEVICES is not set |
| 1179 | |||
| 1180 | # | ||
| 1181 | # Userspace I/O | ||
| 1182 | # | ||
| 1183 | # CONFIG_UIO is not set | 1194 | # CONFIG_UIO is not set |
| 1184 | 1195 | ||
| 1185 | # | 1196 | # |
| @@ -1199,7 +1210,6 @@ CONFIG_FS_MBCACHE=y | |||
| 1199 | # CONFIG_JFS_FS is not set | 1210 | # CONFIG_JFS_FS is not set |
| 1200 | # CONFIG_FS_POSIX_ACL is not set | 1211 | # CONFIG_FS_POSIX_ACL is not set |
| 1201 | # CONFIG_XFS_FS is not set | 1212 | # CONFIG_XFS_FS is not set |
| 1202 | # CONFIG_GFS2_FS is not set | ||
| 1203 | # CONFIG_OCFS2_FS is not set | 1213 | # CONFIG_OCFS2_FS is not set |
| 1204 | CONFIG_DNOTIFY=y | 1214 | CONFIG_DNOTIFY=y |
| 1205 | CONFIG_INOTIFY=y | 1215 | CONFIG_INOTIFY=y |
| @@ -1257,7 +1267,6 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
| 1257 | CONFIG_NFS_FS=y | 1267 | CONFIG_NFS_FS=y |
| 1258 | # CONFIG_NFS_V3 is not set | 1268 | # CONFIG_NFS_V3 is not set |
| 1259 | # CONFIG_NFS_V4 is not set | 1269 | # CONFIG_NFS_V4 is not set |
| 1260 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1261 | # CONFIG_NFSD is not set | 1270 | # CONFIG_NFSD is not set |
| 1262 | CONFIG_ROOT_NFS=y | 1271 | CONFIG_ROOT_NFS=y |
| 1263 | CONFIG_LOCKD=y | 1272 | CONFIG_LOCKD=y |
| @@ -1300,6 +1309,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 1300 | # Library routines | 1309 | # Library routines |
| 1301 | # | 1310 | # |
| 1302 | CONFIG_BITREVERSE=y | 1311 | CONFIG_BITREVERSE=y |
| 1312 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1303 | # CONFIG_CRC_CCITT is not set | 1313 | # CONFIG_CRC_CCITT is not set |
| 1304 | # CONFIG_CRC16 is not set | 1314 | # CONFIG_CRC16 is not set |
| 1305 | # CONFIG_CRC_ITU_T is not set | 1315 | # CONFIG_CRC_ITU_T is not set |
| @@ -1310,6 +1320,7 @@ CONFIG_PLIST=y | |||
| 1310 | CONFIG_HAS_IOMEM=y | 1320 | CONFIG_HAS_IOMEM=y |
| 1311 | CONFIG_HAS_IOPORT=y | 1321 | CONFIG_HAS_IOPORT=y |
| 1312 | CONFIG_HAS_DMA=y | 1322 | CONFIG_HAS_DMA=y |
| 1323 | CONFIG_HAVE_LMB=y | ||
| 1313 | 1324 | ||
| 1314 | # | 1325 | # |
| 1315 | # Kernel hacking | 1326 | # Kernel hacking |
| @@ -1317,6 +1328,7 @@ CONFIG_HAS_DMA=y | |||
| 1317 | # CONFIG_PRINTK_TIME is not set | 1328 | # CONFIG_PRINTK_TIME is not set |
| 1318 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1329 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1319 | CONFIG_ENABLE_MUST_CHECK=y | 1330 | CONFIG_ENABLE_MUST_CHECK=y |
| 1331 | CONFIG_FRAME_WARN=1024 | ||
| 1320 | # CONFIG_MAGIC_SYSRQ is not set | 1332 | # CONFIG_MAGIC_SYSRQ is not set |
| 1321 | # CONFIG_UNUSED_SYMBOLS is not set | 1333 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1322 | # CONFIG_DEBUG_FS is not set | 1334 | # CONFIG_DEBUG_FS is not set |
| @@ -1326,6 +1338,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
| 1326 | # CONFIG_SLUB_STATS is not set | 1338 | # CONFIG_SLUB_STATS is not set |
| 1327 | CONFIG_DEBUG_BUGVERBOSE=y | 1339 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1328 | # CONFIG_SAMPLES is not set | 1340 | # CONFIG_SAMPLES is not set |
| 1341 | # CONFIG_IRQSTACKS is not set | ||
| 1329 | # CONFIG_BOOTX_TEXT is not set | 1342 | # CONFIG_BOOTX_TEXT is not set |
| 1330 | # CONFIG_PPC_EARLY_DEBUG is not set | 1343 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1331 | 1344 | ||
| @@ -1336,48 +1349,78 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
| 1336 | # CONFIG_SECURITY is not set | 1349 | # CONFIG_SECURITY is not set |
| 1337 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1350 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1338 | CONFIG_CRYPTO=y | 1351 | CONFIG_CRYPTO=y |
| 1339 | # CONFIG_CRYPTO_SEQIV is not set | 1352 | |
| 1353 | # | ||
| 1354 | # Crypto core or helper | ||
| 1355 | # | ||
| 1340 | # CONFIG_CRYPTO_MANAGER is not set | 1356 | # CONFIG_CRYPTO_MANAGER is not set |
| 1357 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1358 | # CONFIG_CRYPTO_NULL is not set | ||
| 1359 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1360 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1361 | |||
| 1362 | # | ||
| 1363 | # Authenticated Encryption with Associated Data | ||
| 1364 | # | ||
| 1365 | # CONFIG_CRYPTO_CCM is not set | ||
| 1366 | # CONFIG_CRYPTO_GCM is not set | ||
| 1367 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1368 | |||
| 1369 | # | ||
| 1370 | # Block modes | ||
| 1371 | # | ||
| 1372 | # CONFIG_CRYPTO_CBC is not set | ||
| 1373 | # CONFIG_CRYPTO_CTR is not set | ||
| 1374 | # CONFIG_CRYPTO_CTS is not set | ||
| 1375 | # CONFIG_CRYPTO_ECB is not set | ||
| 1376 | # CONFIG_CRYPTO_LRW is not set | ||
| 1377 | # CONFIG_CRYPTO_PCBC is not set | ||
| 1378 | # CONFIG_CRYPTO_XTS is not set | ||
| 1379 | |||
| 1380 | # | ||
| 1381 | # Hash modes | ||
| 1382 | # | ||
| 1341 | # CONFIG_CRYPTO_HMAC is not set | 1383 | # CONFIG_CRYPTO_HMAC is not set |
| 1342 | # CONFIG_CRYPTO_XCBC is not set | 1384 | # CONFIG_CRYPTO_XCBC is not set |
| 1343 | # CONFIG_CRYPTO_NULL is not set | 1385 | |
| 1386 | # | ||
| 1387 | # Digest | ||
| 1388 | # | ||
| 1389 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1344 | # CONFIG_CRYPTO_MD4 is not set | 1390 | # CONFIG_CRYPTO_MD4 is not set |
| 1345 | # CONFIG_CRYPTO_MD5 is not set | 1391 | # CONFIG_CRYPTO_MD5 is not set |
| 1392 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1346 | # CONFIG_CRYPTO_SHA1 is not set | 1393 | # CONFIG_CRYPTO_SHA1 is not set |
| 1347 | # CONFIG_CRYPTO_SHA256 is not set | 1394 | # CONFIG_CRYPTO_SHA256 is not set |
| 1348 | # CONFIG_CRYPTO_SHA512 is not set | 1395 | # CONFIG_CRYPTO_SHA512 is not set |
| 1349 | # CONFIG_CRYPTO_WP512 is not set | ||
| 1350 | # CONFIG_CRYPTO_TGR192 is not set | 1396 | # CONFIG_CRYPTO_TGR192 is not set |
| 1351 | # CONFIG_CRYPTO_GF128MUL is not set | 1397 | # CONFIG_CRYPTO_WP512 is not set |
| 1352 | # CONFIG_CRYPTO_ECB is not set | 1398 | |
| 1353 | # CONFIG_CRYPTO_CBC is not set | 1399 | # |
| 1354 | # CONFIG_CRYPTO_PCBC is not set | 1400 | # Ciphers |
| 1355 | # CONFIG_CRYPTO_LRW is not set | 1401 | # |
| 1356 | # CONFIG_CRYPTO_XTS is not set | ||
| 1357 | # CONFIG_CRYPTO_CTR is not set | ||
| 1358 | # CONFIG_CRYPTO_GCM is not set | ||
| 1359 | # CONFIG_CRYPTO_CCM is not set | ||
| 1360 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1361 | # CONFIG_CRYPTO_DES is not set | ||
| 1362 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1363 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1364 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1365 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1366 | # CONFIG_CRYPTO_AES is not set | 1402 | # CONFIG_CRYPTO_AES is not set |
| 1403 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1404 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 1405 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 1406 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1367 | # CONFIG_CRYPTO_CAST5 is not set | 1407 | # CONFIG_CRYPTO_CAST5 is not set |
| 1368 | # CONFIG_CRYPTO_CAST6 is not set | 1408 | # CONFIG_CRYPTO_CAST6 is not set |
| 1369 | # CONFIG_CRYPTO_TEA is not set | 1409 | # CONFIG_CRYPTO_DES is not set |
| 1370 | # CONFIG_CRYPTO_ARC4 is not set | 1410 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1371 | # CONFIG_CRYPTO_KHAZAD is not set | 1411 | # CONFIG_CRYPTO_KHAZAD is not set |
| 1372 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 1373 | # CONFIG_CRYPTO_SEED is not set | ||
| 1374 | # CONFIG_CRYPTO_SALSA20 is not set | 1412 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1413 | # CONFIG_CRYPTO_SEED is not set | ||
| 1414 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 1415 | # CONFIG_CRYPTO_TEA is not set | ||
| 1416 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 1417 | |||
| 1418 | # | ||
| 1419 | # Compression | ||
| 1420 | # | ||
| 1375 | # CONFIG_CRYPTO_DEFLATE is not set | 1421 | # CONFIG_CRYPTO_DEFLATE is not set |
| 1376 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 1377 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 1378 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1379 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 1380 | # CONFIG_CRYPTO_LZO is not set | 1422 | # CONFIG_CRYPTO_LZO is not set |
| 1381 | CONFIG_CRYPTO_HW=y | 1423 | CONFIG_CRYPTO_HW=y |
| 1382 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1424 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1383 | # CONFIG_PPC_CLOCK is not set | 1425 | # CONFIG_PPC_CLOCK is not set |
| 1426 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 3e2593c60b12..adaa05fb0478 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Thu Mar 27 13:56:28 2008 | 4 | # Tue May 20 20:03:28 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
| 7 | 7 | ||
| @@ -30,6 +30,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 30 | CONFIG_GENERIC_HARDIRQS=y | 30 | CONFIG_GENERIC_HARDIRQS=y |
| 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
| 32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
| 33 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
| @@ -81,6 +84,7 @@ CONFIG_LOG_BUF_SHIFT=17 | |||
| 81 | CONFIG_CGROUPS=y | 84 | CONFIG_CGROUPS=y |
| 82 | # CONFIG_CGROUP_DEBUG is not set | 85 | # CONFIG_CGROUP_DEBUG is not set |
| 83 | CONFIG_CGROUP_NS=y | 86 | CONFIG_CGROUP_NS=y |
| 87 | CONFIG_CGROUP_DEVICE=y | ||
| 84 | CONFIG_CPUSETS=y | 88 | CONFIG_CPUSETS=y |
| 85 | # CONFIG_GROUP_SCHED is not set | 89 | # CONFIG_GROUP_SCHED is not set |
| 86 | CONFIG_CGROUP_CPUACCT=y | 90 | CONFIG_CGROUP_CPUACCT=y |
| @@ -100,6 +104,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 100 | CONFIG_SYSCTL=y | 104 | CONFIG_SYSCTL=y |
| 101 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
| 102 | CONFIG_SYSCTL_SYSCALL=y | 106 | CONFIG_SYSCTL_SYSCALL=y |
| 107 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 103 | CONFIG_KALLSYMS=y | 108 | CONFIG_KALLSYMS=y |
| 104 | CONFIG_KALLSYMS_ALL=y | 109 | CONFIG_KALLSYMS_ALL=y |
| 105 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -107,6 +112,7 @@ CONFIG_HOTPLUG=y | |||
| 107 | CONFIG_PRINTK=y | 112 | CONFIG_PRINTK=y |
| 108 | CONFIG_BUG=y | 113 | CONFIG_BUG=y |
| 109 | CONFIG_ELF_CORE=y | 114 | CONFIG_ELF_CORE=y |
| 115 | CONFIG_PCSPKR_PLATFORM=y | ||
| 110 | # CONFIG_COMPAT_BRK is not set | 116 | # CONFIG_COMPAT_BRK is not set |
| 111 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
| 112 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
| @@ -129,12 +135,14 @@ CONFIG_KPROBES=y | |||
| 129 | CONFIG_KRETPROBES=y | 135 | CONFIG_KRETPROBES=y |
| 130 | CONFIG_HAVE_KPROBES=y | 136 | CONFIG_HAVE_KPROBES=y |
| 131 | CONFIG_HAVE_KRETPROBES=y | 137 | CONFIG_HAVE_KRETPROBES=y |
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 132 | CONFIG_PROC_PAGE_MONITOR=y | 139 | CONFIG_PROC_PAGE_MONITOR=y |
| 133 | CONFIG_SLABINFO=y | 140 | CONFIG_SLABINFO=y |
| 134 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
| 135 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
| 136 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
| 137 | CONFIG_MODULES=y | 144 | CONFIG_MODULES=y |
| 145 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 138 | CONFIG_MODULE_UNLOAD=y | 146 | CONFIG_MODULE_UNLOAD=y |
| 139 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 147 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 140 | CONFIG_MODVERSIONS=y | 148 | CONFIG_MODVERSIONS=y |
| @@ -178,11 +186,11 @@ CONFIG_LPARCFG=y | |||
| 178 | # CONFIG_PPC_PMAC is not set | 186 | # CONFIG_PPC_PMAC is not set |
| 179 | # CONFIG_PPC_MAPLE is not set | 187 | # CONFIG_PPC_MAPLE is not set |
| 180 | # CONFIG_PPC_PASEMI is not set | 188 | # CONFIG_PPC_PASEMI is not set |
| 181 | # CONFIG_PPC_CELLEB is not set | ||
| 182 | # CONFIG_PPC_PS3 is not set | 189 | # CONFIG_PPC_PS3 is not set |
| 183 | # CONFIG_PPC_CELL is not set | 190 | # CONFIG_PPC_CELL is not set |
| 184 | # CONFIG_PPC_CELL_NATIVE is not set | 191 | # CONFIG_PPC_CELL_NATIVE is not set |
| 185 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 192 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
| 193 | # CONFIG_PPC_CELLEB is not set | ||
| 186 | # CONFIG_PQ2ADS is not set | 194 | # CONFIG_PQ2ADS is not set |
| 187 | CONFIG_PPC_NATIVE=y | 195 | CONFIG_PPC_NATIVE=y |
| 188 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 196 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
| @@ -225,7 +233,6 @@ CONFIG_PREEMPT_NONE=y | |||
| 225 | CONFIG_BINFMT_ELF=y | 233 | CONFIG_BINFMT_ELF=y |
| 226 | CONFIG_COMPAT_BINFMT_ELF=y | 234 | CONFIG_COMPAT_BINFMT_ELF=y |
| 227 | CONFIG_BINFMT_MISC=m | 235 | CONFIG_BINFMT_MISC=m |
| 228 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 229 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 236 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
| 230 | CONFIG_IOMMU_VMERGE=y | 237 | CONFIG_IOMMU_VMERGE=y |
| 231 | CONFIG_IOMMU_HELPER=y | 238 | CONFIG_IOMMU_HELPER=y |
| @@ -255,6 +262,7 @@ CONFIG_SPARSEMEM_EXTREME=y | |||
| 255 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 262 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
| 256 | CONFIG_SPARSEMEM_VMEMMAP=y | 263 | CONFIG_SPARSEMEM_VMEMMAP=y |
| 257 | # CONFIG_MEMORY_HOTPLUG is not set | 264 | # CONFIG_MEMORY_HOTPLUG is not set |
| 265 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 258 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 266 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 259 | CONFIG_MIGRATION=y | 267 | CONFIG_MIGRATION=y |
| 260 | CONFIG_RESOURCES_64BIT=y | 268 | CONFIG_RESOURCES_64BIT=y |
| @@ -263,6 +271,7 @@ CONFIG_BOUNCE=y | |||
| 263 | CONFIG_NODES_SPAN_OTHER_NODES=y | 271 | CONFIG_NODES_SPAN_OTHER_NODES=y |
| 264 | # CONFIG_PPC_HAS_HASH_64K is not set | 272 | # CONFIG_PPC_HAS_HASH_64K is not set |
| 265 | # CONFIG_PPC_64K_PAGES is not set | 273 | # CONFIG_PPC_64K_PAGES is not set |
| 274 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
| 266 | CONFIG_SCHED_SMT=y | 275 | CONFIG_SCHED_SMT=y |
| 267 | CONFIG_PROC_DEVICETREE=y | 276 | CONFIG_PROC_DEVICETREE=y |
| 268 | # CONFIG_CMDLINE_BOOL is not set | 277 | # CONFIG_CMDLINE_BOOL is not set |
| @@ -291,7 +300,10 @@ CONFIG_HOTPLUG_PCI=m | |||
| 291 | # CONFIG_HOTPLUG_PCI_SHPC is not set | 300 | # CONFIG_HOTPLUG_PCI_SHPC is not set |
| 292 | CONFIG_HOTPLUG_PCI_RPA=m | 301 | CONFIG_HOTPLUG_PCI_RPA=m |
| 293 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | 302 | CONFIG_HOTPLUG_PCI_RPA_DLPAR=m |
| 303 | # CONFIG_HAS_RAPIDIO is not set | ||
| 304 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
| 294 | CONFIG_KERNEL_START=0xc000000000000000 | 305 | CONFIG_KERNEL_START=0xc000000000000000 |
| 306 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 295 | 307 | ||
| 296 | # | 308 | # |
| 297 | # Networking | 309 | # Networking |
| @@ -338,8 +350,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 338 | # CONFIG_TCP_MD5SIG is not set | 350 | # CONFIG_TCP_MD5SIG is not set |
| 339 | # CONFIG_IP_VS is not set | 351 | # CONFIG_IP_VS is not set |
| 340 | # CONFIG_IPV6 is not set | 352 | # CONFIG_IPV6 is not set |
| 341 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 342 | # CONFIG_INET6_TUNNEL is not set | ||
| 343 | # CONFIG_NETWORK_SECMARK is not set | 353 | # CONFIG_NETWORK_SECMARK is not set |
| 344 | CONFIG_NETFILTER=y | 354 | CONFIG_NETFILTER=y |
| 345 | # CONFIG_NETFILTER_DEBUG is not set | 355 | # CONFIG_NETFILTER_DEBUG is not set |
| @@ -355,6 +365,7 @@ CONFIG_NF_CONNTRACK=m | |||
| 355 | CONFIG_NF_CT_ACCT=y | 365 | CONFIG_NF_CT_ACCT=y |
| 356 | CONFIG_NF_CONNTRACK_MARK=y | 366 | CONFIG_NF_CONNTRACK_MARK=y |
| 357 | CONFIG_NF_CONNTRACK_EVENTS=y | 367 | CONFIG_NF_CONNTRACK_EVENTS=y |
| 368 | # CONFIG_NF_CT_PROTO_DCCP is not set | ||
| 358 | # CONFIG_NF_CT_PROTO_SCTP is not set | 369 | # CONFIG_NF_CT_PROTO_SCTP is not set |
| 359 | CONFIG_NF_CT_PROTO_UDPLITE=m | 370 | CONFIG_NF_CT_PROTO_UDPLITE=m |
| 360 | # CONFIG_NF_CONNTRACK_AMANDA is not set | 371 | # CONFIG_NF_CONNTRACK_AMANDA is not set |
| @@ -426,6 +437,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m | |||
| 426 | CONFIG_IP_NF_TARGET_REDIRECT=m | 437 | CONFIG_IP_NF_TARGET_REDIRECT=m |
| 427 | CONFIG_IP_NF_TARGET_NETMAP=m | 438 | CONFIG_IP_NF_TARGET_NETMAP=m |
| 428 | CONFIG_NF_NAT_SNMP_BASIC=m | 439 | CONFIG_NF_NAT_SNMP_BASIC=m |
| 440 | CONFIG_NF_NAT_PROTO_UDPLITE=m | ||
| 429 | CONFIG_NF_NAT_FTP=m | 441 | CONFIG_NF_NAT_FTP=m |
| 430 | CONFIG_NF_NAT_IRC=m | 442 | CONFIG_NF_NAT_IRC=m |
| 431 | CONFIG_NF_NAT_TFTP=m | 443 | CONFIG_NF_NAT_TFTP=m |
| @@ -492,6 +504,7 @@ CONFIG_FW_LOADER=y | |||
| 492 | # CONFIG_CONNECTOR is not set | 504 | # CONFIG_CONNECTOR is not set |
| 493 | # CONFIG_MTD is not set | 505 | # CONFIG_MTD is not set |
| 494 | CONFIG_OF_DEVICE=y | 506 | CONFIG_OF_DEVICE=y |
| 507 | CONFIG_OF_I2C=y | ||
| 495 | CONFIG_PARPORT=m | 508 | CONFIG_PARPORT=m |
| 496 | CONFIG_PARPORT_PC=m | 509 | CONFIG_PARPORT_PC=m |
| 497 | # CONFIG_PARPORT_SERIAL is not set | 510 | # CONFIG_PARPORT_SERIAL is not set |
| @@ -545,7 +558,6 @@ CONFIG_IDE_PROC_FS=y | |||
| 545 | # | 558 | # |
| 546 | # IDE chipset support/bugfixes | 559 | # IDE chipset support/bugfixes |
| 547 | # | 560 | # |
| 548 | CONFIG_IDE_GENERIC=y | ||
| 549 | # CONFIG_BLK_DEV_PLATFORM is not set | 561 | # CONFIG_BLK_DEV_PLATFORM is not set |
| 550 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 562 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
| 551 | 563 | ||
| @@ -584,7 +596,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
| 584 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 596 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
| 585 | # CONFIG_BLK_DEV_TC86C001 is not set | 597 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 586 | CONFIG_BLK_DEV_IDEDMA=y | 598 | CONFIG_BLK_DEV_IDEDMA=y |
| 587 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 599 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 588 | # CONFIG_BLK_DEV_HD is not set | 600 | # CONFIG_BLK_DEV_HD is not set |
| 589 | 601 | ||
| 590 | # | 602 | # |
| @@ -671,61 +683,10 @@ CONFIG_SCSI_LPFC=m | |||
| 671 | # CONFIG_SCSI_SRP is not set | 683 | # CONFIG_SCSI_SRP is not set |
| 672 | CONFIG_ATA=y | 684 | CONFIG_ATA=y |
| 673 | # CONFIG_ATA_NONSTANDARD is not set | 685 | # CONFIG_ATA_NONSTANDARD is not set |
| 686 | CONFIG_SATA_PMP=y | ||
| 674 | # CONFIG_SATA_AHCI is not set | 687 | # CONFIG_SATA_AHCI is not set |
| 675 | # CONFIG_SATA_SVW is not set | ||
| 676 | # CONFIG_ATA_PIIX is not set | ||
| 677 | # CONFIG_SATA_MV is not set | ||
| 678 | # CONFIG_SATA_NV is not set | ||
| 679 | # CONFIG_PDC_ADMA is not set | ||
| 680 | # CONFIG_SATA_QSTOR is not set | ||
| 681 | # CONFIG_SATA_PROMISE is not set | ||
| 682 | # CONFIG_SATA_SX4 is not set | ||
| 683 | # CONFIG_SATA_SIL is not set | ||
| 684 | # CONFIG_SATA_SIL24 is not set | 688 | # CONFIG_SATA_SIL24 is not set |
| 685 | # CONFIG_SATA_SIS is not set | 689 | # CONFIG_ATA_SFF is not set |
| 686 | # CONFIG_SATA_ULI is not set | ||
| 687 | # CONFIG_SATA_VIA is not set | ||
| 688 | # CONFIG_SATA_VITESSE is not set | ||
| 689 | # CONFIG_SATA_INIC162X is not set | ||
| 690 | # CONFIG_PATA_ALI is not set | ||
| 691 | # CONFIG_PATA_AMD is not set | ||
| 692 | # CONFIG_PATA_ARTOP is not set | ||
| 693 | # CONFIG_PATA_ATIIXP is not set | ||
| 694 | # CONFIG_PATA_CMD640_PCI is not set | ||
| 695 | # CONFIG_PATA_CMD64X is not set | ||
| 696 | # CONFIG_PATA_CS5520 is not set | ||
| 697 | # CONFIG_PATA_CS5530 is not set | ||
| 698 | # CONFIG_PATA_CYPRESS is not set | ||
| 699 | # CONFIG_PATA_EFAR is not set | ||
| 700 | # CONFIG_ATA_GENERIC is not set | ||
| 701 | # CONFIG_PATA_HPT366 is not set | ||
| 702 | # CONFIG_PATA_HPT37X is not set | ||
| 703 | # CONFIG_PATA_HPT3X2N is not set | ||
| 704 | # CONFIG_PATA_HPT3X3 is not set | ||
| 705 | # CONFIG_PATA_IT821X is not set | ||
| 706 | # CONFIG_PATA_IT8213 is not set | ||
| 707 | # CONFIG_PATA_JMICRON is not set | ||
| 708 | # CONFIG_PATA_TRIFLEX is not set | ||
| 709 | # CONFIG_PATA_MARVELL is not set | ||
| 710 | # CONFIG_PATA_MPIIX is not set | ||
| 711 | # CONFIG_PATA_OLDPIIX is not set | ||
| 712 | # CONFIG_PATA_NETCELL is not set | ||
| 713 | # CONFIG_PATA_NINJA32 is not set | ||
| 714 | # CONFIG_PATA_NS87410 is not set | ||
| 715 | # CONFIG_PATA_NS87415 is not set | ||
| 716 | # CONFIG_PATA_OPTI is not set | ||
| 717 | # CONFIG_PATA_OPTIDMA is not set | ||
| 718 | # CONFIG_PATA_PDC_OLD is not set | ||
| 719 | # CONFIG_PATA_RADISYS is not set | ||
| 720 | # CONFIG_PATA_RZ1000 is not set | ||
| 721 | # CONFIG_PATA_SC1200 is not set | ||
| 722 | # CONFIG_PATA_SERVERWORKS is not set | ||
| 723 | # CONFIG_PATA_PDC2027X is not set | ||
| 724 | # CONFIG_PATA_SIL680 is not set | ||
| 725 | # CONFIG_PATA_SIS is not set | ||
| 726 | # CONFIG_PATA_VIA is not set | ||
| 727 | CONFIG_PATA_WINBOND=y | ||
| 728 | # CONFIG_PATA_PLATFORM is not set | ||
| 729 | CONFIG_MD=y | 690 | CONFIG_MD=y |
| 730 | CONFIG_BLK_DEV_MD=y | 691 | CONFIG_BLK_DEV_MD=y |
| 731 | CONFIG_MD_LINEAR=y | 692 | CONFIG_MD_LINEAR=y |
| @@ -783,7 +744,6 @@ CONFIG_IBMVETH=y | |||
| 783 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 744 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
| 784 | CONFIG_NET_PCI=y | 745 | CONFIG_NET_PCI=y |
| 785 | CONFIG_PCNET32=y | 746 | CONFIG_PCNET32=y |
| 786 | # CONFIG_PCNET32_NAPI is not set | ||
| 787 | # CONFIG_AMD8111_ETH is not set | 747 | # CONFIG_AMD8111_ETH is not set |
| 788 | # CONFIG_ADAPTEC_STARFIRE is not set | 748 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 789 | # CONFIG_B44 is not set | 749 | # CONFIG_B44 is not set |
| @@ -820,7 +780,6 @@ CONFIG_E1000=y | |||
| 820 | # CONFIG_SIS190 is not set | 780 | # CONFIG_SIS190 is not set |
| 821 | # CONFIG_SKGE is not set | 781 | # CONFIG_SKGE is not set |
| 822 | # CONFIG_SKY2 is not set | 782 | # CONFIG_SKY2 is not set |
| 823 | # CONFIG_SK98LIN is not set | ||
| 824 | # CONFIG_VIA_VELOCITY is not set | 783 | # CONFIG_VIA_VELOCITY is not set |
| 825 | CONFIG_TIGON3=y | 784 | CONFIG_TIGON3=y |
| 826 | # CONFIG_BNX2 is not set | 785 | # CONFIG_BNX2 is not set |
| @@ -829,7 +788,6 @@ CONFIG_TIGON3=y | |||
| 829 | CONFIG_NETDEV_10000=y | 788 | CONFIG_NETDEV_10000=y |
| 830 | # CONFIG_CHELSIO_T1 is not set | 789 | # CONFIG_CHELSIO_T1 is not set |
| 831 | # CONFIG_CHELSIO_T3 is not set | 790 | # CONFIG_CHELSIO_T3 is not set |
| 832 | CONFIG_EHEA=m | ||
| 833 | # CONFIG_IXGBE is not set | 791 | # CONFIG_IXGBE is not set |
| 834 | CONFIG_IXGB=m | 792 | CONFIG_IXGB=m |
| 835 | # CONFIG_IXGB_NAPI is not set | 793 | # CONFIG_IXGB_NAPI is not set |
| @@ -838,10 +796,10 @@ CONFIG_S2IO=m | |||
| 838 | # CONFIG_MYRI10GE is not set | 796 | # CONFIG_MYRI10GE is not set |
| 839 | # CONFIG_NETXEN_NIC is not set | 797 | # CONFIG_NETXEN_NIC is not set |
| 840 | # CONFIG_NIU is not set | 798 | # CONFIG_NIU is not set |
| 841 | # CONFIG_PASEMI_MAC is not set | ||
| 842 | # CONFIG_MLX4_CORE is not set | 799 | # CONFIG_MLX4_CORE is not set |
| 843 | # CONFIG_TEHUTI is not set | 800 | # CONFIG_TEHUTI is not set |
| 844 | # CONFIG_BNX2X is not set | 801 | # CONFIG_BNX2X is not set |
| 802 | # CONFIG_SFC is not set | ||
| 845 | CONFIG_TR=y | 803 | CONFIG_TR=y |
| 846 | CONFIG_IBMOL=y | 804 | CONFIG_IBMOL=y |
| 847 | # CONFIG_3C359 is not set | 805 | # CONFIG_3C359 is not set |
| @@ -852,6 +810,7 @@ CONFIG_IBMOL=y | |||
| 852 | # | 810 | # |
| 853 | # CONFIG_WLAN_PRE80211 is not set | 811 | # CONFIG_WLAN_PRE80211 is not set |
| 854 | # CONFIG_WLAN_80211 is not set | 812 | # CONFIG_WLAN_80211 is not set |
| 813 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 855 | 814 | ||
| 856 | # | 815 | # |
| 857 | # USB Network Adapters | 816 | # USB Network Adapters |
| @@ -956,6 +915,7 @@ CONFIG_VT=y | |||
| 956 | CONFIG_VT_CONSOLE=y | 915 | CONFIG_VT_CONSOLE=y |
| 957 | CONFIG_HW_CONSOLE=y | 916 | CONFIG_HW_CONSOLE=y |
| 958 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 917 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 918 | CONFIG_DEVKMEM=y | ||
| 959 | # CONFIG_SERIAL_NONSTANDARD is not set | 919 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 960 | # CONFIG_NOZOMI is not set | 920 | # CONFIG_NOZOMI is not set |
| 961 | 921 | ||
| @@ -1000,13 +960,7 @@ CONFIG_DEVPORT=y | |||
| 1000 | CONFIG_I2C=y | 960 | CONFIG_I2C=y |
| 1001 | CONFIG_I2C_BOARDINFO=y | 961 | CONFIG_I2C_BOARDINFO=y |
| 1002 | # CONFIG_I2C_CHARDEV is not set | 962 | # CONFIG_I2C_CHARDEV is not set |
| 1003 | |||
| 1004 | # | ||
| 1005 | # I2C Algorithms | ||
| 1006 | # | ||
| 1007 | CONFIG_I2C_ALGOBIT=y | 963 | CONFIG_I2C_ALGOBIT=y |
| 1008 | # CONFIG_I2C_ALGOPCF is not set | ||
| 1009 | # CONFIG_I2C_ALGOPCA is not set | ||
| 1010 | 964 | ||
| 1011 | # | 965 | # |
| 1012 | # I2C Hardware Bus support | 966 | # I2C Hardware Bus support |
| @@ -1035,6 +989,7 @@ CONFIG_I2C_ALGOBIT=y | |||
| 1035 | # CONFIG_I2C_VIA is not set | 989 | # CONFIG_I2C_VIA is not set |
| 1036 | # CONFIG_I2C_VIAPRO is not set | 990 | # CONFIG_I2C_VIAPRO is not set |
| 1037 | # CONFIG_I2C_VOODOO3 is not set | 991 | # CONFIG_I2C_VOODOO3 is not set |
| 992 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1038 | 993 | ||
| 1039 | # | 994 | # |
| 1040 | # Miscellaneous I2C Chip support | 995 | # Miscellaneous I2C Chip support |
| @@ -1044,19 +999,13 @@ CONFIG_I2C_ALGOBIT=y | |||
| 1044 | # CONFIG_SENSORS_PCF8574 is not set | 999 | # CONFIG_SENSORS_PCF8574 is not set |
| 1045 | # CONFIG_PCF8575 is not set | 1000 | # CONFIG_PCF8575 is not set |
| 1046 | # CONFIG_SENSORS_PCF8591 is not set | 1001 | # CONFIG_SENSORS_PCF8591 is not set |
| 1047 | # CONFIG_TPS65010 is not set | ||
| 1048 | # CONFIG_SENSORS_MAX6875 is not set | 1002 | # CONFIG_SENSORS_MAX6875 is not set |
| 1049 | # CONFIG_SENSORS_TSL2550 is not set | 1003 | # CONFIG_SENSORS_TSL2550 is not set |
| 1050 | # CONFIG_I2C_DEBUG_CORE is not set | 1004 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1051 | # CONFIG_I2C_DEBUG_ALGO is not set | 1005 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 1052 | # CONFIG_I2C_DEBUG_BUS is not set | 1006 | # CONFIG_I2C_DEBUG_BUS is not set |
| 1053 | # CONFIG_I2C_DEBUG_CHIP is not set | 1007 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 1054 | |||
| 1055 | # | ||
| 1056 | # SPI support | ||
| 1057 | # | ||
| 1058 | # CONFIG_SPI is not set | 1008 | # CONFIG_SPI is not set |
| 1059 | # CONFIG_SPI_MASTER is not set | ||
| 1060 | # CONFIG_W1 is not set | 1009 | # CONFIG_W1 is not set |
| 1061 | # CONFIG_POWER_SUPPLY is not set | 1010 | # CONFIG_POWER_SUPPLY is not set |
| 1062 | # CONFIG_HWMON is not set | 1011 | # CONFIG_HWMON is not set |
| @@ -1073,12 +1022,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 1073 | # Multifunction device drivers | 1022 | # Multifunction device drivers |
| 1074 | # | 1023 | # |
| 1075 | # CONFIG_MFD_SM501 is not set | 1024 | # CONFIG_MFD_SM501 is not set |
| 1025 | # CONFIG_HTC_PASIC3 is not set | ||
| 1076 | 1026 | ||
| 1077 | # | 1027 | # |
| 1078 | # Multimedia devices | 1028 | # Multimedia devices |
| 1079 | # | 1029 | # |
| 1030 | |||
| 1031 | # | ||
| 1032 | # Multimedia core support | ||
| 1033 | # | ||
| 1080 | # CONFIG_VIDEO_DEV is not set | 1034 | # CONFIG_VIDEO_DEV is not set |
| 1081 | # CONFIG_DVB_CORE is not set | 1035 | # CONFIG_DVB_CORE is not set |
| 1036 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1037 | |||
| 1038 | # | ||
| 1039 | # Multimedia drivers | ||
| 1040 | # | ||
| 1082 | # CONFIG_DAB is not set | 1041 | # CONFIG_DAB is not set |
| 1083 | 1042 | ||
| 1084 | # | 1043 | # |
| @@ -1098,8 +1057,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 1098 | # CONFIG_FB_SYS_FILLRECT is not set | 1057 | # CONFIG_FB_SYS_FILLRECT is not set |
| 1099 | # CONFIG_FB_SYS_COPYAREA is not set | 1058 | # CONFIG_FB_SYS_COPYAREA is not set |
| 1100 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1059 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
| 1060 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1101 | # CONFIG_FB_SYS_FOPS is not set | 1061 | # CONFIG_FB_SYS_FOPS is not set |
| 1102 | CONFIG_FB_DEFERRED_IO=y | ||
| 1103 | # CONFIG_FB_SVGALIB is not set | 1062 | # CONFIG_FB_SVGALIB is not set |
| 1104 | CONFIG_FB_MACMODES=y | 1063 | CONFIG_FB_MACMODES=y |
| 1105 | CONFIG_FB_BACKLIGHT=y | 1064 | CONFIG_FB_BACKLIGHT=y |
| @@ -1209,11 +1168,13 @@ CONFIG_USB_DEVICE_CLASS=y | |||
| 1209 | # | 1168 | # |
| 1210 | # USB Host Controller Drivers | 1169 | # USB Host Controller Drivers |
| 1211 | # | 1170 | # |
| 1171 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1212 | CONFIG_USB_EHCI_HCD=y | 1172 | CONFIG_USB_EHCI_HCD=y |
| 1213 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1173 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1214 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1174 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1215 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 1175 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 1216 | # CONFIG_USB_ISP116X_HCD is not set | 1176 | # CONFIG_USB_ISP116X_HCD is not set |
| 1177 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1217 | CONFIG_USB_OHCI_HCD=y | 1178 | CONFIG_USB_OHCI_HCD=y |
| 1218 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 1179 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 1219 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1180 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -1247,7 +1208,9 @@ CONFIG_USB_STORAGE=y | |||
| 1247 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1208 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1248 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1209 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1249 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1210 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1211 | CONFIG_USB_STORAGE_ONETOUCH=y | ||
| 1250 | # CONFIG_USB_STORAGE_KARMA is not set | 1212 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1213 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 1251 | # CONFIG_USB_LIBUSUAL is not set | 1214 | # CONFIG_USB_LIBUSUAL is not set |
| 1252 | 1215 | ||
| 1253 | # | 1216 | # |
| @@ -1290,6 +1253,7 @@ CONFIG_USB_MON=y | |||
| 1290 | # CONFIG_MMC is not set | 1253 | # CONFIG_MMC is not set |
| 1291 | # CONFIG_MEMSTICK is not set | 1254 | # CONFIG_MEMSTICK is not set |
| 1292 | # CONFIG_NEW_LEDS is not set | 1255 | # CONFIG_NEW_LEDS is not set |
| 1256 | # CONFIG_ACCESSIBILITY is not set | ||
| 1293 | CONFIG_INFINIBAND=m | 1257 | CONFIG_INFINIBAND=m |
| 1294 | CONFIG_INFINIBAND_USER_MAD=m | 1258 | CONFIG_INFINIBAND_USER_MAD=m |
| 1295 | CONFIG_INFINIBAND_USER_ACCESS=m | 1259 | CONFIG_INFINIBAND_USER_ACCESS=m |
| @@ -1312,10 +1276,6 @@ CONFIG_INFINIBAND_SRP=m | |||
| 1312 | # CONFIG_RTC_CLASS is not set | 1276 | # CONFIG_RTC_CLASS is not set |
| 1313 | # CONFIG_DMADEVICES is not set | 1277 | # CONFIG_DMADEVICES is not set |
| 1314 | # CONFIG_AUXDISPLAY is not set | 1278 | # CONFIG_AUXDISPLAY is not set |
| 1315 | |||
| 1316 | # | ||
| 1317 | # Userspace I/O | ||
| 1318 | # | ||
| 1319 | # CONFIG_UIO is not set | 1279 | # CONFIG_UIO is not set |
| 1320 | 1280 | ||
| 1321 | # | 1281 | # |
| @@ -1349,11 +1309,12 @@ CONFIG_JFS_SECURITY=y | |||
| 1349 | CONFIG_FS_POSIX_ACL=y | 1309 | CONFIG_FS_POSIX_ACL=y |
| 1350 | CONFIG_XFS_FS=m | 1310 | CONFIG_XFS_FS=m |
| 1351 | # CONFIG_XFS_QUOTA is not set | 1311 | # CONFIG_XFS_QUOTA is not set |
| 1352 | CONFIG_XFS_SECURITY=y | ||
| 1353 | CONFIG_XFS_POSIX_ACL=y | 1312 | CONFIG_XFS_POSIX_ACL=y |
| 1354 | # CONFIG_XFS_RT is not set | 1313 | # CONFIG_XFS_RT is not set |
| 1314 | # CONFIG_XFS_DEBUG is not set | ||
| 1355 | # CONFIG_GFS2_FS is not set | 1315 | # CONFIG_GFS2_FS is not set |
| 1356 | CONFIG_OCFS2_FS=m | 1316 | CONFIG_OCFS2_FS=m |
| 1317 | CONFIG_OCFS2_FS_O2CB=m | ||
| 1357 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1318 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
| 1358 | # CONFIG_OCFS2_DEBUG_FS is not set | 1319 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1359 | CONFIG_DNOTIFY=y | 1320 | CONFIG_DNOTIFY=y |
| @@ -1419,13 +1380,11 @@ CONFIG_NFS_FS=y | |||
| 1419 | CONFIG_NFS_V3=y | 1380 | CONFIG_NFS_V3=y |
| 1420 | CONFIG_NFS_V3_ACL=y | 1381 | CONFIG_NFS_V3_ACL=y |
| 1421 | CONFIG_NFS_V4=y | 1382 | CONFIG_NFS_V4=y |
| 1422 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1423 | CONFIG_NFSD=y | 1383 | CONFIG_NFSD=y |
| 1424 | CONFIG_NFSD_V2_ACL=y | 1384 | CONFIG_NFSD_V2_ACL=y |
| 1425 | CONFIG_NFSD_V3=y | 1385 | CONFIG_NFSD_V3=y |
| 1426 | CONFIG_NFSD_V3_ACL=y | 1386 | CONFIG_NFSD_V3_ACL=y |
| 1427 | CONFIG_NFSD_V4=y | 1387 | CONFIG_NFSD_V4=y |
| 1428 | CONFIG_NFSD_TCP=y | ||
| 1429 | CONFIG_LOCKD=y | 1388 | CONFIG_LOCKD=y |
| 1430 | CONFIG_LOCKD_V4=y | 1389 | CONFIG_LOCKD_V4=y |
| 1431 | CONFIG_EXPORTFS=y | 1390 | CONFIG_EXPORTFS=y |
| @@ -1500,9 +1459,10 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1500 | # Library routines | 1459 | # Library routines |
| 1501 | # | 1460 | # |
| 1502 | CONFIG_BITREVERSE=y | 1461 | CONFIG_BITREVERSE=y |
| 1462 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1503 | CONFIG_CRC_CCITT=m | 1463 | CONFIG_CRC_CCITT=m |
| 1504 | # CONFIG_CRC16 is not set | 1464 | # CONFIG_CRC16 is not set |
| 1505 | # CONFIG_CRC_ITU_T is not set | 1465 | CONFIG_CRC_ITU_T=m |
| 1506 | CONFIG_CRC32=y | 1466 | CONFIG_CRC32=y |
| 1507 | # CONFIG_CRC7 is not set | 1467 | # CONFIG_CRC7 is not set |
| 1508 | CONFIG_LIBCRC32C=m | 1468 | CONFIG_LIBCRC32C=m |
| @@ -1526,6 +1486,7 @@ CONFIG_HAVE_LMB=y | |||
| 1526 | # CONFIG_PRINTK_TIME is not set | 1486 | # CONFIG_PRINTK_TIME is not set |
| 1527 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1487 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1528 | CONFIG_ENABLE_MUST_CHECK=y | 1488 | CONFIG_ENABLE_MUST_CHECK=y |
| 1489 | CONFIG_FRAME_WARN=2048 | ||
| 1529 | CONFIG_MAGIC_SYSRQ=y | 1490 | CONFIG_MAGIC_SYSRQ=y |
| 1530 | # CONFIG_UNUSED_SYMBOLS is not set | 1491 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1531 | CONFIG_DEBUG_FS=y | 1492 | CONFIG_DEBUG_FS=y |
| @@ -1536,18 +1497,23 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1536 | CONFIG_SCHED_DEBUG=y | 1497 | CONFIG_SCHED_DEBUG=y |
| 1537 | # CONFIG_SCHEDSTATS is not set | 1498 | # CONFIG_SCHEDSTATS is not set |
| 1538 | # CONFIG_TIMER_STATS is not set | 1499 | # CONFIG_TIMER_STATS is not set |
| 1500 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1539 | # CONFIG_SLUB_DEBUG_ON is not set | 1501 | # CONFIG_SLUB_DEBUG_ON is not set |
| 1540 | # CONFIG_SLUB_STATS is not set | 1502 | # CONFIG_SLUB_STATS is not set |
| 1541 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1503 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1542 | # CONFIG_RT_MUTEX_TESTER is not set | 1504 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1543 | # CONFIG_DEBUG_SPINLOCK is not set | 1505 | # CONFIG_DEBUG_SPINLOCK is not set |
| 1544 | # CONFIG_DEBUG_MUTEXES is not set | 1506 | # CONFIG_DEBUG_MUTEXES is not set |
| 1507 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 1508 | # CONFIG_PROVE_LOCKING is not set | ||
| 1509 | # CONFIG_LOCK_STAT is not set | ||
| 1545 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1510 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 1546 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1511 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 1547 | # CONFIG_DEBUG_KOBJECT is not set | 1512 | # CONFIG_DEBUG_KOBJECT is not set |
| 1548 | CONFIG_DEBUG_BUGVERBOSE=y | 1513 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1549 | # CONFIG_DEBUG_INFO is not set | 1514 | # CONFIG_DEBUG_INFO is not set |
| 1550 | # CONFIG_DEBUG_VM is not set | 1515 | # CONFIG_DEBUG_VM is not set |
| 1516 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1551 | # CONFIG_DEBUG_LIST is not set | 1517 | # CONFIG_DEBUG_LIST is not set |
| 1552 | # CONFIG_DEBUG_SG is not set | 1518 | # CONFIG_DEBUG_SG is not set |
| 1553 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1519 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1577,53 +1543,83 @@ CONFIG_VIRQ_DEBUG=y | |||
| 1577 | # CONFIG_SECURITY is not set | 1543 | # CONFIG_SECURITY is not set |
| 1578 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1544 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1579 | CONFIG_CRYPTO=y | 1545 | CONFIG_CRYPTO=y |
| 1546 | |||
| 1547 | # | ||
| 1548 | # Crypto core or helper | ||
| 1549 | # | ||
| 1580 | CONFIG_CRYPTO_ALGAPI=y | 1550 | CONFIG_CRYPTO_ALGAPI=y |
| 1581 | CONFIG_CRYPTO_AEAD=m | 1551 | CONFIG_CRYPTO_AEAD=m |
| 1582 | CONFIG_CRYPTO_BLKCIPHER=y | 1552 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1583 | CONFIG_CRYPTO_SEQIV=m | ||
| 1584 | CONFIG_CRYPTO_HASH=y | 1553 | CONFIG_CRYPTO_HASH=y |
| 1585 | CONFIG_CRYPTO_MANAGER=y | 1554 | CONFIG_CRYPTO_MANAGER=y |
| 1555 | CONFIG_CRYPTO_GF128MUL=m | ||
| 1556 | CONFIG_CRYPTO_NULL=m | ||
| 1557 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1558 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1559 | CONFIG_CRYPTO_TEST=m | ||
| 1560 | |||
| 1561 | # | ||
| 1562 | # Authenticated Encryption with Associated Data | ||
| 1563 | # | ||
| 1564 | CONFIG_CRYPTO_CCM=m | ||
| 1565 | CONFIG_CRYPTO_GCM=m | ||
| 1566 | CONFIG_CRYPTO_SEQIV=m | ||
| 1567 | |||
| 1568 | # | ||
| 1569 | # Block modes | ||
| 1570 | # | ||
| 1571 | CONFIG_CRYPTO_CBC=y | ||
| 1572 | CONFIG_CRYPTO_CTR=m | ||
| 1573 | # CONFIG_CRYPTO_CTS is not set | ||
| 1574 | CONFIG_CRYPTO_ECB=m | ||
| 1575 | # CONFIG_CRYPTO_LRW is not set | ||
| 1576 | CONFIG_CRYPTO_PCBC=m | ||
| 1577 | # CONFIG_CRYPTO_XTS is not set | ||
| 1578 | |||
| 1579 | # | ||
| 1580 | # Hash modes | ||
| 1581 | # | ||
| 1586 | CONFIG_CRYPTO_HMAC=y | 1582 | CONFIG_CRYPTO_HMAC=y |
| 1587 | # CONFIG_CRYPTO_XCBC is not set | 1583 | # CONFIG_CRYPTO_XCBC is not set |
| 1588 | CONFIG_CRYPTO_NULL=m | 1584 | |
| 1585 | # | ||
| 1586 | # Digest | ||
| 1587 | # | ||
| 1588 | CONFIG_CRYPTO_CRC32C=m | ||
| 1589 | CONFIG_CRYPTO_MD4=m | 1589 | CONFIG_CRYPTO_MD4=m |
| 1590 | CONFIG_CRYPTO_MD5=y | 1590 | CONFIG_CRYPTO_MD5=y |
| 1591 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1591 | CONFIG_CRYPTO_SHA1=m | 1592 | CONFIG_CRYPTO_SHA1=m |
| 1592 | CONFIG_CRYPTO_SHA256=m | 1593 | CONFIG_CRYPTO_SHA256=m |
| 1593 | CONFIG_CRYPTO_SHA512=m | 1594 | CONFIG_CRYPTO_SHA512=m |
| 1594 | CONFIG_CRYPTO_WP512=m | ||
| 1595 | CONFIG_CRYPTO_TGR192=m | 1595 | CONFIG_CRYPTO_TGR192=m |
| 1596 | CONFIG_CRYPTO_GF128MUL=m | 1596 | CONFIG_CRYPTO_WP512=m |
| 1597 | CONFIG_CRYPTO_ECB=m | 1597 | |
| 1598 | CONFIG_CRYPTO_CBC=y | 1598 | # |
| 1599 | CONFIG_CRYPTO_PCBC=m | 1599 | # Ciphers |
| 1600 | # CONFIG_CRYPTO_LRW is not set | 1600 | # |
| 1601 | # CONFIG_CRYPTO_XTS is not set | ||
| 1602 | CONFIG_CRYPTO_CTR=m | ||
| 1603 | CONFIG_CRYPTO_GCM=m | ||
| 1604 | CONFIG_CRYPTO_CCM=m | ||
| 1605 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1606 | CONFIG_CRYPTO_DES=y | ||
| 1607 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1608 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1609 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1610 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1611 | CONFIG_CRYPTO_SERPENT=m | ||
| 1612 | CONFIG_CRYPTO_AES=m | 1601 | CONFIG_CRYPTO_AES=m |
| 1602 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1603 | CONFIG_CRYPTO_ARC4=m | ||
| 1604 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1605 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1613 | CONFIG_CRYPTO_CAST5=m | 1606 | CONFIG_CRYPTO_CAST5=m |
| 1614 | CONFIG_CRYPTO_CAST6=m | 1607 | CONFIG_CRYPTO_CAST6=m |
| 1615 | CONFIG_CRYPTO_TEA=m | 1608 | CONFIG_CRYPTO_DES=y |
| 1616 | CONFIG_CRYPTO_ARC4=m | 1609 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1617 | CONFIG_CRYPTO_KHAZAD=m | 1610 | CONFIG_CRYPTO_KHAZAD=m |
| 1618 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1619 | # CONFIG_CRYPTO_SEED is not set | ||
| 1620 | CONFIG_CRYPTO_SALSA20=m | 1611 | CONFIG_CRYPTO_SALSA20=m |
| 1612 | # CONFIG_CRYPTO_SEED is not set | ||
| 1613 | CONFIG_CRYPTO_SERPENT=m | ||
| 1614 | CONFIG_CRYPTO_TEA=m | ||
| 1615 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1616 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1617 | |||
| 1618 | # | ||
| 1619 | # Compression | ||
| 1620 | # | ||
| 1621 | CONFIG_CRYPTO_DEFLATE=m | 1621 | CONFIG_CRYPTO_DEFLATE=m |
| 1622 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1623 | CONFIG_CRYPTO_CRC32C=m | ||
| 1624 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1625 | CONFIG_CRYPTO_TEST=m | ||
| 1626 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1627 | CONFIG_CRYPTO_LZO=m | 1622 | CONFIG_CRYPTO_LZO=m |
| 1628 | # CONFIG_CRYPTO_HW is not set | 1623 | # CONFIG_CRYPTO_HW is not set |
| 1629 | # CONFIG_PPC_CLOCK is not set | 1624 | # CONFIG_PPC_CLOCK is not set |
| 1625 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/sbc8641d_defconfig index 3180125aa6c4..8227510b41a9 100644 --- a/arch/powerpc/configs/sbc8641d_defconfig +++ b/arch/powerpc/configs/sbc8641d_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.25-rc6 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Thu Apr 10 18:03:25 2008 | 4 | # Mon Jun 9 08:52:19 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 32 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
| 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
| 35 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 36 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 36 | CONFIG_GENERIC_LOCKBREAK=y | 38 | CONFIG_GENERIC_LOCKBREAK=y |
| 37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| @@ -90,6 +92,7 @@ CONFIG_INITRAMFS_SOURCE="" | |||
| 90 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
| 91 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
| 92 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
| 95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 93 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
| 94 | # CONFIG_KALLSYMS_ALL is not set | 97 | # CONFIG_KALLSYMS_ALL is not set |
| 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| @@ -116,12 +119,14 @@ CONFIG_HAVE_OPROFILE=y | |||
| 116 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
| 117 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
| 118 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
| 122 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 119 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
| 120 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
| 121 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
| 122 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
| 123 | CONFIG_BASE_SMALL=0 | 127 | CONFIG_BASE_SMALL=0 |
| 124 | CONFIG_MODULES=y | 128 | CONFIG_MODULES=y |
| 129 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 125 | CONFIG_MODULE_UNLOAD=y | 130 | CONFIG_MODULE_UNLOAD=y |
| 126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 131 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 127 | # CONFIG_MODVERSIONS is not set | 132 | # CONFIG_MODVERSIONS is not set |
| @@ -197,7 +202,6 @@ CONFIG_PREEMPT=y | |||
| 197 | # CONFIG_PREEMPT_RCU is not set | 202 | # CONFIG_PREEMPT_RCU is not set |
| 198 | CONFIG_BINFMT_ELF=y | 203 | CONFIG_BINFMT_ELF=y |
| 199 | CONFIG_BINFMT_MISC=m | 204 | CONFIG_BINFMT_MISC=m |
| 200 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 201 | # CONFIG_IOMMU_HELPER is not set | 205 | # CONFIG_IOMMU_HELPER is not set |
| 202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 203 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 207 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
| @@ -213,11 +217,13 @@ CONFIG_FLATMEM=y | |||
| 213 | CONFIG_FLAT_NODE_MEM_MAP=y | 217 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 214 | # CONFIG_SPARSEMEM_STATIC is not set | 218 | # CONFIG_SPARSEMEM_STATIC is not set |
| 215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 220 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 217 | # CONFIG_RESOURCES_64BIT is not set | 222 | # CONFIG_RESOURCES_64BIT is not set |
| 218 | CONFIG_ZONE_DMA_FLAG=1 | 223 | CONFIG_ZONE_DMA_FLAG=1 |
| 219 | CONFIG_BOUNCE=y | 224 | CONFIG_BOUNCE=y |
| 220 | CONFIG_VIRT_TO_BUS=y | 225 | CONFIG_VIRT_TO_BUS=y |
| 226 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 221 | # CONFIG_PROC_DEVICETREE is not set | 227 | # CONFIG_PROC_DEVICETREE is not set |
| 222 | # CONFIG_CMDLINE_BOOL is not set | 228 | # CONFIG_CMDLINE_BOOL is not set |
| 223 | # CONFIG_PM is not set | 229 | # CONFIG_PM is not set |
| @@ -237,12 +243,14 @@ CONFIG_PCI_DOMAINS=y | |||
| 237 | CONFIG_PCI_SYSCALL=y | 243 | CONFIG_PCI_SYSCALL=y |
| 238 | CONFIG_PCIEPORTBUS=y | 244 | CONFIG_PCIEPORTBUS=y |
| 239 | CONFIG_PCIEAER=y | 245 | CONFIG_PCIEAER=y |
| 246 | # CONFIG_PCIEASPM is not set | ||
| 240 | CONFIG_ARCH_SUPPORTS_MSI=y | 247 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 241 | # CONFIG_PCI_MSI is not set | 248 | # CONFIG_PCI_MSI is not set |
| 242 | CONFIG_PCI_LEGACY=y | 249 | CONFIG_PCI_LEGACY=y |
| 243 | # CONFIG_PCI_DEBUG is not set | 250 | # CONFIG_PCI_DEBUG is not set |
| 244 | # CONFIG_PCCARD is not set | 251 | # CONFIG_PCCARD is not set |
| 245 | # CONFIG_HOTPLUG_PCI is not set | 252 | # CONFIG_HOTPLUG_PCI is not set |
| 253 | # CONFIG_HAS_RAPIDIO is not set | ||
| 246 | 254 | ||
| 247 | # | 255 | # |
| 248 | # Advanced setup | 256 | # Advanced setup |
| @@ -252,11 +260,11 @@ CONFIG_PCI_LEGACY=y | |||
| 252 | # | 260 | # |
| 253 | # Default settings for advanced configuration options are used | 261 | # Default settings for advanced configuration options are used |
| 254 | # | 262 | # |
| 255 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 256 | CONFIG_LOWMEM_SIZE=0x30000000 | 263 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 264 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 257 | CONFIG_KERNEL_START=0xc0000000 | 265 | CONFIG_KERNEL_START=0xc0000000 |
| 266 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 258 | CONFIG_TASK_SIZE=0xc0000000 | 267 | CONFIG_TASK_SIZE=0xc0000000 |
| 259 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 260 | 268 | ||
| 261 | # | 269 | # |
| 262 | # Networking | 270 | # Networking |
| @@ -328,8 +336,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m | |||
| 328 | CONFIG_INET6_XFRM_MODE_BEET=m | 336 | CONFIG_INET6_XFRM_MODE_BEET=m |
| 329 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 337 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 330 | CONFIG_IPV6_SIT=m | 338 | CONFIG_IPV6_SIT=m |
| 339 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 331 | CONFIG_IPV6_TUNNEL=m | 340 | CONFIG_IPV6_TUNNEL=m |
| 332 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 341 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 342 | # CONFIG_IPV6_MROUTE is not set | ||
| 333 | # CONFIG_NETLABEL is not set | 343 | # CONFIG_NETLABEL is not set |
| 334 | # CONFIG_NETWORK_SECMARK is not set | 344 | # CONFIG_NETWORK_SECMARK is not set |
| 335 | CONFIG_NETFILTER=y | 345 | CONFIG_NETFILTER=y |
| @@ -534,6 +544,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 534 | # CONFIG_MTD_REDBOOT_PARTS is not set | 544 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 535 | # CONFIG_MTD_CMDLINE_PARTS is not set | 545 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 536 | # CONFIG_MTD_OF_PARTS is not set | 546 | # CONFIG_MTD_OF_PARTS is not set |
| 547 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 537 | 548 | ||
| 538 | # | 549 | # |
| 539 | # User Modules And Translation Layers | 550 | # User Modules And Translation Layers |
| @@ -610,6 +621,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 610 | # | 621 | # |
| 611 | # CONFIG_MTD_UBI is not set | 622 | # CONFIG_MTD_UBI is not set |
| 612 | CONFIG_OF_DEVICE=y | 623 | CONFIG_OF_DEVICE=y |
| 624 | CONFIG_OF_I2C=y | ||
| 613 | # CONFIG_PARPORT is not set | 625 | # CONFIG_PARPORT is not set |
| 614 | CONFIG_BLK_DEV=y | 626 | CONFIG_BLK_DEV=y |
| 615 | # CONFIG_BLK_DEV_FD is not set | 627 | # CONFIG_BLK_DEV_FD is not set |
| @@ -727,7 +739,6 @@ CONFIG_NETDEV_1000=y | |||
| 727 | # CONFIG_SIS190 is not set | 739 | # CONFIG_SIS190 is not set |
| 728 | # CONFIG_SKGE is not set | 740 | # CONFIG_SKGE is not set |
| 729 | # CONFIG_SKY2 is not set | 741 | # CONFIG_SKY2 is not set |
| 730 | # CONFIG_SK98LIN is not set | ||
| 731 | # CONFIG_VIA_VELOCITY is not set | 742 | # CONFIG_VIA_VELOCITY is not set |
| 732 | # CONFIG_TIGON3 is not set | 743 | # CONFIG_TIGON3 is not set |
| 733 | # CONFIG_BNX2 is not set | 744 | # CONFIG_BNX2 is not set |
| @@ -743,6 +754,7 @@ CONFIG_GIANFAR=y | |||
| 743 | # | 754 | # |
| 744 | # CONFIG_WLAN_PRE80211 is not set | 755 | # CONFIG_WLAN_PRE80211 is not set |
| 745 | # CONFIG_WLAN_80211 is not set | 756 | # CONFIG_WLAN_80211 is not set |
| 757 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 746 | # CONFIG_WAN is not set | 758 | # CONFIG_WAN is not set |
| 747 | CONFIG_ATM_DRIVERS=y | 759 | CONFIG_ATM_DRIVERS=y |
| 748 | # CONFIG_ATM_DUMMY is not set | 760 | # CONFIG_ATM_DUMMY is not set |
| @@ -825,6 +837,7 @@ CONFIG_VT=y | |||
| 825 | CONFIG_VT_CONSOLE=y | 837 | CONFIG_VT_CONSOLE=y |
| 826 | CONFIG_HW_CONSOLE=y | 838 | CONFIG_HW_CONSOLE=y |
| 827 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 839 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
| 840 | CONFIG_DEVKMEM=y | ||
| 828 | # CONFIG_SERIAL_NONSTANDARD is not set | 841 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 829 | # CONFIG_NOZOMI is not set | 842 | # CONFIG_NOZOMI is not set |
| 830 | 843 | ||
| @@ -863,13 +876,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 863 | CONFIG_I2C_CHARDEV=y | 876 | CONFIG_I2C_CHARDEV=y |
| 864 | 877 | ||
| 865 | # | 878 | # |
| 866 | # I2C Algorithms | ||
| 867 | # | ||
| 868 | # CONFIG_I2C_ALGOBIT is not set | ||
| 869 | # CONFIG_I2C_ALGOPCF is not set | ||
| 870 | # CONFIG_I2C_ALGOPCA is not set | ||
| 871 | |||
| 872 | # | ||
| 873 | # I2C Hardware Bus support | 879 | # I2C Hardware Bus support |
| 874 | # | 880 | # |
| 875 | # CONFIG_I2C_ALI1535 is not set | 881 | # CONFIG_I2C_ALI1535 is not set |
| @@ -895,6 +901,7 @@ CONFIG_I2C_MPC=y | |||
| 895 | # CONFIG_I2C_VIA is not set | 901 | # CONFIG_I2C_VIA is not set |
| 896 | # CONFIG_I2C_VIAPRO is not set | 902 | # CONFIG_I2C_VIAPRO is not set |
| 897 | # CONFIG_I2C_VOODOO3 is not set | 903 | # CONFIG_I2C_VOODOO3 is not set |
| 904 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 898 | 905 | ||
| 899 | # | 906 | # |
| 900 | # Miscellaneous I2C Chip support | 907 | # Miscellaneous I2C Chip support |
| @@ -904,19 +911,13 @@ CONFIG_I2C_MPC=y | |||
| 904 | # CONFIG_SENSORS_PCF8574 is not set | 911 | # CONFIG_SENSORS_PCF8574 is not set |
| 905 | # CONFIG_PCF8575 is not set | 912 | # CONFIG_PCF8575 is not set |
| 906 | # CONFIG_SENSORS_PCF8591 is not set | 913 | # CONFIG_SENSORS_PCF8591 is not set |
| 907 | # CONFIG_TPS65010 is not set | ||
| 908 | # CONFIG_SENSORS_MAX6875 is not set | 914 | # CONFIG_SENSORS_MAX6875 is not set |
| 909 | # CONFIG_SENSORS_TSL2550 is not set | 915 | # CONFIG_SENSORS_TSL2550 is not set |
| 910 | # CONFIG_I2C_DEBUG_CORE is not set | 916 | # CONFIG_I2C_DEBUG_CORE is not set |
| 911 | # CONFIG_I2C_DEBUG_ALGO is not set | 917 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 912 | # CONFIG_I2C_DEBUG_BUS is not set | 918 | # CONFIG_I2C_DEBUG_BUS is not set |
| 913 | # CONFIG_I2C_DEBUG_CHIP is not set | 919 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 914 | |||
| 915 | # | ||
| 916 | # SPI support | ||
| 917 | # | ||
| 918 | # CONFIG_SPI is not set | 920 | # CONFIG_SPI is not set |
| 919 | # CONFIG_SPI_MASTER is not set | ||
| 920 | # CONFIG_W1 is not set | 921 | # CONFIG_W1 is not set |
| 921 | # CONFIG_POWER_SUPPLY is not set | 922 | # CONFIG_POWER_SUPPLY is not set |
| 922 | CONFIG_HWMON=y | 923 | CONFIG_HWMON=y |
| @@ -998,12 +999,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 998 | # Multifunction device drivers | 999 | # Multifunction device drivers |
| 999 | # | 1000 | # |
| 1000 | # CONFIG_MFD_SM501 is not set | 1001 | # CONFIG_MFD_SM501 is not set |
| 1002 | # CONFIG_HTC_PASIC3 is not set | ||
| 1001 | 1003 | ||
| 1002 | # | 1004 | # |
| 1003 | # Multimedia devices | 1005 | # Multimedia devices |
| 1004 | # | 1006 | # |
| 1007 | |||
| 1008 | # | ||
| 1009 | # Multimedia core support | ||
| 1010 | # | ||
| 1005 | # CONFIG_VIDEO_DEV is not set | 1011 | # CONFIG_VIDEO_DEV is not set |
| 1006 | # CONFIG_DVB_CORE is not set | 1012 | # CONFIG_DVB_CORE is not set |
| 1013 | # CONFIG_VIDEO_MEDIA is not set | ||
| 1014 | |||
| 1015 | # | ||
| 1016 | # Multimedia drivers | ||
| 1017 | # | ||
| 1007 | CONFIG_DAB=y | 1018 | CONFIG_DAB=y |
| 1008 | 1019 | ||
| 1009 | # | 1020 | # |
| @@ -1041,6 +1052,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 1041 | CONFIG_USB_ARCH_HAS_OHCI=y | 1052 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1042 | CONFIG_USB_ARCH_HAS_EHCI=y | 1053 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1043 | # CONFIG_USB is not set | 1054 | # CONFIG_USB is not set |
| 1055 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 1056 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 1044 | 1057 | ||
| 1045 | # | 1058 | # |
| 1046 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1059 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -1049,14 +1062,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
| 1049 | # CONFIG_MMC is not set | 1062 | # CONFIG_MMC is not set |
| 1050 | # CONFIG_MEMSTICK is not set | 1063 | # CONFIG_MEMSTICK is not set |
| 1051 | # CONFIG_NEW_LEDS is not set | 1064 | # CONFIG_NEW_LEDS is not set |
| 1065 | # CONFIG_ACCESSIBILITY is not set | ||
| 1052 | # CONFIG_INFINIBAND is not set | 1066 | # CONFIG_INFINIBAND is not set |
| 1053 | # CONFIG_EDAC is not set | 1067 | # CONFIG_EDAC is not set |
| 1054 | # CONFIG_RTC_CLASS is not set | 1068 | # CONFIG_RTC_CLASS is not set |
| 1055 | # CONFIG_DMADEVICES is not set | 1069 | # CONFIG_DMADEVICES is not set |
| 1056 | |||
| 1057 | # | ||
| 1058 | # Userspace I/O | ||
| 1059 | # | ||
| 1060 | # CONFIG_UIO is not set | 1070 | # CONFIG_UIO is not set |
| 1061 | 1071 | ||
| 1062 | # | 1072 | # |
| @@ -1084,8 +1094,8 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
| 1084 | # CONFIG_JFS_FS is not set | 1094 | # CONFIG_JFS_FS is not set |
| 1085 | CONFIG_FS_POSIX_ACL=y | 1095 | CONFIG_FS_POSIX_ACL=y |
| 1086 | # CONFIG_XFS_FS is not set | 1096 | # CONFIG_XFS_FS is not set |
| 1087 | # CONFIG_GFS2_FS is not set | ||
| 1088 | CONFIG_OCFS2_FS=m | 1097 | CONFIG_OCFS2_FS=m |
| 1098 | CONFIG_OCFS2_FS_O2CB=m | ||
| 1089 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1099 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
| 1090 | # CONFIG_OCFS2_DEBUG_FS is not set | 1100 | # CONFIG_OCFS2_DEBUG_FS is not set |
| 1091 | CONFIG_DNOTIFY=y | 1101 | CONFIG_DNOTIFY=y |
| @@ -1145,7 +1155,6 @@ CONFIG_NFS_FS=y | |||
| 1145 | CONFIG_NFS_V3=y | 1155 | CONFIG_NFS_V3=y |
| 1146 | # CONFIG_NFS_V3_ACL is not set | 1156 | # CONFIG_NFS_V3_ACL is not set |
| 1147 | CONFIG_NFS_V4=y | 1157 | CONFIG_NFS_V4=y |
| 1148 | CONFIG_NFS_DIRECTIO=y | ||
| 1149 | # CONFIG_NFSD is not set | 1158 | # CONFIG_NFSD is not set |
| 1150 | CONFIG_ROOT_NFS=y | 1159 | CONFIG_ROOT_NFS=y |
| 1151 | CONFIG_LOCKD=y | 1160 | CONFIG_LOCKD=y |
| @@ -1221,6 +1230,7 @@ CONFIG_NLS_UTF8=m | |||
| 1221 | # Library routines | 1230 | # Library routines |
| 1222 | # | 1231 | # |
| 1223 | CONFIG_BITREVERSE=y | 1232 | CONFIG_BITREVERSE=y |
| 1233 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1224 | CONFIG_CRC_CCITT=m | 1234 | CONFIG_CRC_CCITT=m |
| 1225 | # CONFIG_CRC16 is not set | 1235 | # CONFIG_CRC16 is not set |
| 1226 | # CONFIG_CRC_ITU_T is not set | 1236 | # CONFIG_CRC_ITU_T is not set |
| @@ -1241,6 +1251,7 @@ CONFIG_HAVE_LMB=y | |||
| 1241 | # CONFIG_PRINTK_TIME is not set | 1251 | # CONFIG_PRINTK_TIME is not set |
| 1242 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1252 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 1243 | CONFIG_ENABLE_MUST_CHECK=y | 1253 | CONFIG_ENABLE_MUST_CHECK=y |
| 1254 | CONFIG_FRAME_WARN=1024 | ||
| 1244 | CONFIG_MAGIC_SYSRQ=y | 1255 | CONFIG_MAGIC_SYSRQ=y |
| 1245 | # CONFIG_UNUSED_SYMBOLS is not set | 1256 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1246 | CONFIG_DEBUG_FS=y | 1257 | CONFIG_DEBUG_FS=y |
| @@ -1251,6 +1262,7 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 1251 | CONFIG_SCHED_DEBUG=y | 1262 | CONFIG_SCHED_DEBUG=y |
| 1252 | # CONFIG_SCHEDSTATS is not set | 1263 | # CONFIG_SCHEDSTATS is not set |
| 1253 | # CONFIG_TIMER_STATS is not set | 1264 | # CONFIG_TIMER_STATS is not set |
| 1265 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1254 | # CONFIG_DEBUG_SLAB is not set | 1266 | # CONFIG_DEBUG_SLAB is not set |
| 1255 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1267 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1256 | # CONFIG_RT_MUTEX_TESTER is not set | 1268 | # CONFIG_RT_MUTEX_TESTER is not set |
| @@ -1262,6 +1274,7 @@ CONFIG_SCHED_DEBUG=y | |||
| 1262 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1274 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1263 | CONFIG_DEBUG_INFO=y | 1275 | CONFIG_DEBUG_INFO=y |
| 1264 | # CONFIG_DEBUG_VM is not set | 1276 | # CONFIG_DEBUG_VM is not set |
| 1277 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1265 | # CONFIG_DEBUG_LIST is not set | 1278 | # CONFIG_DEBUG_LIST is not set |
| 1266 | # CONFIG_DEBUG_SG is not set | 1279 | # CONFIG_DEBUG_SG is not set |
| 1267 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1280 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| @@ -1274,6 +1287,7 @@ CONFIG_DEBUG_INFO=y | |||
| 1274 | # CONFIG_DEBUG_PAGEALLOC is not set | 1287 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 1275 | CONFIG_DEBUGGER=y | 1288 | CONFIG_DEBUGGER=y |
| 1276 | # CONFIG_XMON is not set | 1289 | # CONFIG_XMON is not set |
| 1290 | # CONFIG_IRQSTACKS is not set | ||
| 1277 | # CONFIG_VIRQ_DEBUG is not set | 1291 | # CONFIG_VIRQ_DEBUG is not set |
| 1278 | # CONFIG_BDI_SWITCH is not set | 1292 | # CONFIG_BDI_SWITCH is not set |
| 1279 | # CONFIG_PPC_EARLY_DEBUG is not set | 1293 | # CONFIG_PPC_EARLY_DEBUG is not set |
| @@ -1289,54 +1303,84 @@ CONFIG_SECURITY_CAPABILITIES=y | |||
| 1289 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1303 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 1290 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | 1304 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
| 1291 | CONFIG_CRYPTO=y | 1305 | CONFIG_CRYPTO=y |
| 1306 | |||
| 1307 | # | ||
| 1308 | # Crypto core or helper | ||
| 1309 | # | ||
| 1292 | CONFIG_CRYPTO_ALGAPI=y | 1310 | CONFIG_CRYPTO_ALGAPI=y |
| 1293 | CONFIG_CRYPTO_AEAD=m | 1311 | CONFIG_CRYPTO_AEAD=m |
| 1294 | CONFIG_CRYPTO_BLKCIPHER=y | 1312 | CONFIG_CRYPTO_BLKCIPHER=y |
| 1295 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1296 | CONFIG_CRYPTO_HASH=y | 1313 | CONFIG_CRYPTO_HASH=y |
| 1297 | CONFIG_CRYPTO_MANAGER=y | 1314 | CONFIG_CRYPTO_MANAGER=y |
| 1315 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 1316 | CONFIG_CRYPTO_NULL=m | ||
| 1317 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1318 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1319 | CONFIG_CRYPTO_TEST=m | ||
| 1320 | |||
| 1321 | # | ||
| 1322 | # Authenticated Encryption with Associated Data | ||
| 1323 | # | ||
| 1324 | # CONFIG_CRYPTO_CCM is not set | ||
| 1325 | # CONFIG_CRYPTO_GCM is not set | ||
| 1326 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 1327 | |||
| 1328 | # | ||
| 1329 | # Block modes | ||
| 1330 | # | ||
| 1331 | CONFIG_CRYPTO_CBC=y | ||
| 1332 | # CONFIG_CRYPTO_CTR is not set | ||
| 1333 | # CONFIG_CRYPTO_CTS is not set | ||
| 1334 | CONFIG_CRYPTO_ECB=m | ||
| 1335 | # CONFIG_CRYPTO_LRW is not set | ||
| 1336 | CONFIG_CRYPTO_PCBC=m | ||
| 1337 | # CONFIG_CRYPTO_XTS is not set | ||
| 1338 | |||
| 1339 | # | ||
| 1340 | # Hash modes | ||
| 1341 | # | ||
| 1298 | CONFIG_CRYPTO_HMAC=y | 1342 | CONFIG_CRYPTO_HMAC=y |
| 1299 | # CONFIG_CRYPTO_XCBC is not set | 1343 | # CONFIG_CRYPTO_XCBC is not set |
| 1300 | CONFIG_CRYPTO_NULL=m | 1344 | |
| 1345 | # | ||
| 1346 | # Digest | ||
| 1347 | # | ||
| 1348 | CONFIG_CRYPTO_CRC32C=m | ||
| 1301 | CONFIG_CRYPTO_MD4=m | 1349 | CONFIG_CRYPTO_MD4=m |
| 1302 | CONFIG_CRYPTO_MD5=y | 1350 | CONFIG_CRYPTO_MD5=y |
| 1351 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1303 | CONFIG_CRYPTO_SHA1=m | 1352 | CONFIG_CRYPTO_SHA1=m |
| 1304 | CONFIG_CRYPTO_SHA256=m | 1353 | CONFIG_CRYPTO_SHA256=m |
| 1305 | CONFIG_CRYPTO_SHA512=m | 1354 | CONFIG_CRYPTO_SHA512=m |
| 1306 | CONFIG_CRYPTO_WP512=m | ||
| 1307 | # CONFIG_CRYPTO_TGR192 is not set | 1355 | # CONFIG_CRYPTO_TGR192 is not set |
| 1308 | # CONFIG_CRYPTO_GF128MUL is not set | 1356 | CONFIG_CRYPTO_WP512=m |
| 1309 | CONFIG_CRYPTO_ECB=m | 1357 | |
| 1310 | CONFIG_CRYPTO_CBC=y | 1358 | # |
| 1311 | CONFIG_CRYPTO_PCBC=m | 1359 | # Ciphers |
| 1312 | # CONFIG_CRYPTO_LRW is not set | 1360 | # |
| 1313 | # CONFIG_CRYPTO_XTS is not set | ||
| 1314 | # CONFIG_CRYPTO_CTR is not set | ||
| 1315 | # CONFIG_CRYPTO_GCM is not set | ||
| 1316 | # CONFIG_CRYPTO_CCM is not set | ||
| 1317 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 1318 | CONFIG_CRYPTO_DES=y | ||
| 1319 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 1320 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1321 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1322 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1323 | CONFIG_CRYPTO_SERPENT=m | ||
| 1324 | CONFIG_CRYPTO_AES=m | 1361 | CONFIG_CRYPTO_AES=m |
| 1362 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1363 | CONFIG_CRYPTO_ARC4=m | ||
| 1364 | CONFIG_CRYPTO_BLOWFISH=m | ||
| 1365 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1325 | CONFIG_CRYPTO_CAST5=m | 1366 | CONFIG_CRYPTO_CAST5=m |
| 1326 | CONFIG_CRYPTO_CAST6=m | 1367 | CONFIG_CRYPTO_CAST6=m |
| 1327 | CONFIG_CRYPTO_TEA=m | 1368 | CONFIG_CRYPTO_DES=y |
| 1328 | CONFIG_CRYPTO_ARC4=m | 1369 | # CONFIG_CRYPTO_FCRYPT is not set |
| 1329 | CONFIG_CRYPTO_KHAZAD=m | 1370 | CONFIG_CRYPTO_KHAZAD=m |
| 1330 | CONFIG_CRYPTO_ANUBIS=m | ||
| 1331 | # CONFIG_CRYPTO_SEED is not set | ||
| 1332 | # CONFIG_CRYPTO_SALSA20 is not set | 1371 | # CONFIG_CRYPTO_SALSA20 is not set |
| 1372 | # CONFIG_CRYPTO_SEED is not set | ||
| 1373 | CONFIG_CRYPTO_SERPENT=m | ||
| 1374 | CONFIG_CRYPTO_TEA=m | ||
| 1375 | CONFIG_CRYPTO_TWOFISH=m | ||
| 1376 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
| 1377 | |||
| 1378 | # | ||
| 1379 | # Compression | ||
| 1380 | # | ||
| 1333 | CONFIG_CRYPTO_DEFLATE=m | 1381 | CONFIG_CRYPTO_DEFLATE=m |
| 1334 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
| 1335 | CONFIG_CRYPTO_CRC32C=m | ||
| 1336 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 1337 | CONFIG_CRYPTO_TEST=m | ||
| 1338 | CONFIG_CRYPTO_AUTHENC=m | ||
| 1339 | # CONFIG_CRYPTO_LZO is not set | 1382 | # CONFIG_CRYPTO_LZO is not set |
| 1340 | CONFIG_CRYPTO_HW=y | 1383 | CONFIG_CRYPTO_HW=y |
| 1341 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1384 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
| 1342 | # CONFIG_PPC_CLOCK is not set | 1385 | # CONFIG_PPC_CLOCK is not set |
| 1386 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index fdbfd39a3aca..88f6aa8273be 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_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.25-rc7 | 3 | # Linux kernel version: 2.6.26-rc5 |
| 4 | # Mon Mar 31 11:37:19 2008 | 4 | # Mon Jun 9 08:52:20 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -31,6 +31,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
| 31 | CONFIG_GENERIC_HARDIRQS=y | 31 | CONFIG_GENERIC_HARDIRQS=y |
| 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
| 33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
| 34 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 35 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
| 36 | CONFIG_GENERIC_HWEIGHT=y | 38 | CONFIG_GENERIC_HWEIGHT=y |
| @@ -85,6 +87,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
| 85 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
| 86 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
| 87 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
| 90 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 88 | # CONFIG_KALLSYMS is not set | 91 | # CONFIG_KALLSYMS is not set |
| 89 | CONFIG_HOTPLUG=y | 92 | CONFIG_HOTPLUG=y |
| 90 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
| @@ -109,12 +112,14 @@ CONFIG_SLUB=y | |||
| 109 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
| 110 | CONFIG_HAVE_KPROBES=y | 113 | CONFIG_HAVE_KPROBES=y |
| 111 | CONFIG_HAVE_KRETPROBES=y | 114 | CONFIG_HAVE_KRETPROBES=y |
| 115 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 112 | CONFIG_PROC_PAGE_MONITOR=y | 116 | CONFIG_PROC_PAGE_MONITOR=y |
| 113 | CONFIG_SLABINFO=y | 117 | CONFIG_SLABINFO=y |
| 114 | CONFIG_RT_MUTEXES=y | 118 | CONFIG_RT_MUTEXES=y |
| 115 | # CONFIG_TINY_SHMEM is not set | 119 | # CONFIG_TINY_SHMEM is not set |
| 116 | CONFIG_BASE_SMALL=0 | 120 | CONFIG_BASE_SMALL=0 |
| 117 | CONFIG_MODULES=y | 121 | CONFIG_MODULES=y |
| 122 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 118 | CONFIG_MODULE_UNLOAD=y | 123 | CONFIG_MODULE_UNLOAD=y |
| 119 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 124 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 120 | # CONFIG_MODVERSIONS is not set | 125 | # CONFIG_MODVERSIONS is not set |
| @@ -214,11 +219,13 @@ CONFIG_FLATMEM=y | |||
| 214 | CONFIG_FLAT_NODE_MEM_MAP=y | 219 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 215 | # CONFIG_SPARSEMEM_STATIC is not set | 220 | # CONFIG_SPARSEMEM_STATIC is not set |
| 216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
| 222 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 218 | # CONFIG_RESOURCES_64BIT is not set | 224 | # CONFIG_RESOURCES_64BIT is not set |
| 219 | CONFIG_ZONE_DMA_FLAG=1 | 225 | CONFIG_ZONE_DMA_FLAG=1 |
| 220 | CONFIG_BOUNCE=y | 226 | CONFIG_BOUNCE=y |
| 221 | CONFIG_VIRT_TO_BUS=y | 227 | CONFIG_VIRT_TO_BUS=y |
| 228 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
| 222 | CONFIG_PROC_DEVICETREE=y | 229 | CONFIG_PROC_DEVICETREE=y |
| 223 | CONFIG_CMDLINE_BOOL=y | 230 | CONFIG_CMDLINE_BOOL=y |
| 224 | CONFIG_CMDLINE="console=ttyS0,115200" | 231 | CONFIG_CMDLINE="console=ttyS0,115200" |
| @@ -242,6 +249,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
| 242 | CONFIG_PCI_LEGACY=y | 249 | CONFIG_PCI_LEGACY=y |
| 243 | # CONFIG_PCCARD is not set | 250 | # CONFIG_PCCARD is not set |
| 244 | # CONFIG_HOTPLUG_PCI is not set | 251 | # CONFIG_HOTPLUG_PCI is not set |
| 252 | # CONFIG_HAS_RAPIDIO is not set | ||
| 245 | 253 | ||
| 246 | # | 254 | # |
| 247 | # Advanced setup | 255 | # Advanced setup |
| @@ -251,11 +259,11 @@ CONFIG_PCI_LEGACY=y | |||
| 251 | # | 259 | # |
| 252 | # Default settings for advanced configuration options are used | 260 | # Default settings for advanced configuration options are used |
| 253 | # | 261 | # |
| 254 | CONFIG_HIGHMEM_START=0xfe000000 | ||
| 255 | CONFIG_LOWMEM_SIZE=0x30000000 | 262 | CONFIG_LOWMEM_SIZE=0x30000000 |
| 263 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
| 256 | CONFIG_KERNEL_START=0xc0000000 | 264 | CONFIG_KERNEL_START=0xc0000000 |
| 265 | CONFIG_PHYSICAL_START=0x00000000 | ||
| 257 | CONFIG_TASK_SIZE=0xc0000000 | 266 | CONFIG_TASK_SIZE=0xc0000000 |
| 258 | CONFIG_BOOT_LOAD=0x00800000 | ||
| 259 | 267 | ||
| 260 | # | 268 | # |
| 261 | # Networking | 269 | # Networking |
| @@ -298,8 +306,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 298 | CONFIG_DEFAULT_TCP_CONG="cubic" | 306 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 299 | # CONFIG_TCP_MD5SIG is not set | 307 | # CONFIG_TCP_MD5SIG is not set |
| 300 | # CONFIG_IPV6 is not set | 308 | # CONFIG_IPV6 is not set |
| 301 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 302 | # CONFIG_INET6_TUNNEL is not set | ||
| 303 | # CONFIG_NETWORK_SECMARK is not set | 309 | # CONFIG_NETWORK_SECMARK is not set |
| 304 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
| 305 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
| @@ -358,6 +364,7 @@ CONFIG_MTD_PARTITIONS=y | |||
| 358 | # CONFIG_MTD_REDBOOT_PARTS is not set | 364 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 359 | # CONFIG_MTD_CMDLINE_PARTS is not set | 365 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 360 | # CONFIG_MTD_OF_PARTS is not set | 366 | # CONFIG_MTD_OF_PARTS is not set |
| 367 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 361 | 368 | ||
| 362 | # | 369 | # |
| 363 | # User Modules And Translation Layers | 370 | # User Modules And Translation Layers |
| @@ -433,6 +440,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 | |||
| 433 | # | 440 | # |
| 434 | # CONFIG_MTD_UBI is not set | 441 | # CONFIG_MTD_UBI is not set |
| 435 | CONFIG_OF_DEVICE=y | 442 | CONFIG_OF_DEVICE=y |
| 443 | CONFIG_OF_I2C=y | ||
| 436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
| 437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
| 438 | # CONFIG_BLK_DEV_FD is not set | 446 | # CONFIG_BLK_DEV_FD is not set |
| @@ -513,7 +521,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
| 513 | CONFIG_BLK_DEV_VIA82CXXX=y | 521 | CONFIG_BLK_DEV_VIA82CXXX=y |
| 514 | # CONFIG_BLK_DEV_TC86C001 is not set | 522 | # CONFIG_BLK_DEV_TC86C001 is not set |
| 515 | CONFIG_BLK_DEV_IDEDMA=y | 523 | CONFIG_BLK_DEV_IDEDMA=y |
| 516 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 524 | # CONFIG_BLK_DEV_HD_ONLY is not set |
| 517 | # CONFIG_BLK_DEV_HD is not set | 525 | # CONFIG_BLK_DEV_HD is not set |
| 518 | 526 | ||
| 519 | # | 527 | # |
| @@ -638,7 +646,6 @@ CONFIG_R8169=y | |||
| 638 | # CONFIG_SIS190 is not set | 646 | # CONFIG_SIS190 is not set |
| 639 | # CONFIG_SKGE is not set | 647 | # CONFIG_SKGE is not set |
| 640 | # CONFIG_SKY2 is not set | 648 | # CONFIG_SKY2 is not set |
| 641 | # CONFIG_SK98LIN is not set | ||
| 642 | # CONFIG_VIA_VELOCITY is not set | 649 | # CONFIG_VIA_VELOCITY is not set |
| 643 | # CONFIG_TIGON3 is not set | 650 | # CONFIG_TIGON3 is not set |
| 644 | # CONFIG_BNX2 is not set | 651 | # CONFIG_BNX2 is not set |
| @@ -654,6 +661,7 @@ CONFIG_R8169=y | |||
| 654 | # | 661 | # |
| 655 | # CONFIG_WLAN_PRE80211 is not set | 662 | # CONFIG_WLAN_PRE80211 is not set |
| 656 | # CONFIG_WLAN_80211 is not set | 663 | # CONFIG_WLAN_80211 is not set |
| 664 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 657 | 665 | ||
| 658 | # | 666 | # |
| 659 | # USB Network Adapters | 667 | # USB Network Adapters |
| @@ -690,6 +698,7 @@ CONFIG_R8169=y | |||
| 690 | # Character devices | 698 | # Character devices |
| 691 | # | 699 | # |
| 692 | # CONFIG_VT is not set | 700 | # CONFIG_VT is not set |
| 701 | CONFIG_DEVKMEM=y | ||
| 693 | # CONFIG_SERIAL_NONSTANDARD is not set | 702 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 694 | # CONFIG_NOZOMI is not set | 703 | # CONFIG_NOZOMI is not set |
| 695 | 704 | ||
| @@ -717,7 +726,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
| 717 | # CONFIG_IPMI_HANDLER is not set | 726 | # CONFIG_IPMI_HANDLER is not set |
| 718 | CONFIG_HW_RANDOM=m | 727 | CONFIG_HW_RANDOM=m |
| 719 | CONFIG_NVRAM=y | 728 | CONFIG_NVRAM=y |
| 720 | # CONFIG_GEN_RTC is not set | ||
| 721 | # CONFIG_R3964 is not set | 729 | # CONFIG_R3964 is not set |
| 722 | # CONFIG_APPLICOM is not set | 730 | # CONFIG_APPLICOM is not set |
| 723 | # CONFIG_RAW_DRIVER is not set | 731 | # CONFIG_RAW_DRIVER is not set |
| @@ -728,13 +736,6 @@ CONFIG_I2C_BOARDINFO=y | |||
| 728 | CONFIG_I2C_CHARDEV=y | 736 | CONFIG_I2C_CHARDEV=y |
| 729 | 737 | ||
| 730 | # | 738 | # |
| 731 | # I2C Algorithms | ||
| 732 | # | ||
| 733 | # CONFIG_I2C_ALGOBIT is not set | ||
| 734 | # CONFIG_I2C_ALGOPCF is not set | ||
| 735 | # CONFIG_I2C_ALGOPCA is not set | ||
| 736 | |||
| 737 | # | ||
| 738 | # I2C Hardware Bus support | 739 | # I2C Hardware Bus support |
| 739 | # | 740 | # |
| 740 | # CONFIG_I2C_ALI1535 is not set | 741 | # CONFIG_I2C_ALI1535 is not set |
| @@ -761,6 +762,7 @@ CONFIG_I2C_MPC=y | |||
| 761 | # CONFIG_I2C_VIA is not set | 762 | # CONFIG_I2C_VIA is not set |
| 762 | # CONFIG_I2C_VIAPRO is not set | 763 | # CONFIG_I2C_VIAPRO is not set |
| 763 | # CONFIG_I2C_VOODOO3 is not set | 764 | # CONFIG_I2C_VOODOO3 is not set |
| 765 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 764 | 766 | ||
| 765 | # | 767 | # |
| 766 | # Miscellaneous I2C Chip support | 768 | # Miscellaneous I2C Chip support |
| @@ -770,19 +772,13 @@ CONFIG_I2C_MPC=y | |||
| 770 | # CONFIG_SENSORS_PCF8574 is not set | 772 | # CONFIG_SENSORS_PCF8574 is not set |
| 771 | # CONFIG_PCF8575 is not set | 773 | # CONFIG_PCF8575 is not set |
| 772 | # CONFIG_SENSORS_PCF8591 is not set | 774 | # CONFIG_SENSORS_PCF8591 is not set |
| 773 | # CONFIG_TPS65010 is not set | ||
| 774 | # CONFIG_SENSORS_MAX6875 is not set | 775 | # CONFIG_SENSORS_MAX6875 is not set |
| 775 | # CONFIG_SENSORS_TSL2550 is not set | 776 | # CONFIG_SENSORS_TSL2550 is not set |
| 776 | # CONFIG_I2C_DEBUG_CORE is not set | 777 | # CONFIG_I2C_DEBUG_CORE is not set |
| 777 | # CONFIG_I2C_DEBUG_ALGO is not set | 778 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 778 | # CONFIG_I2C_DEBUG_BUS is not set | 779 | # CONFIG_I2C_DEBUG_BUS is not set |
| 779 | # CONFIG_I2C_DEBUG_CHIP is not set | 780 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 780 | |||
| 781 | # | ||
| 782 | # SPI support | ||
| 783 | # | ||
| 784 | # CONFIG_SPI is not set | 781 | # CONFIG_SPI is not set |
| 785 | # CONFIG_SPI_MASTER is not set | ||
| 786 | # CONFIG_W1 is not set | 782 | # CONFIG_W1 is not set |
| 787 | # CONFIG_POWER_SUPPLY is not set | 783 | # CONFIG_POWER_SUPPLY is not set |
| 788 | # CONFIG_HWMON is not set | 784 | # CONFIG_HWMON is not set |
| @@ -799,12 +795,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 799 | # Multifunction device drivers | 795 | # Multifunction device drivers |
| 800 | # | 796 | # |
| 801 | # CONFIG_MFD_SM501 is not set | 797 | # CONFIG_MFD_SM501 is not set |
| 798 | # CONFIG_HTC_PASIC3 is not set | ||
| 802 | 799 | ||
| 803 | # | 800 | # |
| 804 | # Multimedia devices | 801 | # Multimedia devices |
| 805 | # | 802 | # |
| 803 | |||
| 804 | # | ||
| 805 | # Multimedia core support | ||
| 806 | # | ||
| 806 | # CONFIG_VIDEO_DEV is not set | 807 | # CONFIG_VIDEO_DEV is not set |
| 807 | # CONFIG_DVB_CORE is not set | 808 | # CONFIG_DVB_CORE is not set |
| 809 | # CONFIG_VIDEO_MEDIA is not set | ||
| 810 | |||
| 811 | # | ||
| 812 | # Multimedia drivers | ||
| 813 | # | ||
| 808 | # CONFIG_DAB is not set | 814 | # CONFIG_DAB is not set |
| 809 | 815 | ||
| 810 | # | 816 | # |
| @@ -841,16 +847,20 @@ CONFIG_USB_DEVICEFS=y | |||
| 841 | CONFIG_USB_DEVICE_CLASS=y | 847 | CONFIG_USB_DEVICE_CLASS=y |
| 842 | # CONFIG_USB_DYNAMIC_MINORS is not set | 848 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 843 | # CONFIG_USB_OTG is not set | 849 | # CONFIG_USB_OTG is not set |
| 850 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 851 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 844 | 852 | ||
| 845 | # | 853 | # |
| 846 | # USB Host Controller Drivers | 854 | # USB Host Controller Drivers |
| 847 | # | 855 | # |
| 856 | # CONFIG_USB_C67X00_HCD is not set | ||
| 848 | CONFIG_USB_EHCI_HCD=y | 857 | CONFIG_USB_EHCI_HCD=y |
| 849 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 858 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 850 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 859 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 851 | # CONFIG_USB_EHCI_FSL is not set | 860 | # CONFIG_USB_EHCI_FSL is not set |
| 852 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 861 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
| 853 | # CONFIG_USB_ISP116X_HCD is not set | 862 | # CONFIG_USB_ISP116X_HCD is not set |
| 863 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 854 | CONFIG_USB_OHCI_HCD=y | 864 | CONFIG_USB_OHCI_HCD=y |
| 855 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 865 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
| 856 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 866 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| @@ -865,6 +875,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
| 865 | # | 875 | # |
| 866 | # CONFIG_USB_ACM is not set | 876 | # CONFIG_USB_ACM is not set |
| 867 | # CONFIG_USB_PRINTER is not set | 877 | # CONFIG_USB_PRINTER is not set |
| 878 | # CONFIG_USB_WDM is not set | ||
| 868 | 879 | ||
| 869 | # | 880 | # |
| 870 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 881 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -885,6 +896,7 @@ CONFIG_USB_STORAGE=y | |||
| 885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 896 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 886 | # CONFIG_USB_STORAGE_ALAUDA is not set | 897 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 887 | # CONFIG_USB_STORAGE_KARMA is not set | 898 | # CONFIG_USB_STORAGE_KARMA is not set |
| 899 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | ||
| 888 | # CONFIG_USB_LIBUSUAL is not set | 900 | # CONFIG_USB_LIBUSUAL is not set |
| 889 | 901 | ||
| 890 | # | 902 | # |
| @@ -922,10 +934,12 @@ CONFIG_USB_STORAGE=y | |||
| 922 | # CONFIG_USB_TRANCEVIBRATOR is not set | 934 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 923 | # CONFIG_USB_IOWARRIOR is not set | 935 | # CONFIG_USB_IOWARRIOR is not set |
| 924 | # CONFIG_USB_TEST is not set | 936 | # CONFIG_USB_TEST is not set |
| 937 | # CONFIG_USB_ISIGHTFW is not set | ||
| 925 | # CONFIG_USB_GADGET is not set | 938 | # CONFIG_USB_GADGET is not set |
| 926 | # CONFIG_MMC is not set | 939 | # CONFIG_MMC is not set |
| 927 | # CONFIG_MEMSTICK is not set | 940 | # CONFIG_MEMSTICK is not set |
| 928 | # CONFIG_NEW_LEDS is not set | 941 | # CONFIG_NEW_LEDS is not set |
| 942 | # CONFIG_ACCESSIBILITY is not set | ||
| 929 | # CONFIG_INFINIBAND is not set | 943 | # CONFIG_INFINIBAND is not set |
| 930 | # CONFIG_EDAC is not set | 944 | # CONFIG_EDAC is not set |
| 931 | CONFIG_RTC_LIB=y | 945 | CONFIG_RTC_LIB=y |
| @@ -977,11 +991,8 @@ CONFIG_RTC_DRV_DS1307=y | |||
| 977 | # | 991 | # |
| 978 | # on-CPU RTC drivers | 992 | # on-CPU RTC drivers |
| 979 | # | 993 | # |
| 994 | # CONFIG_RTC_DRV_PPC is not set | ||
| 980 | # CONFIG_DMADEVICES is not set | 995 | # CONFIG_DMADEVICES is not set |
| 981 | |||
| 982 | # | ||
| 983 | # Userspace I/O | ||
| 984 | # | ||
| 985 | # CONFIG_UIO is not set | 996 | # CONFIG_UIO is not set |
| 986 | 997 | ||
| 987 | # | 998 | # |
| @@ -1002,10 +1013,9 @@ CONFIG_FS_MBCACHE=y | |||
| 1002 | # CONFIG_FS_POSIX_ACL is not set | 1013 | # CONFIG_FS_POSIX_ACL is not set |
| 1003 | CONFIG_XFS_FS=m | 1014 | CONFIG_XFS_FS=m |
| 1004 | # CONFIG_XFS_QUOTA is not set | 1015 | # CONFIG_XFS_QUOTA is not set |
| 1005 | # CONFIG_XFS_SECURITY is not set | ||
| 1006 | # CONFIG_XFS_POSIX_ACL is not set | 1016 | # CONFIG_XFS_POSIX_ACL is not set |
| 1007 | # CONFIG_XFS_RT is not set | 1017 | # CONFIG_XFS_RT is not set |
| 1008 | # CONFIG_GFS2_FS is not set | 1018 | # CONFIG_XFS_DEBUG is not set |
| 1009 | # CONFIG_OCFS2_FS is not set | 1019 | # CONFIG_OCFS2_FS is not set |
| 1010 | CONFIG_DNOTIFY=y | 1020 | CONFIG_DNOTIFY=y |
| 1011 | CONFIG_INOTIFY=y | 1021 | CONFIG_INOTIFY=y |
| @@ -1138,6 +1148,7 @@ CONFIG_NLS_UTF8=y | |||
| 1138 | # Library routines | 1148 | # Library routines |
| 1139 | # | 1149 | # |
| 1140 | CONFIG_BITREVERSE=y | 1150 | CONFIG_BITREVERSE=y |
| 1151 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 1141 | # CONFIG_CRC_CCITT is not set | 1152 | # CONFIG_CRC_CCITT is not set |
| 1142 | # CONFIG_CRC16 is not set | 1153 | # CONFIG_CRC16 is not set |
| 1143 | # CONFIG_CRC_ITU_T is not set | 1154 | # CONFIG_CRC_ITU_T is not set |
| @@ -1150,6 +1161,7 @@ CONFIG_PLIST=y | |||
| 1150 | CONFIG_HAS_IOMEM=y | 1161 | CONFIG_HAS_IOMEM=y |
| 1151 | CONFIG_HAS_IOPORT=y | 1162 | CONFIG_HAS_IOPORT=y |
| 1152 | CONFIG_HAS_DMA=y | 1163 | CONFIG_HAS_DMA=y |
| 1164 | CONFIG_HAVE_LMB=y | ||
| 1153 | 1165 | ||
| 1154 | # | 1166 | # |
| 1155 | # Kernel hacking | 1167 | # Kernel hacking |
| @@ -1157,6 +1169,7 @@ CONFIG_HAS_DMA=y | |||
| 1157 | # CONFIG_PRINTK_TIME is not set | 1169 | # CONFIG_PRINTK_TIME is not set |
| 1158 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 1170 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
| 1159 | # CONFIG_ENABLE_MUST_CHECK is not set | 1171 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 1172 | CONFIG_FRAME_WARN=1024 | ||
| 1160 | # CONFIG_MAGIC_SYSRQ is not set | 1173 | # CONFIG_MAGIC_SYSRQ is not set |
| 1161 | # CONFIG_UNUSED_SYMBOLS is not set | 1174 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1162 | # CONFIG_DEBUG_FS is not set | 1175 | # CONFIG_DEBUG_FS is not set |
| @@ -1166,6 +1179,7 @@ CONFIG_HAS_DMA=y | |||
| 1166 | # CONFIG_SLUB_STATS is not set | 1179 | # CONFIG_SLUB_STATS is not set |
| 1167 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1180 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 1168 | # CONFIG_SAMPLES is not set | 1181 | # CONFIG_SAMPLES is not set |
| 1182 | # CONFIG_IRQSTACKS is not set | ||
| 1169 | # CONFIG_BOOTX_TEXT is not set | 1183 | # CONFIG_BOOTX_TEXT is not set |
| 1170 | # CONFIG_PPC_EARLY_DEBUG is not set | 1184 | # CONFIG_PPC_EARLY_DEBUG is not set |
| 1171 | 1185 | ||
| @@ -1181,3 +1195,4 @@ CONFIG_ASYNC_MEMCPY=y | |||
| 1181 | CONFIG_ASYNC_XOR=y | 1195 | CONFIG_ASYNC_XOR=y |
| 1182 | # CONFIG_CRYPTO is not set | 1196 | # CONFIG_CRYPTO is not set |
| 1183 | # CONFIG_PPC_CLOCK is not set | 1197 | # CONFIG_PPC_CLOCK is not set |
| 1198 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index c2b9dc4fce5d..22b5d2c459a3 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S | |||
| @@ -368,7 +368,12 @@ interrupt_base: | |||
| 368 | 368 | ||
| 369 | rlwimi r11,r13,0,26,31 /* Insert static perms */ | 369 | rlwimi r11,r13,0,26,31 /* Insert static perms */ |
| 370 | 370 | ||
| 371 | rlwinm r11,r11,0,20,15 /* Clear U0-U3 */ | 371 | /* |
| 372 | * Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added | ||
| 373 | * on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see | ||
| 374 | * include/asm-powerpc/pgtable-ppc32.h for details). | ||
| 375 | */ | ||
| 376 | rlwinm r11,r11,0,20,10 | ||
| 372 | 377 | ||
| 373 | /* find the TLB index that caused the fault. It has to be here. */ | 378 | /* find the TLB index that caused the fault. It has to be here. */ |
| 374 | tlbsx r10, 0, r10 | 379 | tlbsx r10, 0, r10 |
diff --git a/arch/powerpc/kernel/init_task.c b/arch/powerpc/kernel/init_task.c index 941043ae040f..4c85b8d56478 100644 --- a/arch/powerpc/kernel/init_task.c +++ b/arch/powerpc/kernel/init_task.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <asm/uaccess.h> | 8 | #include <asm/uaccess.h> |
| 9 | 9 | ||
| 10 | static struct fs_struct init_fs = INIT_FS; | 10 | static struct fs_struct init_fs = INIT_FS; |
| 11 | static struct files_struct init_files = INIT_FILES; | ||
| 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 11 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 12 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 14 | struct mm_struct init_mm = INIT_MM(init_mm); | 13 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 2f73f705d564..bcc249d90c4d 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
| @@ -1073,7 +1073,7 @@ static const struct file_operations virq_debug_fops = { | |||
| 1073 | static int __init irq_debugfs_init(void) | 1073 | static int __init irq_debugfs_init(void) |
| 1074 | { | 1074 | { |
| 1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, | 1075 | if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root, |
| 1076 | NULL, &virq_debug_fops)) | 1076 | NULL, &virq_debug_fops) == NULL) |
| 1077 | return -ENOMEM; | 1077 | return -ENOMEM; |
| 1078 | 1078 | ||
| 1079 | return 0; | 1079 | return 0; |
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 61dd17449ddc..cf37f5ca4b71 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
| @@ -136,6 +136,11 @@ static int __init add_legacy_soc_port(struct device_node *np, | |||
| 136 | if (of_get_property(np, "clock-frequency", NULL) == NULL) | 136 | if (of_get_property(np, "clock-frequency", NULL) == NULL) |
| 137 | return -1; | 137 | return -1; |
| 138 | 138 | ||
| 139 | /* if reg-shift or offset, don't try to use it */ | ||
| 140 | if ((of_get_property(np, "reg-shift", NULL) != NULL) || | ||
| 141 | (of_get_property(np, "reg-offset", NULL) != NULL)) | ||
| 142 | return -1; | ||
| 143 | |||
| 139 | /* if rtas uses this device, don't try to use it as well */ | 144 | /* if rtas uses this device, don't try to use it as well */ |
| 140 | if (of_get_property(np, "used-by-rtas", NULL) != NULL) | 145 | if (of_get_property(np, "used-by-rtas", NULL) != NULL) |
| 141 | return -1; | 146 | return -1; |
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index 52750745edfd..30eedfc5a566 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
| @@ -189,7 +189,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, | |||
| 189 | 189 | ||
| 190 | dev->cfg_size = pci_cfg_space_size(dev); | 190 | dev->cfg_size = pci_cfg_space_size(dev); |
| 191 | 191 | ||
| 192 | sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus), | 192 | dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus), |
| 193 | dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); | 193 | dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); |
| 194 | dev->class = get_int_prop(node, "class-code", 0); | 194 | dev->class = get_int_prop(node, "class-code", 0); |
| 195 | dev->revision = get_int_prop(node, "revision-id", 0); | 195 | dev->revision = get_int_prop(node, "revision-id", 0); |
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index cf6b5a7d8b3f..d3ac631cbd26 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/screen_info.h> | 8 | #include <linux/screen_info.h> |
| 9 | #include <linux/vt_kern.h> | 9 | #include <linux/vt_kern.h> |
| 10 | #include <linux/nvram.h> | 10 | #include <linux/nvram.h> |
| 11 | #include <linux/console.h> | ||
| 12 | #include <linux/irq.h> | 11 | #include <linux/irq.h> |
| 13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| @@ -160,7 +159,6 @@ EXPORT_SYMBOL(screen_info); | |||
| 160 | EXPORT_SYMBOL(timer_interrupt); | 159 | EXPORT_SYMBOL(timer_interrupt); |
| 161 | EXPORT_SYMBOL(irq_desc); | 160 | EXPORT_SYMBOL(irq_desc); |
| 162 | EXPORT_SYMBOL(tb_ticks_per_jiffy); | 161 | EXPORT_SYMBOL(tb_ticks_per_jiffy); |
| 163 | EXPORT_SYMBOL(console_drivers); | ||
| 164 | EXPORT_SYMBOL(cacheable_memcpy); | 162 | EXPORT_SYMBOL(cacheable_memcpy); |
| 165 | #endif | 163 | #endif |
| 166 | 164 | ||
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh index 8e24fc1821e8..2c7e8e87f770 100644 --- a/arch/powerpc/kernel/prom_init_check.sh +++ b/arch/powerpc/kernel/prom_init_check.sh | |||
| @@ -20,7 +20,7 @@ WHITELIST="add_reloc_offset __bss_start __bss_stop copy_and_flush | |||
| 20 | _end enter_prom memcpy memset reloc_offset __secondary_hold | 20 | _end enter_prom memcpy memset reloc_offset __secondary_hold |
| 21 | __secondary_hold_acknowledge __secondary_hold_spinloop __start | 21 | __secondary_hold_acknowledge __secondary_hold_spinloop __start |
| 22 | strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 | 22 | strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224 |
| 23 | reloc_got2" | 23 | reloc_got2 kernstart_addr" |
| 24 | 24 | ||
| 25 | NM="$1" | 25 | NM="$1" |
| 26 | OBJ="$2" | 26 | OBJ="$2" |
| @@ -48,6 +48,20 @@ do | |||
| 48 | fi | 48 | fi |
| 49 | done | 49 | done |
| 50 | 50 | ||
| 51 | # ignore register save/restore funcitons | ||
| 52 | if [ "${UNDEF:0:9}" = "_restgpr_" ]; then | ||
| 53 | OK=1 | ||
| 54 | fi | ||
| 55 | if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then | ||
| 56 | OK=1 | ||
| 57 | fi | ||
| 58 | if [ "${UNDEF:0:9}" = "_savegpr_" ]; then | ||
| 59 | OK=1 | ||
| 60 | fi | ||
| 61 | if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then | ||
| 62 | OK=1 | ||
| 63 | fi | ||
| 64 | |||
| 51 | if [ $OK -eq 0 ]; then | 65 | if [ $OK -eq 0 ]; then |
| 52 | ERROR=1 | 66 | ERROR=1 |
| 53 | echo "Error: External symbol '$UNDEF' referenced" \ | 67 | echo "Error: External symbol '$UNDEF' referenced" \ |
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index faeb8f207ea4..da7c058e3731 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
| @@ -87,6 +87,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
| 87 | #ifdef CONFIG_ALTIVEC | 87 | #ifdef CONFIG_ALTIVEC |
| 88 | elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)(((unsigned long)sc->vmx_reserve + 15) & ~0xful); | 88 | elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)(((unsigned long)sc->vmx_reserve + 15) & ~0xful); |
| 89 | #endif | 89 | #endif |
| 90 | unsigned long msr = regs->msr; | ||
| 90 | long err = 0; | 91 | long err = 0; |
| 91 | 92 | ||
| 92 | flush_fp_to_thread(current); | 93 | flush_fp_to_thread(current); |
| @@ -102,7 +103,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
| 102 | /* set MSR_VEC in the MSR value in the frame to indicate that sc->v_reg) | 103 | /* set MSR_VEC in the MSR value in the frame to indicate that sc->v_reg) |
| 103 | * contains valid data. | 104 | * contains valid data. |
| 104 | */ | 105 | */ |
| 105 | regs->msr |= MSR_VEC; | 106 | msr |= MSR_VEC; |
| 106 | } | 107 | } |
| 107 | /* We always copy to/from vrsave, it's 0 if we don't have or don't | 108 | /* We always copy to/from vrsave, it's 0 if we don't have or don't |
| 108 | * use altivec. | 109 | * use altivec. |
| @@ -114,6 +115,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
| 114 | err |= __put_user(&sc->gp_regs, &sc->regs); | 115 | err |= __put_user(&sc->gp_regs, &sc->regs); |
| 115 | WARN_ON(!FULL_REGS(regs)); | 116 | WARN_ON(!FULL_REGS(regs)); |
| 116 | err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE); | 117 | err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE); |
| 118 | err |= __put_user(msr, &sc->gp_regs[PT_MSR]); | ||
| 117 | err |= __copy_to_user(&sc->fp_regs, ¤t->thread.fpr, FP_REGS_SIZE); | 119 | err |= __copy_to_user(&sc->fp_regs, ¤t->thread.fpr, FP_REGS_SIZE); |
| 118 | err |= __put_user(signr, &sc->signal); | 120 | err |= __put_user(signr, &sc->signal); |
| 119 | err |= __put_user(handler, &sc->handler); | 121 | err |= __put_user(handler, &sc->handler); |
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index c21a626af676..ce245a850db2 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
| @@ -142,7 +142,7 @@ static void dump_one_vdso_page(struct page *pg, struct page *upg) | |||
| 142 | printk("kpg: %p (c:%d,f:%08lx)", __va(page_to_pfn(pg) << PAGE_SHIFT), | 142 | printk("kpg: %p (c:%d,f:%08lx)", __va(page_to_pfn(pg) << PAGE_SHIFT), |
| 143 | page_count(pg), | 143 | page_count(pg), |
| 144 | pg->flags); | 144 | pg->flags); |
| 145 | if (upg/* && pg != upg*/) { | 145 | if (upg && !IS_ERR(upg) /* && pg != upg*/) { |
| 146 | printk(" upg: %p (c:%d,f:%08lx)", __va(page_to_pfn(upg) | 146 | printk(" upg: %p (c:%d,f:%08lx)", __va(page_to_pfn(upg) |
| 147 | << PAGE_SHIFT), | 147 | << PAGE_SHIFT), |
| 148 | page_count(upg), | 148 | page_count(upg), |
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c index f5d7a5eab96e..75dff7cfa814 100644 --- a/arch/powerpc/kvm/44x_tlb.c +++ b/arch/powerpc/kvm/44x_tlb.c | |||
| @@ -116,8 +116,6 @@ static void kvmppc_44x_shadow_release(struct kvm_vcpu *vcpu, | |||
| 116 | struct tlbe *stlbe = &vcpu->arch.shadow_tlb[index]; | 116 | struct tlbe *stlbe = &vcpu->arch.shadow_tlb[index]; |
| 117 | struct page *page = vcpu->arch.shadow_pages[index]; | 117 | struct page *page = vcpu->arch.shadow_pages[index]; |
| 118 | 118 | ||
| 119 | kunmap(vcpu->arch.shadow_pages[index]); | ||
| 120 | |||
| 121 | if (get_tlb_v(stlbe)) { | 119 | if (get_tlb_v(stlbe)) { |
| 122 | if (kvmppc_44x_tlbe_is_writable(stlbe)) | 120 | if (kvmppc_44x_tlbe_is_writable(stlbe)) |
| 123 | kvm_release_page_dirty(page); | 121 | kvm_release_page_dirty(page); |
| @@ -144,18 +142,19 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gfn_t gfn, u64 asid, | |||
| 144 | stlbe = &vcpu->arch.shadow_tlb[victim]; | 142 | stlbe = &vcpu->arch.shadow_tlb[victim]; |
| 145 | 143 | ||
| 146 | /* Get reference to new page. */ | 144 | /* Get reference to new page. */ |
| 147 | down_write(¤t->mm->mmap_sem); | 145 | down_read(¤t->mm->mmap_sem); |
| 148 | new_page = gfn_to_page(vcpu->kvm, gfn); | 146 | new_page = gfn_to_page(vcpu->kvm, gfn); |
| 149 | if (is_error_page(new_page)) { | 147 | if (is_error_page(new_page)) { |
| 150 | printk(KERN_ERR "Couldn't get guest page!\n"); | 148 | printk(KERN_ERR "Couldn't get guest page for gfn %lx!\n", gfn); |
| 151 | kvm_release_page_clean(new_page); | 149 | kvm_release_page_clean(new_page); |
| 150 | up_read(¤t->mm->mmap_sem); | ||
| 152 | return; | 151 | return; |
| 153 | } | 152 | } |
| 154 | hpaddr = page_to_phys(new_page); | 153 | hpaddr = page_to_phys(new_page); |
| 155 | 154 | ||
| 156 | /* Drop reference to old page. */ | 155 | /* Drop reference to old page. */ |
| 157 | kvmppc_44x_shadow_release(vcpu, victim); | 156 | kvmppc_44x_shadow_release(vcpu, victim); |
| 158 | up_write(¤t->mm->mmap_sem); | 157 | up_read(¤t->mm->mmap_sem); |
| 159 | 158 | ||
| 160 | vcpu->arch.shadow_pages[victim] = new_page; | 159 | vcpu->arch.shadow_pages[victim] = new_page; |
| 161 | 160 | ||
diff --git a/arch/powerpc/kvm/booke_guest.c b/arch/powerpc/kvm/booke_guest.c index 712d89a28c46..9c8ad850c6e3 100644 --- a/arch/powerpc/kvm/booke_guest.c +++ b/arch/powerpc/kvm/booke_guest.c | |||
| @@ -227,39 +227,6 @@ void kvmppc_check_and_deliver_interrupts(struct kvm_vcpu *vcpu) | |||
| 227 | } | 227 | } |
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | static int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu) | ||
| 231 | { | ||
| 232 | enum emulation_result er; | ||
| 233 | int r; | ||
| 234 | |||
| 235 | er = kvmppc_emulate_instruction(run, vcpu); | ||
| 236 | switch (er) { | ||
| 237 | case EMULATE_DONE: | ||
| 238 | /* Future optimization: only reload non-volatiles if they were | ||
| 239 | * actually modified. */ | ||
| 240 | r = RESUME_GUEST_NV; | ||
| 241 | break; | ||
| 242 | case EMULATE_DO_MMIO: | ||
| 243 | run->exit_reason = KVM_EXIT_MMIO; | ||
| 244 | /* We must reload nonvolatiles because "update" load/store | ||
| 245 | * instructions modify register state. */ | ||
| 246 | /* Future optimization: only reload non-volatiles if they were | ||
| 247 | * actually modified. */ | ||
| 248 | r = RESUME_HOST_NV; | ||
| 249 | break; | ||
| 250 | case EMULATE_FAIL: | ||
| 251 | /* XXX Deliver Program interrupt to guest. */ | ||
| 252 | printk(KERN_EMERG "%s: emulation failed (%08x)\n", __func__, | ||
| 253 | vcpu->arch.last_inst); | ||
| 254 | r = RESUME_HOST; | ||
| 255 | break; | ||
| 256 | default: | ||
| 257 | BUG(); | ||
| 258 | } | ||
| 259 | |||
| 260 | return r; | ||
| 261 | } | ||
| 262 | |||
| 263 | /** | 230 | /** |
| 264 | * kvmppc_handle_exit | 231 | * kvmppc_handle_exit |
| 265 | * | 232 | * |
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index a03fe0c80698..000097461283 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c | |||
| @@ -246,6 +246,11 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) | |||
| 246 | case 31: | 246 | case 31: |
| 247 | switch (get_xop(inst)) { | 247 | switch (get_xop(inst)) { |
| 248 | 248 | ||
| 249 | case 23: /* lwzx */ | ||
| 250 | rt = get_rt(inst); | ||
| 251 | emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1); | ||
| 252 | break; | ||
| 253 | |||
| 249 | case 83: /* mfmsr */ | 254 | case 83: /* mfmsr */ |
| 250 | rt = get_rt(inst); | 255 | rt = get_rt(inst); |
| 251 | vcpu->arch.gpr[rt] = vcpu->arch.msr; | 256 | vcpu->arch.gpr[rt] = vcpu->arch.msr; |
| @@ -267,6 +272,13 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) | |||
| 267 | kvmppc_set_msr(vcpu, vcpu->arch.gpr[rs]); | 272 | kvmppc_set_msr(vcpu, vcpu->arch.gpr[rs]); |
| 268 | break; | 273 | break; |
| 269 | 274 | ||
| 275 | case 151: /* stwx */ | ||
| 276 | rs = get_rs(inst); | ||
| 277 | emulated = kvmppc_handle_store(run, vcpu, | ||
| 278 | vcpu->arch.gpr[rs], | ||
| 279 | 4, 1); | ||
| 280 | break; | ||
| 281 | |||
| 270 | case 163: /* wrteei */ | 282 | case 163: /* wrteei */ |
| 271 | vcpu->arch.msr = (vcpu->arch.msr & ~MSR_EE) | 283 | vcpu->arch.msr = (vcpu->arch.msr & ~MSR_EE) |
| 272 | | (inst & MSR_EE); | 284 | | (inst & MSR_EE); |
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index c71d37dc6a88..e522b06cc42f 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile | |||
| @@ -9,7 +9,7 @@ endif | |||
| 9 | ifeq ($(CONFIG_PPC_MERGE),y) | 9 | ifeq ($(CONFIG_PPC_MERGE),y) |
| 10 | obj-y := string.o alloc.o \ | 10 | obj-y := string.o alloc.o \ |
| 11 | checksum_$(CONFIG_WORD_SIZE).o | 11 | checksum_$(CONFIG_WORD_SIZE).o |
| 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o | 12 | obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o |
| 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o | 13 | obj-$(CONFIG_HAS_IOMEM) += devres.o |
| 14 | endif | 14 | endif |
| 15 | 15 | ||
diff --git a/arch/powerpc/lib/crtsavres.S b/arch/powerpc/lib/crtsavres.S new file mode 100644 index 000000000000..70a9cd8a3008 --- /dev/null +++ b/arch/powerpc/lib/crtsavres.S | |||
| @@ -0,0 +1,229 @@ | |||
| 1 | /* | ||
| 2 | * Special support for eabi and SVR4 | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. | ||
| 5 | * Copyright 2008 Freescale Semiconductor, Inc. | ||
| 6 | * Written By Michael Meissner | ||
| 7 | * | ||
| 8 | * Based on gcc/config/rs6000/crtsavres.asm from gcc | ||
| 9 | * | ||
| 10 | * This file is free software; you can redistribute it and/or modify it | ||
| 11 | * under the terms of the GNU General Public License as published by the | ||
| 12 | * Free Software Foundation; either version 2, or (at your option) any | ||
| 13 | * later version. | ||
| 14 | * | ||
| 15 | * In addition to the permissions in the GNU General Public License, the | ||
| 16 | * Free Software Foundation gives you unlimited permission to link the | ||
| 17 | * compiled version of this file with other programs, and to distribute | ||
| 18 | * those programs without any restriction coming from the use of this | ||
| 19 | * file. (The General Public License restrictions do apply in other | ||
| 20 | * respects; for example, they cover modification of the file, and | ||
| 21 | * distribution when not linked into another program.) | ||
| 22 | * | ||
| 23 | * This file is distributed in the hope that it will be useful, but | ||
| 24 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 25 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 26 | * General Public License for more details. | ||
| 27 | * | ||
| 28 | * You should have received a copy of the GNU General Public License | ||
| 29 | * along with this program; see the file COPYING. If not, write to | ||
| 30 | * the Free Software Foundation, 51 Franklin Street, Fifth Floor, | ||
| 31 | * Boston, MA 02110-1301, USA. | ||
| 32 | * | ||
| 33 | * As a special exception, if you link this library with files | ||
| 34 | * compiled with GCC to produce an executable, this does not cause | ||
| 35 | * the resulting executable to be covered by the GNU General Public License. | ||
| 36 | * This exception does not however invalidate any other reasons why | ||
| 37 | * the executable file might be covered by the GNU General Public License. | ||
| 38 | */ | ||
| 39 | |||
| 40 | #include <asm/ppc_asm.h> | ||
| 41 | |||
| 42 | .file "crtsavres.S" | ||
| 43 | .section ".text" | ||
| 44 | |||
| 45 | #ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE | ||
| 46 | |||
| 47 | /* Routines for saving integer registers, called by the compiler. */ | ||
| 48 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 49 | /* function, just beyond the end of the integer save area. */ | ||
| 50 | |||
| 51 | _GLOBAL(_savegpr_14) | ||
| 52 | _GLOBAL(_save32gpr_14) | ||
| 53 | stw 14,-72(11) /* save gp registers */ | ||
| 54 | _GLOBAL(_savegpr_15) | ||
| 55 | _GLOBAL(_save32gpr_15) | ||
| 56 | stw 15,-68(11) | ||
| 57 | _GLOBAL(_savegpr_16) | ||
| 58 | _GLOBAL(_save32gpr_16) | ||
| 59 | stw 16,-64(11) | ||
| 60 | _GLOBAL(_savegpr_17) | ||
| 61 | _GLOBAL(_save32gpr_17) | ||
| 62 | stw 17,-60(11) | ||
| 63 | _GLOBAL(_savegpr_18) | ||
| 64 | _GLOBAL(_save32gpr_18) | ||
| 65 | stw 18,-56(11) | ||
| 66 | _GLOBAL(_savegpr_19) | ||
| 67 | _GLOBAL(_save32gpr_19) | ||
| 68 | stw 19,-52(11) | ||
| 69 | _GLOBAL(_savegpr_20) | ||
| 70 | _GLOBAL(_save32gpr_20) | ||
| 71 | stw 20,-48(11) | ||
| 72 | _GLOBAL(_savegpr_21) | ||
| 73 | _GLOBAL(_save32gpr_21) | ||
| 74 | stw 21,-44(11) | ||
| 75 | _GLOBAL(_savegpr_22) | ||
| 76 | _GLOBAL(_save32gpr_22) | ||
| 77 | stw 22,-40(11) | ||
| 78 | _GLOBAL(_savegpr_23) | ||
| 79 | _GLOBAL(_save32gpr_23) | ||
| 80 | stw 23,-36(11) | ||
| 81 | _GLOBAL(_savegpr_24) | ||
| 82 | _GLOBAL(_save32gpr_24) | ||
| 83 | stw 24,-32(11) | ||
| 84 | _GLOBAL(_savegpr_25) | ||
| 85 | _GLOBAL(_save32gpr_25) | ||
| 86 | stw 25,-28(11) | ||
| 87 | _GLOBAL(_savegpr_26) | ||
| 88 | _GLOBAL(_save32gpr_26) | ||
| 89 | stw 26,-24(11) | ||
| 90 | _GLOBAL(_savegpr_27) | ||
| 91 | _GLOBAL(_save32gpr_27) | ||
| 92 | stw 27,-20(11) | ||
| 93 | _GLOBAL(_savegpr_28) | ||
| 94 | _GLOBAL(_save32gpr_28) | ||
| 95 | stw 28,-16(11) | ||
| 96 | _GLOBAL(_savegpr_29) | ||
| 97 | _GLOBAL(_save32gpr_29) | ||
| 98 | stw 29,-12(11) | ||
| 99 | _GLOBAL(_savegpr_30) | ||
| 100 | _GLOBAL(_save32gpr_30) | ||
| 101 | stw 30,-8(11) | ||
| 102 | _GLOBAL(_savegpr_31) | ||
| 103 | _GLOBAL(_save32gpr_31) | ||
| 104 | stw 31,-4(11) | ||
| 105 | blr | ||
| 106 | |||
| 107 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 108 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 109 | /* function, just beyond the end of the integer restore area. */ | ||
| 110 | |||
| 111 | _GLOBAL(_restgpr_14) | ||
| 112 | _GLOBAL(_rest32gpr_14) | ||
| 113 | lwz 14,-72(11) /* restore gp registers */ | ||
| 114 | _GLOBAL(_restgpr_15) | ||
| 115 | _GLOBAL(_rest32gpr_15) | ||
| 116 | lwz 15,-68(11) | ||
| 117 | _GLOBAL(_restgpr_16) | ||
| 118 | _GLOBAL(_rest32gpr_16) | ||
| 119 | lwz 16,-64(11) | ||
| 120 | _GLOBAL(_restgpr_17) | ||
| 121 | _GLOBAL(_rest32gpr_17) | ||
| 122 | lwz 17,-60(11) | ||
| 123 | _GLOBAL(_restgpr_18) | ||
| 124 | _GLOBAL(_rest32gpr_18) | ||
| 125 | lwz 18,-56(11) | ||
| 126 | _GLOBAL(_restgpr_19) | ||
| 127 | _GLOBAL(_rest32gpr_19) | ||
| 128 | lwz 19,-52(11) | ||
| 129 | _GLOBAL(_restgpr_20) | ||
| 130 | _GLOBAL(_rest32gpr_20) | ||
| 131 | lwz 20,-48(11) | ||
| 132 | _GLOBAL(_restgpr_21) | ||
| 133 | _GLOBAL(_rest32gpr_21) | ||
| 134 | lwz 21,-44(11) | ||
| 135 | _GLOBAL(_restgpr_22) | ||
| 136 | _GLOBAL(_rest32gpr_22) | ||
| 137 | lwz 22,-40(11) | ||
| 138 | _GLOBAL(_restgpr_23) | ||
| 139 | _GLOBAL(_rest32gpr_23) | ||
| 140 | lwz 23,-36(11) | ||
| 141 | _GLOBAL(_restgpr_24) | ||
| 142 | _GLOBAL(_rest32gpr_24) | ||
| 143 | lwz 24,-32(11) | ||
| 144 | _GLOBAL(_restgpr_25) | ||
| 145 | _GLOBAL(_rest32gpr_25) | ||
| 146 | lwz 25,-28(11) | ||
| 147 | _GLOBAL(_restgpr_26) | ||
| 148 | _GLOBAL(_rest32gpr_26) | ||
| 149 | lwz 26,-24(11) | ||
| 150 | _GLOBAL(_restgpr_27) | ||
| 151 | _GLOBAL(_rest32gpr_27) | ||
| 152 | lwz 27,-20(11) | ||
| 153 | _GLOBAL(_restgpr_28) | ||
| 154 | _GLOBAL(_rest32gpr_28) | ||
| 155 | lwz 28,-16(11) | ||
| 156 | _GLOBAL(_restgpr_29) | ||
| 157 | _GLOBAL(_rest32gpr_29) | ||
| 158 | lwz 29,-12(11) | ||
| 159 | _GLOBAL(_restgpr_30) | ||
| 160 | _GLOBAL(_rest32gpr_30) | ||
| 161 | lwz 30,-8(11) | ||
| 162 | _GLOBAL(_restgpr_31) | ||
| 163 | _GLOBAL(_rest32gpr_31) | ||
| 164 | lwz 31,-4(11) | ||
| 165 | blr | ||
| 166 | |||
| 167 | /* Routines for restoring integer registers, called by the compiler. */ | ||
| 168 | /* Called with r11 pointing to the stack header word of the caller of the */ | ||
| 169 | /* function, just beyond the end of the integer restore area. */ | ||
| 170 | |||
| 171 | _GLOBAL(_restgpr_14_x) | ||
| 172 | _GLOBAL(_rest32gpr_14_x) | ||
| 173 | lwz 14,-72(11) /* restore gp registers */ | ||
| 174 | _GLOBAL(_restgpr_15_x) | ||
| 175 | _GLOBAL(_rest32gpr_15_x) | ||
| 176 | lwz 15,-68(11) | ||
| 177 | _GLOBAL(_restgpr_16_x) | ||
| 178 | _GLOBAL(_rest32gpr_16_x) | ||
| 179 | lwz 16,-64(11) | ||
| 180 | _GLOBAL(_restgpr_17_x) | ||
| 181 | _GLOBAL(_rest32gpr_17_x) | ||
| 182 | lwz 17,-60(11) | ||
| 183 | _GLOBAL(_restgpr_18_x) | ||
| 184 | _GLOBAL(_rest32gpr_18_x) | ||
| 185 | lwz 18,-56(11) | ||
| 186 | _GLOBAL(_restgpr_19_x) | ||
| 187 | _GLOBAL(_rest32gpr_19_x) | ||
| 188 | lwz 19,-52(11) | ||
| 189 | _GLOBAL(_restgpr_20_x) | ||
| 190 | _GLOBAL(_rest32gpr_20_x) | ||
| 191 | lwz 20,-48(11) | ||
| 192 | _GLOBAL(_restgpr_21_x) | ||
| 193 | _GLOBAL(_rest32gpr_21_x) | ||
| 194 | lwz 21,-44(11) | ||
| 195 | _GLOBAL(_restgpr_22_x) | ||
| 196 | _GLOBAL(_rest32gpr_22_x) | ||
| 197 | lwz 22,-40(11) | ||
| 198 | _GLOBAL(_restgpr_23_x) | ||
| 199 | _GLOBAL(_rest32gpr_23_x) | ||
| 200 | lwz 23,-36(11) | ||
| 201 | _GLOBAL(_restgpr_24_x) | ||
| 202 | _GLOBAL(_rest32gpr_24_x) | ||
| 203 | lwz 24,-32(11) | ||
| 204 | _GLOBAL(_restgpr_25_x) | ||
| 205 | _GLOBAL(_rest32gpr_25_x) | ||
| 206 | lwz 25,-28(11) | ||
| 207 | _GLOBAL(_restgpr_26_x) | ||
| 208 | _GLOBAL(_rest32gpr_26_x) | ||
| 209 | lwz 26,-24(11) | ||
| 210 | _GLOBAL(_restgpr_27_x) | ||
| 211 | _GLOBAL(_rest32gpr_27_x) | ||
| 212 | lwz 27,-20(11) | ||
| 213 | _GLOBAL(_restgpr_28_x) | ||
| 214 | _GLOBAL(_rest32gpr_28_x) | ||
| 215 | lwz 28,-16(11) | ||
| 216 | _GLOBAL(_restgpr_29_x) | ||
| 217 | _GLOBAL(_rest32gpr_29_x) | ||
| 218 | lwz 29,-12(11) | ||
| 219 | _GLOBAL(_restgpr_30_x) | ||
| 220 | _GLOBAL(_rest32gpr_30_x) | ||
| 221 | lwz 30,-8(11) | ||
| 222 | _GLOBAL(_restgpr_31_x) | ||
| 223 | _GLOBAL(_rest32gpr_31_x) | ||
| 224 | lwz 0,4(11) | ||
| 225 | lwz 31,-4(11) | ||
| 226 | mtlr 0 | ||
| 227 | mr 1,11 | ||
| 228 | blr | ||
| 229 | #endif | ||
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S index ddeaf9e38ad5..b9ba7d930801 100644 --- a/arch/powerpc/mm/hash_low_32.S +++ b/arch/powerpc/mm/hash_low_32.S | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: hashtable.S,v 1.6 1999/10/08 01:56:15 paulus Exp $ | ||
| 3 | * | ||
| 4 | * PowerPC version | 2 | * PowerPC version |
| 5 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) | 3 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) |
| 6 | * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP | 4 | * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP |
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S index 21d248486479..70f4c833fa32 100644 --- a/arch/powerpc/mm/hash_low_64.S +++ b/arch/powerpc/mm/hash_low_64.S | |||
| @@ -568,6 +568,10 @@ htab_inval_old_hpte: | |||
| 568 | ld r7,STK_PARM(r9)(r1) /* ssize */ | 568 | ld r7,STK_PARM(r9)(r1) /* ssize */ |
| 569 | ld r8,STK_PARM(r8)(r1) /* local */ | 569 | ld r8,STK_PARM(r8)(r1) /* local */ |
| 570 | bl .flush_hash_page | 570 | bl .flush_hash_page |
| 571 | /* Clear out _PAGE_HPTE_SUB bits in the new linux PTE */ | ||
| 572 | lis r0,_PAGE_HPTE_SUB@h | ||
| 573 | ori r0,r0,_PAGE_HPTE_SUB@l | ||
| 574 | andc r30,r30,r0 | ||
| 571 | b htab_insert_pte | 575 | b htab_insert_pte |
| 572 | 576 | ||
| 573 | htab_bail_ok: | 577 | htab_bail_ok: |
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index f67e118116fa..51f82d83bf14 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
| @@ -151,6 +151,7 @@ out: | |||
| 151 | return ret; | 151 | return ret; |
| 152 | } | 152 | } |
| 153 | #endif /* CONFIG_MEMORY_HOTREMOVE */ | 153 | #endif /* CONFIG_MEMORY_HOTREMOVE */ |
| 154 | #endif /* CONFIG_MEMORY_HOTPLUG */ | ||
| 154 | 155 | ||
| 155 | /* | 156 | /* |
| 156 | * walk_memory_resource() needs to make sure there is no holes in a given | 157 | * walk_memory_resource() needs to make sure there is no holes in a given |
| @@ -184,8 +185,6 @@ walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg, | |||
| 184 | } | 185 | } |
| 185 | EXPORT_SYMBOL_GPL(walk_memory_resource); | 186 | EXPORT_SYMBOL_GPL(walk_memory_resource); |
| 186 | 187 | ||
| 187 | #endif /* CONFIG_MEMORY_HOTPLUG */ | ||
| 188 | |||
| 189 | void show_mem(void) | 188 | void show_mem(void) |
| 190 | { | 189 | { |
| 191 | unsigned long total = 0, reserved = 0; | 190 | unsigned long total = 0, reserved = 0; |
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 80d1babb230d..e0ff59f21135 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
| @@ -402,7 +402,7 @@ void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags) | |||
| 402 | return; | 402 | return; |
| 403 | } | 403 | } |
| 404 | 404 | ||
| 405 | map_page(address, phys, flags); | 405 | map_page(address, phys, pgprot_val(flags)); |
| 406 | fixmaps++; | 406 | fixmaps++; |
| 407 | } | 407 | } |
| 408 | 408 | ||
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c index 41c7fd91e99e..fe92e65103ed 100644 --- a/arch/powerpc/platforms/52xx/lite5200_pm.c +++ b/arch/powerpc/platforms/52xx/lite5200_pm.c | |||
| @@ -14,6 +14,7 @@ static struct mpc52xx_sdma __iomem *bes; | |||
| 14 | static struct mpc52xx_xlb __iomem *xlb; | 14 | static struct mpc52xx_xlb __iomem *xlb; |
| 15 | static struct mpc52xx_gpio __iomem *gps; | 15 | static struct mpc52xx_gpio __iomem *gps; |
| 16 | static struct mpc52xx_gpio_wkup __iomem *gpw; | 16 | static struct mpc52xx_gpio_wkup __iomem *gpw; |
| 17 | static void __iomem *pci; | ||
| 17 | static void __iomem *sram; | 18 | static void __iomem *sram; |
| 18 | static const int sram_size = 0x4000; /* 16 kBytes */ | 19 | static const int sram_size = 0x4000; /* 16 kBytes */ |
| 19 | static void __iomem *mbar; | 20 | static void __iomem *mbar; |
| @@ -50,6 +51,8 @@ static int lite5200_pm_prepare(void) | |||
| 50 | { .type = "builtin", .compatible = "mpc5200", }, /* efika */ | 51 | { .type = "builtin", .compatible = "mpc5200", }, /* efika */ |
| 51 | {} | 52 | {} |
| 52 | }; | 53 | }; |
| 54 | u64 regaddr64 = 0; | ||
| 55 | const u32 *regaddr_p; | ||
| 53 | 56 | ||
| 54 | /* deep sleep? let mpc52xx code handle that */ | 57 | /* deep sleep? let mpc52xx code handle that */ |
| 55 | if (lite5200_pm_target_state == PM_SUSPEND_STANDBY) | 58 | if (lite5200_pm_target_state == PM_SUSPEND_STANDBY) |
| @@ -60,8 +63,12 @@ static int lite5200_pm_prepare(void) | |||
| 60 | 63 | ||
| 61 | /* map registers */ | 64 | /* map registers */ |
| 62 | np = of_find_matching_node(NULL, immr_ids); | 65 | np = of_find_matching_node(NULL, immr_ids); |
| 63 | mbar = of_iomap(np, 0); | 66 | regaddr_p = of_get_address(np, 0, NULL, NULL); |
| 67 | if (regaddr_p) | ||
| 68 | regaddr64 = of_translate_address(np, regaddr_p); | ||
| 64 | of_node_put(np); | 69 | of_node_put(np); |
| 70 | |||
| 71 | mbar = ioremap((u32) regaddr64, 0xC000); | ||
| 65 | if (!mbar) { | 72 | if (!mbar) { |
| 66 | printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__); | 73 | printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__); |
| 67 | return -ENOSYS; | 74 | return -ENOSYS; |
| @@ -71,6 +78,7 @@ static int lite5200_pm_prepare(void) | |||
| 71 | pic = mbar + 0x500; | 78 | pic = mbar + 0x500; |
| 72 | gps = mbar + 0xb00; | 79 | gps = mbar + 0xb00; |
| 73 | gpw = mbar + 0xc00; | 80 | gpw = mbar + 0xc00; |
| 81 | pci = mbar + 0xd00; | ||
| 74 | bes = mbar + 0x1200; | 82 | bes = mbar + 0x1200; |
| 75 | xlb = mbar + 0x1f00; | 83 | xlb = mbar + 0x1f00; |
| 76 | sram = mbar + 0x8000; | 84 | sram = mbar + 0x8000; |
| @@ -85,6 +93,7 @@ static struct mpc52xx_sdma sbes; | |||
| 85 | static struct mpc52xx_xlb sxlb; | 93 | static struct mpc52xx_xlb sxlb; |
| 86 | static struct mpc52xx_gpio sgps; | 94 | static struct mpc52xx_gpio sgps; |
| 87 | static struct mpc52xx_gpio_wkup sgpw; | 95 | static struct mpc52xx_gpio_wkup sgpw; |
| 96 | static char spci[0x200]; | ||
| 88 | 97 | ||
| 89 | static void lite5200_save_regs(void) | 98 | static void lite5200_save_regs(void) |
| 90 | { | 99 | { |
| @@ -94,6 +103,7 @@ static void lite5200_save_regs(void) | |||
| 94 | _memcpy_fromio(&sxlb, xlb, sizeof(*xlb)); | 103 | _memcpy_fromio(&sxlb, xlb, sizeof(*xlb)); |
| 95 | _memcpy_fromio(&sgps, gps, sizeof(*gps)); | 104 | _memcpy_fromio(&sgps, gps, sizeof(*gps)); |
| 96 | _memcpy_fromio(&sgpw, gpw, sizeof(*gpw)); | 105 | _memcpy_fromio(&sgpw, gpw, sizeof(*gpw)); |
| 106 | _memcpy_fromio(spci, pci, 0x200); | ||
| 97 | 107 | ||
| 98 | _memcpy_fromio(saved_sram, sram, sram_size); | 108 | _memcpy_fromio(saved_sram, sram, sram_size); |
| 99 | } | 109 | } |
| @@ -103,6 +113,8 @@ static void lite5200_restore_regs(void) | |||
| 103 | int i; | 113 | int i; |
| 104 | _memcpy_toio(sram, saved_sram, sram_size); | 114 | _memcpy_toio(sram, saved_sram, sram_size); |
| 105 | 115 | ||
| 116 | /* PCI Configuration */ | ||
| 117 | _memcpy_toio(pci, spci, 0x200); | ||
| 106 | 118 | ||
| 107 | /* | 119 | /* |
| 108 | * GPIOs. Interrupt Master Enable has higher address then other | 120 | * GPIOs. Interrupt Master Enable has higher address then other |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c index 48da5dfe4856..8a455ebce98d 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpio.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpio.c | |||
| @@ -100,7 +100,7 @@ static int mpc52xx_wkup_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) | |||
| 100 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 100 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
| 101 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, | 101 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, |
| 102 | struct mpc52xx_gpiochip, mmchip); | 102 | struct mpc52xx_gpiochip, mmchip); |
| 103 | struct mpc52xx_gpio_wkup *regs = mm_gc->regs; | 103 | struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs; |
| 104 | unsigned long flags; | 104 | unsigned long flags; |
| 105 | 105 | ||
| 106 | spin_lock_irqsave(&gpio_lock, flags); | 106 | spin_lock_irqsave(&gpio_lock, flags); |
| @@ -122,7 +122,7 @@ static int | |||
| 122 | mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) | 122 | mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) |
| 123 | { | 123 | { |
| 124 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 124 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
| 125 | struct mpc52xx_gpio_wkup *regs = mm_gc->regs; | 125 | struct mpc52xx_gpio_wkup __iomem *regs = mm_gc->regs; |
| 126 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, | 126 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, |
| 127 | struct mpc52xx_gpiochip, mmchip); | 127 | struct mpc52xx_gpiochip, mmchip); |
| 128 | unsigned long flags; | 128 | unsigned long flags; |
| @@ -150,7 +150,7 @@ static int __devinit mpc52xx_wkup_gpiochip_probe(struct of_device *ofdev, | |||
| 150 | const struct of_device_id *match) | 150 | const struct of_device_id *match) |
| 151 | { | 151 | { |
| 152 | struct mpc52xx_gpiochip *chip; | 152 | struct mpc52xx_gpiochip *chip; |
| 153 | struct mpc52xx_gpio_wkup *regs; | 153 | struct mpc52xx_gpio_wkup __iomem *regs; |
| 154 | struct of_gpio_chip *ofchip; | 154 | struct of_gpio_chip *ofchip; |
| 155 | int ret; | 155 | int ret; |
| 156 | 156 | ||
| @@ -260,7 +260,7 @@ static int mpc52xx_simple_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) | |||
| 260 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 260 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
| 261 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, | 261 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, |
| 262 | struct mpc52xx_gpiochip, mmchip); | 262 | struct mpc52xx_gpiochip, mmchip); |
| 263 | struct mpc52xx_gpio *regs = mm_gc->regs; | 263 | struct mpc52xx_gpio __iomem *regs = mm_gc->regs; |
| 264 | unsigned long flags; | 264 | unsigned long flags; |
| 265 | 265 | ||
| 266 | spin_lock_irqsave(&gpio_lock, flags); | 266 | spin_lock_irqsave(&gpio_lock, flags); |
| @@ -284,7 +284,7 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) | |||
| 284 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 284 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
| 285 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, | 285 | struct mpc52xx_gpiochip *chip = container_of(mm_gc, |
| 286 | struct mpc52xx_gpiochip, mmchip); | 286 | struct mpc52xx_gpiochip, mmchip); |
| 287 | struct mpc52xx_gpio *regs = mm_gc->regs; | 287 | struct mpc52xx_gpio __iomem *regs = mm_gc->regs; |
| 288 | unsigned long flags; | 288 | unsigned long flags; |
| 289 | 289 | ||
| 290 | spin_lock_irqsave(&gpio_lock, flags); | 290 | spin_lock_irqsave(&gpio_lock, flags); |
| @@ -312,7 +312,7 @@ static int __devinit mpc52xx_simple_gpiochip_probe(struct of_device *ofdev, | |||
| 312 | { | 312 | { |
| 313 | struct mpc52xx_gpiochip *chip; | 313 | struct mpc52xx_gpiochip *chip; |
| 314 | struct of_gpio_chip *ofchip; | 314 | struct of_gpio_chip *ofchip; |
| 315 | struct mpc52xx_gpio *regs; | 315 | struct mpc52xx_gpio __iomem *regs; |
| 316 | int ret; | 316 | int ret; |
| 317 | 317 | ||
| 318 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | 318 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
| @@ -387,7 +387,7 @@ mpc52xx_gpt_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) | |||
| 387 | static int mpc52xx_gpt_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) | 387 | static int mpc52xx_gpt_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio) |
| 388 | { | 388 | { |
| 389 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 389 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
| 390 | struct mpc52xx_gpt *regs = mm_gc->regs; | 390 | struct mpc52xx_gpt __iomem *regs = mm_gc->regs; |
| 391 | 391 | ||
| 392 | out_be32(®s->mode, 0x04); | 392 | out_be32(®s->mode, 0x04); |
| 393 | 393 | ||
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 7ff29d53dc2d..ecbe580c3f32 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
| @@ -34,6 +34,7 @@ config MPC85xx_MDS | |||
| 34 | bool "Freescale MPC85xx MDS" | 34 | bool "Freescale MPC85xx MDS" |
| 35 | select DEFAULT_UIMAGE | 35 | select DEFAULT_UIMAGE |
| 36 | select QUICC_ENGINE | 36 | select QUICC_ENGINE |
| 37 | select PHYLIB | ||
| 37 | help | 38 | help |
| 38 | This option enables support for the MPC85xx MDS board | 39 | This option enables support for the MPC85xx MDS board |
| 39 | 40 | ||
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c index 31da84c458d2..0e04f8fb152a 100644 --- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c +++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c | |||
| @@ -217,7 +217,7 @@ static u##size scc_pciex_in##name(unsigned long port) \ | |||
| 217 | static void scc_pciex_ins##name(unsigned long p, void *b, unsigned long c) \ | 217 | static void scc_pciex_ins##name(unsigned long p, void *b, unsigned long c) \ |
| 218 | { \ | 218 | { \ |
| 219 | struct iowa_bus *bus = iowa_pio_find_bus(p); \ | 219 | struct iowa_bus *bus = iowa_pio_find_bus(p); \ |
| 220 | u##size *dst = b; \ | 220 | __le##size *dst = b; \ |
| 221 | for (; c != 0; c--, dst++) \ | 221 | for (; c != 0; c--, dst++) \ |
| 222 | *dst = cpu_to_le##size(__scc_pciex_in##name(bus->phb, p)); \ | 222 | *dst = cpu_to_le##size(__scc_pciex_in##name(bus->phb, p)); \ |
| 223 | scc_pciex_io_flush(bus); \ | 223 | scc_pciex_io_flush(bus); \ |
| @@ -231,10 +231,11 @@ static void scc_pciex_outs##name(unsigned long p, const void *b, \ | |||
| 231 | unsigned long c) \ | 231 | unsigned long c) \ |
| 232 | { \ | 232 | { \ |
| 233 | struct iowa_bus *bus = iowa_pio_find_bus(p); \ | 233 | struct iowa_bus *bus = iowa_pio_find_bus(p); \ |
| 234 | const u##size *src = b; \ | 234 | const __le##size *src = b; \ |
| 235 | for (; c != 0; c--, src++) \ | 235 | for (; c != 0; c--, src++) \ |
| 236 | __scc_pciex_out##name(bus->phb, le##size##_to_cpu(*src), p); \ | 236 | __scc_pciex_out##name(bus->phb, le##size##_to_cpu(*src), p); \ |
| 237 | } | 237 | } |
| 238 | #define __le8 u8 | ||
| 238 | #define cpu_to_le8(x) (x) | 239 | #define cpu_to_le8(x) (x) |
| 239 | #define le8_to_cpu(x) (x) | 240 | #define le8_to_cpu(x) (x) |
| 240 | PCIEX_PIO_FUNC(8, b) | 241 | PCIEX_PIO_FUNC(8, b) |
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c index 70c660121ec4..78f905bc6a42 100644 --- a/arch/powerpc/platforms/cell/spu_base.c +++ b/arch/powerpc/platforms/cell/spu_base.c | |||
| @@ -219,15 +219,25 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea) | |||
| 219 | extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX | 219 | extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX |
| 220 | static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) | 220 | static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr) |
| 221 | { | 221 | { |
| 222 | int ret; | ||
| 223 | |||
| 222 | pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea); | 224 | pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea); |
| 223 | 225 | ||
| 224 | /* Handle kernel space hash faults immediately. | 226 | /* |
| 225 | User hash faults need to be deferred to process context. */ | 227 | * Handle kernel space hash faults immediately. User hash |
| 226 | if ((dsisr & MFC_DSISR_PTE_NOT_FOUND) | 228 | * faults need to be deferred to process context. |
| 227 | && REGION_ID(ea) != USER_REGION_ID | 229 | */ |
| 228 | && hash_page(ea, _PAGE_PRESENT, 0x300) == 0) { | 230 | if ((dsisr & MFC_DSISR_PTE_NOT_FOUND) && |
| 229 | spu_restart_dma(spu); | 231 | (REGION_ID(ea) != USER_REGION_ID)) { |
| 230 | return 0; | 232 | |
| 233 | spin_unlock(&spu->register_lock); | ||
| 234 | ret = hash_page(ea, _PAGE_PRESENT, 0x300); | ||
| 235 | spin_lock(&spu->register_lock); | ||
| 236 | |||
| 237 | if (!ret) { | ||
| 238 | spu_restart_dma(spu); | ||
| 239 | return 0; | ||
| 240 | } | ||
| 231 | } | 241 | } |
| 232 | 242 | ||
| 233 | spu->class_1_dar = ea; | 243 | spu->class_1_dar = ea; |
| @@ -324,17 +334,13 @@ spu_irq_class_0(int irq, void *data) | |||
| 324 | stat = spu_int_stat_get(spu, 0) & mask; | 334 | stat = spu_int_stat_get(spu, 0) & mask; |
| 325 | 335 | ||
| 326 | spu->class_0_pending |= stat; | 336 | spu->class_0_pending |= stat; |
| 327 | spu->class_0_dsisr = spu_mfc_dsisr_get(spu); | ||
| 328 | spu->class_0_dar = spu_mfc_dar_get(spu); | 337 | spu->class_0_dar = spu_mfc_dar_get(spu); |
| 329 | spin_unlock(&spu->register_lock); | ||
| 330 | |||
| 331 | spu->stop_callback(spu, 0); | 338 | spu->stop_callback(spu, 0); |
| 332 | |||
| 333 | spu->class_0_pending = 0; | 339 | spu->class_0_pending = 0; |
| 334 | spu->class_0_dsisr = 0; | ||
| 335 | spu->class_0_dar = 0; | 340 | spu->class_0_dar = 0; |
| 336 | 341 | ||
| 337 | spu_int_stat_clear(spu, 0, stat); | 342 | spu_int_stat_clear(spu, 0, stat); |
| 343 | spin_unlock(&spu->register_lock); | ||
| 338 | 344 | ||
| 339 | return IRQ_HANDLED; | 345 | return IRQ_HANDLED; |
| 340 | } | 346 | } |
| @@ -357,13 +363,12 @@ spu_irq_class_1(int irq, void *data) | |||
| 357 | spu_mfc_dsisr_set(spu, 0ul); | 363 | spu_mfc_dsisr_set(spu, 0ul); |
| 358 | spu_int_stat_clear(spu, 1, stat); | 364 | spu_int_stat_clear(spu, 1, stat); |
| 359 | 365 | ||
| 360 | if (stat & CLASS1_SEGMENT_FAULT_INTR) | ||
| 361 | __spu_trap_data_seg(spu, dar); | ||
| 362 | |||
| 363 | spin_unlock(&spu->register_lock); | ||
| 364 | pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat, | 366 | pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat, |
| 365 | dar, dsisr); | 367 | dar, dsisr); |
| 366 | 368 | ||
| 369 | if (stat & CLASS1_SEGMENT_FAULT_INTR) | ||
| 370 | __spu_trap_data_seg(spu, dar); | ||
| 371 | |||
| 367 | if (stat & CLASS1_STORAGE_FAULT_INTR) | 372 | if (stat & CLASS1_STORAGE_FAULT_INTR) |
| 368 | __spu_trap_data_map(spu, dar, dsisr); | 373 | __spu_trap_data_map(spu, dar, dsisr); |
| 369 | 374 | ||
| @@ -376,6 +381,8 @@ spu_irq_class_1(int irq, void *data) | |||
| 376 | spu->class_1_dsisr = 0; | 381 | spu->class_1_dsisr = 0; |
| 377 | spu->class_1_dar = 0; | 382 | spu->class_1_dar = 0; |
| 378 | 383 | ||
| 384 | spin_unlock(&spu->register_lock); | ||
| 385 | |||
| 379 | return stat ? IRQ_HANDLED : IRQ_NONE; | 386 | return stat ? IRQ_HANDLED : IRQ_NONE; |
| 380 | } | 387 | } |
| 381 | 388 | ||
| @@ -394,14 +401,12 @@ spu_irq_class_2(int irq, void *data) | |||
| 394 | mask = spu_int_mask_get(spu, 2); | 401 | mask = spu_int_mask_get(spu, 2); |
| 395 | /* ignore interrupts we're not waiting for */ | 402 | /* ignore interrupts we're not waiting for */ |
| 396 | stat &= mask; | 403 | stat &= mask; |
| 397 | |||
| 398 | /* mailbox interrupts are level triggered. mask them now before | 404 | /* mailbox interrupts are level triggered. mask them now before |
| 399 | * acknowledging */ | 405 | * acknowledging */ |
| 400 | if (stat & mailbox_intrs) | 406 | if (stat & mailbox_intrs) |
| 401 | spu_int_mask_and(spu, 2, ~(stat & mailbox_intrs)); | 407 | spu_int_mask_and(spu, 2, ~(stat & mailbox_intrs)); |
| 402 | /* acknowledge all interrupts before the callbacks */ | 408 | /* acknowledge all interrupts before the callbacks */ |
| 403 | spu_int_stat_clear(spu, 2, stat); | 409 | spu_int_stat_clear(spu, 2, stat); |
| 404 | spin_unlock(&spu->register_lock); | ||
| 405 | 410 | ||
| 406 | pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask); | 411 | pr_debug("class 2 interrupt %d, %lx, %lx\n", irq, stat, mask); |
| 407 | 412 | ||
| @@ -421,6 +426,9 @@ spu_irq_class_2(int irq, void *data) | |||
| 421 | spu->wbox_callback(spu); | 426 | spu->wbox_callback(spu); |
| 422 | 427 | ||
| 423 | spu->stats.class2_intr++; | 428 | spu->stats.class2_intr++; |
| 429 | |||
| 430 | spin_unlock(&spu->register_lock); | ||
| 431 | |||
| 424 | return stat ? IRQ_HANDLED : IRQ_NONE; | 432 | return stat ? IRQ_HANDLED : IRQ_NONE; |
| 425 | } | 433 | } |
| 426 | 434 | ||
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index b7493b865812..f7edba6cb795 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c | |||
| @@ -27,7 +27,6 @@ void spufs_stop_callback(struct spu *spu, int irq) | |||
| 27 | switch(irq) { | 27 | switch(irq) { |
| 28 | case 0 : | 28 | case 0 : |
| 29 | ctx->csa.class_0_pending = spu->class_0_pending; | 29 | ctx->csa.class_0_pending = spu->class_0_pending; |
| 30 | ctx->csa.class_0_dsisr = spu->class_0_dsisr; | ||
| 31 | ctx->csa.class_0_dar = spu->class_0_dar; | 30 | ctx->csa.class_0_dar = spu->class_0_dar; |
| 32 | break; | 31 | break; |
| 33 | case 1 : | 32 | case 1 : |
| @@ -51,18 +50,22 @@ int spu_stopped(struct spu_context *ctx, u32 *stat) | |||
| 51 | u64 dsisr; | 50 | u64 dsisr; |
| 52 | u32 stopped; | 51 | u32 stopped; |
| 53 | 52 | ||
| 54 | *stat = ctx->ops->status_read(ctx); | ||
| 55 | |||
| 56 | if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags)) | ||
| 57 | return 1; | ||
| 58 | |||
| 59 | stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP | | 53 | stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP | |
| 60 | SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP; | 54 | SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP; |
| 61 | if (!(*stat & SPU_STATUS_RUNNING) && (*stat & stopped)) | 55 | |
| 56 | top: | ||
| 57 | *stat = ctx->ops->status_read(ctx); | ||
| 58 | if (*stat & stopped) { | ||
| 59 | /* | ||
| 60 | * If the spu hasn't finished stopping, we need to | ||
| 61 | * re-read the register to get the stopped value. | ||
| 62 | */ | ||
| 63 | if (*stat & SPU_STATUS_RUNNING) | ||
| 64 | goto top; | ||
| 62 | return 1; | 65 | return 1; |
| 66 | } | ||
| 63 | 67 | ||
| 64 | dsisr = ctx->csa.class_0_dsisr; | 68 | if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags)) |
| 65 | if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED)) | ||
| 66 | return 1; | 69 | return 1; |
| 67 | 70 | ||
| 68 | dsisr = ctx->csa.class_1_dsisr; | 71 | dsisr = ctx->csa.class_1_dsisr; |
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 745dd51ec37f..e929e70a84e3 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/arch/powerpc/platforms/cell/spufs/sched.c | |||
| @@ -230,19 +230,23 @@ static void spu_bind_context(struct spu *spu, struct spu_context *ctx) | |||
| 230 | ctx->stats.slb_flt_base = spu->stats.slb_flt; | 230 | ctx->stats.slb_flt_base = spu->stats.slb_flt; |
| 231 | ctx->stats.class2_intr_base = spu->stats.class2_intr; | 231 | ctx->stats.class2_intr_base = spu->stats.class2_intr; |
| 232 | 232 | ||
| 233 | spu_associate_mm(spu, ctx->owner); | ||
| 234 | |||
| 235 | spin_lock_irq(&spu->register_lock); | ||
| 233 | spu->ctx = ctx; | 236 | spu->ctx = ctx; |
| 234 | spu->flags = 0; | 237 | spu->flags = 0; |
| 235 | ctx->spu = spu; | 238 | ctx->spu = spu; |
| 236 | ctx->ops = &spu_hw_ops; | 239 | ctx->ops = &spu_hw_ops; |
| 237 | spu->pid = current->pid; | 240 | spu->pid = current->pid; |
| 238 | spu->tgid = current->tgid; | 241 | spu->tgid = current->tgid; |
| 239 | spu_associate_mm(spu, ctx->owner); | ||
| 240 | spu->ibox_callback = spufs_ibox_callback; | 242 | spu->ibox_callback = spufs_ibox_callback; |
| 241 | spu->wbox_callback = spufs_wbox_callback; | 243 | spu->wbox_callback = spufs_wbox_callback; |
| 242 | spu->stop_callback = spufs_stop_callback; | 244 | spu->stop_callback = spufs_stop_callback; |
| 243 | spu->mfc_callback = spufs_mfc_callback; | 245 | spu->mfc_callback = spufs_mfc_callback; |
| 244 | mb(); | 246 | spin_unlock_irq(&spu->register_lock); |
| 247 | |||
| 245 | spu_unmap_mappings(ctx); | 248 | spu_unmap_mappings(ctx); |
| 249 | |||
| 246 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0); | 250 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0); |
| 247 | spu_restore(&ctx->csa, spu); | 251 | spu_restore(&ctx->csa, spu); |
| 248 | spu->timestamp = jiffies; | 252 | spu->timestamp = jiffies; |
| @@ -403,6 +407,8 @@ static int has_affinity(struct spu_context *ctx) | |||
| 403 | */ | 407 | */ |
| 404 | static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | 408 | static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) |
| 405 | { | 409 | { |
| 410 | u32 status; | ||
| 411 | |||
| 406 | spu_context_trace(spu_unbind_context__enter, ctx, spu); | 412 | spu_context_trace(spu_unbind_context__enter, ctx, spu); |
| 407 | 413 | ||
| 408 | spuctx_switch_state(ctx, SPU_UTIL_SYSTEM); | 414 | spuctx_switch_state(ctx, SPU_UTIL_SYSTEM); |
| @@ -423,18 +429,22 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | |||
| 423 | spu_unmap_mappings(ctx); | 429 | spu_unmap_mappings(ctx); |
| 424 | spu_save(&ctx->csa, spu); | 430 | spu_save(&ctx->csa, spu); |
| 425 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0); | 431 | spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0); |
| 432 | |||
| 433 | spin_lock_irq(&spu->register_lock); | ||
| 426 | spu->timestamp = jiffies; | 434 | spu->timestamp = jiffies; |
| 427 | ctx->state = SPU_STATE_SAVED; | 435 | ctx->state = SPU_STATE_SAVED; |
| 428 | spu->ibox_callback = NULL; | 436 | spu->ibox_callback = NULL; |
| 429 | spu->wbox_callback = NULL; | 437 | spu->wbox_callback = NULL; |
| 430 | spu->stop_callback = NULL; | 438 | spu->stop_callback = NULL; |
| 431 | spu->mfc_callback = NULL; | 439 | spu->mfc_callback = NULL; |
| 432 | spu_associate_mm(spu, NULL); | ||
| 433 | spu->pid = 0; | 440 | spu->pid = 0; |
| 434 | spu->tgid = 0; | 441 | spu->tgid = 0; |
| 435 | ctx->ops = &spu_backing_ops; | 442 | ctx->ops = &spu_backing_ops; |
| 436 | spu->flags = 0; | 443 | spu->flags = 0; |
| 437 | spu->ctx = NULL; | 444 | spu->ctx = NULL; |
| 445 | spin_unlock_irq(&spu->register_lock); | ||
| 446 | |||
| 447 | spu_associate_mm(spu, NULL); | ||
| 438 | 448 | ||
| 439 | ctx->stats.slb_flt += | 449 | ctx->stats.slb_flt += |
| 440 | (spu->stats.slb_flt - ctx->stats.slb_flt_base); | 450 | (spu->stats.slb_flt - ctx->stats.slb_flt_base); |
| @@ -444,6 +454,9 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx) | |||
| 444 | /* This maps the underlying spu state to idle */ | 454 | /* This maps the underlying spu state to idle */ |
| 445 | spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); | 455 | spuctx_switch_state(ctx, SPU_UTIL_IDLE_LOADED); |
| 446 | ctx->spu = NULL; | 456 | ctx->spu = NULL; |
| 457 | |||
| 458 | if (spu_stopped(ctx, &status)) | ||
| 459 | wake_up_all(&ctx->stop_wq); | ||
| 447 | } | 460 | } |
| 448 | 461 | ||
| 449 | /** | 462 | /** |
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c index 5b3fb2b321ab..3a58ffabccd9 100644 --- a/arch/powerpc/platforms/ps3/mm.c +++ b/arch/powerpc/platforms/ps3/mm.c | |||
| @@ -317,6 +317,9 @@ static int __init ps3_mm_add_memory(void) | |||
| 317 | return result; | 317 | return result; |
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | lmb_add(start_addr, map.r1.size); | ||
| 321 | lmb_analyze(); | ||
| 322 | |||
| 320 | result = online_pages(start_pfn, nr_pages); | 323 | result = online_pages(start_pfn, nr_pages); |
| 321 | 324 | ||
| 322 | if (result) | 325 | if (result) |
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c index 68ea5eee39a8..8c1ca477c52c 100644 --- a/arch/powerpc/platforms/pseries/eeh_driver.c +++ b/arch/powerpc/platforms/pseries/eeh_driver.c | |||
| @@ -42,17 +42,20 @@ static inline const char * pcid_name (struct pci_dev *pdev) | |||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | #ifdef DEBUG | 44 | #ifdef DEBUG |
| 45 | static void print_device_node_tree (struct pci_dn *pdn, int dent) | 45 | static void print_device_node_tree(struct pci_dn *pdn, int dent) |
| 46 | { | 46 | { |
| 47 | int i; | 47 | int i; |
| 48 | if (!pdn) return; | 48 | struct device_node *pc; |
| 49 | for (i=0;i<dent; i++) | 49 | |
| 50 | if (!pdn) | ||
| 51 | return; | ||
| 52 | for (i = 0; i < dent; i++) | ||
| 50 | printk(" "); | 53 | printk(" "); |
| 51 | printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n", | 54 | printk("dn=%s mode=%x \tcfg_addr=%x pe_addr=%x \tfull=%s\n", |
| 52 | pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr, | 55 | pdn->node->name, pdn->eeh_mode, pdn->eeh_config_addr, |
| 53 | pdn->eeh_pe_config_addr, pdn->node->full_name); | 56 | pdn->eeh_pe_config_addr, pdn->node->full_name); |
| 54 | dent += 3; | 57 | dent += 3; |
| 55 | struct device_node *pc = pdn->node->child; | 58 | pc = pdn->node->child; |
| 56 | while (pc) { | 59 | while (pc) { |
| 57 | print_device_node_tree(PCI_DN(pc), dent); | 60 | print_device_node_tree(PCI_DN(pc), dent); |
| 58 | pc = pc->sibling; | 61 | pc = pc->sibling; |
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c index f68903e15bd5..42f7e384e6c4 100644 --- a/arch/powerpc/platforms/pseries/nvram.c +++ b/arch/powerpc/platforms/pseries/nvram.c | |||
| @@ -131,8 +131,10 @@ int __init pSeries_nvram_init(void) | |||
| 131 | return -ENODEV; | 131 | return -ENODEV; |
| 132 | 132 | ||
| 133 | nbytes_p = of_get_property(nvram, "#bytes", &proplen); | 133 | nbytes_p = of_get_property(nvram, "#bytes", &proplen); |
| 134 | if (nbytes_p == NULL || proplen != sizeof(unsigned int)) | 134 | if (nbytes_p == NULL || proplen != sizeof(unsigned int)) { |
| 135 | of_node_put(nvram); | ||
| 135 | return -EIO; | 136 | return -EIO; |
| 137 | } | ||
| 136 | 138 | ||
| 137 | nvram_size = *nbytes_p; | 139 | nvram_size = *nbytes_p; |
| 138 | 140 | ||
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 3a7054e2bb75..019657c110b6 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
| @@ -432,7 +432,7 @@ static struct i2c_driver_device i2c_devices[] __initdata = { | |||
| 432 | {"dallas,ds1339", "ds1339"}, | 432 | {"dallas,ds1339", "ds1339"}, |
| 433 | {"dallas,ds1340", "ds1340"}, | 433 | {"dallas,ds1340", "ds1340"}, |
| 434 | {"stm,m41t00", "m41t00"}, | 434 | {"stm,m41t00", "m41t00"}, |
| 435 | {"dallas,ds1374", "rtc-ds1374"}, | 435 | {"dallas,ds1374", "ds1374"}, |
| 436 | }; | 436 | }; |
| 437 | 437 | ||
| 438 | static int __init of_find_i2c_driver(struct device_node *node, | 438 | static int __init of_find_i2c_driver(struct device_node *node, |
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 8619f2a3f1f6..7680001676a6 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -1331,6 +1331,9 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) | |||
| 1331 | unsigned long flags; | 1331 | unsigned long flags; |
| 1332 | u32 reg; | 1332 | u32 reg; |
| 1333 | 1333 | ||
| 1334 | if (!mpic) | ||
| 1335 | return; | ||
| 1336 | |||
| 1334 | spin_lock_irqsave(&mpic_lock, flags); | 1337 | spin_lock_irqsave(&mpic_lock, flags); |
| 1335 | if (is_ipi) { | 1338 | if (is_ipi) { |
| 1336 | reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) & | 1339 | reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) & |
| @@ -1346,23 +1349,6 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri) | |||
| 1346 | spin_unlock_irqrestore(&mpic_lock, flags); | 1349 | spin_unlock_irqrestore(&mpic_lock, flags); |
| 1347 | } | 1350 | } |
| 1348 | 1351 | ||
| 1349 | unsigned int mpic_irq_get_priority(unsigned int irq) | ||
| 1350 | { | ||
| 1351 | unsigned int is_ipi; | ||
| 1352 | struct mpic *mpic = mpic_find(irq, &is_ipi); | ||
| 1353 | unsigned int src = mpic_irq_to_hw(irq); | ||
| 1354 | unsigned long flags; | ||
| 1355 | u32 reg; | ||
| 1356 | |||
| 1357 | spin_lock_irqsave(&mpic_lock, flags); | ||
| 1358 | if (is_ipi) | ||
| 1359 | reg = mpic_ipi_read(src = mpic->ipi_vecs[0]); | ||
| 1360 | else | ||
| 1361 | reg = mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI)); | ||
| 1362 | spin_unlock_irqrestore(&mpic_lock, flags); | ||
| 1363 | return (reg & MPIC_VECPRI_PRIORITY_MASK) >> MPIC_VECPRI_PRIORITY_SHIFT; | ||
| 1364 | } | ||
| 1365 | |||
| 1366 | void mpic_setup_this_cpu(void) | 1352 | void mpic_setup_this_cpu(void) |
| 1367 | { | 1353 | { |
| 1368 | #ifdef CONFIG_SMP | 1354 | #ifdef CONFIG_SMP |
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 1702de9395ee..bfcf70ee8959 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
| @@ -2844,7 +2844,6 @@ static void dump_spu_fields(struct spu *spu) | |||
| 2844 | DUMP_FIELD(spu, "0x%lx", flags); | 2844 | DUMP_FIELD(spu, "0x%lx", flags); |
| 2845 | DUMP_FIELD(spu, "%d", class_0_pending); | 2845 | DUMP_FIELD(spu, "%d", class_0_pending); |
| 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); | 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); |
| 2847 | DUMP_FIELD(spu, "0x%lx", class_0_dsisr); | ||
| 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dar); | 2847 | DUMP_FIELD(spu, "0x%lx", class_1_dar); |
| 2849 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); | 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); |
| 2850 | DUMP_FIELD(spu, "0x%lx", irqs[0]); | 2849 | DUMP_FIELD(spu, "0x%lx", irqs[0]); |
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 602c268fc8a2..5d529bcbeee9 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
| @@ -60,8 +60,10 @@ long long __ashrdi3(long long, int); | |||
| 60 | long long __ashldi3(long long, int); | 60 | long long __ashldi3(long long, int); |
| 61 | long long __lshrdi3(long long, int); | 61 | long long __lshrdi3(long long, int); |
| 62 | 62 | ||
| 63 | EXPORT_SYMBOL(empty_zero_page); | ||
| 63 | EXPORT_SYMBOL(clear_pages); | 64 | EXPORT_SYMBOL(clear_pages); |
| 64 | EXPORT_SYMBOL(clear_user_page); | 65 | EXPORT_SYMBOL(clear_user_page); |
| 66 | EXPORT_SYMBOL(copy_page); | ||
| 65 | EXPORT_SYMBOL(transfer_to_handler); | 67 | EXPORT_SYMBOL(transfer_to_handler); |
| 66 | EXPORT_SYMBOL(do_IRQ); | 68 | EXPORT_SYMBOL(do_IRQ); |
| 67 | EXPORT_SYMBOL(machine_check_exception); | 69 | EXPORT_SYMBOL(machine_check_exception); |
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 1d035082e78e..107e492cb47e 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -304,10 +304,14 @@ config ARCH_SPARSEMEM_ENABLE | |||
| 304 | def_bool y | 304 | def_bool y |
| 305 | select SPARSEMEM_VMEMMAP_ENABLE | 305 | select SPARSEMEM_VMEMMAP_ENABLE |
| 306 | select SPARSEMEM_VMEMMAP | 306 | select SPARSEMEM_VMEMMAP |
| 307 | select SPARSEMEM_STATIC if !64BIT | ||
| 307 | 308 | ||
| 308 | config ARCH_SPARSEMEM_DEFAULT | 309 | config ARCH_SPARSEMEM_DEFAULT |
| 309 | def_bool y | 310 | def_bool y |
| 310 | 311 | ||
| 312 | config ARCH_SELECT_MEMORY_MODEL | ||
| 313 | def_bool y | ||
| 314 | |||
| 311 | source "mm/Kconfig" | 315 | source "mm/Kconfig" |
| 312 | 316 | ||
| 313 | comment "I/O subsystem configuration" | 317 | comment "I/O subsystem configuration" |
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c index 655d52543e2d..ad40729bec3d 100644 --- a/arch/s390/appldata/appldata_base.c +++ b/arch/s390/appldata/appldata_base.c | |||
| @@ -130,6 +130,7 @@ static void appldata_work_fn(struct work_struct *work) | |||
| 130 | 130 | ||
| 131 | P_DEBUG(" -= Work Queue =-\n"); | 131 | P_DEBUG(" -= Work Queue =-\n"); |
| 132 | i = 0; | 132 | i = 0; |
| 133 | get_online_cpus(); | ||
| 133 | spin_lock(&appldata_ops_lock); | 134 | spin_lock(&appldata_ops_lock); |
| 134 | list_for_each(lh, &appldata_ops_list) { | 135 | list_for_each(lh, &appldata_ops_list) { |
| 135 | ops = list_entry(lh, struct appldata_ops, list); | 136 | ops = list_entry(lh, struct appldata_ops, list); |
| @@ -140,6 +141,7 @@ static void appldata_work_fn(struct work_struct *work) | |||
| 140 | } | 141 | } |
| 141 | } | 142 | } |
| 142 | spin_unlock(&appldata_ops_lock); | 143 | spin_unlock(&appldata_ops_lock); |
| 144 | put_online_cpus(); | ||
| 143 | } | 145 | } |
| 144 | 146 | ||
| 145 | /* | 147 | /* |
| @@ -266,12 +268,14 @@ appldata_timer_handler(ctl_table *ctl, int write, struct file *filp, | |||
| 266 | len = *lenp; | 268 | len = *lenp; |
| 267 | if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len)) | 269 | if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len)) |
| 268 | return -EFAULT; | 270 | return -EFAULT; |
| 271 | get_online_cpus(); | ||
| 269 | spin_lock(&appldata_timer_lock); | 272 | spin_lock(&appldata_timer_lock); |
| 270 | if (buf[0] == '1') | 273 | if (buf[0] == '1') |
| 271 | __appldata_vtimer_setup(APPLDATA_ADD_TIMER); | 274 | __appldata_vtimer_setup(APPLDATA_ADD_TIMER); |
| 272 | else if (buf[0] == '0') | 275 | else if (buf[0] == '0') |
| 273 | __appldata_vtimer_setup(APPLDATA_DEL_TIMER); | 276 | __appldata_vtimer_setup(APPLDATA_DEL_TIMER); |
| 274 | spin_unlock(&appldata_timer_lock); | 277 | spin_unlock(&appldata_timer_lock); |
| 278 | put_online_cpus(); | ||
| 275 | out: | 279 | out: |
| 276 | *lenp = len; | 280 | *lenp = len; |
| 277 | *ppos += len; | 281 | *ppos += len; |
| @@ -314,10 +318,12 @@ appldata_interval_handler(ctl_table *ctl, int write, struct file *filp, | |||
| 314 | return -EINVAL; | 318 | return -EINVAL; |
| 315 | } | 319 | } |
| 316 | 320 | ||
| 321 | get_online_cpus(); | ||
| 317 | spin_lock(&appldata_timer_lock); | 322 | spin_lock(&appldata_timer_lock); |
| 318 | appldata_interval = interval; | 323 | appldata_interval = interval; |
| 319 | __appldata_vtimer_setup(APPLDATA_MOD_TIMER); | 324 | __appldata_vtimer_setup(APPLDATA_MOD_TIMER); |
| 320 | spin_unlock(&appldata_timer_lock); | 325 | spin_unlock(&appldata_timer_lock); |
| 326 | put_online_cpus(); | ||
| 321 | 327 | ||
| 322 | P_INFO("Monitoring CPU interval set to %u milliseconds.\n", | 328 | P_INFO("Monitoring CPU interval set to %u milliseconds.\n", |
| 323 | interval); | 329 | interval); |
| @@ -556,8 +562,10 @@ static int __init appldata_init(void) | |||
| 556 | return -ENOMEM; | 562 | return -ENOMEM; |
| 557 | } | 563 | } |
| 558 | 564 | ||
| 565 | get_online_cpus(); | ||
| 559 | for_each_online_cpu(i) | 566 | for_each_online_cpu(i) |
| 560 | appldata_online_cpu(i); | 567 | appldata_online_cpu(i); |
| 568 | put_online_cpus(); | ||
| 561 | 569 | ||
| 562 | /* Register cpu hotplug notifier */ | 570 | /* Register cpu hotplug notifier */ |
| 563 | register_hotcpu_notifier(&appldata_nb); | 571 | register_hotcpu_notifier(&appldata_nb); |
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index aa341d0ea1e6..c5cdb975d590 100644 --- a/arch/s390/defconfig +++ b/arch/s390/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.25 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Wed Apr 30 11:07:45 2008 | 4 | # Fri May 30 09:49:33 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_SCHED_MC=y | 6 | CONFIG_SCHED_MC=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| @@ -103,6 +103,7 @@ CONFIG_RT_MUTEXES=y | |||
| 103 | # CONFIG_TINY_SHMEM is not set | 103 | # CONFIG_TINY_SHMEM is not set |
| 104 | CONFIG_BASE_SMALL=0 | 104 | CONFIG_BASE_SMALL=0 |
| 105 | CONFIG_MODULES=y | 105 | CONFIG_MODULES=y |
| 106 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 106 | CONFIG_MODULE_UNLOAD=y | 107 | CONFIG_MODULE_UNLOAD=y |
| 107 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 108 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 108 | CONFIG_MODVERSIONS=y | 109 | CONFIG_MODVERSIONS=y |
| @@ -173,6 +174,7 @@ CONFIG_PREEMPT=y | |||
| 173 | # CONFIG_PREEMPT_RCU is not set | 174 | # CONFIG_PREEMPT_RCU is not set |
| 174 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 175 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 175 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 176 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
| 177 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 176 | CONFIG_SELECT_MEMORY_MODEL=y | 178 | CONFIG_SELECT_MEMORY_MODEL=y |
| 177 | # CONFIG_FLATMEM_MANUAL is not set | 179 | # CONFIG_FLATMEM_MANUAL is not set |
| 178 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 180 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| @@ -210,6 +212,7 @@ CONFIG_FORCE_MAX_ZONEORDER=9 | |||
| 210 | CONFIG_PFAULT=y | 212 | CONFIG_PFAULT=y |
| 211 | # CONFIG_SHARED_KERNEL is not set | 213 | # CONFIG_SHARED_KERNEL is not set |
| 212 | # CONFIG_CMM is not set | 214 | # CONFIG_CMM is not set |
| 215 | # CONFIG_PAGE_STATES is not set | ||
| 213 | CONFIG_VIRT_TIMER=y | 216 | CONFIG_VIRT_TIMER=y |
| 214 | CONFIG_VIRT_CPU_ACCOUNTING=y | 217 | CONFIG_VIRT_CPU_ACCOUNTING=y |
| 215 | # CONFIG_APPLDATA_BASE is not set | 218 | # CONFIG_APPLDATA_BASE is not set |
| @@ -620,6 +623,7 @@ CONFIG_S390_VMUR=m | |||
| 620 | # | 623 | # |
| 621 | # CONFIG_MEMSTICK is not set | 624 | # CONFIG_MEMSTICK is not set |
| 622 | # CONFIG_NEW_LEDS is not set | 625 | # CONFIG_NEW_LEDS is not set |
| 626 | CONFIG_ACCESSIBILITY=y | ||
| 623 | 627 | ||
| 624 | # | 628 | # |
| 625 | # File systems | 629 | # File systems |
| @@ -754,11 +758,12 @@ CONFIG_FRAME_WARN=2048 | |||
| 754 | CONFIG_MAGIC_SYSRQ=y | 758 | CONFIG_MAGIC_SYSRQ=y |
| 755 | # CONFIG_UNUSED_SYMBOLS is not set | 759 | # CONFIG_UNUSED_SYMBOLS is not set |
| 756 | CONFIG_DEBUG_FS=y | 760 | CONFIG_DEBUG_FS=y |
| 757 | CONFIG_HEADERS_CHECK=y | 761 | # CONFIG_HEADERS_CHECK is not set |
| 758 | CONFIG_DEBUG_KERNEL=y | 762 | CONFIG_DEBUG_KERNEL=y |
| 759 | # CONFIG_SCHED_DEBUG is not set | 763 | # CONFIG_SCHED_DEBUG is not set |
| 760 | # CONFIG_SCHEDSTATS is not set | 764 | # CONFIG_SCHEDSTATS is not set |
| 761 | # CONFIG_TIMER_STATS is not set | 765 | # CONFIG_TIMER_STATS is not set |
| 766 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 762 | # CONFIG_DEBUG_SLAB is not set | 767 | # CONFIG_DEBUG_SLAB is not set |
| 763 | CONFIG_DEBUG_PREEMPT=y | 768 | CONFIG_DEBUG_PREEMPT=y |
| 764 | # CONFIG_DEBUG_RT_MUTEXES is not set | 769 | # CONFIG_DEBUG_RT_MUTEXES is not set |
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c index c14a336f6300..d2f270c995d9 100644 --- a/arch/s390/kernel/dis.c +++ b/arch/s390/kernel/dis.c | |||
| @@ -208,7 +208,7 @@ static const unsigned char formats[][7] = { | |||
| 208 | [INSTR_RRF_F0FF] = { 0xff, F_16,F_24,F_28,0,0,0 }, /* e.g. madbr */ | 208 | [INSTR_RRF_F0FF] = { 0xff, F_16,F_24,F_28,0,0,0 }, /* e.g. madbr */ |
| 209 | [INSTR_RRF_FUFF] = { 0xff, F_24,F_16,F_28,U4_20,0,0 },/* e.g. didbr */ | 209 | [INSTR_RRF_FUFF] = { 0xff, F_24,F_16,F_28,U4_20,0,0 },/* e.g. didbr */ |
| 210 | [INSTR_RRF_RURR] = { 0xff, R_24,R_28,R_16,U4_20,0,0 },/* e.g. .insn */ | 210 | [INSTR_RRF_RURR] = { 0xff, R_24,R_28,R_16,U4_20,0,0 },/* e.g. .insn */ |
| 211 | [INSTR_RRF_R0RR] = { 0xff, R_24,R_28,R_16,0,0,0 }, /* e.g. idte */ | 211 | [INSTR_RRF_R0RR] = { 0xff, R_24,R_16,R_28,0,0,0 }, /* e.g. idte */ |
| 212 | [INSTR_RRF_U0FF] = { 0xff, F_24,U4_16,F_28,0,0,0 }, /* e.g. fixr */ | 212 | [INSTR_RRF_U0FF] = { 0xff, F_24,U4_16,F_28,0,0,0 }, /* e.g. fixr */ |
| 213 | [INSTR_RRF_U0RF] = { 0xff, R_24,U4_16,F_28,0,0,0 }, /* e.g. cfebr */ | 213 | [INSTR_RRF_U0RF] = { 0xff, R_24,U4_16,F_28,0,0,0 }, /* e.g. cfebr */ |
| 214 | [INSTR_RRF_M0RR] = { 0xff, R_24,R_28,M_16,0,0,0 }, /* e.g. sske */ | 214 | [INSTR_RRF_M0RR] = { 0xff, R_24,R_28,M_16,0,0,0 }, /* e.g. sske */ |
diff --git a/arch/s390/kernel/init_task.c b/arch/s390/kernel/init_task.c index d494161b05b4..7ad003969251 100644 --- a/arch/s390/kernel/init_task.c +++ b/arch/s390/kernel/init_task.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
| 18 | 18 | ||
| 19 | static struct fs_struct init_fs = INIT_FS; | 19 | static struct fs_struct init_fs = INIT_FS; |
| 20 | static struct files_struct init_files = INIT_FILES; | ||
| 21 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 20 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 22 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 21 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 23 | struct mm_struct init_mm = INIT_MM(init_mm); | 22 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 1f4228948dc4..5d4fa4b1c74c 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
| @@ -711,7 +711,7 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
| 711 | memset(sf, 0, sizeof(struct stack_frame)); | 711 | memset(sf, 0, sizeof(struct stack_frame)); |
| 712 | sf->gprs[9] = (unsigned long) sf; | 712 | sf->gprs[9] = (unsigned long) sf; |
| 713 | cpu_lowcore->save_area[15] = (unsigned long) sf; | 713 | cpu_lowcore->save_area[15] = (unsigned long) sf; |
| 714 | __ctl_store(cpu_lowcore->cregs_save_area[0], 0, 15); | 714 | __ctl_store(cpu_lowcore->cregs_save_area, 0, 15); |
| 715 | asm volatile( | 715 | asm volatile( |
| 716 | " stam 0,15,0(%0)" | 716 | " stam 0,15,0(%0)" |
| 717 | : : "a" (&cpu_lowcore->access_regs_save_area) : "memory"); | 717 | : : "a" (&cpu_lowcore->access_regs_save_area) : "memory"); |
| @@ -1089,7 +1089,7 @@ out: | |||
| 1089 | 1089 | ||
| 1090 | #ifdef CONFIG_HOTPLUG_CPU | 1090 | #ifdef CONFIG_HOTPLUG_CPU |
| 1091 | 1091 | ||
| 1092 | int smp_rescan_cpus(void) | 1092 | int __ref smp_rescan_cpus(void) |
| 1093 | { | 1093 | { |
| 1094 | cpumask_t newcpus; | 1094 | cpumask_t newcpus; |
| 1095 | int cpu; | 1095 | int cpu; |
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index f639a152869f..a0775e1f08df 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c | |||
| @@ -20,7 +20,7 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu) | |||
| 20 | VCPU_EVENT(vcpu, 5, "%s", "diag time slice end"); | 20 | VCPU_EVENT(vcpu, 5, "%s", "diag time slice end"); |
| 21 | vcpu->stat.diagnose_44++; | 21 | vcpu->stat.diagnose_44++; |
| 22 | vcpu_put(vcpu); | 22 | vcpu_put(vcpu); |
| 23 | schedule(); | 23 | yield(); |
| 24 | vcpu_load(vcpu); | 24 | vcpu_load(vcpu); |
| 25 | return 0; | 25 | return 0; |
| 26 | } | 26 | } |
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index fcd1ed8015c1..84a7fed4cd4e 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
| @@ -339,6 +339,11 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) | |||
| 339 | if (kvm_cpu_has_interrupt(vcpu)) | 339 | if (kvm_cpu_has_interrupt(vcpu)) |
| 340 | return 0; | 340 | return 0; |
| 341 | 341 | ||
| 342 | __set_cpu_idle(vcpu); | ||
| 343 | spin_lock_bh(&vcpu->arch.local_int.lock); | ||
| 344 | vcpu->arch.local_int.timer_due = 0; | ||
| 345 | spin_unlock_bh(&vcpu->arch.local_int.lock); | ||
| 346 | |||
| 342 | if (psw_interrupts_disabled(vcpu)) { | 347 | if (psw_interrupts_disabled(vcpu)) { |
| 343 | VCPU_EVENT(vcpu, 3, "%s", "disabled wait"); | 348 | VCPU_EVENT(vcpu, 3, "%s", "disabled wait"); |
| 344 | __unset_cpu_idle(vcpu); | 349 | __unset_cpu_idle(vcpu); |
| @@ -366,8 +371,6 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) | |||
| 366 | no_timer: | 371 | no_timer: |
| 367 | spin_lock_bh(&vcpu->arch.local_int.float_int->lock); | 372 | spin_lock_bh(&vcpu->arch.local_int.float_int->lock); |
| 368 | spin_lock_bh(&vcpu->arch.local_int.lock); | 373 | spin_lock_bh(&vcpu->arch.local_int.lock); |
| 369 | __set_cpu_idle(vcpu); | ||
| 370 | vcpu->arch.local_int.timer_due = 0; | ||
| 371 | add_wait_queue(&vcpu->arch.local_int.wq, &wait); | 374 | add_wait_queue(&vcpu->arch.local_int.wq, &wait); |
| 372 | while (list_empty(&vcpu->arch.local_int.list) && | 375 | while (list_empty(&vcpu->arch.local_int.list) && |
| 373 | list_empty(&vcpu->arch.local_int.float_int->list) && | 376 | list_empty(&vcpu->arch.local_int.float_int->list) && |
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 0ac36a649eba..6558b09ff579 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c | |||
| @@ -423,6 +423,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, | |||
| 423 | return -EINVAL; /* not implemented yet */ | 423 | return -EINVAL; /* not implemented yet */ |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | extern void s390_handle_mcck(void); | ||
| 427 | |||
| 426 | static void __vcpu_run(struct kvm_vcpu *vcpu) | 428 | static void __vcpu_run(struct kvm_vcpu *vcpu) |
| 427 | { | 429 | { |
| 428 | memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16); | 430 | memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16); |
| @@ -430,13 +432,21 @@ static void __vcpu_run(struct kvm_vcpu *vcpu) | |||
| 430 | if (need_resched()) | 432 | if (need_resched()) |
| 431 | schedule(); | 433 | schedule(); |
| 432 | 434 | ||
| 435 | if (test_thread_flag(TIF_MCCK_PENDING)) | ||
| 436 | s390_handle_mcck(); | ||
| 437 | |||
| 438 | kvm_s390_deliver_pending_interrupts(vcpu); | ||
| 439 | |||
| 433 | vcpu->arch.sie_block->icptcode = 0; | 440 | vcpu->arch.sie_block->icptcode = 0; |
| 434 | local_irq_disable(); | 441 | local_irq_disable(); |
| 435 | kvm_guest_enter(); | 442 | kvm_guest_enter(); |
| 436 | local_irq_enable(); | 443 | local_irq_enable(); |
| 437 | VCPU_EVENT(vcpu, 6, "entering sie flags %x", | 444 | VCPU_EVENT(vcpu, 6, "entering sie flags %x", |
| 438 | atomic_read(&vcpu->arch.sie_block->cpuflags)); | 445 | atomic_read(&vcpu->arch.sie_block->cpuflags)); |
| 439 | sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs); | 446 | if (sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs)) { |
| 447 | VCPU_EVENT(vcpu, 3, "%s", "fault in sie instruction"); | ||
| 448 | kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); | ||
| 449 | } | ||
| 440 | VCPU_EVENT(vcpu, 6, "exit sie icptcode %d", | 450 | VCPU_EVENT(vcpu, 6, "exit sie icptcode %d", |
| 441 | vcpu->arch.sie_block->icptcode); | 451 | vcpu->arch.sie_block->icptcode); |
| 442 | local_irq_disable(); | 452 | local_irq_disable(); |
| @@ -475,7 +485,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
| 475 | might_sleep(); | 485 | might_sleep(); |
| 476 | 486 | ||
| 477 | do { | 487 | do { |
| 478 | kvm_s390_deliver_pending_interrupts(vcpu); | ||
| 479 | __vcpu_run(vcpu); | 488 | __vcpu_run(vcpu); |
| 480 | rc = kvm_handle_sie_intercept(vcpu); | 489 | rc = kvm_handle_sie_intercept(vcpu); |
| 481 | } while (!signal_pending(current) && !rc); | 490 | } while (!signal_pending(current) && !rc); |
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 29f3a63806b9..05598649b326 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
| @@ -44,37 +44,34 @@ char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); | |||
| 44 | 44 | ||
| 45 | void show_mem(void) | 45 | void show_mem(void) |
| 46 | { | 46 | { |
| 47 | int i, total = 0, reserved = 0; | 47 | unsigned long i, total = 0, reserved = 0; |
| 48 | int shared = 0, cached = 0; | 48 | unsigned long shared = 0, cached = 0; |
| 49 | unsigned long flags; | ||
| 49 | struct page *page; | 50 | struct page *page; |
| 51 | pg_data_t *pgdat; | ||
| 50 | 52 | ||
| 51 | printk("Mem-info:\n"); | 53 | printk("Mem-info:\n"); |
| 52 | show_free_areas(); | 54 | show_free_areas(); |
| 53 | i = max_mapnr; | 55 | for_each_online_pgdat(pgdat) { |
| 54 | while (i-- > 0) { | 56 | pgdat_resize_lock(pgdat, &flags); |
| 55 | if (!pfn_valid(i)) | 57 | for (i = 0; i < pgdat->node_spanned_pages; i++) { |
| 56 | continue; | 58 | if (!pfn_valid(pgdat->node_start_pfn + i)) |
| 57 | page = pfn_to_page(i); | 59 | continue; |
| 58 | total++; | 60 | page = pfn_to_page(pgdat->node_start_pfn + i); |
| 59 | if (PageReserved(page)) | 61 | total++; |
| 60 | reserved++; | 62 | if (PageReserved(page)) |
| 61 | else if (PageSwapCache(page)) | 63 | reserved++; |
| 62 | cached++; | 64 | else if (PageSwapCache(page)) |
| 63 | else if (page_count(page)) | 65 | cached++; |
| 64 | shared += page_count(page) - 1; | 66 | else if (page_count(page)) |
| 67 | shared += page_count(page) - 1; | ||
| 68 | } | ||
| 69 | pgdat_resize_unlock(pgdat, &flags); | ||
| 65 | } | 70 | } |
| 66 | printk("%d pages of RAM\n", total); | 71 | printk("%ld pages of RAM\n", total); |
| 67 | printk("%d reserved pages\n", reserved); | 72 | printk("%ld reserved pages\n", reserved); |
| 68 | printk("%d pages shared\n", shared); | 73 | printk("%ld pages shared\n", shared); |
| 69 | printk("%d pages swap cached\n", cached); | 74 | printk("%ld pages swap cached\n", cached); |
| 70 | |||
| 71 | printk("%lu pages dirty\n", global_page_state(NR_FILE_DIRTY)); | ||
| 72 | printk("%lu pages writeback\n", global_page_state(NR_WRITEBACK)); | ||
| 73 | printk("%lu pages mapped\n", global_page_state(NR_FILE_MAPPED)); | ||
| 74 | printk("%lu pages slab\n", | ||
| 75 | global_page_state(NR_SLAB_RECLAIMABLE) + | ||
| 76 | global_page_state(NR_SLAB_UNRECLAIMABLE)); | ||
| 77 | printk("%lu pages pagetables\n", global_page_state(NR_PAGETABLE)); | ||
| 78 | } | 75 | } |
| 79 | 76 | ||
| 80 | /* | 77 | /* |
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 5c1aea97cd12..3d98ba82ea67 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c | |||
| @@ -254,36 +254,46 @@ void disable_noexec(struct mm_struct *mm, struct task_struct *tsk) | |||
| 254 | int s390_enable_sie(void) | 254 | int s390_enable_sie(void) |
| 255 | { | 255 | { |
| 256 | struct task_struct *tsk = current; | 256 | struct task_struct *tsk = current; |
| 257 | struct mm_struct *mm; | 257 | struct mm_struct *mm, *old_mm; |
| 258 | int rc; | ||
| 259 | 258 | ||
| 260 | task_lock(tsk); | 259 | /* Do we have pgstes? if yes, we are done */ |
| 261 | |||
| 262 | rc = 0; | ||
| 263 | if (tsk->mm->context.pgstes) | 260 | if (tsk->mm->context.pgstes) |
| 264 | goto unlock; | 261 | return 0; |
| 265 | 262 | ||
| 266 | rc = -EINVAL; | 263 | /* lets check if we are allowed to replace the mm */ |
| 264 | task_lock(tsk); | ||
| 267 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || | 265 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || |
| 268 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) | 266 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) { |
| 269 | goto unlock; | 267 | task_unlock(tsk); |
| 268 | return -EINVAL; | ||
| 269 | } | ||
| 270 | task_unlock(tsk); | ||
| 270 | 271 | ||
| 271 | tsk->mm->context.pgstes = 1; /* dirty little tricks .. */ | 272 | /* we copy the mm with pgstes enabled */ |
| 273 | tsk->mm->context.pgstes = 1; | ||
| 272 | mm = dup_mm(tsk); | 274 | mm = dup_mm(tsk); |
| 273 | tsk->mm->context.pgstes = 0; | 275 | tsk->mm->context.pgstes = 0; |
| 274 | |||
| 275 | rc = -ENOMEM; | ||
| 276 | if (!mm) | 276 | if (!mm) |
| 277 | goto unlock; | 277 | return -ENOMEM; |
| 278 | mmput(tsk->mm); | 278 | |
| 279 | /* Now lets check again if somebody attached ptrace etc */ | ||
| 280 | task_lock(tsk); | ||
| 281 | if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 || | ||
| 282 | tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) { | ||
| 283 | mmput(mm); | ||
| 284 | task_unlock(tsk); | ||
| 285 | return -EINVAL; | ||
| 286 | } | ||
| 287 | |||
| 288 | /* ok, we are alone. No ptrace, no threads, etc. */ | ||
| 289 | old_mm = tsk->mm; | ||
| 279 | tsk->mm = tsk->active_mm = mm; | 290 | tsk->mm = tsk->active_mm = mm; |
| 280 | preempt_disable(); | 291 | preempt_disable(); |
| 281 | update_mm(mm, tsk); | 292 | update_mm(mm, tsk); |
| 282 | cpu_set(smp_processor_id(), mm->cpu_vm_mask); | 293 | cpu_set(smp_processor_id(), mm->cpu_vm_mask); |
| 283 | preempt_enable(); | 294 | preempt_enable(); |
| 284 | rc = 0; | ||
| 285 | unlock: | ||
| 286 | task_unlock(tsk); | 295 | task_unlock(tsk); |
| 287 | return rc; | 296 | mmput(old_mm); |
| 297 | return 0; | ||
| 288 | } | 298 | } |
| 289 | EXPORT_SYMBOL_GPL(s390_enable_sie); | 299 | EXPORT_SYMBOL_GPL(s390_enable_sie); |
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index ea2804808f39..e4868bfc672f 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c | |||
| @@ -27,12 +27,19 @@ struct memory_segment { | |||
| 27 | 27 | ||
| 28 | static LIST_HEAD(mem_segs); | 28 | static LIST_HEAD(mem_segs); |
| 29 | 29 | ||
| 30 | static pud_t *vmem_pud_alloc(void) | 30 | static void __ref *vmem_alloc_pages(unsigned int order) |
| 31 | { | ||
| 32 | if (slab_is_available()) | ||
| 33 | return (void *)__get_free_pages(GFP_KERNEL, order); | ||
| 34 | return alloc_bootmem_pages((1 << order) * PAGE_SIZE); | ||
| 35 | } | ||
| 36 | |||
| 37 | static inline pud_t *vmem_pud_alloc(void) | ||
| 31 | { | 38 | { |
| 32 | pud_t *pud = NULL; | 39 | pud_t *pud = NULL; |
| 33 | 40 | ||
| 34 | #ifdef CONFIG_64BIT | 41 | #ifdef CONFIG_64BIT |
| 35 | pud = vmemmap_alloc_block(PAGE_SIZE * 4, 0); | 42 | pud = vmem_alloc_pages(2); |
| 36 | if (!pud) | 43 | if (!pud) |
| 37 | return NULL; | 44 | return NULL; |
| 38 | clear_table((unsigned long *) pud, _REGION3_ENTRY_EMPTY, PAGE_SIZE * 4); | 45 | clear_table((unsigned long *) pud, _REGION3_ENTRY_EMPTY, PAGE_SIZE * 4); |
| @@ -40,12 +47,12 @@ static pud_t *vmem_pud_alloc(void) | |||
| 40 | return pud; | 47 | return pud; |
| 41 | } | 48 | } |
| 42 | 49 | ||
| 43 | static pmd_t *vmem_pmd_alloc(void) | 50 | static inline pmd_t *vmem_pmd_alloc(void) |
| 44 | { | 51 | { |
| 45 | pmd_t *pmd = NULL; | 52 | pmd_t *pmd = NULL; |
| 46 | 53 | ||
| 47 | #ifdef CONFIG_64BIT | 54 | #ifdef CONFIG_64BIT |
| 48 | pmd = vmemmap_alloc_block(PAGE_SIZE * 4, 0); | 55 | pmd = vmem_alloc_pages(2); |
| 49 | if (!pmd) | 56 | if (!pmd) |
| 50 | return NULL; | 57 | return NULL; |
| 51 | clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE * 4); | 58 | clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE * 4); |
| @@ -207,13 +214,14 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node) | |||
| 207 | if (pte_none(*pt_dir)) { | 214 | if (pte_none(*pt_dir)) { |
| 208 | unsigned long new_page; | 215 | unsigned long new_page; |
| 209 | 216 | ||
| 210 | new_page =__pa(vmemmap_alloc_block(PAGE_SIZE, 0)); | 217 | new_page =__pa(vmem_alloc_pages(0)); |
| 211 | if (!new_page) | 218 | if (!new_page) |
| 212 | goto out; | 219 | goto out; |
| 213 | pte = pfn_pte(new_page >> PAGE_SHIFT, PAGE_KERNEL); | 220 | pte = pfn_pte(new_page >> PAGE_SHIFT, PAGE_KERNEL); |
| 214 | *pt_dir = pte; | 221 | *pt_dir = pte; |
| 215 | } | 222 | } |
| 216 | } | 223 | } |
| 224 | memset(start, 0, nr * sizeof(struct page)); | ||
| 217 | ret = 0; | 225 | ret = 0; |
| 218 | out: | 226 | out: |
| 219 | flush_tlb_kernel_range(start_addr, end_addr); | 227 | flush_tlb_kernel_range(start_addr, end_addr); |
| @@ -228,7 +236,7 @@ static int insert_memory_segment(struct memory_segment *seg) | |||
| 228 | { | 236 | { |
| 229 | struct memory_segment *tmp; | 237 | struct memory_segment *tmp; |
| 230 | 238 | ||
| 231 | if (seg->start + seg->size >= VMEM_MAX_PHYS || | 239 | if (seg->start + seg->size > VMEM_MAX_PHYS || |
| 232 | seg->start + seg->size < seg->start) | 240 | seg->start + seg->size < seg->start) |
| 233 | return -ERANGE; | 241 | return -ERANGE; |
| 234 | 242 | ||
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 8a68160079a9..9a854c8e5274 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -281,7 +281,6 @@ config CPU_SUBTYPE_SH7723 | |||
| 281 | select CPU_SH4A | 281 | select CPU_SH4A |
| 282 | select CPU_SHX2 | 282 | select CPU_SHX2 |
| 283 | select ARCH_SPARSEMEM_ENABLE | 283 | select ARCH_SPARSEMEM_ENABLE |
| 284 | select SYS_SUPPORTS_NUMA | ||
| 285 | help | 284 | help |
| 286 | Select SH7723 if you have an SH-MobileR2 CPU. | 285 | Select SH7723 if you have an SH-MobileR2 CPU. |
| 287 | 286 | ||
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug index 0d2ef1e9a6fd..0f4549860226 100644 --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug | |||
| @@ -81,7 +81,7 @@ config DEBUG_STACK_USAGE | |||
| 81 | 81 | ||
| 82 | config 4KSTACKS | 82 | config 4KSTACKS |
| 83 | bool "Use 4Kb for kernel stacks instead of 8Kb" | 83 | bool "Use 4Kb for kernel stacks instead of 8Kb" |
| 84 | depends on DEBUG_KERNEL | 84 | depends on DEBUG_KERNEL && (MMU || BROKEN) |
| 85 | help | 85 | help |
| 86 | If you say Y here the kernel will use a 4Kb stacksize for the | 86 | If you say Y here the kernel will use a 4Kb stacksize for the |
| 87 | kernel stack attached to each process/thread. This facilitates | 87 | kernel stack attached to each process/thread. This facilitates |
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 8050b03d51fc..fb7b1b15e392 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile | |||
| @@ -41,6 +41,8 @@ cflags-$(CONFIG_CPU_SH5) := $(call cc-option,-m5-32media-nofpu,) | |||
| 41 | cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb | 41 | cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb |
| 42 | cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml | 42 | cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml |
| 43 | 43 | ||
| 44 | cflags-y += $(call cc-option,-mno-fdpic) | ||
| 45 | |||
| 44 | # | 46 | # |
| 45 | # -Wa,-isa= tuning implies -Wa,-dsp for the versions of binutils that | 47 | # -Wa,-isa= tuning implies -Wa,-dsp for the versions of binutils that |
| 46 | # support it, while -Wa,-dsp by itself limits the range of usable opcodes | 48 | # support it, while -Wa,-dsp by itself limits the range of usable opcodes |
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c index 452d0d6459a4..2308e8753bcd 100644 --- a/arch/sh/boards/renesas/rts7751r2d/setup.c +++ b/arch/sh/boards/renesas/rts7751r2d/setup.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
| 13 | #include <linux/ata_platform.h> | 13 | #include <linux/ata_platform.h> |
| 14 | #include <linux/serial_8250.h> | ||
| 15 | #include <linux/sm501.h> | 14 | #include <linux/sm501.h> |
| 16 | #include <linux/sm501-regs.h> | 15 | #include <linux/sm501-regs.h> |
| 17 | #include <linux/pm.h> | 16 | #include <linux/pm.h> |
| @@ -109,27 +108,6 @@ static struct platform_device heartbeat_device = { | |||
| 109 | .resource = heartbeat_resources, | 108 | .resource = heartbeat_resources, |
| 110 | }; | 109 | }; |
| 111 | 110 | ||
| 112 | static struct plat_serial8250_port uart_platform_data[] = { | ||
| 113 | { | ||
| 114 | .membase = (void __iomem *)0xb3e30000, | ||
| 115 | .mapbase = 0xb3e30000, | ||
| 116 | .iotype = UPIO_MEM, | ||
| 117 | .irq = IRQ_VOYAGER, | ||
| 118 | .flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ, | ||
| 119 | .regshift = 2, | ||
| 120 | .uartclk = (9600 * 16), | ||
| 121 | }, | ||
| 122 | { 0 }, | ||
| 123 | }; | ||
| 124 | |||
| 125 | static struct platform_device uart_device = { | ||
| 126 | .name = "serial8250", | ||
| 127 | .id = PLAT8250_DEV_PLATFORM, | ||
| 128 | .dev = { | ||
| 129 | .platform_data = uart_platform_data, | ||
| 130 | }, | ||
| 131 | }; | ||
| 132 | |||
| 133 | static struct resource sm501_resources[] = { | 111 | static struct resource sm501_resources[] = { |
| 134 | [0] = { | 112 | [0] = { |
| 135 | .start = 0x10000000, | 113 | .start = 0x10000000, |
| @@ -185,11 +163,7 @@ static struct sm501_platdata_fb sm501_fb_pdata = { | |||
| 185 | }; | 163 | }; |
| 186 | 164 | ||
| 187 | static struct sm501_initdata sm501_initdata = { | 165 | static struct sm501_initdata sm501_initdata = { |
| 188 | .gpio_high = { | 166 | .devices = SM501_USE_USB_HOST | SM501_USE_UART0, |
| 189 | .set = 0x00001fe0, | ||
| 190 | .mask = 0x0, | ||
| 191 | }, | ||
| 192 | .devices = SM501_USE_USB_HOST, | ||
| 193 | }; | 167 | }; |
| 194 | 168 | ||
| 195 | static struct sm501_platdata sm501_platform_data = { | 169 | static struct sm501_platdata sm501_platform_data = { |
| @@ -208,7 +182,6 @@ static struct platform_device sm501_device = { | |||
| 208 | }; | 182 | }; |
| 209 | 183 | ||
| 210 | static struct platform_device *rts7751r2d_devices[] __initdata = { | 184 | static struct platform_device *rts7751r2d_devices[] __initdata = { |
| 211 | &uart_device, | ||
| 212 | &sm501_device, | 185 | &sm501_device, |
| 213 | &heartbeat_device, | 186 | &heartbeat_device, |
| 214 | &spi_sh_sci_device, | 187 | &spi_sh_sci_device, |
| @@ -272,16 +245,6 @@ static void __init rts7751r2d_setup(char **cmdline_p) | |||
| 272 | 245 | ||
| 273 | sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL; | 246 | sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL; |
| 274 | writel(readl(sm501_reg) | 0x00f107c0, sm501_reg); | 247 | writel(readl(sm501_reg) | 0x00f107c0, sm501_reg); |
| 275 | |||
| 276 | /* | ||
| 277 | * Power Mode Gate - Enable UART0 | ||
| 278 | */ | ||
| 279 | |||
| 280 | sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_0_GATE; | ||
| 281 | writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg); | ||
| 282 | |||
| 283 | sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_1_GATE; | ||
| 284 | writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg); | ||
| 285 | } | 248 | } |
| 286 | 249 | ||
| 287 | /* | 250 | /* |
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig index f52db125432f..38f934ab50c7 100644 --- a/arch/sh/configs/landisk_defconfig +++ b/arch/sh/configs/landisk_defconfig | |||
| @@ -226,7 +226,6 @@ CONFIG_CPU_HAS_PTEA=y | |||
| 226 | # | 226 | # |
| 227 | CONFIG_SH_TMU=y | 227 | CONFIG_SH_TMU=y |
| 228 | CONFIG_SH_TIMER_IRQ=16 | 228 | CONFIG_SH_TIMER_IRQ=16 |
| 229 | # CONFIG_NO_IDLE_HZ is not set | ||
| 230 | CONFIG_SH_PCLK_FREQ=33333333 | 229 | CONFIG_SH_PCLK_FREQ=33333333 |
| 231 | 230 | ||
| 232 | # | 231 | # |
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig index 9fa66d92a4e7..b68b6cdbb78f 100644 --- a/arch/sh/configs/lboxre2_defconfig +++ b/arch/sh/configs/lboxre2_defconfig | |||
| @@ -231,7 +231,6 @@ CONFIG_CPU_HAS_PTEA=y | |||
| 231 | # | 231 | # |
| 232 | CONFIG_SH_TMU=y | 232 | CONFIG_SH_TMU=y |
| 233 | CONFIG_SH_TIMER_IRQ=16 | 233 | CONFIG_SH_TIMER_IRQ=16 |
| 234 | # CONFIG_NO_IDLE_HZ is not set | ||
| 235 | CONFIG_SH_PCLK_FREQ=40000000 | 234 | CONFIG_SH_PCLK_FREQ=40000000 |
| 236 | 235 | ||
| 237 | # | 236 | # |
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index ee5900817f8f..287408b2ace6 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.24 | 3 | # Linux kernel version: 2.6.26-rc3 |
| 4 | # Wed Feb 6 21:52:20 2008 | 4 | # Thu May 22 14:30:07 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
| 7 | CONFIG_SUPERH32=y | 7 | CONFIG_SUPERH32=y |
| @@ -20,6 +20,7 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 22 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 22 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
| 23 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 24 | 25 | ||
| 25 | # | 26 | # |
| @@ -36,18 +37,16 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
| 36 | # CONFIG_POSIX_MQUEUE is not set | 37 | # CONFIG_POSIX_MQUEUE is not set |
| 37 | # CONFIG_BSD_PROCESS_ACCT is not set | 38 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 38 | # CONFIG_TASKSTATS is not set | 39 | # CONFIG_TASKSTATS is not set |
| 39 | # CONFIG_USER_NS is not set | ||
| 40 | # CONFIG_PID_NS is not set | ||
| 41 | # CONFIG_AUDIT is not set | 40 | # CONFIG_AUDIT is not set |
| 42 | CONFIG_IKCONFIG=y | 41 | CONFIG_IKCONFIG=y |
| 43 | CONFIG_IKCONFIG_PROC=y | 42 | CONFIG_IKCONFIG_PROC=y |
| 44 | CONFIG_LOG_BUF_SHIFT=14 | 43 | CONFIG_LOG_BUF_SHIFT=14 |
| 45 | # CONFIG_CGROUPS is not set | 44 | # CONFIG_CGROUPS is not set |
| 46 | CONFIG_FAIR_GROUP_SCHED=y | 45 | # CONFIG_GROUP_SCHED is not set |
| 47 | CONFIG_FAIR_USER_SCHED=y | ||
| 48 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
| 49 | CONFIG_SYSFS_DEPRECATED=y | 46 | CONFIG_SYSFS_DEPRECATED=y |
| 47 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 50 | # CONFIG_RELAY is not set | 48 | # CONFIG_RELAY is not set |
| 49 | # CONFIG_NAMESPACES is not set | ||
| 51 | CONFIG_BLK_DEV_INITRD=y | 50 | CONFIG_BLK_DEV_INITRD=y |
| 52 | CONFIG_INITRAMFS_SOURCE="" | 51 | CONFIG_INITRAMFS_SOURCE="" |
| 53 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 52 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| @@ -61,11 +60,13 @@ CONFIG_HOTPLUG=y | |||
| 61 | CONFIG_PRINTK=y | 60 | CONFIG_PRINTK=y |
| 62 | CONFIG_BUG=y | 61 | CONFIG_BUG=y |
| 63 | CONFIG_ELF_CORE=y | 62 | CONFIG_ELF_CORE=y |
| 63 | CONFIG_COMPAT_BRK=y | ||
| 64 | CONFIG_BASE_FULL=y | 64 | CONFIG_BASE_FULL=y |
| 65 | CONFIG_FUTEX=y | 65 | CONFIG_FUTEX=y |
| 66 | CONFIG_ANON_INODES=y | 66 | CONFIG_ANON_INODES=y |
| 67 | CONFIG_EPOLL=y | 67 | CONFIG_EPOLL=y |
| 68 | CONFIG_SIGNALFD=y | 68 | CONFIG_SIGNALFD=y |
| 69 | CONFIG_TIMERFD=y | ||
| 69 | CONFIG_EVENTFD=y | 70 | CONFIG_EVENTFD=y |
| 70 | CONFIG_SHMEM=y | 71 | CONFIG_SHMEM=y |
| 71 | CONFIG_VM_EVENT_COUNTERS=y | 72 | CONFIG_VM_EVENT_COUNTERS=y |
| @@ -77,11 +78,15 @@ CONFIG_PROFILING=y | |||
| 77 | CONFIG_OPROFILE=y | 78 | CONFIG_OPROFILE=y |
| 78 | CONFIG_HAVE_OPROFILE=y | 79 | CONFIG_HAVE_OPROFILE=y |
| 79 | # CONFIG_HAVE_KPROBES is not set | 80 | # CONFIG_HAVE_KPROBES is not set |
| 81 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 82 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 83 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 80 | CONFIG_SLABINFO=y | 84 | CONFIG_SLABINFO=y |
| 81 | CONFIG_RT_MUTEXES=y | 85 | CONFIG_RT_MUTEXES=y |
| 82 | # CONFIG_TINY_SHMEM is not set | 86 | # CONFIG_TINY_SHMEM is not set |
| 83 | CONFIG_BASE_SMALL=0 | 87 | CONFIG_BASE_SMALL=0 |
| 84 | CONFIG_MODULES=y | 88 | CONFIG_MODULES=y |
| 89 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 85 | # CONFIG_MODULE_UNLOAD is not set | 90 | # CONFIG_MODULE_UNLOAD is not set |
| 86 | # CONFIG_MODVERSIONS is not set | 91 | # CONFIG_MODVERSIONS is not set |
| 87 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 92 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| @@ -105,7 +110,6 @@ CONFIG_DEFAULT_AS=y | |||
| 105 | # CONFIG_DEFAULT_NOOP is not set | 110 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 111 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
| 107 | CONFIG_CLASSIC_RCU=y | 112 | CONFIG_CLASSIC_RCU=y |
| 108 | # CONFIG_PREEMPT_RCU is not set | ||
| 109 | 113 | ||
| 110 | # | 114 | # |
| 111 | # System type | 115 | # System type |
| @@ -118,6 +122,7 @@ CONFIG_CPU_SHX2=y | |||
| 118 | # CONFIG_CPU_SUBTYPE_SH7203 is not set | 122 | # CONFIG_CPU_SUBTYPE_SH7203 is not set |
| 119 | # CONFIG_CPU_SUBTYPE_SH7206 is not set | 123 | # CONFIG_CPU_SUBTYPE_SH7206 is not set |
| 120 | # CONFIG_CPU_SUBTYPE_SH7263 is not set | 124 | # CONFIG_CPU_SUBTYPE_SH7263 is not set |
| 125 | # CONFIG_CPU_SUBTYPE_MXG is not set | ||
| 121 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | 126 | # CONFIG_CPU_SUBTYPE_SH7705 is not set |
| 122 | # CONFIG_CPU_SUBTYPE_SH7706 is not set | 127 | # CONFIG_CPU_SUBTYPE_SH7706 is not set |
| 123 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | 128 | # CONFIG_CPU_SUBTYPE_SH7707 is not set |
| @@ -135,6 +140,7 @@ CONFIG_CPU_SHX2=y | |||
| 135 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | 140 | # CONFIG_CPU_SUBTYPE_SH7751R is not set |
| 136 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 141 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
| 137 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 142 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
| 143 | # CONFIG_CPU_SUBTYPE_SH7723 is not set | ||
| 138 | # CONFIG_CPU_SUBTYPE_SH7763 is not set | 144 | # CONFIG_CPU_SUBTYPE_SH7763 is not set |
| 139 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | 145 | # CONFIG_CPU_SUBTYPE_SH7770 is not set |
| 140 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | 146 | # CONFIG_CPU_SUBTYPE_SH7780 is not set |
| @@ -142,6 +148,7 @@ CONFIG_CPU_SHX2=y | |||
| 142 | # CONFIG_CPU_SUBTYPE_SHX3 is not set | 148 | # CONFIG_CPU_SUBTYPE_SHX3 is not set |
| 143 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | 149 | # CONFIG_CPU_SUBTYPE_SH7343 is not set |
| 144 | CONFIG_CPU_SUBTYPE_SH7722=y | 150 | CONFIG_CPU_SUBTYPE_SH7722=y |
| 151 | # CONFIG_CPU_SUBTYPE_SH7366 is not set | ||
| 145 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set | 152 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set |
| 146 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set | 153 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set |
| 147 | 154 | ||
| @@ -255,7 +262,6 @@ CONFIG_HZ=250 | |||
| 255 | CONFIG_PREEMPT_NONE=y | 262 | CONFIG_PREEMPT_NONE=y |
| 256 | # CONFIG_PREEMPT_VOLUNTARY is not set | 263 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 257 | # CONFIG_PREEMPT is not set | 264 | # CONFIG_PREEMPT is not set |
| 258 | CONFIG_RCU_TRACE=y | ||
| 259 | CONFIG_GUSA=y | 265 | CONFIG_GUSA=y |
| 260 | 266 | ||
| 261 | # | 267 | # |
| @@ -323,8 +329,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
| 323 | CONFIG_DEFAULT_TCP_CONG="cubic" | 329 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 324 | # CONFIG_TCP_MD5SIG is not set | 330 | # CONFIG_TCP_MD5SIG is not set |
| 325 | # CONFIG_IPV6 is not set | 331 | # CONFIG_IPV6 is not set |
| 326 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 327 | # CONFIG_INET6_TUNNEL is not set | ||
| 328 | # CONFIG_NETWORK_SECMARK is not set | 332 | # CONFIG_NETWORK_SECMARK is not set |
| 329 | # CONFIG_NETFILTER is not set | 333 | # CONFIG_NETFILTER is not set |
| 330 | # CONFIG_IP_DCCP is not set | 334 | # CONFIG_IP_DCCP is not set |
| @@ -376,7 +380,90 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 376 | CONFIG_FW_LOADER=m | 380 | CONFIG_FW_LOADER=m |
| 377 | # CONFIG_SYS_HYPERVISOR is not set | 381 | # CONFIG_SYS_HYPERVISOR is not set |
| 378 | # CONFIG_CONNECTOR is not set | 382 | # CONFIG_CONNECTOR is not set |
| 379 | # CONFIG_MTD is not set | 383 | CONFIG_MTD=y |
| 384 | # CONFIG_MTD_DEBUG is not set | ||
| 385 | CONFIG_MTD_CONCAT=y | ||
| 386 | CONFIG_MTD_PARTITIONS=y | ||
| 387 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
| 388 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 389 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 390 | |||
| 391 | # | ||
| 392 | # User Modules And Translation Layers | ||
| 393 | # | ||
| 394 | CONFIG_MTD_CHAR=y | ||
| 395 | CONFIG_MTD_BLKDEVS=y | ||
| 396 | CONFIG_MTD_BLOCK=y | ||
| 397 | # CONFIG_FTL is not set | ||
| 398 | # CONFIG_NFTL is not set | ||
| 399 | # CONFIG_INFTL is not set | ||
| 400 | # CONFIG_RFD_FTL is not set | ||
| 401 | # CONFIG_SSFDC is not set | ||
| 402 | # CONFIG_MTD_OOPS is not set | ||
| 403 | |||
| 404 | # | ||
| 405 | # RAM/ROM/Flash chip drivers | ||
| 406 | # | ||
| 407 | CONFIG_MTD_CFI=y | ||
| 408 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 409 | CONFIG_MTD_GEN_PROBE=y | ||
| 410 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 411 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 412 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 413 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 414 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 415 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 416 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 417 | CONFIG_MTD_CFI_I1=y | ||
| 418 | CONFIG_MTD_CFI_I2=y | ||
| 419 | # CONFIG_MTD_CFI_I4 is not set | ||
| 420 | # CONFIG_MTD_CFI_I8 is not set | ||
| 421 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
| 422 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 423 | # CONFIG_MTD_CFI_STAA is not set | ||
| 424 | CONFIG_MTD_CFI_UTIL=y | ||
| 425 | # CONFIG_MTD_RAM is not set | ||
| 426 | # CONFIG_MTD_ROM is not set | ||
| 427 | # CONFIG_MTD_ABSENT is not set | ||
| 428 | |||
| 429 | # | ||
| 430 | # Mapping drivers for chip access | ||
| 431 | # | ||
| 432 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 433 | CONFIG_MTD_PHYSMAP=y | ||
| 434 | CONFIG_MTD_PHYSMAP_START=0xffffffff | ||
| 435 | CONFIG_MTD_PHYSMAP_LEN=0 | ||
| 436 | CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | ||
| 437 | # CONFIG_MTD_PLATRAM is not set | ||
| 438 | |||
| 439 | # | ||
| 440 | # Self-contained MTD device drivers | ||
| 441 | # | ||
| 442 | # CONFIG_MTD_SLRAM is not set | ||
| 443 | # CONFIG_MTD_PHRAM is not set | ||
| 444 | # CONFIG_MTD_MTDRAM is not set | ||
| 445 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 446 | |||
| 447 | # | ||
| 448 | # Disk-On-Chip Device Drivers | ||
| 449 | # | ||
| 450 | # CONFIG_MTD_DOC2000 is not set | ||
| 451 | # CONFIG_MTD_DOC2001 is not set | ||
| 452 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 453 | CONFIG_MTD_NAND=y | ||
| 454 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
| 455 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
| 456 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
| 457 | CONFIG_MTD_NAND_IDS=y | ||
| 458 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
| 459 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
| 460 | CONFIG_MTD_NAND_PLATFORM=y | ||
| 461 | # CONFIG_MTD_ONENAND is not set | ||
| 462 | |||
| 463 | # | ||
| 464 | # UBI - Unsorted block images | ||
| 465 | # | ||
| 466 | # CONFIG_MTD_UBI is not set | ||
| 380 | # CONFIG_PARPORT is not set | 467 | # CONFIG_PARPORT is not set |
| 381 | CONFIG_BLK_DEV=y | 468 | CONFIG_BLK_DEV=y |
| 382 | # CONFIG_BLK_DEV_COW_COMMON is not set | 469 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| @@ -385,11 +472,13 @@ CONFIG_BLK_DEV=y | |||
| 385 | CONFIG_BLK_DEV_RAM=y | 472 | CONFIG_BLK_DEV_RAM=y |
| 386 | CONFIG_BLK_DEV_RAM_COUNT=16 | 473 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 387 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 474 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 388 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 475 | # CONFIG_BLK_DEV_XIP is not set |
| 389 | # CONFIG_CDROM_PKTCDVD is not set | 476 | # CONFIG_CDROM_PKTCDVD is not set |
| 390 | # CONFIG_ATA_OVER_ETH is not set | 477 | # CONFIG_ATA_OVER_ETH is not set |
| 391 | CONFIG_MISC_DEVICES=y | 478 | CONFIG_MISC_DEVICES=y |
| 392 | # CONFIG_EEPROM_93CX6 is not set | 479 | # CONFIG_EEPROM_93CX6 is not set |
| 480 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 481 | CONFIG_HAVE_IDE=y | ||
| 393 | # CONFIG_IDE is not set | 482 | # CONFIG_IDE is not set |
| 394 | 483 | ||
| 395 | # | 484 | # |
| @@ -461,6 +550,7 @@ CONFIG_SMC91X=y | |||
| 461 | # | 550 | # |
| 462 | # CONFIG_WLAN_PRE80211 is not set | 551 | # CONFIG_WLAN_PRE80211 is not set |
| 463 | # CONFIG_WLAN_80211 is not set | 552 | # CONFIG_WLAN_80211 is not set |
| 553 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 464 | # CONFIG_WAN is not set | 554 | # CONFIG_WAN is not set |
| 465 | # CONFIG_PPP is not set | 555 | # CONFIG_PPP is not set |
| 466 | # CONFIG_SLIP is not set | 556 | # CONFIG_SLIP is not set |
| @@ -482,13 +572,20 @@ CONFIG_INPUT=y | |||
| 482 | # | 572 | # |
| 483 | # CONFIG_INPUT_MOUSEDEV is not set | 573 | # CONFIG_INPUT_MOUSEDEV is not set |
| 484 | # CONFIG_INPUT_JOYDEV is not set | 574 | # CONFIG_INPUT_JOYDEV is not set |
| 485 | # CONFIG_INPUT_EVDEV is not set | 575 | CONFIG_INPUT_EVDEV=y |
| 486 | # CONFIG_INPUT_EVBUG is not set | 576 | # CONFIG_INPUT_EVBUG is not set |
| 487 | 577 | ||
| 488 | # | 578 | # |
| 489 | # Input Device Drivers | 579 | # Input Device Drivers |
| 490 | # | 580 | # |
| 491 | # CONFIG_INPUT_KEYBOARD is not set | 581 | CONFIG_INPUT_KEYBOARD=y |
| 582 | # CONFIG_KEYBOARD_ATKBD is not set | ||
| 583 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
| 584 | # CONFIG_KEYBOARD_LKKBD is not set | ||
| 585 | # CONFIG_KEYBOARD_XTKBD is not set | ||
| 586 | # CONFIG_KEYBOARD_NEWTON is not set | ||
| 587 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
| 588 | CONFIG_KEYBOARD_SH_KEYSC=y | ||
| 492 | # CONFIG_INPUT_MOUSE is not set | 589 | # CONFIG_INPUT_MOUSE is not set |
| 493 | # CONFIG_INPUT_JOYSTICK is not set | 590 | # CONFIG_INPUT_JOYSTICK is not set |
| 494 | # CONFIG_INPUT_TABLET is not set | 591 | # CONFIG_INPUT_TABLET is not set |
| @@ -508,6 +605,7 @@ CONFIG_VT=y | |||
| 508 | CONFIG_VT_CONSOLE=y | 605 | CONFIG_VT_CONSOLE=y |
| 509 | CONFIG_HW_CONSOLE=y | 606 | CONFIG_HW_CONSOLE=y |
| 510 | CONFIG_VT_HW_CONSOLE_BINDING=y | 607 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 608 | CONFIG_DEVKMEM=y | ||
| 511 | # CONFIG_SERIAL_NONSTANDARD is not set | 609 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 512 | 610 | ||
| 513 | # | 611 | # |
| @@ -531,16 +629,40 @@ CONFIG_HW_RANDOM=y | |||
| 531 | # CONFIG_R3964 is not set | 629 | # CONFIG_R3964 is not set |
| 532 | # CONFIG_RAW_DRIVER is not set | 630 | # CONFIG_RAW_DRIVER is not set |
| 533 | # CONFIG_TCG_TPM is not set | 631 | # CONFIG_TCG_TPM is not set |
| 534 | # CONFIG_I2C is not set | 632 | CONFIG_I2C=y |
| 535 | 633 | CONFIG_I2C_BOARDINFO=y | |
| 536 | # | 634 | # CONFIG_I2C_CHARDEV is not set |
| 537 | # SPI support | 635 | |
| 538 | # | 636 | # |
| 637 | # I2C Hardware Bus support | ||
| 638 | # | ||
| 639 | # CONFIG_I2C_OCORES is not set | ||
| 640 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 641 | # CONFIG_I2C_SIMTEC is not set | ||
| 642 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 643 | # CONFIG_I2C_STUB is not set | ||
| 644 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 645 | CONFIG_I2C_SH_MOBILE=y | ||
| 646 | |||
| 647 | # | ||
| 648 | # Miscellaneous I2C Chip support | ||
| 649 | # | ||
| 650 | # CONFIG_DS1682 is not set | ||
| 651 | # CONFIG_SENSORS_EEPROM is not set | ||
| 652 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 653 | # CONFIG_PCF8575 is not set | ||
| 654 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 655 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 656 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 657 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 658 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 659 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 660 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 539 | # CONFIG_SPI is not set | 661 | # CONFIG_SPI is not set |
| 540 | # CONFIG_SPI_MASTER is not set | ||
| 541 | # CONFIG_W1 is not set | 662 | # CONFIG_W1 is not set |
| 542 | # CONFIG_POWER_SUPPLY is not set | 663 | # CONFIG_POWER_SUPPLY is not set |
| 543 | # CONFIG_HWMON is not set | 664 | # CONFIG_HWMON is not set |
| 665 | # CONFIG_THERMAL is not set | ||
| 544 | # CONFIG_WATCHDOG is not set | 666 | # CONFIG_WATCHDOG is not set |
| 545 | 667 | ||
| 546 | # | 668 | # |
| @@ -553,12 +675,22 @@ CONFIG_SSB_POSSIBLE=y | |||
| 553 | # Multifunction device drivers | 675 | # Multifunction device drivers |
| 554 | # | 676 | # |
| 555 | # CONFIG_MFD_SM501 is not set | 677 | # CONFIG_MFD_SM501 is not set |
| 678 | # CONFIG_HTC_PASIC3 is not set | ||
| 556 | 679 | ||
| 557 | # | 680 | # |
| 558 | # Multimedia devices | 681 | # Multimedia devices |
| 559 | # | 682 | # |
| 683 | |||
| 684 | # | ||
| 685 | # Multimedia core support | ||
| 686 | # | ||
| 560 | # CONFIG_VIDEO_DEV is not set | 687 | # CONFIG_VIDEO_DEV is not set |
| 561 | # CONFIG_DVB_CORE is not set | 688 | # CONFIG_DVB_CORE is not set |
| 689 | # CONFIG_VIDEO_MEDIA is not set | ||
| 690 | |||
| 691 | # | ||
| 692 | # Multimedia drivers | ||
| 693 | # | ||
| 562 | # CONFIG_DAB is not set | 694 | # CONFIG_DAB is not set |
| 563 | 695 | ||
| 564 | # | 696 | # |
| @@ -592,6 +724,8 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
| 592 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 724 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 593 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 725 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
| 594 | # CONFIG_USB is not set | 726 | # CONFIG_USB is not set |
| 727 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 728 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 595 | 729 | ||
| 596 | # | 730 | # |
| 597 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 731 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
| @@ -608,6 +742,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
| 608 | CONFIG_USB_GADGET_M66592=y | 742 | CONFIG_USB_GADGET_M66592=y |
| 609 | CONFIG_USB_M66592=y | 743 | CONFIG_USB_M66592=y |
| 610 | CONFIG_SUPERH_BUILT_IN_M66592=y | 744 | CONFIG_SUPERH_BUILT_IN_M66592=y |
| 745 | # CONFIG_USB_GADGET_PXA27X is not set | ||
| 611 | # CONFIG_USB_GADGET_GOKU is not set | 746 | # CONFIG_USB_GADGET_GOKU is not set |
| 612 | # CONFIG_USB_GADGET_LH7A40X is not set | 747 | # CONFIG_USB_GADGET_LH7A40X is not set |
| 613 | # CONFIG_USB_GADGET_OMAP is not set | 748 | # CONFIG_USB_GADGET_OMAP is not set |
| @@ -623,7 +758,9 @@ CONFIG_USB_G_SERIAL=y | |||
| 623 | # CONFIG_USB_MIDI_GADGET is not set | 758 | # CONFIG_USB_MIDI_GADGET is not set |
| 624 | # CONFIG_USB_G_PRINTER is not set | 759 | # CONFIG_USB_G_PRINTER is not set |
| 625 | # CONFIG_MMC is not set | 760 | # CONFIG_MMC is not set |
| 761 | # CONFIG_MEMSTICK is not set | ||
| 626 | # CONFIG_NEW_LEDS is not set | 762 | # CONFIG_NEW_LEDS is not set |
| 763 | # CONFIG_ACCESSIBILITY is not set | ||
| 627 | CONFIG_RTC_LIB=y | 764 | CONFIG_RTC_LIB=y |
| 628 | CONFIG_RTC_CLASS=y | 765 | CONFIG_RTC_CLASS=y |
| 629 | CONFIG_RTC_HCTOSYS=y | 766 | CONFIG_RTC_HCTOSYS=y |
| @@ -640,15 +777,31 @@ CONFIG_RTC_INTF_DEV=y | |||
| 640 | # CONFIG_RTC_DRV_TEST is not set | 777 | # CONFIG_RTC_DRV_TEST is not set |
| 641 | 778 | ||
| 642 | # | 779 | # |
| 780 | # I2C RTC drivers | ||
| 781 | # | ||
| 782 | # CONFIG_RTC_DRV_DS1307 is not set | ||
| 783 | # CONFIG_RTC_DRV_DS1374 is not set | ||
| 784 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 785 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 786 | CONFIG_RTC_DRV_RS5C372=y | ||
| 787 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 788 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 789 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 790 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 791 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 792 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 793 | |||
| 794 | # | ||
| 643 | # SPI RTC drivers | 795 | # SPI RTC drivers |
| 644 | # | 796 | # |
| 645 | 797 | ||
| 646 | # | 798 | # |
| 647 | # Platform RTC drivers | 799 | # Platform RTC drivers |
| 648 | # | 800 | # |
| 801 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 649 | # CONFIG_RTC_DRV_DS1553 is not set | 802 | # CONFIG_RTC_DRV_DS1553 is not set |
| 650 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 651 | # CONFIG_RTC_DRV_DS1742 is not set | 803 | # CONFIG_RTC_DRV_DS1742 is not set |
| 804 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 652 | # CONFIG_RTC_DRV_M48T86 is not set | 805 | # CONFIG_RTC_DRV_M48T86 is not set |
| 653 | # CONFIG_RTC_DRV_M48T59 is not set | 806 | # CONFIG_RTC_DRV_M48T59 is not set |
| 654 | # CONFIG_RTC_DRV_V3020 is not set | 807 | # CONFIG_RTC_DRV_V3020 is not set |
| @@ -657,10 +810,6 @@ CONFIG_RTC_INTF_DEV=y | |||
| 657 | # on-CPU RTC drivers | 810 | # on-CPU RTC drivers |
| 658 | # | 811 | # |
| 659 | CONFIG_RTC_DRV_SH=y | 812 | CONFIG_RTC_DRV_SH=y |
| 660 | |||
| 661 | # | ||
| 662 | # Userspace I/O | ||
| 663 | # | ||
| 664 | # CONFIG_UIO is not set | 813 | # CONFIG_UIO is not set |
| 665 | 814 | ||
| 666 | # | 815 | # |
| @@ -673,13 +822,10 @@ CONFIG_RTC_DRV_SH=y | |||
| 673 | # CONFIG_JFS_FS is not set | 822 | # CONFIG_JFS_FS is not set |
| 674 | # CONFIG_FS_POSIX_ACL is not set | 823 | # CONFIG_FS_POSIX_ACL is not set |
| 675 | # CONFIG_XFS_FS is not set | 824 | # CONFIG_XFS_FS is not set |
| 676 | # CONFIG_GFS2_FS is not set | ||
| 677 | # CONFIG_OCFS2_FS is not set | 825 | # CONFIG_OCFS2_FS is not set |
| 678 | # CONFIG_MINIX_FS is not set | 826 | # CONFIG_DNOTIFY is not set |
| 679 | # CONFIG_ROMFS_FS is not set | ||
| 680 | # CONFIG_INOTIFY is not set | 827 | # CONFIG_INOTIFY is not set |
| 681 | # CONFIG_QUOTA is not set | 828 | # CONFIG_QUOTA is not set |
| 682 | # CONFIG_DNOTIFY is not set | ||
| 683 | # CONFIG_AUTOFS_FS is not set | 829 | # CONFIG_AUTOFS_FS is not set |
| 684 | # CONFIG_AUTOFS4_FS is not set | 830 | # CONFIG_AUTOFS4_FS is not set |
| 685 | # CONFIG_FUSE_FS is not set | 831 | # CONFIG_FUSE_FS is not set |
| @@ -720,10 +866,13 @@ CONFIG_TMPFS=y | |||
| 720 | # CONFIG_BEFS_FS is not set | 866 | # CONFIG_BEFS_FS is not set |
| 721 | # CONFIG_BFS_FS is not set | 867 | # CONFIG_BFS_FS is not set |
| 722 | # CONFIG_EFS_FS is not set | 868 | # CONFIG_EFS_FS is not set |
| 869 | # CONFIG_JFFS2_FS is not set | ||
| 723 | # CONFIG_CRAMFS is not set | 870 | # CONFIG_CRAMFS is not set |
| 724 | # CONFIG_VXFS_FS is not set | 871 | # CONFIG_VXFS_FS is not set |
| 872 | # CONFIG_MINIX_FS is not set | ||
| 725 | # CONFIG_HPFS_FS is not set | 873 | # CONFIG_HPFS_FS is not set |
| 726 | # CONFIG_QNX4FS_FS is not set | 874 | # CONFIG_QNX4FS_FS is not set |
| 875 | # CONFIG_ROMFS_FS is not set | ||
| 727 | # CONFIG_SYSV_FS is not set | 876 | # CONFIG_SYSV_FS is not set |
| 728 | # CONFIG_UFS_FS is not set | 877 | # CONFIG_UFS_FS is not set |
| 729 | # CONFIG_NETWORK_FILESYSTEMS is not set | 878 | # CONFIG_NETWORK_FILESYSTEMS is not set |
| @@ -743,6 +892,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y | |||
| 743 | # CONFIG_PRINTK_TIME is not set | 892 | # CONFIG_PRINTK_TIME is not set |
| 744 | CONFIG_ENABLE_WARN_DEPRECATED=y | 893 | CONFIG_ENABLE_WARN_DEPRECATED=y |
| 745 | CONFIG_ENABLE_MUST_CHECK=y | 894 | CONFIG_ENABLE_MUST_CHECK=y |
| 895 | CONFIG_FRAME_WARN=1024 | ||
| 746 | # CONFIG_MAGIC_SYSRQ is not set | 896 | # CONFIG_MAGIC_SYSRQ is not set |
| 747 | # CONFIG_UNUSED_SYMBOLS is not set | 897 | # CONFIG_UNUSED_SYMBOLS is not set |
| 748 | CONFIG_DEBUG_FS=y | 898 | CONFIG_DEBUG_FS=y |
| @@ -763,48 +913,77 @@ CONFIG_EARLY_PRINTK=y | |||
| 763 | # CONFIG_SECURITY is not set | 913 | # CONFIG_SECURITY is not set |
| 764 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 914 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
| 765 | CONFIG_CRYPTO=y | 915 | CONFIG_CRYPTO=y |
| 766 | # CONFIG_CRYPTO_SEQIV is not set | 916 | |
| 917 | # | ||
| 918 | # Crypto core or helper | ||
| 919 | # | ||
| 767 | # CONFIG_CRYPTO_MANAGER is not set | 920 | # CONFIG_CRYPTO_MANAGER is not set |
| 921 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 922 | # CONFIG_CRYPTO_NULL is not set | ||
| 923 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 924 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 925 | # CONFIG_CRYPTO_TEST is not set | ||
| 926 | |||
| 927 | # | ||
| 928 | # Authenticated Encryption with Associated Data | ||
| 929 | # | ||
| 930 | # CONFIG_CRYPTO_CCM is not set | ||
| 931 | # CONFIG_CRYPTO_GCM is not set | ||
| 932 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 933 | |||
| 934 | # | ||
| 935 | # Block modes | ||
| 936 | # | ||
| 937 | # CONFIG_CRYPTO_CBC is not set | ||
| 938 | # CONFIG_CRYPTO_CTR is not set | ||
| 939 | # CONFIG_CRYPTO_CTS is not set | ||
| 940 | # CONFIG_CRYPTO_ECB is not set | ||
| 941 | # CONFIG_CRYPTO_LRW is not set | ||
| 942 | # CONFIG_CRYPTO_PCBC is not set | ||
| 943 | # CONFIG_CRYPTO_XTS is not set | ||
| 944 | |||
| 945 | # | ||
| 946 | # Hash modes | ||
| 947 | # | ||
| 768 | # CONFIG_CRYPTO_HMAC is not set | 948 | # CONFIG_CRYPTO_HMAC is not set |
| 769 | # CONFIG_CRYPTO_XCBC is not set | 949 | # CONFIG_CRYPTO_XCBC is not set |
| 770 | # CONFIG_CRYPTO_NULL is not set | 950 | |
| 951 | # | ||
| 952 | # Digest | ||
| 953 | # | ||
| 954 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 771 | # CONFIG_CRYPTO_MD4 is not set | 955 | # CONFIG_CRYPTO_MD4 is not set |
| 772 | # CONFIG_CRYPTO_MD5 is not set | 956 | # CONFIG_CRYPTO_MD5 is not set |
| 957 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 773 | # CONFIG_CRYPTO_SHA1 is not set | 958 | # CONFIG_CRYPTO_SHA1 is not set |
| 774 | # CONFIG_CRYPTO_SHA256 is not set | 959 | # CONFIG_CRYPTO_SHA256 is not set |
| 775 | # CONFIG_CRYPTO_SHA512 is not set | 960 | # CONFIG_CRYPTO_SHA512 is not set |
| 776 | # CONFIG_CRYPTO_WP512 is not set | ||
| 777 | # CONFIG_CRYPTO_TGR192 is not set | 961 | # CONFIG_CRYPTO_TGR192 is not set |
| 778 | # CONFIG_CRYPTO_GF128MUL is not set | 962 | # CONFIG_CRYPTO_WP512 is not set |
| 779 | # CONFIG_CRYPTO_ECB is not set | 963 | |
| 780 | # CONFIG_CRYPTO_CBC is not set | 964 | # |
| 781 | # CONFIG_CRYPTO_PCBC is not set | 965 | # Ciphers |
| 782 | # CONFIG_CRYPTO_LRW is not set | 966 | # |
| 783 | # CONFIG_CRYPTO_XTS is not set | ||
| 784 | # CONFIG_CRYPTO_CTR is not set | ||
| 785 | # CONFIG_CRYPTO_GCM is not set | ||
| 786 | # CONFIG_CRYPTO_CCM is not set | ||
| 787 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 788 | # CONFIG_CRYPTO_DES is not set | ||
| 789 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 790 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 791 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 792 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 793 | # CONFIG_CRYPTO_AES is not set | 967 | # CONFIG_CRYPTO_AES is not set |
| 968 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 969 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 970 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 971 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 794 | # CONFIG_CRYPTO_CAST5 is not set | 972 | # CONFIG_CRYPTO_CAST5 is not set |
| 795 | # CONFIG_CRYPTO_CAST6 is not set | 973 | # CONFIG_CRYPTO_CAST6 is not set |
| 796 | # CONFIG_CRYPTO_TEA is not set | 974 | # CONFIG_CRYPTO_DES is not set |
| 797 | # CONFIG_CRYPTO_ARC4 is not set | 975 | # CONFIG_CRYPTO_FCRYPT is not set |
| 798 | # CONFIG_CRYPTO_KHAZAD is not set | 976 | # CONFIG_CRYPTO_KHAZAD is not set |
| 799 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 800 | # CONFIG_CRYPTO_SEED is not set | ||
| 801 | # CONFIG_CRYPTO_SALSA20 is not set | 977 | # CONFIG_CRYPTO_SALSA20 is not set |
| 978 | # CONFIG_CRYPTO_SEED is not set | ||
| 979 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 980 | # CONFIG_CRYPTO_TEA is not set | ||
| 981 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 982 | |||
| 983 | # | ||
| 984 | # Compression | ||
| 985 | # | ||
| 802 | # CONFIG_CRYPTO_DEFLATE is not set | 986 | # CONFIG_CRYPTO_DEFLATE is not set |
| 803 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 804 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 805 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 806 | # CONFIG_CRYPTO_TEST is not set | ||
| 807 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 808 | # CONFIG_CRYPTO_LZO is not set | 987 | # CONFIG_CRYPTO_LZO is not set |
| 809 | CONFIG_CRYPTO_HW=y | 988 | CONFIG_CRYPTO_HW=y |
| 810 | 989 | ||
| @@ -812,6 +991,7 @@ CONFIG_CRYPTO_HW=y | |||
| 812 | # Library routines | 991 | # Library routines |
| 813 | # | 992 | # |
| 814 | CONFIG_BITREVERSE=y | 993 | CONFIG_BITREVERSE=y |
| 994 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 815 | # CONFIG_CRC_CCITT is not set | 995 | # CONFIG_CRC_CCITT is not set |
| 816 | # CONFIG_CRC16 is not set | 996 | # CONFIG_CRC16 is not set |
| 817 | # CONFIG_CRC_ITU_T is not set | 997 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig new file mode 100644 index 000000000000..a0ebd439cbd2 --- /dev/null +++ b/arch/sh/configs/rsk7203_defconfig | |||
| @@ -0,0 +1,841 @@ | |||
| 1 | # | ||
| 2 | # Automatically generated make config: don't edit | ||
| 3 | # Linux kernel version: 2.6.26-rc4 | ||
| 4 | # Tue Jun 3 13:02:42 2008 | ||
| 5 | # | ||
| 6 | CONFIG_SUPERH=y | ||
| 7 | CONFIG_SUPERH32=y | ||
| 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 9 | CONFIG_GENERIC_BUG=y | ||
| 10 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 11 | CONFIG_GENERIC_HWEIGHT=y | ||
| 12 | CONFIG_GENERIC_HARDIRQS=y | ||
| 13 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 14 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 15 | # CONFIG_GENERIC_TIME is not set | ||
| 16 | # CONFIG_GENERIC_CLOCKEVENTS is not set | ||
| 17 | CONFIG_STACKTRACE_SUPPORT=y | ||
| 18 | CONFIG_LOCKDEP_SUPPORT=y | ||
| 19 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 20 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 21 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
| 22 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
| 24 | |||
| 25 | # | ||
| 26 | # General setup | ||
| 27 | # | ||
| 28 | CONFIG_EXPERIMENTAL=y | ||
| 29 | CONFIG_BROKEN_ON_SMP=y | ||
| 30 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 31 | CONFIG_LOCALVERSION="" | ||
| 32 | # CONFIG_LOCALVERSION_AUTO is not set | ||
| 33 | CONFIG_SYSVIPC=y | ||
| 34 | CONFIG_SYSVIPC_SYSCTL=y | ||
| 35 | CONFIG_POSIX_MQUEUE=y | ||
| 36 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
| 37 | # CONFIG_TASKSTATS is not set | ||
| 38 | # CONFIG_AUDIT is not set | ||
| 39 | # CONFIG_IKCONFIG is not set | ||
| 40 | CONFIG_LOG_BUF_SHIFT=14 | ||
| 41 | # CONFIG_CGROUPS is not set | ||
| 42 | CONFIG_GROUP_SCHED=y | ||
| 43 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 44 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 45 | CONFIG_USER_SCHED=y | ||
| 46 | # CONFIG_CGROUP_SCHED is not set | ||
| 47 | CONFIG_SYSFS_DEPRECATED=y | ||
| 48 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 49 | # CONFIG_RELAY is not set | ||
| 50 | # CONFIG_NAMESPACES is not set | ||
| 51 | CONFIG_BLK_DEV_INITRD=y | ||
| 52 | CONFIG_INITRAMFS_SOURCE="" | ||
| 53 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 54 | CONFIG_SYSCTL=y | ||
| 55 | CONFIG_EMBEDDED=y | ||
| 56 | CONFIG_UID16=y | ||
| 57 | CONFIG_SYSCTL_SYSCALL=y | ||
| 58 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 59 | CONFIG_KALLSYMS=y | ||
| 60 | CONFIG_KALLSYMS_ALL=y | ||
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 62 | CONFIG_HOTPLUG=y | ||
| 63 | CONFIG_PRINTK=y | ||
| 64 | CONFIG_BUG=y | ||
| 65 | CONFIG_ELF_CORE=y | ||
| 66 | CONFIG_COMPAT_BRK=y | ||
| 67 | CONFIG_BASE_FULL=y | ||
| 68 | CONFIG_FUTEX=y | ||
| 69 | CONFIG_ANON_INODES=y | ||
| 70 | CONFIG_EPOLL=y | ||
| 71 | CONFIG_SIGNALFD=y | ||
| 72 | CONFIG_TIMERFD=y | ||
| 73 | CONFIG_EVENTFD=y | ||
| 74 | CONFIG_VM_EVENT_COUNTERS=y | ||
| 75 | CONFIG_SLAB=y | ||
| 76 | # CONFIG_SLUB is not set | ||
| 77 | # CONFIG_SLOB is not set | ||
| 78 | CONFIG_PROFILING=y | ||
| 79 | # CONFIG_MARKERS is not set | ||
| 80 | CONFIG_OPROFILE=y | ||
| 81 | CONFIG_HAVE_OPROFILE=y | ||
| 82 | # CONFIG_HAVE_KPROBES is not set | ||
| 83 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 84 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 85 | CONFIG_SLABINFO=y | ||
| 86 | CONFIG_RT_MUTEXES=y | ||
| 87 | CONFIG_TINY_SHMEM=y | ||
| 88 | CONFIG_BASE_SMALL=0 | ||
| 89 | # CONFIG_MODULES is not set | ||
| 90 | CONFIG_BLOCK=y | ||
| 91 | # CONFIG_LBD is not set | ||
| 92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 93 | # CONFIG_LSF is not set | ||
| 94 | # CONFIG_BLK_DEV_BSG is not set | ||
| 95 | |||
| 96 | # | ||
| 97 | # IO Schedulers | ||
| 98 | # | ||
| 99 | CONFIG_IOSCHED_NOOP=y | ||
| 100 | # CONFIG_IOSCHED_AS is not set | ||
| 101 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 102 | # CONFIG_IOSCHED_CFQ is not set | ||
| 103 | # CONFIG_DEFAULT_AS is not set | ||
| 104 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 105 | # CONFIG_DEFAULT_CFQ is not set | ||
| 106 | CONFIG_DEFAULT_NOOP=y | ||
| 107 | CONFIG_DEFAULT_IOSCHED="noop" | ||
| 108 | CONFIG_CLASSIC_RCU=y | ||
| 109 | |||
| 110 | # | ||
| 111 | # System type | ||
| 112 | # | ||
| 113 | CONFIG_CPU_SH2=y | ||
| 114 | CONFIG_CPU_SH2A=y | ||
| 115 | # CONFIG_CPU_SUBTYPE_SH7619 is not set | ||
| 116 | CONFIG_CPU_SUBTYPE_SH7203=y | ||
| 117 | # CONFIG_CPU_SUBTYPE_SH7206 is not set | ||
| 118 | # CONFIG_CPU_SUBTYPE_SH7263 is not set | ||
| 119 | # CONFIG_CPU_SUBTYPE_MXG is not set | ||
| 120 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | ||
| 121 | # CONFIG_CPU_SUBTYPE_SH7706 is not set | ||
| 122 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | ||
| 123 | # CONFIG_CPU_SUBTYPE_SH7708 is not set | ||
| 124 | # CONFIG_CPU_SUBTYPE_SH7709 is not set | ||
| 125 | # CONFIG_CPU_SUBTYPE_SH7710 is not set | ||
| 126 | # CONFIG_CPU_SUBTYPE_SH7712 is not set | ||
| 127 | # CONFIG_CPU_SUBTYPE_SH7720 is not set | ||
| 128 | # CONFIG_CPU_SUBTYPE_SH7721 is not set | ||
| 129 | # CONFIG_CPU_SUBTYPE_SH7750 is not set | ||
| 130 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | ||
| 131 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | ||
| 132 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | ||
| 133 | # CONFIG_CPU_SUBTYPE_SH7751 is not set | ||
| 134 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | ||
| 135 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | ||
| 136 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | ||
| 137 | # CONFIG_CPU_SUBTYPE_SH7723 is not set | ||
| 138 | # CONFIG_CPU_SUBTYPE_SH7763 is not set | ||
| 139 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | ||
| 140 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | ||
| 141 | # CONFIG_CPU_SUBTYPE_SH7785 is not set | ||
| 142 | # CONFIG_CPU_SUBTYPE_SHX3 is not set | ||
| 143 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | ||
| 144 | # CONFIG_CPU_SUBTYPE_SH7722 is not set | ||
| 145 | # CONFIG_CPU_SUBTYPE_SH7366 is not set | ||
| 146 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set | ||
| 147 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set | ||
| 148 | |||
| 149 | # | ||
| 150 | # Memory management options | ||
| 151 | # | ||
| 152 | CONFIG_QUICKLIST=y | ||
| 153 | CONFIG_PAGE_OFFSET=0x00000000 | ||
| 154 | CONFIG_MEMORY_START=0x0c000000 | ||
| 155 | CONFIG_MEMORY_SIZE=0x01000000 | ||
| 156 | CONFIG_29BIT=y | ||
| 157 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 158 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 159 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | ||
| 160 | CONFIG_MAX_ACTIVE_REGIONS=1 | ||
| 161 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 162 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 163 | CONFIG_PAGE_SIZE_4KB=y | ||
| 164 | # CONFIG_PAGE_SIZE_8KB is not set | ||
| 165 | # CONFIG_PAGE_SIZE_64KB is not set | ||
| 166 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 167 | CONFIG_FLATMEM_MANUAL=y | ||
| 168 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 169 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 170 | CONFIG_FLATMEM=y | ||
| 171 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 172 | CONFIG_SPARSEMEM_STATIC=y | ||
| 173 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 174 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 175 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
| 176 | # CONFIG_RESOURCES_64BIT is not set | ||
| 177 | CONFIG_ZONE_DMA_FLAG=0 | ||
| 178 | CONFIG_NR_QUICK=2 | ||
| 179 | |||
| 180 | # | ||
| 181 | # Cache configuration | ||
| 182 | # | ||
| 183 | # CONFIG_SH_DIRECT_MAPPED is not set | ||
| 184 | CONFIG_CACHE_WRITEBACK=y | ||
| 185 | # CONFIG_CACHE_WRITETHROUGH is not set | ||
| 186 | # CONFIG_CACHE_OFF is not set | ||
| 187 | |||
| 188 | # | ||
| 189 | # Processor features | ||
| 190 | # | ||
| 191 | # CONFIG_CPU_LITTLE_ENDIAN is not set | ||
| 192 | CONFIG_CPU_BIG_ENDIAN=y | ||
| 193 | CONFIG_SH_FPU=y | ||
| 194 | CONFIG_CPU_HAS_FPU=y | ||
| 195 | |||
| 196 | # | ||
| 197 | # Board support | ||
| 198 | # | ||
| 199 | |||
| 200 | # | ||
| 201 | # Timer and clock configuration | ||
| 202 | # | ||
| 203 | CONFIG_SH_CMT=y | ||
| 204 | # CONFIG_SH_MTU2 is not set | ||
| 205 | CONFIG_SH_TIMER_IRQ=142 | ||
| 206 | CONFIG_SH_PCLK_FREQ=16670800 | ||
| 207 | CONFIG_SH_CLK_MD=0 | ||
| 208 | # CONFIG_TICK_ONESHOT is not set | ||
| 209 | |||
| 210 | # | ||
| 211 | # CPU Frequency scaling | ||
| 212 | # | ||
| 213 | CONFIG_CPU_FREQ=y | ||
| 214 | CONFIG_CPU_FREQ_TABLE=y | ||
| 215 | # CONFIG_CPU_FREQ_DEBUG is not set | ||
| 216 | CONFIG_CPU_FREQ_STAT=y | ||
| 217 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | ||
| 218 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | ||
| 219 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 220 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | ||
| 221 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 222 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 223 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | ||
| 224 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | ||
| 225 | # CONFIG_CPU_FREQ_GOV_USERSPACE is not set | ||
| 226 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set | ||
| 227 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | ||
| 228 | CONFIG_SH_CPU_FREQ=y | ||
| 229 | |||
| 230 | # | ||
| 231 | # DMA support | ||
| 232 | # | ||
| 233 | |||
| 234 | # | ||
| 235 | # Companion Chips | ||
| 236 | # | ||
| 237 | |||
| 238 | # | ||
| 239 | # Additional SuperH Device Drivers | ||
| 240 | # | ||
| 241 | CONFIG_HEARTBEAT=y | ||
| 242 | # CONFIG_PUSH_SWITCH is not set | ||
| 243 | |||
| 244 | # | ||
| 245 | # Kernel features | ||
| 246 | # | ||
| 247 | # CONFIG_HZ_100 is not set | ||
| 248 | # CONFIG_HZ_250 is not set | ||
| 249 | # CONFIG_HZ_300 is not set | ||
| 250 | CONFIG_HZ_1000=y | ||
| 251 | CONFIG_HZ=1000 | ||
| 252 | # CONFIG_SCHED_HRTICK is not set | ||
| 253 | # CONFIG_KEXEC is not set | ||
| 254 | # CONFIG_CRASH_DUMP is not set | ||
| 255 | CONFIG_PREEMPT_NONE=y | ||
| 256 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
| 257 | # CONFIG_PREEMPT is not set | ||
| 258 | CONFIG_GUSA=y | ||
| 259 | |||
| 260 | # | ||
| 261 | # Boot options | ||
| 262 | # | ||
| 263 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | ||
| 264 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | ||
| 265 | CONFIG_CMDLINE_BOOL=y | ||
| 266 | CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel" | ||
| 267 | |||
| 268 | # | ||
| 269 | # Bus options | ||
| 270 | # | ||
| 271 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
| 272 | # CONFIG_PCCARD is not set | ||
| 273 | |||
| 274 | # | ||
| 275 | # Executable file formats | ||
| 276 | # | ||
| 277 | CONFIG_BINFMT_FLAT=y | ||
| 278 | CONFIG_BINFMT_ZFLAT=y | ||
| 279 | CONFIG_BINFMT_SHARED_FLAT=y | ||
| 280 | # CONFIG_BINFMT_MISC is not set | ||
| 281 | |||
| 282 | # | ||
| 283 | # Networking | ||
| 284 | # | ||
| 285 | CONFIG_NET=y | ||
| 286 | |||
| 287 | # | ||
| 288 | # Networking options | ||
| 289 | # | ||
| 290 | # CONFIG_PACKET is not set | ||
| 291 | # CONFIG_UNIX is not set | ||
| 292 | # CONFIG_NET_KEY is not set | ||
| 293 | CONFIG_INET=y | ||
| 294 | # CONFIG_IP_MULTICAST is not set | ||
| 295 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 296 | CONFIG_IP_FIB_HASH=y | ||
| 297 | CONFIG_IP_PNP=y | ||
| 298 | CONFIG_IP_PNP_DHCP=y | ||
| 299 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 300 | # CONFIG_IP_PNP_RARP is not set | ||
| 301 | # CONFIG_NET_IPIP is not set | ||
| 302 | # CONFIG_NET_IPGRE is not set | ||
| 303 | # CONFIG_ARPD is not set | ||
| 304 | # CONFIG_SYN_COOKIES is not set | ||
| 305 | # CONFIG_INET_AH is not set | ||
| 306 | # CONFIG_INET_ESP is not set | ||
| 307 | # CONFIG_INET_IPCOMP is not set | ||
| 308 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 309 | # CONFIG_INET_TUNNEL is not set | ||
| 310 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| 311 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| 312 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| 313 | # CONFIG_INET_LRO is not set | ||
| 314 | # CONFIG_INET_DIAG is not set | ||
| 315 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 316 | CONFIG_TCP_CONG_CUBIC=y | ||
| 317 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
| 318 | # CONFIG_TCP_MD5SIG is not set | ||
| 319 | # CONFIG_IPV6 is not set | ||
| 320 | # CONFIG_NETWORK_SECMARK is not set | ||
| 321 | # CONFIG_NETFILTER is not set | ||
| 322 | # CONFIG_IP_DCCP is not set | ||
| 323 | # CONFIG_IP_SCTP is not set | ||
| 324 | # CONFIG_TIPC is not set | ||
| 325 | # CONFIG_ATM is not set | ||
| 326 | # CONFIG_BRIDGE is not set | ||
| 327 | # CONFIG_VLAN_8021Q is not set | ||
| 328 | # CONFIG_DECNET is not set | ||
| 329 | # CONFIG_LLC2 is not set | ||
| 330 | # CONFIG_IPX is not set | ||
| 331 | # CONFIG_ATALK is not set | ||
| 332 | # CONFIG_X25 is not set | ||
| 333 | # CONFIG_LAPB is not set | ||
| 334 | # CONFIG_ECONET is not set | ||
| 335 | # CONFIG_WAN_ROUTER is not set | ||
| 336 | # CONFIG_NET_SCHED is not set | ||
| 337 | |||
| 338 | # | ||
| 339 | # Network testing | ||
| 340 | # | ||
| 341 | # CONFIG_NET_PKTGEN is not set | ||
| 342 | # CONFIG_HAMRADIO is not set | ||
| 343 | # CONFIG_CAN is not set | ||
| 344 | # CONFIG_IRDA is not set | ||
| 345 | # CONFIG_BT is not set | ||
| 346 | # CONFIG_AF_RXRPC is not set | ||
| 347 | |||
| 348 | # | ||
| 349 | # Wireless | ||
| 350 | # | ||
| 351 | # CONFIG_CFG80211 is not set | ||
| 352 | # CONFIG_WIRELESS_EXT is not set | ||
| 353 | # CONFIG_MAC80211 is not set | ||
| 354 | # CONFIG_IEEE80211 is not set | ||
| 355 | # CONFIG_RFKILL is not set | ||
| 356 | # CONFIG_NET_9P is not set | ||
| 357 | |||
| 358 | # | ||
| 359 | # Device Drivers | ||
| 360 | # | ||
| 361 | |||
| 362 | # | ||
| 363 | # Generic Driver Options | ||
| 364 | # | ||
| 365 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 366 | # CONFIG_STANDALONE is not set | ||
| 367 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
| 368 | # CONFIG_FW_LOADER is not set | ||
| 369 | # CONFIG_DEBUG_DRIVER is not set | ||
| 370 | # CONFIG_DEBUG_DEVRES is not set | ||
| 371 | # CONFIG_SYS_HYPERVISOR is not set | ||
| 372 | # CONFIG_CONNECTOR is not set | ||
| 373 | CONFIG_MTD=y | ||
| 374 | # CONFIG_MTD_DEBUG is not set | ||
| 375 | CONFIG_MTD_CONCAT=y | ||
| 376 | CONFIG_MTD_PARTITIONS=y | ||
| 377 | CONFIG_MTD_REDBOOT_PARTS=y | ||
| 378 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
| 379 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
| 380 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | ||
| 381 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
| 382 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 383 | |||
| 384 | # | ||
| 385 | # User Modules And Translation Layers | ||
| 386 | # | ||
| 387 | CONFIG_MTD_CHAR=y | ||
| 388 | CONFIG_MTD_BLKDEVS=y | ||
| 389 | CONFIG_MTD_BLOCK=y | ||
| 390 | # CONFIG_FTL is not set | ||
| 391 | # CONFIG_NFTL is not set | ||
| 392 | # CONFIG_INFTL is not set | ||
| 393 | # CONFIG_RFD_FTL is not set | ||
| 394 | # CONFIG_SSFDC is not set | ||
| 395 | # CONFIG_MTD_OOPS is not set | ||
| 396 | |||
| 397 | # | ||
| 398 | # RAM/ROM/Flash chip drivers | ||
| 399 | # | ||
| 400 | CONFIG_MTD_CFI=y | ||
| 401 | # CONFIG_MTD_JEDECPROBE is not set | ||
| 402 | CONFIG_MTD_GEN_PROBE=y | ||
| 403 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
| 404 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 405 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 406 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 407 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
| 408 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
| 409 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
| 410 | CONFIG_MTD_CFI_I1=y | ||
| 411 | CONFIG_MTD_CFI_I2=y | ||
| 412 | # CONFIG_MTD_CFI_I4 is not set | ||
| 413 | # CONFIG_MTD_CFI_I8 is not set | ||
| 414 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
| 415 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 416 | # CONFIG_MTD_CFI_STAA is not set | ||
| 417 | CONFIG_MTD_CFI_UTIL=y | ||
| 418 | # CONFIG_MTD_RAM is not set | ||
| 419 | # CONFIG_MTD_ROM is not set | ||
| 420 | # CONFIG_MTD_ABSENT is not set | ||
| 421 | |||
| 422 | # | ||
| 423 | # Mapping drivers for chip access | ||
| 424 | # | ||
| 425 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
| 426 | CONFIG_MTD_PHYSMAP=y | ||
| 427 | CONFIG_MTD_PHYSMAP_START=0x20000000 | ||
| 428 | CONFIG_MTD_PHYSMAP_LEN=0x01000000 | ||
| 429 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | ||
| 430 | # CONFIG_MTD_UCLINUX is not set | ||
| 431 | # CONFIG_MTD_PLATRAM is not set | ||
| 432 | |||
| 433 | # | ||
| 434 | # Self-contained MTD device drivers | ||
| 435 | # | ||
| 436 | # CONFIG_MTD_SLRAM is not set | ||
| 437 | # CONFIG_MTD_PHRAM is not set | ||
| 438 | # CONFIG_MTD_MTDRAM is not set | ||
| 439 | # CONFIG_MTD_BLOCK2MTD is not set | ||
| 440 | |||
| 441 | # | ||
| 442 | # Disk-On-Chip Device Drivers | ||
| 443 | # | ||
| 444 | # CONFIG_MTD_DOC2000 is not set | ||
| 445 | # CONFIG_MTD_DOC2001 is not set | ||
| 446 | # CONFIG_MTD_DOC2001PLUS is not set | ||
| 447 | # CONFIG_MTD_NAND is not set | ||
| 448 | # CONFIG_MTD_ONENAND is not set | ||
| 449 | |||
| 450 | # | ||
| 451 | # UBI - Unsorted block images | ||
| 452 | # | ||
| 453 | # CONFIG_MTD_UBI is not set | ||
| 454 | # CONFIG_PARPORT is not set | ||
| 455 | CONFIG_BLK_DEV=y | ||
| 456 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
| 457 | # CONFIG_BLK_DEV_LOOP is not set | ||
| 458 | # CONFIG_BLK_DEV_NBD is not set | ||
| 459 | # CONFIG_BLK_DEV_RAM is not set | ||
| 460 | # CONFIG_CDROM_PKTCDVD is not set | ||
| 461 | # CONFIG_ATA_OVER_ETH is not set | ||
| 462 | CONFIG_MISC_DEVICES=y | ||
| 463 | # CONFIG_EEPROM_93CX6 is not set | ||
| 464 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 465 | CONFIG_HAVE_IDE=y | ||
| 466 | # CONFIG_IDE is not set | ||
| 467 | |||
| 468 | # | ||
| 469 | # SCSI device support | ||
| 470 | # | ||
| 471 | # CONFIG_RAID_ATTRS is not set | ||
| 472 | # CONFIG_SCSI is not set | ||
| 473 | # CONFIG_SCSI_DMA is not set | ||
| 474 | # CONFIG_SCSI_NETLINK is not set | ||
| 475 | # CONFIG_ATA is not set | ||
| 476 | # CONFIG_MD is not set | ||
| 477 | CONFIG_NETDEVICES=y | ||
| 478 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
| 479 | # CONFIG_DUMMY is not set | ||
| 480 | # CONFIG_BONDING is not set | ||
| 481 | # CONFIG_MACVLAN is not set | ||
| 482 | # CONFIG_EQUALIZER is not set | ||
| 483 | # CONFIG_TUN is not set | ||
| 484 | # CONFIG_VETH is not set | ||
| 485 | # CONFIG_PHYLIB is not set | ||
| 486 | CONFIG_NET_ETHERNET=y | ||
| 487 | CONFIG_MII=y | ||
| 488 | # CONFIG_AX88796 is not set | ||
| 489 | # CONFIG_STNIC is not set | ||
| 490 | CONFIG_SMC91X=y | ||
| 491 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 492 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 493 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 494 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 495 | # CONFIG_B44 is not set | ||
| 496 | CONFIG_NETDEV_1000=y | ||
| 497 | # CONFIG_E1000E_ENABLED is not set | ||
| 498 | CONFIG_NETDEV_10000=y | ||
| 499 | |||
| 500 | # | ||
| 501 | # Wireless LAN | ||
| 502 | # | ||
| 503 | # CONFIG_WLAN_PRE80211 is not set | ||
| 504 | # CONFIG_WLAN_80211 is not set | ||
| 505 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 506 | # CONFIG_WAN is not set | ||
| 507 | # CONFIG_PPP is not set | ||
| 508 | # CONFIG_SLIP is not set | ||
| 509 | # CONFIG_NETCONSOLE is not set | ||
| 510 | # CONFIG_NETPOLL is not set | ||
| 511 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 512 | # CONFIG_ISDN is not set | ||
| 513 | # CONFIG_PHONE is not set | ||
| 514 | |||
| 515 | # | ||
| 516 | # Input device support | ||
| 517 | # | ||
| 518 | CONFIG_INPUT=y | ||
| 519 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 520 | # CONFIG_INPUT_POLLDEV is not set | ||
| 521 | |||
| 522 | # | ||
| 523 | # Userland interfaces | ||
| 524 | # | ||
| 525 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 526 | # CONFIG_INPUT_JOYDEV is not set | ||
| 527 | # CONFIG_INPUT_EVDEV is not set | ||
| 528 | # CONFIG_INPUT_EVBUG is not set | ||
| 529 | |||
| 530 | # | ||
| 531 | # Input Device Drivers | ||
| 532 | # | ||
| 533 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 534 | # CONFIG_INPUT_MOUSE is not set | ||
| 535 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 536 | # CONFIG_INPUT_TABLET is not set | ||
| 537 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 538 | # CONFIG_INPUT_MISC is not set | ||
| 539 | |||
| 540 | # | ||
| 541 | # Hardware I/O ports | ||
| 542 | # | ||
| 543 | # CONFIG_SERIO is not set | ||
| 544 | # CONFIG_GAMEPORT is not set | ||
| 545 | |||
| 546 | # | ||
| 547 | # Character devices | ||
| 548 | # | ||
| 549 | # CONFIG_VT is not set | ||
| 550 | CONFIG_DEVKMEM=y | ||
| 551 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
| 552 | |||
| 553 | # | ||
| 554 | # Serial drivers | ||
| 555 | # | ||
| 556 | # CONFIG_SERIAL_8250 is not set | ||
| 557 | |||
| 558 | # | ||
| 559 | # Non-8250 serial port support | ||
| 560 | # | ||
| 561 | CONFIG_SERIAL_SH_SCI=y | ||
| 562 | CONFIG_SERIAL_SH_SCI_NR_UARTS=4 | ||
| 563 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
| 564 | CONFIG_SERIAL_CORE=y | ||
| 565 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
| 566 | # CONFIG_UNIX98_PTYS is not set | ||
| 567 | # CONFIG_LEGACY_PTYS is not set | ||
| 568 | # CONFIG_IPMI_HANDLER is not set | ||
| 569 | # CONFIG_HW_RANDOM is not set | ||
| 570 | # CONFIG_R3964 is not set | ||
| 571 | # CONFIG_RAW_DRIVER is not set | ||
| 572 | # CONFIG_TCG_TPM is not set | ||
| 573 | # CONFIG_I2C is not set | ||
| 574 | # CONFIG_SPI is not set | ||
| 575 | # CONFIG_W1 is not set | ||
| 576 | # CONFIG_POWER_SUPPLY is not set | ||
| 577 | # CONFIG_HWMON is not set | ||
| 578 | CONFIG_THERMAL=y | ||
| 579 | # CONFIG_WATCHDOG is not set | ||
| 580 | |||
| 581 | # | ||
| 582 | # Sonics Silicon Backplane | ||
| 583 | # | ||
| 584 | CONFIG_SSB_POSSIBLE=y | ||
| 585 | # CONFIG_SSB is not set | ||
| 586 | |||
| 587 | # | ||
| 588 | # Multifunction device drivers | ||
| 589 | # | ||
| 590 | # CONFIG_MFD_SM501 is not set | ||
| 591 | # CONFIG_HTC_PASIC3 is not set | ||
| 592 | |||
| 593 | # | ||
| 594 | # Multimedia devices | ||
| 595 | # | ||
| 596 | |||
| 597 | # | ||
| 598 | # Multimedia core support | ||
| 599 | # | ||
| 600 | # CONFIG_VIDEO_DEV is not set | ||
| 601 | # CONFIG_DVB_CORE is not set | ||
| 602 | # CONFIG_VIDEO_MEDIA is not set | ||
| 603 | |||
| 604 | # | ||
| 605 | # Multimedia drivers | ||
| 606 | # | ||
| 607 | CONFIG_DAB=y | ||
| 608 | |||
| 609 | # | ||
| 610 | # Graphics support | ||
| 611 | # | ||
| 612 | # CONFIG_VGASTATE is not set | ||
| 613 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 614 | # CONFIG_FB is not set | ||
| 615 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
| 616 | |||
| 617 | # | ||
| 618 | # Display device support | ||
| 619 | # | ||
| 620 | # CONFIG_DISPLAY_SUPPORT is not set | ||
| 621 | |||
| 622 | # | ||
| 623 | # Sound | ||
| 624 | # | ||
| 625 | # CONFIG_SOUND is not set | ||
| 626 | CONFIG_HID_SUPPORT=y | ||
| 627 | CONFIG_HID=y | ||
| 628 | # CONFIG_HID_DEBUG is not set | ||
| 629 | # CONFIG_HIDRAW is not set | ||
| 630 | CONFIG_USB_SUPPORT=y | ||
| 631 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 632 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
| 633 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 634 | # CONFIG_USB is not set | ||
| 635 | # CONFIG_USB_OTG_WHITELIST is not set | ||
| 636 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
| 637 | |||
| 638 | # | ||
| 639 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 640 | # | ||
| 641 | # CONFIG_USB_GADGET is not set | ||
| 642 | # CONFIG_MMC is not set | ||
| 643 | # CONFIG_MEMSTICK is not set | ||
| 644 | # CONFIG_NEW_LEDS is not set | ||
| 645 | # CONFIG_ACCESSIBILITY is not set | ||
| 646 | CONFIG_RTC_LIB=y | ||
| 647 | CONFIG_RTC_CLASS=y | ||
| 648 | CONFIG_RTC_HCTOSYS=y | ||
| 649 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 650 | # CONFIG_RTC_DEBUG is not set | ||
| 651 | |||
| 652 | # | ||
| 653 | # RTC interfaces | ||
| 654 | # | ||
| 655 | CONFIG_RTC_INTF_SYSFS=y | ||
| 656 | CONFIG_RTC_INTF_PROC=y | ||
| 657 | CONFIG_RTC_INTF_DEV=y | ||
| 658 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 659 | # CONFIG_RTC_DRV_TEST is not set | ||
| 660 | |||
| 661 | # | ||
| 662 | # SPI RTC drivers | ||
| 663 | # | ||
| 664 | |||
| 665 | # | ||
| 666 | # Platform RTC drivers | ||
| 667 | # | ||
| 668 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 669 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 670 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 671 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 672 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 673 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 674 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 675 | |||
| 676 | # | ||
| 677 | # on-CPU RTC drivers | ||
| 678 | # | ||
| 679 | CONFIG_RTC_DRV_SH=y | ||
| 680 | # CONFIG_UIO is not set | ||
| 681 | |||
| 682 | # | ||
| 683 | # File systems | ||
| 684 | # | ||
| 685 | # CONFIG_EXT2_FS is not set | ||
| 686 | # CONFIG_EXT3_FS is not set | ||
| 687 | # CONFIG_EXT4DEV_FS is not set | ||
| 688 | # CONFIG_REISERFS_FS is not set | ||
| 689 | # CONFIG_JFS_FS is not set | ||
| 690 | # CONFIG_FS_POSIX_ACL is not set | ||
| 691 | # CONFIG_XFS_FS is not set | ||
| 692 | # CONFIG_OCFS2_FS is not set | ||
| 693 | # CONFIG_DNOTIFY is not set | ||
| 694 | # CONFIG_INOTIFY is not set | ||
| 695 | # CONFIG_QUOTA is not set | ||
| 696 | # CONFIG_AUTOFS_FS is not set | ||
| 697 | # CONFIG_AUTOFS4_FS is not set | ||
| 698 | # CONFIG_FUSE_FS is not set | ||
| 699 | |||
| 700 | # | ||
| 701 | # CD-ROM/DVD Filesystems | ||
| 702 | # | ||
| 703 | # CONFIG_ISO9660_FS is not set | ||
| 704 | # CONFIG_UDF_FS is not set | ||
| 705 | |||
| 706 | # | ||
| 707 | # DOS/FAT/NT Filesystems | ||
| 708 | # | ||
| 709 | # CONFIG_MSDOS_FS is not set | ||
| 710 | # CONFIG_VFAT_FS is not set | ||
| 711 | # CONFIG_NTFS_FS is not set | ||
| 712 | |||
| 713 | # | ||
| 714 | # Pseudo filesystems | ||
| 715 | # | ||
| 716 | CONFIG_PROC_FS=y | ||
| 717 | CONFIG_PROC_SYSCTL=y | ||
| 718 | CONFIG_SYSFS=y | ||
| 719 | # CONFIG_TMPFS is not set | ||
| 720 | # CONFIG_HUGETLB_PAGE is not set | ||
| 721 | # CONFIG_CONFIGFS_FS is not set | ||
| 722 | |||
| 723 | # | ||
| 724 | # Miscellaneous filesystems | ||
| 725 | # | ||
| 726 | # CONFIG_ADFS_FS is not set | ||
| 727 | # CONFIG_AFFS_FS is not set | ||
| 728 | # CONFIG_HFS_FS is not set | ||
| 729 | # CONFIG_HFSPLUS_FS is not set | ||
| 730 | # CONFIG_BEFS_FS is not set | ||
| 731 | # CONFIG_BFS_FS is not set | ||
| 732 | # CONFIG_EFS_FS is not set | ||
| 733 | # CONFIG_JFFS2_FS is not set | ||
| 734 | # CONFIG_CRAMFS is not set | ||
| 735 | # CONFIG_VXFS_FS is not set | ||
| 736 | # CONFIG_MINIX_FS is not set | ||
| 737 | # CONFIG_HPFS_FS is not set | ||
| 738 | # CONFIG_QNX4FS_FS is not set | ||
| 739 | CONFIG_ROMFS_FS=y | ||
| 740 | # CONFIG_SYSV_FS is not set | ||
| 741 | # CONFIG_UFS_FS is not set | ||
| 742 | CONFIG_NETWORK_FILESYSTEMS=y | ||
| 743 | CONFIG_NFS_FS=y | ||
| 744 | # CONFIG_NFS_V3 is not set | ||
| 745 | # CONFIG_NFS_V4 is not set | ||
| 746 | # CONFIG_NFSD is not set | ||
| 747 | CONFIG_ROOT_NFS=y | ||
| 748 | CONFIG_LOCKD=y | ||
| 749 | CONFIG_NFS_COMMON=y | ||
| 750 | CONFIG_SUNRPC=y | ||
| 751 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 752 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 753 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 754 | # CONFIG_SMB_FS is not set | ||
| 755 | # CONFIG_CIFS is not set | ||
| 756 | # CONFIG_NCP_FS is not set | ||
| 757 | # CONFIG_CODA_FS is not set | ||
| 758 | # CONFIG_AFS_FS is not set | ||
| 759 | |||
| 760 | # | ||
| 761 | # Partition Types | ||
| 762 | # | ||
| 763 | # CONFIG_PARTITION_ADVANCED is not set | ||
| 764 | CONFIG_MSDOS_PARTITION=y | ||
| 765 | # CONFIG_NLS is not set | ||
| 766 | # CONFIG_DLM is not set | ||
| 767 | |||
| 768 | # | ||
| 769 | # Kernel hacking | ||
| 770 | # | ||
| 771 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
| 772 | # CONFIG_PRINTK_TIME is not set | ||
| 773 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 774 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
| 775 | CONFIG_FRAME_WARN=1024 | ||
| 776 | CONFIG_MAGIC_SYSRQ=y | ||
| 777 | # CONFIG_UNUSED_SYMBOLS is not set | ||
| 778 | # CONFIG_DEBUG_FS is not set | ||
| 779 | # CONFIG_HEADERS_CHECK is not set | ||
| 780 | CONFIG_DEBUG_KERNEL=y | ||
| 781 | CONFIG_DEBUG_SHIRQ=y | ||
| 782 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 783 | CONFIG_SCHED_DEBUG=y | ||
| 784 | # CONFIG_SCHEDSTATS is not set | ||
| 785 | # CONFIG_TIMER_STATS is not set | ||
| 786 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 787 | # CONFIG_DEBUG_SLAB is not set | ||
| 788 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 789 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 790 | # CONFIG_DEBUG_SPINLOCK is not set | ||
| 791 | CONFIG_DEBUG_MUTEXES=y | ||
| 792 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
| 793 | # CONFIG_PROVE_LOCKING is not set | ||
| 794 | # CONFIG_LOCK_STAT is not set | ||
| 795 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | ||
| 796 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
| 797 | # CONFIG_DEBUG_KOBJECT is not set | ||
| 798 | CONFIG_DEBUG_BUGVERBOSE=y | ||
| 799 | CONFIG_DEBUG_INFO=y | ||
| 800 | # CONFIG_DEBUG_VM is not set | ||
| 801 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 802 | # CONFIG_DEBUG_LIST is not set | ||
| 803 | # CONFIG_DEBUG_SG is not set | ||
| 804 | CONFIG_FRAME_POINTER=y | ||
| 805 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 806 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 807 | # CONFIG_FAULT_INJECTION is not set | ||
| 808 | # CONFIG_SAMPLES is not set | ||
| 809 | # CONFIG_SH_STANDARD_BIOS is not set | ||
| 810 | CONFIG_EARLY_SCIF_CONSOLE=y | ||
| 811 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xfffe8000 | ||
| 812 | CONFIG_EARLY_PRINTK=y | ||
| 813 | CONFIG_DEBUG_BOOTMEM=y | ||
| 814 | CONFIG_DEBUG_STACKOVERFLOW=y | ||
| 815 | CONFIG_DEBUG_STACK_USAGE=y | ||
| 816 | # CONFIG_IRQSTACKS is not set | ||
| 817 | |||
| 818 | # | ||
| 819 | # Security options | ||
| 820 | # | ||
| 821 | # CONFIG_KEYS is not set | ||
| 822 | # CONFIG_SECURITY is not set | ||
| 823 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 824 | # CONFIG_CRYPTO is not set | ||
| 825 | |||
| 826 | # | ||
| 827 | # Library routines | ||
| 828 | # | ||
| 829 | CONFIG_BITREVERSE=y | ||
| 830 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
| 831 | # CONFIG_CRC_CCITT is not set | ||
| 832 | # CONFIG_CRC16 is not set | ||
| 833 | # CONFIG_CRC_ITU_T is not set | ||
| 834 | CONFIG_CRC32=y | ||
| 835 | # CONFIG_CRC7 is not set | ||
| 836 | # CONFIG_LIBCRC32C is not set | ||
| 837 | CONFIG_ZLIB_INFLATE=y | ||
| 838 | CONFIG_PLIST=y | ||
| 839 | CONFIG_HAS_IOMEM=y | ||
| 840 | CONFIG_HAS_IOPORT=y | ||
| 841 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig index 0d0cda908270..6b34baa26eae 100644 --- a/arch/sh/configs/se7206_defconfig +++ b/arch/sh/configs/se7206_defconfig | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.23-rc4 | 3 | # Linux kernel version: 2.6.26-rc4 |
| 4 | # Thu Sep 13 16:40:16 2007 | 4 | # Tue Jun 3 20:27:08 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
| 7 | CONFIG_SUPERH32=y | ||
| 7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 8 | CONFIG_GENERIC_BUG=y | 9 | CONFIG_GENERIC_BUG=y |
| 9 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 10 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| @@ -18,6 +19,7 @@ CONFIG_LOCKDEP_SUPPORT=y | |||
| 18 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 19 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 19 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 20 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 20 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | 21 | CONFIG_ARCH_NO_VIRT_TO_BUS=y |
| 22 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 21 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 22 | 24 | ||
| 23 | # | 25 | # |
| @@ -25,47 +27,82 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | |||
| 25 | # | 27 | # |
| 26 | CONFIG_EXPERIMENTAL=y | 28 | CONFIG_EXPERIMENTAL=y |
| 27 | CONFIG_BROKEN_ON_SMP=y | 29 | CONFIG_BROKEN_ON_SMP=y |
| 30 | CONFIG_LOCK_KERNEL=y | ||
| 28 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 31 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 29 | CONFIG_LOCALVERSION="" | 32 | CONFIG_LOCALVERSION="" |
| 30 | # CONFIG_LOCALVERSION_AUTO is not set | 33 | CONFIG_LOCALVERSION_AUTO=y |
| 31 | # CONFIG_SYSVIPC is not set | 34 | CONFIG_SYSVIPC=y |
| 32 | # CONFIG_POSIX_MQUEUE is not set | 35 | CONFIG_SYSVIPC_SYSCTL=y |
| 33 | # CONFIG_BSD_PROCESS_ACCT is not set | 36 | CONFIG_POSIX_MQUEUE=y |
| 37 | CONFIG_BSD_PROCESS_ACCT=y | ||
| 38 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 34 | # CONFIG_TASKSTATS is not set | 39 | # CONFIG_TASKSTATS is not set |
| 35 | # CONFIG_USER_NS is not set | 40 | CONFIG_AUDIT=y |
| 36 | # CONFIG_AUDIT is not set | 41 | CONFIG_AUDITSYSCALL=y |
| 37 | # CONFIG_IKCONFIG is not set | 42 | # CONFIG_IKCONFIG is not set |
| 38 | CONFIG_LOG_BUF_SHIFT=14 | 43 | CONFIG_LOG_BUF_SHIFT=14 |
| 39 | CONFIG_SYSFS_DEPRECATED=y | 44 | CONFIG_CGROUPS=y |
| 40 | # CONFIG_RELAY is not set | 45 | CONFIG_CGROUP_DEBUG=y |
| 41 | # CONFIG_BLK_DEV_INITRD is not set | 46 | CONFIG_CGROUP_NS=y |
| 47 | CONFIG_CGROUP_DEVICE=y | ||
| 48 | # CONFIG_GROUP_SCHED is not set | ||
| 49 | CONFIG_CGROUP_CPUACCT=y | ||
| 50 | CONFIG_RESOURCE_COUNTERS=y | ||
| 51 | CONFIG_MM_OWNER=y | ||
| 52 | CONFIG_CGROUP_MEM_RES_CTLR=y | ||
| 53 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 54 | CONFIG_RELAY=y | ||
| 55 | CONFIG_NAMESPACES=y | ||
| 56 | CONFIG_UTS_NS=y | ||
| 57 | CONFIG_IPC_NS=y | ||
| 58 | CONFIG_USER_NS=y | ||
| 59 | CONFIG_PID_NS=y | ||
| 60 | CONFIG_BLK_DEV_INITRD=y | ||
| 61 | CONFIG_INITRAMFS_SOURCE="" | ||
| 42 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 62 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 43 | CONFIG_SYSCTL=y | 63 | CONFIG_SYSCTL=y |
| 44 | CONFIG_EMBEDDED=y | 64 | CONFIG_EMBEDDED=y |
| 45 | # CONFIG_UID16 is not set | 65 | # CONFIG_UID16 is not set |
| 46 | # CONFIG_SYSCTL_SYSCALL is not set | 66 | # CONFIG_SYSCTL_SYSCALL is not set |
| 47 | # CONFIG_KALLSYMS is not set | 67 | CONFIG_KALLSYMS=y |
| 48 | # CONFIG_HOTPLUG is not set | 68 | CONFIG_KALLSYMS_ALL=y |
| 69 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
| 70 | CONFIG_HOTPLUG=y | ||
| 49 | CONFIG_PRINTK=y | 71 | CONFIG_PRINTK=y |
| 50 | CONFIG_BUG=y | 72 | CONFIG_BUG=y |
| 51 | # CONFIG_ELF_CORE is not set | 73 | # CONFIG_ELF_CORE is not set |
| 52 | # CONFIG_BASE_FULL is not set | 74 | # CONFIG_COMPAT_BRK is not set |
| 53 | # CONFIG_FUTEX is not set | 75 | CONFIG_BASE_FULL=y |
| 76 | CONFIG_FUTEX=y | ||
| 54 | CONFIG_ANON_INODES=y | 77 | CONFIG_ANON_INODES=y |
| 55 | # CONFIG_EPOLL is not set | 78 | CONFIG_EPOLL=y |
| 56 | CONFIG_SIGNALFD=y | 79 | CONFIG_SIGNALFD=y |
| 57 | CONFIG_TIMERFD=y | 80 | CONFIG_TIMERFD=y |
| 58 | CONFIG_EVENTFD=y | 81 | CONFIG_EVENTFD=y |
| 59 | # CONFIG_VM_EVENT_COUNTERS is not set | 82 | CONFIG_VM_EVENT_COUNTERS=y |
| 60 | CONFIG_SLUB_DEBUG=y | ||
| 61 | # CONFIG_SLAB is not set | 83 | # CONFIG_SLAB is not set |
| 62 | CONFIG_SLUB=y | 84 | # CONFIG_SLUB is not set |
| 63 | # CONFIG_SLOB is not set | 85 | CONFIG_SLOB=y |
| 86 | CONFIG_PROFILING=y | ||
| 87 | # CONFIG_MARKERS is not set | ||
| 88 | CONFIG_OPROFILE=y | ||
| 89 | CONFIG_HAVE_OPROFILE=y | ||
| 90 | # CONFIG_HAVE_KPROBES is not set | ||
| 91 | # CONFIG_HAVE_KRETPROBES is not set | ||
| 92 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 93 | CONFIG_RT_MUTEXES=y | ||
| 64 | CONFIG_TINY_SHMEM=y | 94 | CONFIG_TINY_SHMEM=y |
| 65 | CONFIG_BASE_SMALL=1 | 95 | CONFIG_BASE_SMALL=0 |
| 66 | # CONFIG_MODULES is not set | 96 | CONFIG_MODULES=y |
| 97 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
| 98 | CONFIG_MODULE_UNLOAD=y | ||
| 99 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
| 100 | # CONFIG_MODVERSIONS is not set | ||
| 101 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
| 102 | # CONFIG_KMOD is not set | ||
| 67 | CONFIG_BLOCK=y | 103 | CONFIG_BLOCK=y |
| 68 | # CONFIG_LBD is not set | 104 | # CONFIG_LBD is not set |
| 105 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 69 | # CONFIG_LSF is not set | 106 | # CONFIG_LSF is not set |
| 70 | # CONFIG_BLK_DEV_BSG is not set | 107 | # CONFIG_BLK_DEV_BSG is not set |
| 71 | 108 | ||
| @@ -81,6 +118,7 @@ CONFIG_IOSCHED_NOOP=y | |||
| 81 | # CONFIG_DEFAULT_CFQ is not set | 118 | # CONFIG_DEFAULT_CFQ is not set |
| 82 | CONFIG_DEFAULT_NOOP=y | 119 | CONFIG_DEFAULT_NOOP=y |
| 83 | CONFIG_DEFAULT_IOSCHED="noop" | 120 | CONFIG_DEFAULT_IOSCHED="noop" |
| 121 | # CONFIG_CLASSIC_RCU is not set | ||
| 84 | 122 | ||
| 85 | # | 123 | # |
| 86 | # System type | 124 | # System type |
| @@ -88,7 +126,10 @@ CONFIG_DEFAULT_IOSCHED="noop" | |||
| 88 | CONFIG_CPU_SH2=y | 126 | CONFIG_CPU_SH2=y |
| 89 | CONFIG_CPU_SH2A=y | 127 | CONFIG_CPU_SH2A=y |
| 90 | # CONFIG_CPU_SUBTYPE_SH7619 is not set | 128 | # CONFIG_CPU_SUBTYPE_SH7619 is not set |
| 129 | # CONFIG_CPU_SUBTYPE_SH7203 is not set | ||
| 91 | CONFIG_CPU_SUBTYPE_SH7206=y | 130 | CONFIG_CPU_SUBTYPE_SH7206=y |
| 131 | # CONFIG_CPU_SUBTYPE_SH7263 is not set | ||
| 132 | # CONFIG_CPU_SUBTYPE_MXG is not set | ||
| 92 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | 133 | # CONFIG_CPU_SUBTYPE_SH7705 is not set |
| 93 | # CONFIG_CPU_SUBTYPE_SH7706 is not set | 134 | # CONFIG_CPU_SUBTYPE_SH7706 is not set |
| 94 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | 135 | # CONFIG_CPU_SUBTYPE_SH7707 is not set |
| @@ -97,6 +138,7 @@ CONFIG_CPU_SUBTYPE_SH7206=y | |||
| 97 | # CONFIG_CPU_SUBTYPE_SH7710 is not set | 138 | # CONFIG_CPU_SUBTYPE_SH7710 is not set |
| 98 | # CONFIG_CPU_SUBTYPE_SH7712 is not set | 139 | # CONFIG_CPU_SUBTYPE_SH7712 is not set |
| 99 | # CONFIG_CPU_SUBTYPE_SH7720 is not set | 140 | # CONFIG_CPU_SUBTYPE_SH7720 is not set |
| 141 | # CONFIG_CPU_SUBTYPE_SH7721 is not set | ||
| 100 | # CONFIG_CPU_SUBTYPE_SH7750 is not set | 142 | # CONFIG_CPU_SUBTYPE_SH7750 is not set |
| 101 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | 143 | # CONFIG_CPU_SUBTYPE_SH7091 is not set |
| 102 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | 144 | # CONFIG_CPU_SUBTYPE_SH7750R is not set |
| @@ -105,14 +147,17 @@ CONFIG_CPU_SUBTYPE_SH7206=y | |||
| 105 | # CONFIG_CPU_SUBTYPE_SH7751R is not set | 147 | # CONFIG_CPU_SUBTYPE_SH7751R is not set |
| 106 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 148 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
| 107 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 149 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
| 108 | # CONFIG_CPU_SUBTYPE_ST40STB1 is not set | 150 | # CONFIG_CPU_SUBTYPE_SH7723 is not set |
| 109 | # CONFIG_CPU_SUBTYPE_ST40GX1 is not set | 151 | # CONFIG_CPU_SUBTYPE_SH7763 is not set |
| 110 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | 152 | # CONFIG_CPU_SUBTYPE_SH7770 is not set |
| 111 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | 153 | # CONFIG_CPU_SUBTYPE_SH7780 is not set |
| 112 | # CONFIG_CPU_SUBTYPE_SH7785 is not set | 154 | # CONFIG_CPU_SUBTYPE_SH7785 is not set |
| 113 | # CONFIG_CPU_SUBTYPE_SHX3 is not set | 155 | # CONFIG_CPU_SUBTYPE_SHX3 is not set |
| 114 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | 156 | # CONFIG_CPU_SUBTYPE_SH7343 is not set |
| 115 | # CONFIG_CPU_SUBTYPE_SH7722 is not set | 157 | # CONFIG_CPU_SUBTYPE_SH7722 is not set |
| 158 | # CONFIG_CPU_SUBTYPE_SH7366 is not set | ||
| 159 | # CONFIG_CPU_SUBTYPE_SH5_101 is not set | ||
| 160 | # CONFIG_CPU_SUBTYPE_SH5_103 is not set | ||
| 116 | 161 | ||
| 117 | # | 162 | # |
| 118 | # Memory management options | 163 | # Memory management options |
| @@ -121,23 +166,25 @@ CONFIG_QUICKLIST=y | |||
| 121 | CONFIG_PAGE_OFFSET=0x00000000 | 166 | CONFIG_PAGE_OFFSET=0x00000000 |
| 122 | CONFIG_MEMORY_START=0x0c000000 | 167 | CONFIG_MEMORY_START=0x0c000000 |
| 123 | CONFIG_MEMORY_SIZE=0x04000000 | 168 | CONFIG_MEMORY_SIZE=0x04000000 |
| 169 | CONFIG_29BIT=y | ||
| 124 | CONFIG_ARCH_FLATMEM_ENABLE=y | 170 | CONFIG_ARCH_FLATMEM_ENABLE=y |
| 125 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 171 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
| 126 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 172 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
| 127 | CONFIG_MAX_ACTIVE_REGIONS=1 | 173 | CONFIG_MAX_ACTIVE_REGIONS=1 |
| 128 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 174 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
| 129 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 175 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
| 130 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 131 | CONFIG_PAGE_SIZE_4KB=y | 176 | CONFIG_PAGE_SIZE_4KB=y |
| 132 | # CONFIG_PAGE_SIZE_8KB is not set | 177 | # CONFIG_PAGE_SIZE_8KB is not set |
| 133 | # CONFIG_PAGE_SIZE_64KB is not set | 178 | # CONFIG_PAGE_SIZE_64KB is not set |
| 134 | CONFIG_SELECT_MEMORY_MODEL=y | 179 | CONFIG_SELECT_MEMORY_MODEL=y |
| 135 | # CONFIG_FLATMEM_MANUAL is not set | 180 | CONFIG_FLATMEM_MANUAL=y |
| 136 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 181 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 137 | CONFIG_SPARSEMEM_MANUAL=y | 182 | # CONFIG_SPARSEMEM_MANUAL is not set |
| 138 | CONFIG_SPARSEMEM=y | 183 | CONFIG_FLATMEM=y |
| 139 | CONFIG_HAVE_MEMORY_PRESENT=y | 184 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 140 | CONFIG_SPARSEMEM_STATIC=y | 185 | CONFIG_SPARSEMEM_STATIC=y |
| 186 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 187 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 141 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 188 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 142 | # CONFIG_RESOURCES_64BIT is not set | 189 | # CONFIG_RESOURCES_64BIT is not set |
| 143 | CONFIG_ZONE_DMA_FLAG=0 | 190 | CONFIG_ZONE_DMA_FLAG=0 |
| @@ -183,13 +230,16 @@ CONFIG_CPU_FREQ_TABLE=y | |||
| 183 | CONFIG_CPU_FREQ_STAT=y | 230 | CONFIG_CPU_FREQ_STAT=y |
| 184 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 231 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
| 185 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 232 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
| 233 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | ||
| 186 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 234 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set |
| 235 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 236 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 187 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 237 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
| 188 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 238 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
| 189 | # CONFIG_CPU_FREQ_GOV_USERSPACE is not set | 239 | # CONFIG_CPU_FREQ_GOV_USERSPACE is not set |
| 190 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set | 240 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set |
| 191 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | 241 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
| 192 | # CONFIG_SH_CPU_FREQ is not set | 242 | CONFIG_SH_CPU_FREQ=y |
| 193 | 243 | ||
| 194 | # | 244 | # |
| 195 | # DMA support | 245 | # DMA support |
| @@ -213,11 +263,15 @@ CONFIG_HEARTBEAT=y | |||
| 213 | # CONFIG_HZ_300 is not set | 263 | # CONFIG_HZ_300 is not set |
| 214 | CONFIG_HZ_1000=y | 264 | CONFIG_HZ_1000=y |
| 215 | CONFIG_HZ=1000 | 265 | CONFIG_HZ=1000 |
| 216 | # CONFIG_KEXEC is not set | 266 | # CONFIG_SCHED_HRTICK is not set |
| 267 | CONFIG_KEXEC=y | ||
| 217 | # CONFIG_CRASH_DUMP is not set | 268 | # CONFIG_CRASH_DUMP is not set |
| 218 | CONFIG_PREEMPT_NONE=y | 269 | # CONFIG_PREEMPT_NONE is not set |
| 219 | # CONFIG_PREEMPT_VOLUNTARY is not set | 270 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 220 | # CONFIG_PREEMPT is not set | 271 | CONFIG_PREEMPT=y |
| 272 | CONFIG_PREEMPT_RCU=y | ||
| 273 | CONFIG_RCU_TRACE=y | ||
| 274 | CONFIG_GUSA=y | ||
| 221 | 275 | ||
| 222 | # | 276 | # |
| 223 | # Boot options | 277 | # Boot options |
| @@ -225,25 +279,25 @@ CONFIG_PREEMPT_NONE=y | |||
| 225 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 | 279 | CONFIG_ZERO_PAGE_OFFSET=0x00001000 |
| 226 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 280 | CONFIG_BOOT_LINK_OFFSET=0x00800000 |
| 227 | CONFIG_CMDLINE_BOOL=y | 281 | CONFIG_CMDLINE_BOOL=y |
| 228 | CONFIG_CMDLINE="console=ttySC3,115200 earlyprintk=serial ignore_loglevel" | 282 | CONFIG_CMDLINE="console=ttySC3,115200 ignore_loglevel earlyprintk=serial" |
| 229 | 283 | ||
| 230 | # | 284 | # |
| 231 | # Bus options | 285 | # Bus options |
| 232 | # | 286 | # |
| 233 | # CONFIG_CF_ENABLER is not set | 287 | CONFIG_CF_ENABLER=y |
| 288 | # CONFIG_CF_AREA5 is not set | ||
| 289 | CONFIG_CF_AREA6=y | ||
| 290 | CONFIG_CF_BASE_ADDR=0xb8000000 | ||
| 234 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 291 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
| 235 | 292 | # CONFIG_PCCARD is not set | |
| 236 | # | ||
| 237 | # PCCARD (PCMCIA/CardBus) support | ||
| 238 | # | ||
| 239 | 293 | ||
| 240 | # | 294 | # |
| 241 | # Executable file formats | 295 | # Executable file formats |
| 242 | # | 296 | # |
| 243 | CONFIG_BINFMT_FLAT=y | 297 | CONFIG_BINFMT_FLAT=y |
| 244 | CONFIG_BINFMT_ZFLAT=y | 298 | CONFIG_BINFMT_ZFLAT=y |
| 245 | # CONFIG_BINFMT_SHARED_FLAT is not set | 299 | CONFIG_BINFMT_SHARED_FLAT=y |
| 246 | # CONFIG_BINFMT_MISC is not set | 300 | CONFIG_BINFMT_MISC=y |
| 247 | 301 | ||
| 248 | # | 302 | # |
| 249 | # Networking | 303 | # Networking |
| @@ -253,14 +307,24 @@ CONFIG_NET=y | |||
| 253 | # | 307 | # |
| 254 | # Networking options | 308 | # Networking options |
| 255 | # | 309 | # |
| 256 | # CONFIG_PACKET is not set | 310 | CONFIG_PACKET=y |
| 257 | # CONFIG_UNIX is not set | 311 | # CONFIG_PACKET_MMAP is not set |
| 258 | # CONFIG_NET_KEY is not set | 312 | CONFIG_UNIX=y |
| 313 | CONFIG_XFRM=y | ||
| 314 | # CONFIG_XFRM_USER is not set | ||
| 315 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 316 | # CONFIG_XFRM_MIGRATE is not set | ||
| 317 | # CONFIG_XFRM_STATISTICS is not set | ||
| 318 | CONFIG_NET_KEY=y | ||
| 319 | # CONFIG_NET_KEY_MIGRATE is not set | ||
| 259 | CONFIG_INET=y | 320 | CONFIG_INET=y |
| 260 | # CONFIG_IP_MULTICAST is not set | 321 | # CONFIG_IP_MULTICAST is not set |
| 261 | # CONFIG_IP_ADVANCED_ROUTER is not set | 322 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| 262 | CONFIG_IP_FIB_HASH=y | 323 | CONFIG_IP_FIB_HASH=y |
| 263 | # CONFIG_IP_PNP is not set | 324 | CONFIG_IP_PNP=y |
| 325 | CONFIG_IP_PNP_DHCP=y | ||
| 326 | # CONFIG_IP_PNP_BOOTP is not set | ||
| 327 | # CONFIG_IP_PNP_RARP is not set | ||
| 264 | # CONFIG_NET_IPIP is not set | 328 | # CONFIG_NET_IPIP is not set |
| 265 | # CONFIG_NET_IPGRE is not set | 329 | # CONFIG_NET_IPGRE is not set |
| 266 | # CONFIG_ARPD is not set | 330 | # CONFIG_ARPD is not set |
| @@ -273,14 +337,13 @@ CONFIG_IP_FIB_HASH=y | |||
| 273 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 337 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 274 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 338 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 275 | # CONFIG_INET_XFRM_MODE_BEET is not set | 339 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 340 | # CONFIG_INET_LRO is not set | ||
| 276 | # CONFIG_INET_DIAG is not set | 341 | # CONFIG_INET_DIAG is not set |
| 277 | # CONFIG_TCP_CONG_ADVANCED is not set | 342 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 278 | CONFIG_TCP_CONG_CUBIC=y | 343 | CONFIG_TCP_CONG_CUBIC=y |
| 279 | CONFIG_DEFAULT_TCP_CONG="cubic" | 344 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 280 | # CONFIG_TCP_MD5SIG is not set | 345 | # CONFIG_TCP_MD5SIG is not set |
| 281 | # CONFIG_IPV6 is not set | 346 | # CONFIG_IPV6 is not set |
| 282 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 283 | # CONFIG_INET6_TUNNEL is not set | ||
| 284 | # CONFIG_NETWORK_SECMARK is not set | 347 | # CONFIG_NETWORK_SECMARK is not set |
| 285 | # CONFIG_NETFILTER is not set | 348 | # CONFIG_NETFILTER is not set |
| 286 | # CONFIG_IP_DCCP is not set | 349 | # CONFIG_IP_DCCP is not set |
| @@ -297,10 +360,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 297 | # CONFIG_LAPB is not set | 360 | # CONFIG_LAPB is not set |
| 298 | # CONFIG_ECONET is not set | 361 | # CONFIG_ECONET is not set |
| 299 | # CONFIG_WAN_ROUTER is not set | 362 | # CONFIG_WAN_ROUTER is not set |
| 300 | |||
| 301 | # | ||
| 302 | # QoS and/or fair queueing | ||
| 303 | # | ||
| 304 | # CONFIG_NET_SCHED is not set | 363 | # CONFIG_NET_SCHED is not set |
| 305 | 364 | ||
| 306 | # | 365 | # |
| @@ -308,6 +367,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 308 | # | 367 | # |
| 309 | # CONFIG_NET_PKTGEN is not set | 368 | # CONFIG_NET_PKTGEN is not set |
| 310 | # CONFIG_HAMRADIO is not set | 369 | # CONFIG_HAMRADIO is not set |
| 370 | # CONFIG_CAN is not set | ||
| 311 | # CONFIG_IRDA is not set | 371 | # CONFIG_IRDA is not set |
| 312 | # CONFIG_BT is not set | 372 | # CONFIG_BT is not set |
| 313 | # CONFIG_AF_RXRPC is not set | 373 | # CONFIG_AF_RXRPC is not set |
| @@ -329,8 +389,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
| 329 | # | 389 | # |
| 330 | # Generic Driver Options | 390 | # Generic Driver Options |
| 331 | # | 391 | # |
| 392 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 332 | # CONFIG_STANDALONE is not set | 393 | # CONFIG_STANDALONE is not set |
| 333 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 394 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 395 | # CONFIG_FW_LOADER is not set | ||
| 334 | # CONFIG_DEBUG_DRIVER is not set | 396 | # CONFIG_DEBUG_DRIVER is not set |
| 335 | # CONFIG_DEBUG_DEVRES is not set | 397 | # CONFIG_DEBUG_DEVRES is not set |
| 336 | # CONFIG_SYS_HYPERVISOR is not set | 398 | # CONFIG_SYS_HYPERVISOR is not set |
| @@ -339,11 +401,9 @@ CONFIG_MTD=y | |||
| 339 | # CONFIG_MTD_DEBUG is not set | 401 | # CONFIG_MTD_DEBUG is not set |
| 340 | CONFIG_MTD_CONCAT=y | 402 | CONFIG_MTD_CONCAT=y |
| 341 | CONFIG_MTD_PARTITIONS=y | 403 | CONFIG_MTD_PARTITIONS=y |
| 342 | CONFIG_MTD_REDBOOT_PARTS=y | 404 | # CONFIG_MTD_REDBOOT_PARTS is not set |
| 343 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
| 344 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
| 345 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | ||
| 346 | # CONFIG_MTD_CMDLINE_PARTS is not set | 405 | # CONFIG_MTD_CMDLINE_PARTS is not set |
| 406 | # CONFIG_MTD_AR7_PARTS is not set | ||
| 347 | 407 | ||
| 348 | # | 408 | # |
| 349 | # User Modules And Translation Layers | 409 | # User Modules And Translation Layers |
| @@ -356,6 +416,7 @@ CONFIG_MTD_BLOCK=y | |||
| 356 | # CONFIG_INFTL is not set | 416 | # CONFIG_INFTL is not set |
| 357 | # CONFIG_RFD_FTL is not set | 417 | # CONFIG_RFD_FTL is not set |
| 358 | # CONFIG_SSFDC is not set | 418 | # CONFIG_SSFDC is not set |
| 419 | # CONFIG_MTD_OOPS is not set | ||
| 359 | 420 | ||
| 360 | # | 421 | # |
| 361 | # RAM/ROM/Flash chip drivers | 422 | # RAM/ROM/Flash chip drivers |
| @@ -390,7 +451,6 @@ CONFIG_MTD_PHYSMAP=y | |||
| 390 | CONFIG_MTD_PHYSMAP_START=0x20000000 | 451 | CONFIG_MTD_PHYSMAP_START=0x20000000 |
| 391 | CONFIG_MTD_PHYSMAP_LEN=0x01000000 | 452 | CONFIG_MTD_PHYSMAP_LEN=0x01000000 |
| 392 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | 453 | CONFIG_MTD_PHYSMAP_BANKWIDTH=4 |
| 393 | # CONFIG_MTD_SOLUTIONENGINE is not set | ||
| 394 | # CONFIG_MTD_UCLINUX is not set | 454 | # CONFIG_MTD_UCLINUX is not set |
| 395 | # CONFIG_MTD_PLATRAM is not set | 455 | # CONFIG_MTD_PLATRAM is not set |
| 396 | 456 | ||
| @@ -418,13 +478,19 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=4 | |||
| 418 | # CONFIG_PARPORT is not set | 478 | # CONFIG_PARPORT is not set |
| 419 | CONFIG_BLK_DEV=y | 479 | CONFIG_BLK_DEV=y |
| 420 | # CONFIG_BLK_DEV_COW_COMMON is not set | 480 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 421 | # CONFIG_BLK_DEV_LOOP is not set | 481 | CONFIG_BLK_DEV_LOOP=y |
| 482 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
| 422 | # CONFIG_BLK_DEV_NBD is not set | 483 | # CONFIG_BLK_DEV_NBD is not set |
| 423 | # CONFIG_BLK_DEV_RAM is not set | 484 | CONFIG_BLK_DEV_RAM=y |
| 485 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
| 486 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
| 487 | # CONFIG_BLK_DEV_XIP is not set | ||
| 424 | # CONFIG_CDROM_PKTCDVD is not set | 488 | # CONFIG_CDROM_PKTCDVD is not set |
| 425 | # CONFIG_ATA_OVER_ETH is not set | 489 | # CONFIG_ATA_OVER_ETH is not set |
| 426 | CONFIG_MISC_DEVICES=y | 490 | CONFIG_MISC_DEVICES=y |
| 427 | # CONFIG_EEPROM_93CX6 is not set | 491 | CONFIG_EEPROM_93CX6=y |
| 492 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
| 493 | CONFIG_HAVE_IDE=y | ||
| 428 | # CONFIG_IDE is not set | 494 | # CONFIG_IDE is not set |
| 429 | 495 | ||
| 430 | # | 496 | # |
| @@ -443,23 +509,30 @@ CONFIG_NETDEVICES=y | |||
| 443 | # CONFIG_MACVLAN is not set | 509 | # CONFIG_MACVLAN is not set |
| 444 | # CONFIG_EQUALIZER is not set | 510 | # CONFIG_EQUALIZER is not set |
| 445 | # CONFIG_TUN is not set | 511 | # CONFIG_TUN is not set |
| 512 | # CONFIG_VETH is not set | ||
| 446 | # CONFIG_PHYLIB is not set | 513 | # CONFIG_PHYLIB is not set |
| 447 | CONFIG_NET_ETHERNET=y | 514 | CONFIG_NET_ETHERNET=y |
| 448 | CONFIG_MII=y | 515 | CONFIG_MII=y |
| 516 | # CONFIG_AX88796 is not set | ||
| 449 | # CONFIG_STNIC is not set | 517 | # CONFIG_STNIC is not set |
| 450 | CONFIG_SMC91X=y | 518 | CONFIG_SMC91X=y |
| 451 | CONFIG_NETDEV_1000=y | 519 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
| 452 | CONFIG_NETDEV_10000=y | 520 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
| 521 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 522 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 523 | # CONFIG_B44 is not set | ||
| 524 | # CONFIG_NETDEV_1000 is not set | ||
| 525 | # CONFIG_NETDEV_10000 is not set | ||
| 453 | 526 | ||
| 454 | # | 527 | # |
| 455 | # Wireless LAN | 528 | # Wireless LAN |
| 456 | # | 529 | # |
| 457 | # CONFIG_WLAN_PRE80211 is not set | 530 | # CONFIG_WLAN_PRE80211 is not set |
| 458 | # CONFIG_WLAN_80211 is not set | 531 | # CONFIG_WLAN_80211 is not set |
| 532 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 459 | # CONFIG_WAN is not set | 533 | # CONFIG_WAN is not set |
| 460 | # CONFIG_PPP is not set | 534 | # CONFIG_PPP is not set |
| 461 | # CONFIG_SLIP is not set | 535 | # CONFIG_SLIP is not set |
| 462 | # CONFIG_SHAPER is not set | ||
| 463 | # CONFIG_NETCONSOLE is not set | 536 | # CONFIG_NETCONSOLE is not set |
| 464 | # CONFIG_NETPOLL is not set | 537 | # CONFIG_NETPOLL is not set |
| 465 | # CONFIG_NET_POLL_CONTROLLER is not set | 538 | # CONFIG_NET_POLL_CONTROLLER is not set |
| @@ -469,28 +542,7 @@ CONFIG_NETDEV_10000=y | |||
| 469 | # | 542 | # |
| 470 | # Input device support | 543 | # Input device support |
| 471 | # | 544 | # |
| 472 | CONFIG_INPUT=y | 545 | # CONFIG_INPUT is not set |
| 473 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
| 474 | # CONFIG_INPUT_POLLDEV is not set | ||
| 475 | |||
| 476 | # | ||
| 477 | # Userland interfaces | ||
| 478 | # | ||
| 479 | # CONFIG_INPUT_MOUSEDEV is not set | ||
| 480 | # CONFIG_INPUT_JOYDEV is not set | ||
| 481 | # CONFIG_INPUT_TSDEV is not set | ||
| 482 | # CONFIG_INPUT_EVDEV is not set | ||
| 483 | # CONFIG_INPUT_EVBUG is not set | ||
| 484 | |||
| 485 | # | ||
| 486 | # Input Device Drivers | ||
| 487 | # | ||
| 488 | # CONFIG_INPUT_KEYBOARD is not set | ||
| 489 | # CONFIG_INPUT_MOUSE is not set | ||
| 490 | # CONFIG_INPUT_JOYSTICK is not set | ||
| 491 | # CONFIG_INPUT_TABLET is not set | ||
| 492 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
| 493 | # CONFIG_INPUT_MISC is not set | ||
| 494 | 546 | ||
| 495 | # | 547 | # |
| 496 | # Hardware I/O ports | 548 | # Hardware I/O ports |
| @@ -502,6 +554,7 @@ CONFIG_INPUT=y | |||
| 502 | # Character devices | 554 | # Character devices |
| 503 | # | 555 | # |
| 504 | # CONFIG_VT is not set | 556 | # CONFIG_VT is not set |
| 557 | # CONFIG_DEVKMEM is not set | ||
| 505 | # CONFIG_SERIAL_NONSTANDARD is not set | 558 | # CONFIG_SERIAL_NONSTANDARD is not set |
| 506 | 559 | ||
| 507 | # | 560 | # |
| @@ -520,106 +573,119 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
| 520 | # CONFIG_UNIX98_PTYS is not set | 573 | # CONFIG_UNIX98_PTYS is not set |
| 521 | # CONFIG_LEGACY_PTYS is not set | 574 | # CONFIG_LEGACY_PTYS is not set |
| 522 | # CONFIG_IPMI_HANDLER is not set | 575 | # CONFIG_IPMI_HANDLER is not set |
| 523 | # CONFIG_WATCHDOG is not set | ||
| 524 | # CONFIG_HW_RANDOM is not set | 576 | # CONFIG_HW_RANDOM is not set |
| 525 | # CONFIG_R3964 is not set | 577 | # CONFIG_R3964 is not set |
| 526 | # CONFIG_RAW_DRIVER is not set | 578 | # CONFIG_RAW_DRIVER is not set |
| 527 | # CONFIG_TCG_TPM is not set | 579 | # CONFIG_TCG_TPM is not set |
| 528 | # CONFIG_I2C is not set | 580 | # CONFIG_I2C is not set |
| 529 | |||
| 530 | # | ||
| 531 | # SPI support | ||
| 532 | # | ||
| 533 | # CONFIG_SPI is not set | 581 | # CONFIG_SPI is not set |
| 534 | # CONFIG_SPI_MASTER is not set | ||
| 535 | # CONFIG_W1 is not set | 582 | # CONFIG_W1 is not set |
| 536 | # CONFIG_POWER_SUPPLY is not set | 583 | # CONFIG_POWER_SUPPLY is not set |
| 537 | # CONFIG_HWMON is not set | 584 | # CONFIG_HWMON is not set |
| 585 | # CONFIG_THERMAL is not set | ||
| 586 | # CONFIG_WATCHDOG is not set | ||
| 587 | |||
| 588 | # | ||
| 589 | # Sonics Silicon Backplane | ||
| 590 | # | ||
| 591 | CONFIG_SSB_POSSIBLE=y | ||
| 592 | # CONFIG_SSB is not set | ||
| 538 | 593 | ||
| 539 | # | 594 | # |
| 540 | # Multifunction device drivers | 595 | # Multifunction device drivers |
| 541 | # | 596 | # |
| 542 | # CONFIG_MFD_SM501 is not set | 597 | # CONFIG_MFD_SM501 is not set |
| 598 | # CONFIG_HTC_PASIC3 is not set | ||
| 543 | 599 | ||
| 544 | # | 600 | # |
| 545 | # Multimedia devices | 601 | # Multimedia devices |
| 546 | # | 602 | # |
| 603 | |||
| 604 | # | ||
| 605 | # Multimedia core support | ||
| 606 | # | ||
| 547 | # CONFIG_VIDEO_DEV is not set | 607 | # CONFIG_VIDEO_DEV is not set |
| 548 | # CONFIG_DVB_CORE is not set | 608 | # CONFIG_DVB_CORE is not set |
| 549 | CONFIG_DAB=y | 609 | # CONFIG_VIDEO_MEDIA is not set |
| 610 | |||
| 611 | # | ||
| 612 | # Multimedia drivers | ||
| 613 | # | ||
| 614 | # CONFIG_DAB is not set | ||
| 550 | 615 | ||
| 551 | # | 616 | # |
| 552 | # Graphics support | 617 | # Graphics support |
| 553 | # | 618 | # |
| 619 | # CONFIG_VGASTATE is not set | ||
| 620 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 621 | # CONFIG_FB is not set | ||
| 554 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 622 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 555 | 623 | ||
| 556 | # | 624 | # |
| 557 | # Display device support | 625 | # Display device support |
| 558 | # | 626 | # |
| 559 | # CONFIG_DISPLAY_SUPPORT is not set | 627 | # CONFIG_DISPLAY_SUPPORT is not set |
| 560 | # CONFIG_VGASTATE is not set | ||
| 561 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
| 562 | # CONFIG_FB is not set | ||
| 563 | 628 | ||
| 564 | # | 629 | # |
| 565 | # Sound | 630 | # Sound |
| 566 | # | 631 | # |
| 567 | # CONFIG_SOUND is not set | 632 | # CONFIG_SOUND is not set |
| 568 | CONFIG_HID_SUPPORT=y | 633 | # CONFIG_USB_SUPPORT is not set |
| 569 | CONFIG_HID=y | ||
| 570 | # CONFIG_HID_DEBUG is not set | ||
| 571 | CONFIG_USB_SUPPORT=y | ||
| 572 | CONFIG_USB_ARCH_HAS_HCD=y | ||
| 573 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
| 574 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 575 | # CONFIG_USB is not set | ||
| 576 | |||
| 577 | # | ||
| 578 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 579 | # | ||
| 580 | |||
| 581 | # | ||
| 582 | # USB Gadget Support | ||
| 583 | # | ||
| 584 | # CONFIG_USB_GADGET is not set | ||
| 585 | # CONFIG_MMC is not set | 634 | # CONFIG_MMC is not set |
| 635 | # CONFIG_MEMSTICK is not set | ||
| 586 | # CONFIG_NEW_LEDS is not set | 636 | # CONFIG_NEW_LEDS is not set |
| 587 | # CONFIG_RTC_CLASS is not set | 637 | # CONFIG_ACCESSIBILITY is not set |
| 638 | CONFIG_RTC_LIB=y | ||
| 639 | CONFIG_RTC_CLASS=y | ||
| 640 | CONFIG_RTC_HCTOSYS=y | ||
| 641 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
| 642 | # CONFIG_RTC_DEBUG is not set | ||
| 588 | 643 | ||
| 589 | # | 644 | # |
| 590 | # DMA Engine support | 645 | # RTC interfaces |
| 591 | # | 646 | # |
| 592 | # CONFIG_DMA_ENGINE is not set | 647 | CONFIG_RTC_INTF_SYSFS=y |
| 648 | CONFIG_RTC_INTF_PROC=y | ||
| 649 | CONFIG_RTC_INTF_DEV=y | ||
| 650 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 651 | # CONFIG_RTC_DRV_TEST is not set | ||
| 593 | 652 | ||
| 594 | # | 653 | # |
| 595 | # DMA Clients | 654 | # SPI RTC drivers |
| 596 | # | 655 | # |
| 597 | 656 | ||
| 598 | # | 657 | # |
| 599 | # DMA Devices | 658 | # Platform RTC drivers |
| 600 | # | 659 | # |
| 660 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 661 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 662 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 663 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 664 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 665 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 666 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 601 | 667 | ||
| 602 | # | 668 | # |
| 603 | # Userspace I/O | 669 | # on-CPU RTC drivers |
| 604 | # | 670 | # |
| 671 | CONFIG_RTC_DRV_SH=y | ||
| 605 | # CONFIG_UIO is not set | 672 | # CONFIG_UIO is not set |
| 606 | 673 | ||
| 607 | # | 674 | # |
| 608 | # File systems | 675 | # File systems |
| 609 | # | 676 | # |
| 610 | # CONFIG_EXT2_FS is not set | 677 | CONFIG_EXT2_FS=y |
| 678 | # CONFIG_EXT2_FS_XATTR is not set | ||
| 611 | # CONFIG_EXT3_FS is not set | 679 | # CONFIG_EXT3_FS is not set |
| 612 | # CONFIG_EXT4DEV_FS is not set | 680 | # CONFIG_EXT4DEV_FS is not set |
| 613 | # CONFIG_REISERFS_FS is not set | 681 | # CONFIG_REISERFS_FS is not set |
| 614 | # CONFIG_JFS_FS is not set | 682 | # CONFIG_JFS_FS is not set |
| 615 | # CONFIG_FS_POSIX_ACL is not set | 683 | # CONFIG_FS_POSIX_ACL is not set |
| 616 | # CONFIG_XFS_FS is not set | 684 | # CONFIG_XFS_FS is not set |
| 617 | # CONFIG_GFS2_FS is not set | 685 | # CONFIG_OCFS2_FS is not set |
| 618 | # CONFIG_MINIX_FS is not set | 686 | # CONFIG_DNOTIFY is not set |
| 619 | CONFIG_ROMFS_FS=y | ||
| 620 | # CONFIG_INOTIFY is not set | 687 | # CONFIG_INOTIFY is not set |
| 621 | # CONFIG_QUOTA is not set | 688 | # CONFIG_QUOTA is not set |
| 622 | # CONFIG_DNOTIFY is not set | ||
| 623 | # CONFIG_AUTOFS_FS is not set | 689 | # CONFIG_AUTOFS_FS is not set |
| 624 | # CONFIG_AUTOFS4_FS is not set | 690 | # CONFIG_AUTOFS4_FS is not set |
| 625 | # CONFIG_FUSE_FS is not set | 691 | # CONFIG_FUSE_FS is not set |
| @@ -642,10 +708,11 @@ CONFIG_ROMFS_FS=y | |||
| 642 | # | 708 | # |
| 643 | CONFIG_PROC_FS=y | 709 | CONFIG_PROC_FS=y |
| 644 | CONFIG_PROC_SYSCTL=y | 710 | CONFIG_PROC_SYSCTL=y |
| 645 | # CONFIG_SYSFS is not set | 711 | CONFIG_SYSFS=y |
| 646 | # CONFIG_TMPFS is not set | 712 | CONFIG_TMPFS=y |
| 713 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
| 647 | # CONFIG_HUGETLB_PAGE is not set | 714 | # CONFIG_HUGETLB_PAGE is not set |
| 648 | CONFIG_RAMFS=y | 715 | CONFIG_CONFIGFS_FS=y |
| 649 | 716 | ||
| 650 | # | 717 | # |
| 651 | # Miscellaneous filesystems | 718 | # Miscellaneous filesystems |
| @@ -658,18 +725,28 @@ CONFIG_RAMFS=y | |||
| 658 | # CONFIG_BFS_FS is not set | 725 | # CONFIG_BFS_FS is not set |
| 659 | # CONFIG_EFS_FS is not set | 726 | # CONFIG_EFS_FS is not set |
| 660 | # CONFIG_JFFS2_FS is not set | 727 | # CONFIG_JFFS2_FS is not set |
| 661 | # CONFIG_CRAMFS is not set | 728 | CONFIG_CRAMFS=y |
| 662 | # CONFIG_VXFS_FS is not set | 729 | # CONFIG_VXFS_FS is not set |
| 730 | # CONFIG_MINIX_FS is not set | ||
| 663 | # CONFIG_HPFS_FS is not set | 731 | # CONFIG_HPFS_FS is not set |
| 664 | # CONFIG_QNX4FS_FS is not set | 732 | # CONFIG_QNX4FS_FS is not set |
| 733 | CONFIG_ROMFS_FS=y | ||
| 665 | # CONFIG_SYSV_FS is not set | 734 | # CONFIG_SYSV_FS is not set |
| 666 | # CONFIG_UFS_FS is not set | 735 | # CONFIG_UFS_FS is not set |
| 667 | 736 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 668 | # | 737 | CONFIG_NFS_FS=y |
| 669 | # Network File Systems | 738 | CONFIG_NFS_V3=y |
| 670 | # | 739 | # CONFIG_NFS_V3_ACL is not set |
| 671 | # CONFIG_NFS_FS is not set | 740 | # CONFIG_NFS_V4 is not set |
| 672 | # CONFIG_NFSD is not set | 741 | # CONFIG_NFSD is not set |
| 742 | CONFIG_ROOT_NFS=y | ||
| 743 | CONFIG_LOCKD=y | ||
| 744 | CONFIG_LOCKD_V4=y | ||
| 745 | CONFIG_NFS_COMMON=y | ||
| 746 | CONFIG_SUNRPC=y | ||
| 747 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 748 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 749 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 673 | # CONFIG_SMB_FS is not set | 750 | # CONFIG_SMB_FS is not set |
| 674 | # CONFIG_CIFS is not set | 751 | # CONFIG_CIFS is not set |
| 675 | # CONFIG_NCP_FS is not set | 752 | # CONFIG_NCP_FS is not set |
| @@ -681,30 +758,20 @@ CONFIG_RAMFS=y | |||
| 681 | # | 758 | # |
| 682 | # CONFIG_PARTITION_ADVANCED is not set | 759 | # CONFIG_PARTITION_ADVANCED is not set |
| 683 | CONFIG_MSDOS_PARTITION=y | 760 | CONFIG_MSDOS_PARTITION=y |
| 684 | |||
| 685 | # | ||
| 686 | # Native Language Support | ||
| 687 | # | ||
| 688 | # CONFIG_NLS is not set | 761 | # CONFIG_NLS is not set |
| 689 | 762 | # CONFIG_DLM is not set | |
| 690 | # | ||
| 691 | # Distributed Lock Manager | ||
| 692 | # | ||
| 693 | |||
| 694 | # | ||
| 695 | # Profiling support | ||
| 696 | # | ||
| 697 | CONFIG_PROFILING=y | ||
| 698 | # CONFIG_OPROFILE is not set | ||
| 699 | 763 | ||
| 700 | # | 764 | # |
| 701 | # Kernel hacking | 765 | # Kernel hacking |
| 702 | # | 766 | # |
| 703 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 767 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 704 | # CONFIG_PRINTK_TIME is not set | 768 | # CONFIG_PRINTK_TIME is not set |
| 769 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
| 705 | # CONFIG_ENABLE_MUST_CHECK is not set | 770 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 771 | CONFIG_FRAME_WARN=1024 | ||
| 706 | # CONFIG_MAGIC_SYSRQ is not set | 772 | # CONFIG_MAGIC_SYSRQ is not set |
| 707 | # CONFIG_UNUSED_SYMBOLS is not set | 773 | # CONFIG_UNUSED_SYMBOLS is not set |
| 774 | CONFIG_DEBUG_FS=y | ||
| 708 | # CONFIG_HEADERS_CHECK is not set | 775 | # CONFIG_HEADERS_CHECK is not set |
| 709 | CONFIG_DEBUG_KERNEL=y | 776 | CONFIG_DEBUG_KERNEL=y |
| 710 | # CONFIG_DEBUG_SHIRQ is not set | 777 | # CONFIG_DEBUG_SHIRQ is not set |
| @@ -712,7 +779,10 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
| 712 | CONFIG_SCHED_DEBUG=y | 779 | CONFIG_SCHED_DEBUG=y |
| 713 | # CONFIG_SCHEDSTATS is not set | 780 | # CONFIG_SCHEDSTATS is not set |
| 714 | # CONFIG_TIMER_STATS is not set | 781 | # CONFIG_TIMER_STATS is not set |
| 715 | CONFIG_SLUB_DEBUG_ON=y | 782 | # CONFIG_DEBUG_OBJECTS is not set |
| 783 | CONFIG_DEBUG_PREEMPT=y | ||
| 784 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
| 785 | # CONFIG_RT_MUTEX_TESTER is not set | ||
| 716 | # CONFIG_DEBUG_SPINLOCK is not set | 786 | # CONFIG_DEBUG_SPINLOCK is not set |
| 717 | # CONFIG_DEBUG_MUTEXES is not set | 787 | # CONFIG_DEBUG_MUTEXES is not set |
| 718 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 788 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
| @@ -722,38 +792,123 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y | |||
| 722 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 792 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
| 723 | # CONFIG_DEBUG_KOBJECT is not set | 793 | # CONFIG_DEBUG_KOBJECT is not set |
| 724 | CONFIG_DEBUG_BUGVERBOSE=y | 794 | CONFIG_DEBUG_BUGVERBOSE=y |
| 725 | CONFIG_DEBUG_INFO=y | 795 | # CONFIG_DEBUG_INFO is not set |
| 726 | # CONFIG_DEBUG_VM is not set | 796 | CONFIG_DEBUG_VM=y |
| 727 | # CONFIG_DEBUG_LIST is not set | 797 | # CONFIG_DEBUG_WRITECOUNT is not set |
| 798 | CONFIG_DEBUG_LIST=y | ||
| 799 | # CONFIG_DEBUG_SG is not set | ||
| 728 | CONFIG_FRAME_POINTER=y | 800 | CONFIG_FRAME_POINTER=y |
| 729 | CONFIG_FORCED_INLINING=y | 801 | # CONFIG_BOOT_PRINTK_DELAY is not set |
| 802 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 803 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 730 | # CONFIG_FAULT_INJECTION is not set | 804 | # CONFIG_FAULT_INJECTION is not set |
| 805 | # CONFIG_SAMPLES is not set | ||
| 731 | # CONFIG_SH_STANDARD_BIOS is not set | 806 | # CONFIG_SH_STANDARD_BIOS is not set |
| 732 | CONFIG_EARLY_SCIF_CONSOLE=y | 807 | # CONFIG_EARLY_SCIF_CONSOLE is not set |
| 733 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xfffe9800 | ||
| 734 | CONFIG_EARLY_PRINTK=y | ||
| 735 | # CONFIG_DEBUG_BOOTMEM is not set | 808 | # CONFIG_DEBUG_BOOTMEM is not set |
| 736 | CONFIG_DEBUG_STACKOVERFLOW=y | 809 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 737 | CONFIG_DEBUG_STACK_USAGE=y | 810 | CONFIG_DEBUG_STACK_USAGE=y |
| 738 | # CONFIG_4KSTACKS is not set | 811 | # CONFIG_IRQSTACKS is not set |
| 739 | 812 | ||
| 740 | # | 813 | # |
| 741 | # Security options | 814 | # Security options |
| 742 | # | 815 | # |
| 743 | # CONFIG_KEYS is not set | 816 | # CONFIG_KEYS is not set |
| 744 | # CONFIG_CRYPTO is not set | 817 | # CONFIG_SECURITY is not set |
| 818 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
| 819 | CONFIG_CRYPTO=y | ||
| 820 | |||
| 821 | # | ||
| 822 | # Crypto core or helper | ||
| 823 | # | ||
| 824 | CONFIG_CRYPTO_ALGAPI=y | ||
| 825 | # CONFIG_CRYPTO_MANAGER is not set | ||
| 826 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 827 | # CONFIG_CRYPTO_NULL is not set | ||
| 828 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 829 | # CONFIG_CRYPTO_AUTHENC is not set | ||
| 830 | # CONFIG_CRYPTO_TEST is not set | ||
| 831 | |||
| 832 | # | ||
| 833 | # Authenticated Encryption with Associated Data | ||
| 834 | # | ||
| 835 | # CONFIG_CRYPTO_CCM is not set | ||
| 836 | # CONFIG_CRYPTO_GCM is not set | ||
| 837 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 838 | |||
| 839 | # | ||
| 840 | # Block modes | ||
| 841 | # | ||
| 842 | # CONFIG_CRYPTO_CBC is not set | ||
| 843 | # CONFIG_CRYPTO_CTR is not set | ||
| 844 | # CONFIG_CRYPTO_CTS is not set | ||
| 845 | # CONFIG_CRYPTO_ECB is not set | ||
| 846 | # CONFIG_CRYPTO_LRW is not set | ||
| 847 | # CONFIG_CRYPTO_PCBC is not set | ||
| 848 | # CONFIG_CRYPTO_XTS is not set | ||
| 849 | |||
| 850 | # | ||
| 851 | # Hash modes | ||
| 852 | # | ||
| 853 | # CONFIG_CRYPTO_HMAC is not set | ||
| 854 | # CONFIG_CRYPTO_XCBC is not set | ||
| 855 | |||
| 856 | # | ||
| 857 | # Digest | ||
| 858 | # | ||
| 859 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 860 | # CONFIG_CRYPTO_MD4 is not set | ||
| 861 | # CONFIG_CRYPTO_MD5 is not set | ||
| 862 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 863 | # CONFIG_CRYPTO_SHA1 is not set | ||
| 864 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 865 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 866 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 867 | # CONFIG_CRYPTO_WP512 is not set | ||
| 868 | |||
| 869 | # | ||
| 870 | # Ciphers | ||
| 871 | # | ||
| 872 | # CONFIG_CRYPTO_AES is not set | ||
| 873 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 874 | # CONFIG_CRYPTO_ARC4 is not set | ||
| 875 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 876 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 877 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 878 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 879 | # CONFIG_CRYPTO_DES is not set | ||
| 880 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 881 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 882 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 883 | # CONFIG_CRYPTO_SEED is not set | ||
| 884 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 885 | # CONFIG_CRYPTO_TEA is not set | ||
| 886 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 887 | |||
| 888 | # | ||
| 889 | # Compression | ||
| 890 | # | ||
| 891 | CONFIG_CRYPTO_DEFLATE=y | ||
| 892 | CONFIG_CRYPTO_LZO=y | ||
| 893 | # CONFIG_CRYPTO_HW is not set | ||
| 745 | 894 | ||
| 746 | # | 895 | # |
| 747 | # Library routines | 896 | # Library routines |
| 748 | # | 897 | # |
| 749 | CONFIG_BITREVERSE=y | 898 | CONFIG_BITREVERSE=y |
| 750 | # CONFIG_CRC_CCITT is not set | 899 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
| 751 | # CONFIG_CRC16 is not set | 900 | CONFIG_CRC_CCITT=y |
| 752 | # CONFIG_CRC_ITU_T is not set | 901 | CONFIG_CRC16=y |
| 902 | CONFIG_CRC_ITU_T=y | ||
| 753 | CONFIG_CRC32=y | 903 | CONFIG_CRC32=y |
| 754 | # CONFIG_CRC7 is not set | 904 | CONFIG_CRC7=y |
| 755 | # CONFIG_LIBCRC32C is not set | 905 | CONFIG_LIBCRC32C=y |
| 906 | CONFIG_AUDIT_GENERIC=y | ||
| 756 | CONFIG_ZLIB_INFLATE=y | 907 | CONFIG_ZLIB_INFLATE=y |
| 908 | CONFIG_ZLIB_DEFLATE=y | ||
| 909 | CONFIG_LZO_COMPRESS=y | ||
| 910 | CONFIG_LZO_DECOMPRESS=y | ||
| 911 | CONFIG_PLIST=y | ||
| 757 | CONFIG_HAS_IOMEM=y | 912 | CONFIG_HAS_IOMEM=y |
| 758 | CONFIG_HAS_IOPORT=y | 913 | CONFIG_HAS_IOPORT=y |
| 759 | CONFIG_HAS_DMA=y | 914 | CONFIG_HAS_DMA=y |
diff --git a/arch/sh/configs/se7705_defconfig b/arch/sh/configs/se7705_defconfig index 84717d854867..490dcbc2ce33 100644 --- a/arch/sh/configs/se7705_defconfig +++ b/arch/sh/configs/se7705_defconfig | |||
| @@ -239,7 +239,6 @@ CONFIG_CPU_HAS_SR_RB=y | |||
| 239 | # | 239 | # |
| 240 | CONFIG_SH_TMU=y | 240 | CONFIG_SH_TMU=y |
| 241 | CONFIG_SH_TIMER_IRQ=16 | 241 | CONFIG_SH_TIMER_IRQ=16 |
| 242 | # CONFIG_NO_IDLE_HZ is not set | ||
| 243 | CONFIG_SH_PCLK_FREQ=33333333 | 242 | CONFIG_SH_PCLK_FREQ=33333333 |
| 244 | 243 | ||
| 245 | # | 244 | # |
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig index 240a1cef69aa..2dd83af988f0 100644 --- a/arch/sh/configs/se7712_defconfig +++ b/arch/sh/configs/se7712_defconfig | |||
| @@ -236,7 +236,6 @@ CONFIG_CPU_HAS_SR_RB=y | |||
| 236 | # | 236 | # |
| 237 | CONFIG_SH_TMU=y | 237 | CONFIG_SH_TMU=y |
| 238 | CONFIG_SH_TIMER_IRQ=16 | 238 | CONFIG_SH_TIMER_IRQ=16 |
| 239 | # CONFIG_NO_IDLE_HZ is not set | ||
| 240 | CONFIG_SH_PCLK_FREQ=66666666 | 239 | CONFIG_SH_PCLK_FREQ=66666666 |
| 241 | 240 | ||
| 242 | # | 241 | # |
diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defconfig index c60b6fd4fc42..167786f9a9bd 100644 --- a/arch/sh/configs/se7750_defconfig +++ b/arch/sh/configs/se7750_defconfig | |||
| @@ -235,7 +235,6 @@ CONFIG_CPU_HAS_PTEA=y | |||
| 235 | # | 235 | # |
| 236 | CONFIG_SH_TMU=y | 236 | CONFIG_SH_TMU=y |
| 237 | CONFIG_SH_TIMER_IRQ=16 | 237 | CONFIG_SH_TIMER_IRQ=16 |
| 238 | # CONFIG_NO_IDLE_HZ is not set | ||
| 239 | CONFIG_SH_PCLK_FREQ=33333333 | 238 | CONFIG_SH_PCLK_FREQ=33333333 |
| 240 | 239 | ||
| 241 | # | 240 | # |
diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c index ab77b0e0fa0e..938817e34e2b 100644 --- a/arch/sh/drivers/heartbeat.c +++ b/arch/sh/drivers/heartbeat.c | |||
| @@ -154,4 +154,4 @@ module_exit(heartbeat_exit); | |||
| 154 | 154 | ||
| 155 | MODULE_VERSION(DRV_VERSION); | 155 | MODULE_VERSION(DRV_VERSION); |
| 156 | MODULE_AUTHOR("Paul Mundt"); | 156 | MODULE_AUTHOR("Paul Mundt"); |
| 157 | MODULE_LICENSE("GPLv2"); | 157 | MODULE_LICENSE("GPL v2"); |
diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c index de45c6a3e33b..79baa47af977 100644 --- a/arch/sh/kernel/cpu/irq/intc-sh5.c +++ b/arch/sh/kernel/cpu/irq/intc-sh5.c | |||
| @@ -242,6 +242,7 @@ void __init plat_irq_setup(void) | |||
| 242 | reg += 8; | 242 | reg += 8; |
| 243 | } | 243 | } |
| 244 | } | 244 | } |
| 245 | } | ||
| 245 | #endif | 246 | #endif |
| 246 | 247 | ||
| 247 | /* | 248 | /* |
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c index ebceb0dadff5..be4926969181 100644 --- a/arch/sh/kernel/cpu/sh4/probe.c +++ b/arch/sh/kernel/cpu/sh4/probe.c | |||
| @@ -132,6 +132,7 @@ int __init detect_cpu_and_cache_system(void) | |||
| 132 | 132 | ||
| 133 | switch (prr) { | 133 | switch (prr) { |
| 134 | case 0x50: | 134 | case 0x50: |
| 135 | case 0x51: | ||
| 135 | boot_cpu_data.type = CPU_SH7723; | 136 | boot_cpu_data.type = CPU_SH7723; |
| 136 | boot_cpu_data.flags |= CPU_HAS_FPU | CPU_HAS_L2_CACHE; | 137 | boot_cpu_data.flags |= CPU_HAS_FPU | CPU_HAS_L2_CACHE; |
| 137 | break; | 138 | break; |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c index 805535aa505e..27fa81bef6a0 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c | |||
| @@ -26,7 +26,7 @@ static int pfc_divisors[] = { 1, 1, 1, 1, 1, 1, 1, 18, | |||
| 26 | 26 | ||
| 27 | static void master_clk_init(struct clk *clk) | 27 | static void master_clk_init(struct clk *clk) |
| 28 | { | 28 | { |
| 29 | clk->rate *= 36; | 29 | clk->rate *= pfc_divisors[ctrl_inl(FRQMR1) & 0x000f]; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | static struct clk_ops sh7785_master_clk_ops = { | 32 | static struct clk_ops sh7785_master_clk_ops = { |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index 069314037049..62ebccf18b3c 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | static struct resource usbf_resources[] = { | 17 | static struct resource usbf_resources[] = { |
| 18 | [0] = { | 18 | [0] = { |
| 19 | .name = "USBF", | 19 | .name = "m66592_udc", |
| 20 | .start = 0x04480000, | 20 | .start = 0x04480000, |
| 21 | .end = 0x044800FF, | 21 | .end = 0x044800FF, |
| 22 | .flags = IORESOURCE_MEM, | 22 | .flags = IORESOURCE_MEM, |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index 16925cf28db8..a0470f2f5479 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
| @@ -16,6 +16,21 @@ | |||
| 16 | 16 | ||
| 17 | static struct plat_sci_port sci_platform_data[] = { | 17 | static struct plat_sci_port sci_platform_data[] = { |
| 18 | { | 18 | { |
| 19 | .mapbase = 0xffe00000, | ||
| 20 | .flags = UPF_BOOT_AUTOCONF, | ||
| 21 | .type = PORT_SCIF, | ||
| 22 | .irqs = { 80, 80, 80, 80 }, | ||
| 23 | },{ | ||
| 24 | .mapbase = 0xffe10000, | ||
| 25 | .flags = UPF_BOOT_AUTOCONF, | ||
| 26 | .type = PORT_SCIF, | ||
| 27 | .irqs = { 81, 81, 81, 81 }, | ||
| 28 | },{ | ||
| 29 | .mapbase = 0xffe20000, | ||
| 30 | .flags = UPF_BOOT_AUTOCONF, | ||
| 31 | .type = PORT_SCIF, | ||
| 32 | .irqs = { 82, 82, 82, 82 }, | ||
| 33 | },{ | ||
| 19 | .mapbase = 0xa4e30000, | 34 | .mapbase = 0xa4e30000, |
| 20 | .flags = UPF_BOOT_AUTOCONF, | 35 | .flags = UPF_BOOT_AUTOCONF, |
| 21 | .type = PORT_SCI, | 36 | .type = PORT_SCI, |
| @@ -73,9 +88,35 @@ static struct platform_device rtc_device = { | |||
| 73 | .resource = rtc_resources, | 88 | .resource = rtc_resources, |
| 74 | }; | 89 | }; |
| 75 | 90 | ||
| 91 | static struct resource sh7723_usb_host_resources[] = { | ||
| 92 | [0] = { | ||
| 93 | .name = "r8a66597_hcd", | ||
| 94 | .start = 0xa4d80000, | ||
| 95 | .end = 0xa4d800ff, | ||
| 96 | .flags = IORESOURCE_MEM, | ||
| 97 | }, | ||
| 98 | [1] = { | ||
| 99 | .start = 65, | ||
| 100 | .end = 65, | ||
| 101 | .flags = IORESOURCE_IRQ, | ||
| 102 | }, | ||
| 103 | }; | ||
| 104 | |||
| 105 | static struct platform_device sh7723_usb_host_device = { | ||
| 106 | .name = "r8a66597_hcd", | ||
| 107 | .id = 0, | ||
| 108 | .dev = { | ||
| 109 | .dma_mask = NULL, /* not use dma */ | ||
| 110 | .coherent_dma_mask = 0xffffffff, | ||
| 111 | }, | ||
| 112 | .num_resources = ARRAY_SIZE(sh7723_usb_host_resources), | ||
| 113 | .resource = sh7723_usb_host_resources, | ||
| 114 | }; | ||
| 115 | |||
| 76 | static struct platform_device *sh7723_devices[] __initdata = { | 116 | static struct platform_device *sh7723_devices[] __initdata = { |
| 77 | &sci_device, | 117 | &sci_device, |
| 78 | &rtc_device, | 118 | &rtc_device, |
| 119 | &sh7723_usb_host_device, | ||
| 79 | }; | 120 | }; |
| 80 | 121 | ||
| 81 | static int __init sh7723_devices_setup(void) | 122 | static int __init sh7723_devices_setup(void) |
| @@ -153,7 +194,7 @@ static struct intc_vect vectors[] __initdata = { | |||
| 153 | INTC_VECT(VIO_VOUI,0x8E0), | 194 | INTC_VECT(VIO_VOUI,0x8E0), |
| 154 | 195 | ||
| 155 | INTC_VECT(SCIFA_SCIFA0,0x900), | 196 | INTC_VECT(SCIFA_SCIFA0,0x900), |
| 156 | INTC_VECT(VPU_VPUI,0x920), | 197 | INTC_VECT(VPU_VPUI,0x980), |
| 157 | INTC_VECT(TPU_TPUI,0x9A0), | 198 | INTC_VECT(TPU_TPUI,0x9A0), |
| 158 | INTC_VECT(ADC_ADI,0x9E0), | 199 | INTC_VECT(ADC_ADI,0x9E0), |
| 159 | INTC_VECT(USB_USI0,0xA20), | 200 | INTC_VECT(USB_USI0,0xA20), |
| @@ -292,9 +333,3 @@ void __init plat_irq_setup(void) | |||
| 292 | { | 333 | { |
| 293 | register_intc_controller(&intc_desc); | 334 | register_intc_controller(&intc_desc); |
| 294 | } | 335 | } |
| 295 | |||
| 296 | void __init plat_mem_setup(void) | ||
| 297 | { | ||
| 298 | /* Register the URAM space as Node 1 */ | ||
| 299 | setup_bootmem_node(1, 0x055f0000, 0x05610000); | ||
| 300 | } | ||
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c index ae2b22219f02..f189a559462b 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7763.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7763.c | |||
| @@ -291,8 +291,9 @@ static struct intc_sense_reg irq_sense_registers[] __initdata = { | |||
| 291 | }; | 291 | }; |
| 292 | 292 | ||
| 293 | static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors, | 293 | static DECLARE_INTC_DESC(intc_irq_desc, "sh7763-irq", irq_vectors, |
| 294 | NULL, NULL, irq_mask_registers, irq_prio_registers, | 294 | NULL, irq_mask_registers, irq_prio_registers, |
| 295 | irq_sense_registers); | 295 | irq_sense_registers); |
| 296 | |||
| 296 | 297 | ||
| 297 | /* External interrupt pins in IRL mode */ | 298 | /* External interrupt pins in IRL mode */ |
| 298 | static struct intc_vect irl_vectors[] __initdata = { | 299 | static struct intc_vect irl_vectors[] __initdata = { |
| @@ -324,10 +325,10 @@ static struct intc_mask_reg irl7654_mask_registers[] __initdata = { | |||
| 324 | }; | 325 | }; |
| 325 | 326 | ||
| 326 | static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7763-irl7654", irl_vectors, | 327 | static DECLARE_INTC_DESC(intc_irl7654_desc, "sh7763-irl7654", irl_vectors, |
| 327 | NULL, NULL, irl7654_mask_registers, NULL, NULL); | 328 | NULL, irl7654_mask_registers, NULL, NULL); |
| 328 | 329 | ||
| 329 | static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7763-irl3210", irl_vectors, | 330 | static DECLARE_INTC_DESC(intc_irl3210_desc, "sh7763-irl3210", irl_vectors, |
| 330 | NULL, NULL, irl3210_mask_registers, NULL, NULL); | 331 | NULL, irl3210_mask_registers, NULL, NULL); |
| 331 | 332 | ||
| 332 | #define INTC_ICR0 0xffd00000 | 333 | #define INTC_ICR0 0xffd00000 |
| 333 | #define INTC_INTMSK0 0xffd00044 | 334 | #define INTC_INTMSK0 0xffd00044 |
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 926b2e7b11c1..718bd2356b34 100644 --- a/arch/sh/kernel/entry-common.S +++ b/arch/sh/kernel/entry-common.S | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | /* $Id: entry.S,v 1.37 2004/06/11 13:02:46 doyu Exp $ | 1 | /* |
| 2 | * | ||
| 3 | * linux/arch/sh/entry.S | ||
| 4 | * | ||
| 5 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka | 2 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka |
| 6 | * Copyright (C) 2003 Paul Mundt | 3 | * Copyright (C) 2003 - 2008 Paul Mundt |
| 7 | * | 4 | * |
| 8 | * This file is subject to the terms and conditions of the GNU General Public | 5 | * This file is subject to the terms and conditions of the GNU General Public |
| 9 | * License. See the file "COPYING" in the main directory of this archive | 6 | * License. See the file "COPYING" in the main directory of this archive |
| @@ -262,6 +259,7 @@ __restore_all: | |||
| 262 | 259 | ||
| 263 | .align 2 | 260 | .align 2 |
| 264 | syscall_badsys: ! Bad syscall number | 261 | syscall_badsys: ! Bad syscall number |
| 262 | get_current_thread_info r8, r0 | ||
| 265 | mov #-ENOSYS, r0 | 263 | mov #-ENOSYS, r0 |
| 266 | bra resume_userspace | 264 | bra resume_userspace |
| 267 | mov.l r0, @(OFF_R0,r15) ! Return value | 265 | mov.l r0, @(OFF_R0,r15) ! Return value |
| @@ -281,7 +279,9 @@ debug_trap: | |||
| 281 | mov.l 1f, r8 | 279 | mov.l 1f, r8 |
| 282 | add r0, r8 | 280 | add r0, r8 |
| 283 | mov.l @r8, r8 | 281 | mov.l @r8, r8 |
| 284 | jmp @r8 | 282 | jsr @r8 |
| 283 | nop | ||
| 284 | bra __restore_all | ||
| 285 | nop | 285 | nop |
| 286 | 286 | ||
| 287 | .align 2 | 287 | .align 2 |
diff --git a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S index d67d7ed09f22..ae0a382a82eb 100644 --- a/arch/sh/kernel/head_32.S +++ b/arch/sh/kernel/head_32.S | |||
| @@ -30,8 +30,8 @@ ENTRY(empty_zero_page) | |||
| 30 | .long 0 /* RAMDISK_FLAGS */ | 30 | .long 0 /* RAMDISK_FLAGS */ |
| 31 | .long 0x0200 /* ORIG_ROOT_DEV */ | 31 | .long 0x0200 /* ORIG_ROOT_DEV */ |
| 32 | .long 1 /* LOADER_TYPE */ | 32 | .long 1 /* LOADER_TYPE */ |
| 33 | .long 0x00360000 /* INITRD_START */ | 33 | .long 0x00000000 /* INITRD_START */ |
| 34 | .long 0x000a0000 /* INITRD_SIZE */ | 34 | .long 0x00000000 /* INITRD_SIZE */ |
| 35 | #ifdef CONFIG_32BIT | 35 | #ifdef CONFIG_32BIT |
| 36 | .long 0x53453f00 + 32 /* "SE?" = 32 bit */ | 36 | .long 0x53453f00 + 32 /* "SE?" = 32 bit */ |
| 37 | #else | 37 | #else |
diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c index f9bcc606127e..b151a25cb14d 100644 --- a/arch/sh/kernel/init_task.c +++ b/arch/sh/kernel/init_task.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <asm/pgtable.h> | 8 | #include <asm/pgtable.h> |
| 9 | 9 | ||
| 10 | static struct fs_struct init_fs = INIT_FS; | 10 | static struct fs_struct init_fs = INIT_FS; |
| 11 | static struct files_struct init_files = INIT_FILES; | ||
| 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 11 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 12 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 14 | struct pt_regs fake_swapper_regs; | 13 | struct pt_regs fake_swapper_regs; |
diff --git a/arch/sh/kernel/kgdb_stub.c b/arch/sh/kernel/kgdb_stub.c index 832641bbd47d..bf8ac4c71640 100644 --- a/arch/sh/kernel/kgdb_stub.c +++ b/arch/sh/kernel/kgdb_stub.c | |||
| @@ -274,8 +274,7 @@ static char *mem_to_hex(const char *mem, char *buf, const int count) | |||
| 274 | } | 274 | } |
| 275 | for (i = 0; i < count; i++) { | 275 | for (i = 0; i < count; i++) { |
| 276 | ch = *mem++; | 276 | ch = *mem++; |
| 277 | *buf++ = highhex(ch); | 277 | buf = pack_hex_byte(buf, ch); |
| 278 | *buf++ = lowhex(ch); | ||
| 279 | } | 278 | } |
| 280 | *buf = 0; | 279 | *buf = 0; |
| 281 | return (buf); | 280 | return (buf); |
| @@ -427,8 +426,8 @@ static void put_packet(char *buffer) | |||
| 427 | 426 | ||
| 428 | /* '#' Separator, put high and low components of checksum */ | 427 | /* '#' Separator, put high and low components of checksum */ |
| 429 | put_debug_char('#'); | 428 | put_debug_char('#'); |
| 430 | put_debug_char(highhex(checksum)); | 429 | put_debug_char(hex_asc_hi(checksum)); |
| 431 | put_debug_char(lowhex(checksum)); | 430 | put_debug_char(hex_asc_lo(checksum)); |
| 432 | } | 431 | } |
| 433 | while ((get_debug_char()) != '+'); /* While no ack */ | 432 | while ((get_debug_char()) != '+'); /* While no ack */ |
| 434 | } | 433 | } |
| @@ -650,8 +649,8 @@ static void undo_single_step(void) | |||
| 650 | static void send_signal_msg(const int signum) | 649 | static void send_signal_msg(const int signum) |
| 651 | { | 650 | { |
| 652 | out_buffer[0] = 'S'; | 651 | out_buffer[0] = 'S'; |
| 653 | out_buffer[1] = highhex(signum); | 652 | out_buffer[1] = hex_asc_hi(signum); |
| 654 | out_buffer[2] = lowhex(signum); | 653 | out_buffer[2] = hex_asc_lo(signum); |
| 655 | out_buffer[3] = 0; | 654 | out_buffer[3] = 0; |
| 656 | put_packet(out_buffer); | 655 | put_packet(out_buffer); |
| 657 | } | 656 | } |
diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c index b3d0a03b4c76..5482e65375a9 100644 --- a/arch/sh/kernel/module.c +++ b/arch/sh/kernel/module.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/fs.h> | 30 | #include <linux/fs.h> |
| 31 | #include <linux/string.h> | 31 | #include <linux/string.h> |
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <asm/unaligned.h> | ||
| 33 | 34 | ||
| 34 | void *module_alloc(unsigned long size) | 35 | void *module_alloc(unsigned long size) |
| 35 | { | 36 | { |
| @@ -56,34 +57,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, | |||
| 56 | return 0; | 57 | return 0; |
| 57 | } | 58 | } |
| 58 | 59 | ||
| 59 | #ifdef CONFIG_SUPERH32 | ||
| 60 | #define COPY_UNALIGNED_WORD(sw, tw, align) \ | ||
| 61 | { \ | ||
| 62 | void *__s = &(sw), *__t = &(tw); \ | ||
| 63 | unsigned short *__s2 = __s, *__t2 = __t; \ | ||
| 64 | unsigned char *__s1 = __s, *__t1 = __t; \ | ||
| 65 | switch ((align)) \ | ||
| 66 | { \ | ||
| 67 | case 0: \ | ||
| 68 | *(unsigned long *) __t = *(unsigned long *) __s; \ | ||
| 69 | break; \ | ||
| 70 | case 2: \ | ||
| 71 | *__t2++ = *__s2++; \ | ||
| 72 | *__t2 = *__s2; \ | ||
| 73 | break; \ | ||
| 74 | default: \ | ||
| 75 | *__t1++ = *__s1++; \ | ||
| 76 | *__t1++ = *__s1++; \ | ||
| 77 | *__t1++ = *__s1++; \ | ||
| 78 | *__t1 = *__s1; \ | ||
| 79 | break; \ | ||
| 80 | } \ | ||
| 81 | } | ||
| 82 | #else | ||
| 83 | /* One thing SHmedia doesn't screw up! */ | ||
| 84 | #define COPY_UNALIGNED_WORD(sw, tw, align) { (tw) = (sw); } | ||
| 85 | #endif | ||
| 86 | |||
| 87 | int apply_relocate_add(Elf32_Shdr *sechdrs, | 60 | int apply_relocate_add(Elf32_Shdr *sechdrs, |
| 88 | const char *strtab, | 61 | const char *strtab, |
| 89 | unsigned int symindex, | 62 | unsigned int symindex, |
| @@ -96,7 +69,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
| 96 | Elf32_Addr relocation; | 69 | Elf32_Addr relocation; |
| 97 | uint32_t *location; | 70 | uint32_t *location; |
| 98 | uint32_t value; | 71 | uint32_t value; |
| 99 | int align; | ||
| 100 | 72 | ||
| 101 | pr_debug("Applying relocate section %u to %u\n", relsec, | 73 | pr_debug("Applying relocate section %u to %u\n", relsec, |
| 102 | sechdrs[relsec].sh_info); | 74 | sechdrs[relsec].sh_info); |
| @@ -109,7 +81,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
| 109 | sym = (Elf32_Sym *)sechdrs[symindex].sh_addr | 81 | sym = (Elf32_Sym *)sechdrs[symindex].sh_addr |
| 110 | + ELF32_R_SYM(rel[i].r_info); | 82 | + ELF32_R_SYM(rel[i].r_info); |
| 111 | relocation = sym->st_value + rel[i].r_addend; | 83 | relocation = sym->st_value + rel[i].r_addend; |
| 112 | align = (int)location & 3; | ||
| 113 | 84 | ||
| 114 | #ifdef CONFIG_SUPERH64 | 85 | #ifdef CONFIG_SUPERH64 |
| 115 | /* For text addresses, bit2 of the st_other field indicates | 86 | /* For text addresses, bit2 of the st_other field indicates |
| @@ -122,15 +93,15 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, | |||
| 122 | 93 | ||
| 123 | switch (ELF32_R_TYPE(rel[i].r_info)) { | 94 | switch (ELF32_R_TYPE(rel[i].r_info)) { |
| 124 | case R_SH_DIR32: | 95 | case R_SH_DIR32: |
| 125 | COPY_UNALIGNED_WORD (*location, value, align); | 96 | value = get_unaligned(location); |
| 126 | value += relocation; | 97 | value += relocation; |
| 127 | COPY_UNALIGNED_WORD (value, *location, align); | 98 | put_unaligned(value, location); |
| 128 | break; | 99 | break; |
| 129 | case R_SH_REL32: | 100 | case R_SH_REL32: |
| 130 | relocation = (relocation - (Elf32_Addr) location); | 101 | relocation = (relocation - (Elf32_Addr) location); |
| 131 | COPY_UNALIGNED_WORD (*location, value, align); | 102 | value = get_unaligned(location); |
| 132 | value += relocation; | 103 | value += relocation; |
| 133 | COPY_UNALIGNED_WORD (value, *location, align); | 104 | put_unaligned(value, location); |
| 134 | break; | 105 | break; |
| 135 | case R_SH_IMM_LOW16: | 106 | case R_SH_IMM_LOW16: |
| 136 | *location = (*location & ~0x3fffc00) | | 107 | *location = (*location & ~0x3fffc00) | |
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 516bde9c50fa..bca2bbc575db 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
| @@ -292,6 +292,17 @@ void __init setup_arch(char **cmdline_p) | |||
| 292 | 292 | ||
| 293 | ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); | 293 | ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV); |
| 294 | 294 | ||
| 295 | printk(KERN_NOTICE "Boot params:\n" | ||
| 296 | "... MOUNT_ROOT_RDONLY - %08lx\n" | ||
| 297 | "... RAMDISK_FLAGS - %08lx\n" | ||
| 298 | "... ORIG_ROOT_DEV - %08lx\n" | ||
| 299 | "... LOADER_TYPE - %08lx\n" | ||
| 300 | "... INITRD_START - %08lx\n" | ||
| 301 | "... INITRD_SIZE - %08lx\n", | ||
| 302 | MOUNT_ROOT_RDONLY, RAMDISK_FLAGS, | ||
| 303 | ORIG_ROOT_DEV, LOADER_TYPE, | ||
| 304 | INITRD_START, INITRD_SIZE); | ||
| 305 | |||
| 295 | #ifdef CONFIG_BLK_DEV_RAM | 306 | #ifdef CONFIG_BLK_DEV_RAM |
| 296 | rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; | 307 | rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK; |
| 297 | rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0); | 308 | rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0); |
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index a3bdc68ef02c..438f1ebcc453 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <linux/kdebug.h> | 4 | #include <linux/kdebug.h> |
| 5 | #include <linux/signal.h> | 5 | #include <linux/signal.h> |
| 6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 7 | #include <linux/uaccess.h> | ||
| 7 | #include <asm/system.h> | 8 | #include <asm/system.h> |
| 8 | 9 | ||
| 9 | #ifdef CONFIG_BUG | 10 | #ifdef CONFIG_BUG |
| @@ -21,7 +22,14 @@ static void handle_BUG(struct pt_regs *regs) | |||
| 21 | 22 | ||
| 22 | int is_valid_bugaddr(unsigned long addr) | 23 | int is_valid_bugaddr(unsigned long addr) |
| 23 | { | 24 | { |
| 24 | return addr >= PAGE_OFFSET; | 25 | unsigned short opcode; |
| 26 | |||
| 27 | if (addr < PAGE_OFFSET) | ||
| 28 | return 0; | ||
| 29 | if (probe_kernel_address((u16 *)addr, opcode)) | ||
| 30 | return 0; | ||
| 31 | |||
| 32 | return opcode == TRAPA_BUG_OPCODE; | ||
| 25 | } | 33 | } |
| 26 | #endif | 34 | #endif |
| 27 | 35 | ||
diff --git a/arch/sh/lib/memcpy-sh4.S b/arch/sh/lib/memcpy-sh4.S index 560bc17eebdd..459fa92a7c53 100644 --- a/arch/sh/lib/memcpy-sh4.S +++ b/arch/sh/lib/memcpy-sh4.S | |||
| @@ -126,10 +126,10 @@ | |||
| 126 | 126 | ||
| 127 | mov.l r3,@-r0 ! 30 LS | 127 | mov.l r3,@-r0 ! 30 LS |
| 128 | #else | 128 | #else |
| 129 | 3: mov r1,r3 ! OPQR | 129 | 3: mov r7,r3 ! OPQR |
| 130 | shlr8 r3 ! xOPQ | 130 | shlr8 r3 ! xOPQ |
| 131 | mov.l @(r0,r5),r1 ! KLMN | 131 | mov.l @(r0,r5),r7 ! KLMN |
| 132 | mov r1,r6 | 132 | mov r7,r6 |
| 133 | shll16 r6 | 133 | shll16 r6 |
| 134 | shll8 r6 ! Nxxx | 134 | shll8 r6 ! Nxxx |
| 135 | or r6,r3 ! NOPQ | 135 | or r6,r3 ! NOPQ |
| @@ -733,24 +733,24 @@ ENTRY(memcpy) | |||
| 733 | movca.l r0,@r1 ! 40 LS (latency=3-7) | 733 | movca.l r0,@r1 ! 40 LS (latency=3-7) |
| 734 | add #-0x1c, r1 ! 50 EX | 734 | add #-0x1c, r1 ! 50 EX |
| 735 | 735 | ||
| 736 | mov.l r3, @(0x1c,r1) ! 33 LS | 736 | mov.l r3, @(0x18,r1) ! 33 LS |
| 737 | xtrct r11, r10 ! 48 EX | 737 | xtrct r11, r10 ! 48 EX |
| 738 | 738 | ||
| 739 | mov.l r6, @(0x18,r1) ! 33 LS | 739 | mov.l r6, @(0x14,r1) ! 33 LS |
| 740 | xtrct r12, r11 ! 48 EX | 740 | xtrct r12, r11 ! 48 EX |
| 741 | 741 | ||
| 742 | mov.l r7, @(0x14,r1) ! 33 LS | 742 | mov.l r7, @(0x10,r1) ! 33 LS |
| 743 | 743 | ||
| 744 | mov.l r8, @(0x10,r1) ! 33 LS | 744 | mov.l r8, @(0x0c,r1) ! 33 LS |
| 745 | add #-0x3e, r5 ! 50 EX | 745 | add #-0x1e, r5 ! 50 EX |
| 746 | 746 | ||
| 747 | mov.l r9, @(0x0c,r1) ! 33 LS | 747 | mov.l r9, @(0x08,r1) ! 33 LS |
| 748 | cmp/eq r2,r1 ! 54 MT | 748 | cmp/eq r2,r1 ! 54 MT |
| 749 | 749 | ||
| 750 | mov.l r10, @(0x08,r1) ! 33 LS | 750 | mov.l r10, @(0x04,r1) ! 33 LS |
| 751 | bf/s 2b ! 109 BR | 751 | bf/s 2b ! 109 BR |
| 752 | 752 | ||
| 753 | mov.l r11, @(0x04,r1) ! 33 LS | 753 | mov.l r11, @(0x00,r1) ! 33 LS |
| 754 | #endif | 754 | #endif |
| 755 | 755 | ||
| 756 | mov.l @r15+, r12 | 756 | mov.l @r15+, r12 |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index d211fdb24584..789724e61e83 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: config.in,v 1.113 2002/01/24 22:14:44 davem Exp $ | ||
| 2 | # For a description of the syntax of this configuration file, | 1 | # For a description of the syntax of this configuration file, |
| 3 | # see Documentation/kbuild/kconfig-language.txt. | 2 | # see Documentation/kbuild/kconfig-language.txt. |
| 4 | # | 3 | # |
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile index b365084316ac..22d331e1e941 100644 --- a/arch/sparc/boot/Makefile +++ b/arch/sparc/boot/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: Makefile,v 1.10 2000/02/23 08:17:46 jj Exp $ | ||
| 2 | # Makefile for the Sparc boot stuff. | 1 | # Makefile for the Sparc boot stuff. |
| 3 | # | 2 | # |
| 4 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/boot/btfixupprep.c b/arch/sparc/boot/btfixupprep.c index dc7b0546e3bb..52a4208fe4f0 100644 --- a/arch/sparc/boot/btfixupprep.c +++ b/arch/sparc/boot/btfixupprep.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: btfixupprep.c,v 1.6 2001/08/22 15:27:47 davem Exp $ | 1 | /* |
| 2 | Simple utility to prepare vmlinux image for sparc. | 2 | Simple utility to prepare vmlinux image for sparc. |
| 3 | Resolves all BTFIXUP uses and settings and creates | 3 | Resolves all BTFIXUP uses and settings and creates |
| 4 | a special .s object to link to the image. | 4 | a special .s object to link to the image. |
diff --git a/arch/sparc/boot/piggyback.c b/arch/sparc/boot/piggyback.c index 6962cc68ed5b..c9f500c1a8b2 100644 --- a/arch/sparc/boot/piggyback.c +++ b/arch/sparc/boot/piggyback.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: piggyback.c,v 1.4 2000/12/05 00:48:57 anton Exp $ | 1 | /* |
| 2 | Simple utility to make a single-image install kernel with initial ramdisk | 2 | Simple utility to make a single-image install kernel with initial ramdisk |
| 3 | for Sparc tftpbooting without need to set up nfs. | 3 | for Sparc tftpbooting without need to set up nfs. |
| 4 | 4 | ||
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index 96344ff2bbe1..92c6fc07e59c 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: ebus.c,v 1.20 2002/01/05 01:13:43 davem Exp $ | 1 | /* |
| 2 | * ebus.c: PCI to EBus bridge device. | 2 | * ebus.c: PCI to EBus bridge device. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc/kernel/etrap.S b/arch/sparc/kernel/etrap.S index a8b35bed12a2..f37d961d67a6 100644 --- a/arch/sparc/kernel/etrap.S +++ b/arch/sparc/kernel/etrap.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: etrap.S,v 1.31 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
| 2 | * etrap.S: Sparc trap window preparation for entry into the | 2 | * etrap.S: Sparc trap window preparation for entry into the |
| 3 | * Linux kernel. | 3 | * Linux kernel. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S index 8bec05fa5795..3bfd6085a91d 100644 --- a/arch/sparc/kernel/head.S +++ b/arch/sparc/kernel/head.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: head.S,v 1.105 2001/08/12 09:08:56 davem Exp $ | 1 | /* |
| 2 | * head.S: The initial boot code for the Sparc port of Linux. | 2 | * head.S: The initial boot code for the Sparc port of Linux. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/idprom.c b/arch/sparc/kernel/idprom.c index 3a5bad525394..7220562cdb34 100644 --- a/arch/sparc/kernel/idprom.c +++ b/arch/sparc/kernel/idprom.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: idprom.c,v 1.24 1999/08/31 06:54:20 davem Exp $ | 1 | /* |
| 2 | * idprom.c: Routines to load the idprom into kernel addresses and | 2 | * idprom.c: Routines to load the idprom into kernel addresses and |
| 3 | * interpret the data contained within. | 3 | * interpret the data contained within. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c index d9d4f96360c7..8e64ebc445ef 100644 --- a/arch/sparc/kernel/init_task.c +++ b/arch/sparc/kernel/init_task.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include <asm/uaccess.h> | 9 | #include <asm/uaccess.h> |
| 10 | 10 | ||
| 11 | static struct fs_struct init_fs = INIT_FS; | 11 | static struct fs_struct init_fs = INIT_FS; |
| 12 | static struct files_struct init_files = INIT_FILES; | ||
| 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 12 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 13 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 15 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index ad0ede24ca1d..7b17522f59bf 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: ioport.c,v 1.45 2001/10/30 04:54:21 davem Exp $ | 1 | /* |
| 2 | * ioport.c: Simple io mapping allocator. | 2 | * ioport.c: Simple io mapping allocator. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c index 01a6756ba371..087390b092b0 100644 --- a/arch/sparc/kernel/irq.c +++ b/arch/sparc/kernel/irq.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: irq.c,v 1.114 2001/12/11 04:55:51 davem Exp $ | 1 | /* |
| 2 | * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the | 2 | * arch/sparc/kernel/irq.c: Interrupt request handling routines. On the |
| 3 | * Sparc the IRQs are basically 'cast in stone' | 3 | * Sparc the IRQs are basically 'cast in stone' |
| 4 | * and you are supposed to probe the prom's device | 4 | * and you are supposed to probe the prom's device |
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c index 59e9344e7a0d..adaaed4ea2fb 100644 --- a/arch/sparc/kernel/led.c +++ b/arch/sparc/kernel/led.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 3 | #include <linux/init.h> | 3 | #include <linux/init.h> |
| 4 | #include <linux/proc_fs.h> | 4 | #include <linux/proc_fs.h> |
| 5 | #include <linux/seq_file.h> | ||
| 5 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 6 | #include <linux/jiffies.h> | 7 | #include <linux/jiffies.h> |
| 7 | #include <linux/timer.h> | 8 | #include <linux/timer.h> |
| @@ -45,21 +46,22 @@ static void led_blink(unsigned long timeout) | |||
| 45 | add_timer(&led_blink_timer); | 46 | add_timer(&led_blink_timer); |
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | static int led_read_proc(char *buf, char **start, off_t offset, int count, | 49 | static int led_proc_show(struct seq_file *m, void *v) |
| 49 | int *eof, void *data) | ||
| 50 | { | 50 | { |
| 51 | int len = 0; | ||
| 52 | |||
| 53 | if (get_auxio() & AUXIO_LED) | 51 | if (get_auxio() & AUXIO_LED) |
| 54 | len = sprintf(buf, "on\n"); | 52 | seq_puts(m, "on\n"); |
| 55 | else | 53 | else |
| 56 | len = sprintf(buf, "off\n"); | 54 | seq_puts(m, "off\n"); |
| 55 | return 0; | ||
| 56 | } | ||
| 57 | 57 | ||
| 58 | return len; | 58 | static int led_proc_open(struct inode *inode, struct file *file) |
| 59 | { | ||
| 60 | return single_open(file, led_proc_show, NULL); | ||
| 59 | } | 61 | } |
| 60 | 62 | ||
| 61 | static int led_write_proc(struct file *file, const char __user *buffer, | 63 | static ssize_t led_proc_write(struct file *file, const char __user *buffer, |
| 62 | unsigned long count, void *data) | 64 | size_t count, loff_t *ppos) |
| 63 | { | 65 | { |
| 64 | char *buf = NULL; | 66 | char *buf = NULL; |
| 65 | 67 | ||
| @@ -103,6 +105,15 @@ static int led_write_proc(struct file *file, const char __user *buffer, | |||
| 103 | return count; | 105 | return count; |
| 104 | } | 106 | } |
| 105 | 107 | ||
| 108 | static const struct file_operations led_proc_fops = { | ||
| 109 | .owner = THIS_MODULE, | ||
| 110 | .open = led_proc_open, | ||
| 111 | .read = seq_read, | ||
| 112 | .llseek = seq_lseek, | ||
| 113 | .release = single_release, | ||
| 114 | .write = led_proc_write, | ||
| 115 | }; | ||
| 116 | |||
| 106 | static struct proc_dir_entry *led; | 117 | static struct proc_dir_entry *led; |
| 107 | 118 | ||
| 108 | #define LED_VERSION "0.1" | 119 | #define LED_VERSION "0.1" |
| @@ -112,12 +123,9 @@ static int __init led_init(void) | |||
| 112 | init_timer(&led_blink_timer); | 123 | init_timer(&led_blink_timer); |
| 113 | led_blink_timer.function = led_blink; | 124 | led_blink_timer.function = led_blink; |
| 114 | 125 | ||
| 115 | led = create_proc_entry("led", 0, NULL); | 126 | led = proc_create("led", 0, NULL, &led_proc_fops); |
| 116 | if (!led) | 127 | if (!led) |
| 117 | return -ENOMEM; | 128 | return -ENOMEM; |
| 118 | |||
| 119 | led->read_proc = led_read_proc; /* reader function */ | ||
| 120 | led->write_proc = led_write_proc; /* writer function */ | ||
| 121 | led->owner = THIS_MODULE; | 129 | led->owner = THIS_MODULE; |
| 122 | 130 | ||
| 123 | printk(KERN_INFO | 131 | printk(KERN_INFO |
diff --git a/arch/sparc/kernel/muldiv.c b/arch/sparc/kernel/muldiv.c index 37b9a4942232..e352239e72c8 100644 --- a/arch/sparc/kernel/muldiv.c +++ b/arch/sparc/kernel/muldiv.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: muldiv.c,v 1.5 1997/12/15 20:07:20 ecd Exp $ | 1 | /* |
| 2 | * muldiv.c: Hardware multiply/division illegal instruction trap | 2 | * muldiv.c: Hardware multiply/division illegal instruction trap |
| 3 | * for sun4c/sun4 (which do not have those instructions) | 3 | * for sun4c/sun4 (which do not have those instructions) |
| 4 | * | 4 | * |
diff --git a/arch/sparc/kernel/rtrap.S b/arch/sparc/kernel/rtrap.S index ab818cdc4cc0..ce30082ab266 100644 --- a/arch/sparc/kernel/rtrap.S +++ b/arch/sparc/kernel/rtrap.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: rtrap.S,v 1.58 2002/01/31 03:30:05 davem Exp $ | 1 | /* |
| 2 | * rtrap.S: Return from Sparc trap low-level code. | 2 | * rtrap.S: Return from Sparc trap low-level code. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 8a55c4f0df84..a0ea0bc6f471 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: setup.c,v 1.126 2001/11/13 00:49:27 davem Exp $ | 1 | /* |
| 2 | * linux/arch/sparc/kernel/setup.c | 2 | * linux/arch/sparc/kernel/setup.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index aa8ee06cf488..b23cea5ca5d1 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: sparc_ksyms.c,v 1.107 2001/07/17 16:17:33 anton Exp $ | 1 | /* |
| 2 | * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. | 2 | * arch/sparc/kernel/ksyms.c: Sparc specific ksyms support. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index e0efab2a6bef..8ac5661cafff 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: sun4d_irq.c,v 1.29 2001/12/11 04:55:51 davem Exp $ | 1 | /* |
| 2 | * arch/sparc/kernel/sun4d_irq.c: | 2 | * arch/sparc/kernel/sun4d_irq.c: |
| 3 | * SS1000/SC2000 interrupt handling. | 3 | * SS1000/SC2000 interrupt handling. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S index 2dcdaa1fd8cd..356c56aebc62 100644 --- a/arch/sparc/kernel/trampoline.S +++ b/arch/sparc/kernel/trampoline.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: trampoline.S,v 1.14 2002/01/11 08:45:38 davem Exp $ | 1 | /* |
| 2 | * trampoline.S: SMP cpu boot-up trampoline code. | 2 | * trampoline.S: SMP cpu boot-up trampoline code. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c index d404e7994527..978e9d85949e 100644 --- a/arch/sparc/kernel/traps.c +++ b/arch/sparc/kernel/traps.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: traps.c,v 1.64 2000/09/03 15:00:49 anton Exp $ | 1 | /* |
| 2 | * arch/sparc/kernel/traps.c | 2 | * arch/sparc/kernel/traps.c |
| 3 | * | 3 | * |
| 4 | * Copyright 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/unaligned.c b/arch/sparc/kernel/unaligned.c index 33857be16661..c2a28c5ad650 100644 --- a/arch/sparc/kernel/unaligned.c +++ b/arch/sparc/kernel/unaligned.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: unaligned.c,v 1.23 2001/12/21 00:54:31 davem Exp $ | 1 | /* |
| 2 | * unaligned.c: Unaligned load/store trap handling with special | 2 | * unaligned.c: Unaligned load/store trap handling with special |
| 3 | * cases for the kernel to do them more quickly. | 3 | * cases for the kernel to do them more quickly. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/kernel/wof.S b/arch/sparc/kernel/wof.S index 083b1215d515..4bce38dfe3c5 100644 --- a/arch/sparc/kernel/wof.S +++ b/arch/sparc/kernel/wof.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: wof.S,v 1.40 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
| 2 | * wof.S: Sparc window overflow handler. | 2 | * wof.S: Sparc window overflow handler. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/kernel/wuf.S b/arch/sparc/kernel/wuf.S index d1a266bf103a..82e5145b0f77 100644 --- a/arch/sparc/kernel/wuf.S +++ b/arch/sparc/kernel/wuf.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: wuf.S,v 1.39 2000/01/08 16:38:18 anton Exp $ | 1 | /* |
| 2 | * wuf.S: Window underflow trap handler for the Sparc. | 2 | * wuf.S: Window underflow trap handler for the Sparc. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller | 4 | * Copyright (C) 1995 David S. Miller |
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 76effdbea075..6e303e10c3b9 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: Makefile,v 1.35 2000/12/15 00:41:18 davem Exp $ | ||
| 2 | # Makefile for Sparc library files.. | 1 | # Makefile for Sparc library files.. |
| 3 | # | 2 | # |
| 4 | 3 | ||
diff --git a/arch/sparc/lib/ashldi3.S b/arch/sparc/lib/ashldi3.S index 52418a0cb3dd..17912e608716 100644 --- a/arch/sparc/lib/ashldi3.S +++ b/arch/sparc/lib/ashldi3.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: ashldi3.S,v 1.2 1999/11/19 04:11:46 davem Exp $ | 1 | /* |
| 2 | * ashldi3.S: GCC emits these for certain drivers playing | 2 | * ashldi3.S: GCC emits these for certain drivers playing |
| 3 | * with long longs. | 3 | * with long longs. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/lib/ashrdi3.S b/arch/sparc/lib/ashrdi3.S index 2848237598a4..85398fd6dcc9 100644 --- a/arch/sparc/lib/ashrdi3.S +++ b/arch/sparc/lib/ashrdi3.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: ashrdi3.S,v 1.4 1999/11/19 04:11:49 davem Exp $ | 1 | /* |
| 2 | * ashrdi3.S: The filesystem code creates all kinds of references to | 2 | * ashrdi3.S: The filesystem code creates all kinds of references to |
| 3 | * this little routine on the sparc with gcc. | 3 | * this little routine on the sparc with gcc. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/lib/blockops.S b/arch/sparc/lib/blockops.S index a7c7ffaa4a94..804be87f9a42 100644 --- a/arch/sparc/lib/blockops.S +++ b/arch/sparc/lib/blockops.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: blockops.S,v 1.8 1998/01/30 10:58:44 jj Exp $ | 1 | /* |
| 2 | * blockops.S: Common block zero optimized routines. | 2 | * blockops.S: Common block zero optimized routines. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/locks.S b/arch/sparc/lib/locks.S index b1df55cb2215..64f53f2b673d 100644 --- a/arch/sparc/lib/locks.S +++ b/arch/sparc/lib/locks.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: locks.S,v 1.16 2000/02/26 11:02:47 anton Exp $ | 1 | /* |
| 2 | * locks.S: SMP low-level lock primitives on Sparc. | 2 | * locks.S: SMP low-level lock primitives on Sparc. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/lshrdi3.S b/arch/sparc/lib/lshrdi3.S index 35abf5b2bd15..47a1354c1602 100644 --- a/arch/sparc/lib/lshrdi3.S +++ b/arch/sparc/lib/lshrdi3.S | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | /* $Id: lshrdi3.S,v 1.1 1999/03/21 06:37:45 davem Exp $ */ | ||
| 2 | 1 | ||
| 3 | .globl __lshrdi3 | 2 | .globl __lshrdi3 |
| 4 | __lshrdi3: | 3 | __lshrdi3: |
diff --git a/arch/sparc/lib/memscan.S b/arch/sparc/lib/memscan.S index 28e78ff090ac..4ff1657dfc24 100644 --- a/arch/sparc/lib/memscan.S +++ b/arch/sparc/lib/memscan.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: memscan.S,v 1.4 1996/09/08 02:01:20 davem Exp $ | 1 | /* |
| 2 | * memscan.S: Optimized memscan for the Sparc. | 2 | * memscan.S: Optimized memscan for the Sparc. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/lib/mul.S b/arch/sparc/lib/mul.S index da693560d878..c45470d0b0ce 100644 --- a/arch/sparc/lib/mul.S +++ b/arch/sparc/lib/mul.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: mul.S,v 1.4 1996/09/30 02:22:32 davem Exp $ | 1 | /* |
| 2 | * mul.S: This routine was taken from glibc-1.09 and is covered | 2 | * mul.S: This routine was taken from glibc-1.09 and is covered |
| 3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
| 4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/rem.S b/arch/sparc/lib/rem.S index bf015a90d07e..42fb86252815 100644 --- a/arch/sparc/lib/rem.S +++ b/arch/sparc/lib/rem.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: rem.S,v 1.7 1996/09/30 02:22:34 davem Exp $ | 1 | /* |
| 2 | * rem.S: This routine was taken from glibc-1.09 and is covered | 2 | * rem.S: This routine was taken from glibc-1.09 and is covered |
| 3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
| 4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/rwsem.S b/arch/sparc/lib/rwsem.S index f406b1f22791..9675268e7fde 100644 --- a/arch/sparc/lib/rwsem.S +++ b/arch/sparc/lib/rwsem.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: rwsem.S,v 1.5 2000/05/09 17:40:13 davem Exp $ | 1 | /* |
| 2 | * Assembly part of rw semaphores. | 2 | * Assembly part of rw semaphores. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) | 4 | * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com) |
diff --git a/arch/sparc/lib/sdiv.S b/arch/sparc/lib/sdiv.S index af9451629d0b..f0a0d4e4db78 100644 --- a/arch/sparc/lib/sdiv.S +++ b/arch/sparc/lib/sdiv.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: sdiv.S,v 1.6 1996/10/02 17:37:00 davem Exp $ | 1 | /* |
| 2 | * sdiv.S: This routine was taken from glibc-1.09 and is covered | 2 | * sdiv.S: This routine was taken from glibc-1.09 and is covered |
| 3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
| 4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/strncmp.S b/arch/sparc/lib/strncmp.S index 615626805d4b..494ec664537a 100644 --- a/arch/sparc/lib/strncmp.S +++ b/arch/sparc/lib/strncmp.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: strncmp.S,v 1.2 1996/09/09 02:47:20 davem Exp $ | 1 | /* |
| 2 | * strncmp.S: Hand optimized Sparc assembly of GCC output from GNU libc | 2 | * strncmp.S: Hand optimized Sparc assembly of GCC output from GNU libc |
| 3 | * generic strncmp routine. | 3 | * generic strncmp routine. |
| 4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/udiv.S b/arch/sparc/lib/udiv.S index 169e01da6715..2101405bdfcb 100644 --- a/arch/sparc/lib/udiv.S +++ b/arch/sparc/lib/udiv.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: udiv.S,v 1.4 1996/09/30 02:22:38 davem Exp $ | 1 | /* |
| 2 | * udiv.S: This routine was taken from glibc-1.09 and is covered | 2 | * udiv.S: This routine was taken from glibc-1.09 and is covered |
| 3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
| 4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/umul.S b/arch/sparc/lib/umul.S index f0e5b20a2536..1f36ae682529 100644 --- a/arch/sparc/lib/umul.S +++ b/arch/sparc/lib/umul.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: umul.S,v 1.4 1996/09/30 02:22:39 davem Exp $ | 1 | /* |
| 2 | * umul.S: This routine was taken from glibc-1.09 and is covered | 2 | * umul.S: This routine was taken from glibc-1.09 and is covered |
| 3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
| 4 | */ | 4 | */ |
diff --git a/arch/sparc/lib/urem.S b/arch/sparc/lib/urem.S index 6b92bdc8b04c..77123eb83c44 100644 --- a/arch/sparc/lib/urem.S +++ b/arch/sparc/lib/urem.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: urem.S,v 1.4 1996/09/30 02:22:42 davem Exp $ | 1 | /* |
| 2 | * urem.S: This routine was taken from glibc-1.09 and is covered | 2 | * urem.S: This routine was taken from glibc-1.09 and is covered |
| 3 | * by the GNU Library General Public License Version 2. | 3 | * by the GNU Library General Public License Version 2. |
| 4 | */ | 4 | */ |
diff --git a/arch/sparc/math-emu/ashldi3.S b/arch/sparc/math-emu/ashldi3.S index eab1d097296a..7230ff5c7aa1 100644 --- a/arch/sparc/math-emu/ashldi3.S +++ b/arch/sparc/math-emu/ashldi3.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: ashldi3.S,v 1.1 1998/04/06 16:09:28 jj Exp $ | 1 | /* |
| 2 | * ashldi3.S: Math-emu code creates all kinds of references to | 2 | * ashldi3.S: Math-emu code creates all kinds of references to |
| 3 | * this little routine on the sparc with gcc. | 3 | * this little routine on the sparc with gcc. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile index 16eeba4b991a..109c8b22cb38 100644 --- a/arch/sparc/mm/Makefile +++ b/arch/sparc/mm/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: Makefile,v 1.38 2000/12/15 00:41:22 davem Exp $ | ||
| 2 | # Makefile for the linux Sparc-specific parts of the memory manager. | 1 | # Makefile for the linux Sparc-specific parts of the memory manager. |
| 3 | # | 2 | # |
| 4 | 3 | ||
diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c index abd50795a7b6..0a3cd8f6cfe4 100644 --- a/arch/sparc/mm/fault.c +++ b/arch/sparc/mm/fault.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: fault.c,v 1.122 2001/11/17 07:19:26 davem Exp $ | 1 | /* |
| 2 | * fault.c: Page fault handlers for the Sparc. | 2 | * fault.c: Page fault handlers for the Sparc. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/generic.c b/arch/sparc/mm/generic.c index 1ef7fa03fefe..a289261da9fd 100644 --- a/arch/sparc/mm/generic.c +++ b/arch/sparc/mm/generic.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: generic.c,v 1.14 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
| 2 | * generic.c: Generic Sparc mm routines that are not dependent upon | 2 | * generic.c: Generic Sparc mm routines that are not dependent upon |
| 3 | * MMU type but are Sparc specific. | 3 | * MMU type but are Sparc specific. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S index d29cc24c5bba..44aad32eeb4e 100644 --- a/arch/sparc/mm/hypersparc.S +++ b/arch/sparc/mm/hypersparc.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: hypersparc.S,v 1.18 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
| 2 | * hypersparc.S: High speed Hypersparc mmu/cache operations. | 2 | * hypersparc.S: High speed Hypersparc mmu/cache operations. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index b89837accc88..7794ecb896e3 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: init.c,v 1.103 2001/11/19 19:03:08 davem Exp $ | 1 | /* |
| 2 | * linux/arch/sparc/mm/init.c | 2 | * linux/arch/sparc/mm/init.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index b86dfce8eee4..f167835db3df 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: io-unit.c,v 1.24 2001/12/17 07:05:09 davem Exp $ | 1 | /* |
| 2 | * io-unit.c: IO-UNIT specific routines for memory management. | 2 | * io-unit.c: IO-UNIT specific routines for memory management. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc/mm/loadmmu.c b/arch/sparc/mm/loadmmu.c index 2d9cd65160a4..652be05acbea 100644 --- a/arch/sparc/mm/loadmmu.c +++ b/arch/sparc/mm/loadmmu.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: loadmmu.c,v 1.56 2000/02/08 20:24:21 davem Exp $ | 1 | /* |
| 2 | * loadmmu.c: This code loads up all the mm function pointers once the | 2 | * loadmmu.c: This code loads up all the mm function pointers once the |
| 3 | * machine type has been determined. It also sets the static | 3 | * machine type has been determined. It also sets the static |
| 4 | * mmu values such as PAGE_NONE, etc. | 4 | * mmu values such as PAGE_NONE, etc. |
diff --git a/arch/sparc/mm/nosrmmu.c b/arch/sparc/mm/nosrmmu.c index 9e215659697e..3701f70fc30a 100644 --- a/arch/sparc/mm/nosrmmu.c +++ b/arch/sparc/mm/nosrmmu.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: nosrmmu.c,v 1.5 1999/11/19 04:11:54 davem Exp $ | 1 | /* |
| 2 | * nosrmmu.c: This file is a bunch of dummies for sun4 compiles, | 2 | * nosrmmu.c: This file is a bunch of dummies for sun4 compiles, |
| 3 | * so that it does not need srmmu and avoid ifdefs. | 3 | * so that it does not need srmmu and avoid ifdefs. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/mm/nosun4c.c b/arch/sparc/mm/nosun4c.c index ea2e2105341d..196263f895b7 100644 --- a/arch/sparc/mm/nosun4c.c +++ b/arch/sparc/mm/nosun4c.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: nosun4c.c,v 1.3 2000/02/14 04:52:36 jj Exp $ | 1 | /* |
| 2 | * nosun4c.c: This file is a bunch of dummies for SMP compiles, | 2 | * nosun4c.c: This file is a bunch of dummies for SMP compiles, |
| 3 | * so that it does not need sun4c and avoid ifdefs. | 3 | * so that it does not need sun4c and avoid ifdefs. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S index 9f4cd396a0fa..c801c3953a00 100644 --- a/arch/sparc/mm/swift.S +++ b/arch/sparc/mm/swift.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: swift.S,v 1.9 2002/01/08 11:11:59 davem Exp $ | 1 | /* |
| 2 | * swift.S: MicroSparc-II mmu/cache operations. | 2 | * swift.S: MicroSparc-II mmu/cache operations. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S index 4988e6a310bb..db0d6de33a87 100644 --- a/arch/sparc/mm/tsunami.S +++ b/arch/sparc/mm/tsunami.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: tsunami.S,v 1.7 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
| 2 | * tsunami.S: High speed MicroSparc-I mmu/cache operations. | 2 | * tsunami.S: High speed MicroSparc-I mmu/cache operations. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index 754c622548a5..6dfcc13d3100 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: viking.S,v 1.19 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
| 2 | * viking.S: High speed Viking cache/mmu operations | 2 | * viking.S: High speed Viking cache/mmu operations |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc/prom/Makefile b/arch/sparc/prom/Makefile index 2b217ee40703..7f5eacfcfbcf 100644 --- a/arch/sparc/prom/Makefile +++ b/arch/sparc/prom/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: Makefile,v 1.8 2000/12/15 00:41:22 davem Exp $ | ||
| 2 | # Makefile for the Sun Boot PROM interface library under | 1 | # Makefile for the Sun Boot PROM interface library under |
| 3 | # Linux. | 2 | # Linux. |
| 4 | # | 3 | # |
diff --git a/arch/sparc/prom/bootstr.c b/arch/sparc/prom/bootstr.c index cfdeac2788d1..5a35c768ff7c 100644 --- a/arch/sparc/prom/bootstr.c +++ b/arch/sparc/prom/bootstr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: bootstr.c,v 1.20 2000/02/08 20:24:23 davem Exp $ | 1 | /* |
| 2 | * bootstr.c: Boot string/argument acquisition from the PROM. | 2 | * bootstr.c: Boot string/argument acquisition from the PROM. |
| 3 | * | 3 | * |
| 4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c index 2a007a784415..790057a34616 100644 --- a/arch/sparc/prom/console.c +++ b/arch/sparc/prom/console.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: console.c,v 1.25 2001/10/30 04:54:22 davem Exp $ | 1 | /* |
| 2 | * console.c: Routines that deal with sending and receiving IO | 2 | * console.c: Routines that deal with sending and receiving IO |
| 3 | * to/from the current console device using the PROM. | 3 | * to/from the current console device using the PROM. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/prom/devmap.c b/arch/sparc/prom/devmap.c index eb12073578ad..1e517915b0df 100644 --- a/arch/sparc/prom/devmap.c +++ b/arch/sparc/prom/devmap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: devmap.c,v 1.7 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
| 2 | * promdevmap.c: Map device/IO areas to virtual addresses. | 2 | * promdevmap.c: Map device/IO areas to virtual addresses. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/devops.c b/arch/sparc/prom/devops.c index 61919b54f6cc..9f1a95c91ad1 100644 --- a/arch/sparc/prom/devops.c +++ b/arch/sparc/prom/devops.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: devops.c,v 1.13 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
| 2 | * devops.c: Device operations using the PROM. | 2 | * devops.c: Device operations using the PROM. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c index 2fa3a474e3a2..729f87066945 100644 --- a/arch/sparc/prom/init.c +++ b/arch/sparc/prom/init.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: init.c,v 1.14 2000/01/29 01:09:12 anton Exp $ | 1 | /* |
| 2 | * init.c: Initialize internal variables used by the PROM | 2 | * init.c: Initialize internal variables used by the PROM |
| 3 | * library functions. | 3 | * library functions. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/prom/misc.c b/arch/sparc/prom/misc.c index d9fb3af41c1f..49b5057b9601 100644 --- a/arch/sparc/prom/misc.c +++ b/arch/sparc/prom/misc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: misc.c,v 1.18 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
| 2 | * misc.c: Miscellaneous prom functions that don't belong | 2 | * misc.c: Miscellaneous prom functions that don't belong |
| 3 | * anywhere else. | 3 | * anywhere else. |
| 4 | * | 4 | * |
diff --git a/arch/sparc/prom/mp.c b/arch/sparc/prom/mp.c index 92fe3739fdb8..4c4dc79f65af 100644 --- a/arch/sparc/prom/mp.c +++ b/arch/sparc/prom/mp.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: mp.c,v 1.12 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
| 2 | * mp.c: OpenBoot Prom Multiprocessor support routines. Don't call | 2 | * mp.c: OpenBoot Prom Multiprocessor support routines. Don't call |
| 3 | * these on a UP or else you will halt and catch fire. ;) | 3 | * these on a UP or else you will halt and catch fire. ;) |
| 4 | * | 4 | * |
diff --git a/arch/sparc/prom/palloc.c b/arch/sparc/prom/palloc.c index 84ce8bc54473..20be339cc2ce 100644 --- a/arch/sparc/prom/palloc.c +++ b/arch/sparc/prom/palloc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: palloc.c,v 1.4 1996/04/25 06:09:48 davem Exp $ | 1 | /* |
| 2 | * palloc.c: Memory allocation from the Sun PROM. | 2 | * palloc.c: Memory allocation from the Sun PROM. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/ranges.c b/arch/sparc/prom/ranges.c index a2920323c900..f9b7def35f6e 100644 --- a/arch/sparc/prom/ranges.c +++ b/arch/sparc/prom/ranges.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: ranges.c,v 1.15 2001/12/19 00:29:51 davem Exp $ | 1 | /* |
| 2 | * ranges.c: Handle ranges in newer proms for obio/sbus. | 2 | * ranges.c: Handle ranges in newer proms for obio/sbus. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc/prom/segment.c b/arch/sparc/prom/segment.c index 09d6460165ab..04fd03a7f926 100644 --- a/arch/sparc/prom/segment.c +++ b/arch/sparc/prom/segment.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: segment.c,v 1.7 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
| 2 | * segment.c: Prom routine to map segments in other contexts before | 2 | * segment.c: Prom routine to map segments in other contexts before |
| 3 | * a standalone is completely mapped. This is for sun4 and | 3 | * a standalone is completely mapped. This is for sun4 and |
| 4 | * sun4c architectures only. | 4 | * sun4c architectures only. |
diff --git a/arch/sparc/prom/tree.c b/arch/sparc/prom/tree.c index 5ec246573a98..f228fe057b24 100644 --- a/arch/sparc/prom/tree.c +++ b/arch/sparc/prom/tree.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: tree.c,v 1.26 2000/08/26 02:38:03 anton Exp $ | 1 | /* |
| 2 | * tree.c: Basic device tree traversal/scanning for the Linux | 2 | * tree.c: Basic device tree traversal/scanning for the Linux |
| 3 | * prom library. | 3 | * prom library. |
| 4 | * | 4 | * |
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index 9cb75c852b45..4b8f2b084c21 100644 --- a/arch/sparc64/Makefile +++ b/arch/sparc64/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: Makefile,v 1.52 2002/02/09 19:49:31 davem Exp $ | ||
| 2 | # sparc64/Makefile | 1 | # sparc64/Makefile |
| 3 | # | 2 | # |
| 4 | # Makefile for the architecture dependent flags and dependencies on the | 3 | # Makefile for the architecture dependent flags and dependencies on the |
diff --git a/arch/sparc64/boot/Makefile b/arch/sparc64/boot/Makefile index 6968a6da57da..0458b5244f09 100644 --- a/arch/sparc64/boot/Makefile +++ b/arch/sparc64/boot/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: Makefile,v 1.4 1997/12/15 20:08:56 ecd Exp $ | ||
| 2 | # Makefile for the Sparc64 boot stuff. | 1 | # Makefile for the Sparc64 boot stuff. |
| 3 | # | 2 | # |
| 4 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 3 | # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/boot/piggyback.c b/arch/sparc64/boot/piggyback.c index 36f907408c60..de364bfed0bb 100644 --- a/arch/sparc64/boot/piggyback.c +++ b/arch/sparc64/boot/piggyback.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: piggyback.c,v 1.2 2000/09/19 14:34:39 anton Exp $ | 1 | /* |
| 2 | Simple utility to make a single-image install kernel with initial ramdisk | 2 | Simple utility to make a single-image install kernel with initial ramdisk |
| 3 | for Sparc64 tftpbooting without need to set up nfs. | 3 | for Sparc64 tftpbooting without need to set up nfs. |
| 4 | 4 | ||
diff --git a/arch/sparc64/kernel/dtlb_prot.S b/arch/sparc64/kernel/dtlb_prot.S index e0a920162604..b2c2c5be281c 100644 --- a/arch/sparc64/kernel/dtlb_prot.S +++ b/arch/sparc64/kernel/dtlb_prot.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: dtlb_prot.S,v 1.22 2001/04/11 23:40:32 davem Exp $ | 1 | /* |
| 2 | * dtlb_prot.S: DTLB protection trap strategy. | 2 | * dtlb_prot.S: DTLB protection trap strategy. |
| 3 | * This is included directly into the trap table. | 3 | * This is included directly into the trap table. |
| 4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index bc2632274840..c49d0388b793 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: ebus.c,v 1.64 2001/11/08 04:41:33 davem Exp $ | 1 | /* |
| 2 | * ebus.c: PCI to EBus bridge device. | 2 | * ebus.c: PCI to EBus bridge device. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S index f25e1da3fd03..29ce489bc188 100644 --- a/arch/sparc64/kernel/etrap.S +++ b/arch/sparc64/kernel/etrap.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: etrap.S,v 1.46 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
| 2 | * etrap.S: Preparing for entry into the kernel on Sparc V9. | 2 | * etrap.S: Preparing for entry into the kernel on Sparc V9. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996, 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996, 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/idprom.c b/arch/sparc64/kernel/idprom.c index 3b6789e09a72..5b45a808c621 100644 --- a/arch/sparc64/kernel/idprom.c +++ b/arch/sparc64/kernel/idprom.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: idprom.c,v 1.3 1999/08/31 06:54:53 davem Exp $ | 1 | /* |
| 2 | * idprom.c: Routines to load the idprom into kernel addresses and | 2 | * idprom.c: Routines to load the idprom into kernel addresses and |
| 3 | * interpret the data contained within. | 3 | * interpret the data contained within. |
| 4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/init_task.c b/arch/sparc64/kernel/init_task.c index 90007cf88bac..d2b312381c19 100644 --- a/arch/sparc64/kernel/init_task.c +++ b/arch/sparc64/kernel/init_task.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <asm/processor.h> | 10 | #include <asm/processor.h> |
| 11 | 11 | ||
| 12 | static struct fs_struct init_fs = INIT_FS; | 12 | static struct fs_struct init_fs = INIT_FS; |
| 13 | static struct files_struct init_files = INIT_FILES; | ||
| 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 13 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 14 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 16 | struct mm_struct init_mm = INIT_MM(init_mm); | 15 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 4129c0449856..2084f81a76e1 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* arch/sparc64/kernel/process.c | 1 | /* arch/sparc64/kernel/process.c |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 1995, 1996 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1995, 1996, 2008 David S. Miller (davem@davemloft.net) |
| 4 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) | 4 | * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be) |
| 5 | * Copyright (C) 1997, 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 5 | * Copyright (C) 1997, 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| 6 | */ | 6 | */ |
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/cpu.h> | 31 | #include <linux/cpu.h> |
| 32 | #include <linux/elfcore.h> | 32 | #include <linux/elfcore.h> |
| 33 | #include <linux/sysrq.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/oplib.h> | 35 | #include <asm/oplib.h> |
| 35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
| @@ -49,6 +50,8 @@ | |||
| 49 | #include <asm/sstate.h> | 50 | #include <asm/sstate.h> |
| 50 | #include <asm/reboot.h> | 51 | #include <asm/reboot.h> |
| 51 | #include <asm/syscalls.h> | 52 | #include <asm/syscalls.h> |
| 53 | #include <asm/irq_regs.h> | ||
| 54 | #include <asm/smp.h> | ||
| 52 | 55 | ||
| 53 | /* #define VERBOSE_SHOWREGS */ | 56 | /* #define VERBOSE_SHOWREGS */ |
| 54 | 57 | ||
| @@ -298,6 +301,118 @@ void show_regs(struct pt_regs *regs) | |||
| 298 | #endif | 301 | #endif |
| 299 | } | 302 | } |
| 300 | 303 | ||
| 304 | #ifdef CONFIG_MAGIC_SYSRQ | ||
| 305 | struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; | ||
| 306 | static DEFINE_SPINLOCK(global_reg_snapshot_lock); | ||
| 307 | |||
| 308 | static void __global_reg_self(struct thread_info *tp, struct pt_regs *regs, | ||
| 309 | int this_cpu) | ||
| 310 | { | ||
| 311 | flushw_all(); | ||
| 312 | |||
| 313 | global_reg_snapshot[this_cpu].tstate = regs->tstate; | ||
| 314 | global_reg_snapshot[this_cpu].tpc = regs->tpc; | ||
| 315 | global_reg_snapshot[this_cpu].tnpc = regs->tnpc; | ||
| 316 | global_reg_snapshot[this_cpu].o7 = regs->u_regs[UREG_I7]; | ||
| 317 | |||
| 318 | if (regs->tstate & TSTATE_PRIV) { | ||
| 319 | struct reg_window *rw; | ||
| 320 | |||
| 321 | rw = (struct reg_window *) | ||
| 322 | (regs->u_regs[UREG_FP] + STACK_BIAS); | ||
| 323 | global_reg_snapshot[this_cpu].i7 = rw->ins[6]; | ||
| 324 | } else | ||
| 325 | global_reg_snapshot[this_cpu].i7 = 0; | ||
| 326 | |||
| 327 | global_reg_snapshot[this_cpu].thread = tp; | ||
| 328 | } | ||
| 329 | |||
| 330 | /* In order to avoid hangs we do not try to synchronize with the | ||
| 331 | * global register dump client cpus. The last store they make is to | ||
| 332 | * the thread pointer, so do a short poll waiting for that to become | ||
| 333 | * non-NULL. | ||
| 334 | */ | ||
| 335 | static void __global_reg_poll(struct global_reg_snapshot *gp) | ||
| 336 | { | ||
| 337 | int limit = 0; | ||
| 338 | |||
| 339 | while (!gp->thread && ++limit < 100) { | ||
| 340 | barrier(); | ||
| 341 | udelay(1); | ||
| 342 | } | ||
| 343 | } | ||
| 344 | |||
| 345 | static void sysrq_handle_globreg(int key, struct tty_struct *tty) | ||
| 346 | { | ||
| 347 | struct thread_info *tp = current_thread_info(); | ||
| 348 | struct pt_regs *regs = get_irq_regs(); | ||
| 349 | #ifdef CONFIG_KALLSYMS | ||
| 350 | char buffer[KSYM_SYMBOL_LEN]; | ||
| 351 | #endif | ||
| 352 | unsigned long flags; | ||
| 353 | int this_cpu, cpu; | ||
| 354 | |||
| 355 | if (!regs) | ||
| 356 | regs = tp->kregs; | ||
| 357 | |||
| 358 | spin_lock_irqsave(&global_reg_snapshot_lock, flags); | ||
| 359 | |||
| 360 | memset(global_reg_snapshot, 0, sizeof(global_reg_snapshot)); | ||
| 361 | |||
| 362 | this_cpu = raw_smp_processor_id(); | ||
| 363 | |||
| 364 | __global_reg_self(tp, regs, this_cpu); | ||
| 365 | |||
| 366 | smp_fetch_global_regs(); | ||
| 367 | |||
| 368 | for_each_online_cpu(cpu) { | ||
| 369 | struct global_reg_snapshot *gp = &global_reg_snapshot[cpu]; | ||
| 370 | struct thread_info *tp; | ||
| 371 | |||
| 372 | __global_reg_poll(gp); | ||
| 373 | |||
| 374 | tp = gp->thread; | ||
| 375 | printk("%c CPU[%3d]: TSTATE[%016lx] TPC[%016lx] TNPC[%016lx] TASK[%s:%d]\n", | ||
| 376 | (cpu == this_cpu ? '*' : ' '), cpu, | ||
| 377 | gp->tstate, gp->tpc, gp->tnpc, | ||
| 378 | ((tp && tp->task) ? tp->task->comm : "NULL"), | ||
| 379 | ((tp && tp->task) ? tp->task->pid : -1)); | ||
| 380 | #ifdef CONFIG_KALLSYMS | ||
| 381 | if (gp->tstate & TSTATE_PRIV) { | ||
| 382 | sprint_symbol(buffer, gp->tpc); | ||
| 383 | printk(" TPC[%s] ", buffer); | ||
| 384 | sprint_symbol(buffer, gp->o7); | ||
| 385 | printk("O7[%s] ", buffer); | ||
| 386 | sprint_symbol(buffer, gp->i7); | ||
| 387 | printk("I7[%s]\n", buffer); | ||
| 388 | } else | ||
| 389 | #endif | ||
| 390 | { | ||
| 391 | printk(" TPC[%lx] O7[%lx] I7[%lx]\n", | ||
| 392 | gp->tpc, gp->o7, gp->i7); | ||
| 393 | } | ||
| 394 | } | ||
| 395 | |||
| 396 | memset(global_reg_snapshot, 0, sizeof(global_reg_snapshot)); | ||
| 397 | |||
| 398 | spin_unlock_irqrestore(&global_reg_snapshot_lock, flags); | ||
| 399 | } | ||
| 400 | |||
| 401 | static struct sysrq_key_op sparc_globalreg_op = { | ||
| 402 | .handler = sysrq_handle_globreg, | ||
| 403 | .help_msg = "Globalregs", | ||
| 404 | .action_msg = "Show Global CPU Regs", | ||
| 405 | }; | ||
| 406 | |||
| 407 | static int __init sparc_globreg_init(void) | ||
| 408 | { | ||
| 409 | return register_sysrq_key('y', &sparc_globalreg_op); | ||
| 410 | } | ||
| 411 | |||
| 412 | core_initcall(sparc_globreg_init); | ||
| 413 | |||
| 414 | #endif | ||
| 415 | |||
| 301 | unsigned long thread_saved_pc(struct task_struct *tsk) | 416 | unsigned long thread_saved_pc(struct task_struct *tsk) |
| 302 | { | 417 | { |
| 303 | struct thread_info *ti = task_thread_info(tsk); | 418 | struct thread_info *ti = task_thread_info(tsk); |
| @@ -542,20 +657,39 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
| 542 | struct task_struct *p, struct pt_regs *regs) | 657 | struct task_struct *p, struct pt_regs *regs) |
| 543 | { | 658 | { |
| 544 | struct thread_info *t = task_thread_info(p); | 659 | struct thread_info *t = task_thread_info(p); |
| 660 | struct sparc_stackf *parent_sf; | ||
| 661 | unsigned long child_stack_sz; | ||
| 545 | char *child_trap_frame; | 662 | char *child_trap_frame; |
| 663 | int kernel_thread; | ||
| 546 | 664 | ||
| 547 | /* Calculate offset to stack_frame & pt_regs */ | 665 | kernel_thread = (regs->tstate & TSTATE_PRIV) ? 1 : 0; |
| 548 | child_trap_frame = task_stack_page(p) + (THREAD_SIZE - (TRACEREG_SZ+STACKFRAME_SZ)); | 666 | parent_sf = ((struct sparc_stackf *) regs) - 1; |
| 549 | memcpy(child_trap_frame, (((struct sparc_stackf *)regs)-1), (TRACEREG_SZ+STACKFRAME_SZ)); | ||
| 550 | 667 | ||
| 551 | t->flags = (t->flags & ~((0xffUL << TI_FLAG_CWP_SHIFT) | (0xffUL << TI_FLAG_CURRENT_DS_SHIFT))) | | 668 | /* Calculate offset to stack_frame & pt_regs */ |
| 669 | child_stack_sz = ((STACKFRAME_SZ + TRACEREG_SZ) + | ||
| 670 | (kernel_thread ? STACKFRAME_SZ : 0)); | ||
| 671 | child_trap_frame = (task_stack_page(p) + | ||
| 672 | (THREAD_SIZE - child_stack_sz)); | ||
| 673 | memcpy(child_trap_frame, parent_sf, child_stack_sz); | ||
| 674 | |||
| 675 | t->flags = (t->flags & ~((0xffUL << TI_FLAG_CWP_SHIFT) | | ||
| 676 | (0xffUL << TI_FLAG_CURRENT_DS_SHIFT))) | | ||
| 552 | (((regs->tstate + 1) & TSTATE_CWP) << TI_FLAG_CWP_SHIFT); | 677 | (((regs->tstate + 1) & TSTATE_CWP) << TI_FLAG_CWP_SHIFT); |
| 553 | t->new_child = 1; | 678 | t->new_child = 1; |
| 554 | t->ksp = ((unsigned long) child_trap_frame) - STACK_BIAS; | 679 | t->ksp = ((unsigned long) child_trap_frame) - STACK_BIAS; |
| 555 | t->kregs = (struct pt_regs *)(child_trap_frame+sizeof(struct sparc_stackf)); | 680 | t->kregs = (struct pt_regs *) (child_trap_frame + |
| 681 | sizeof(struct sparc_stackf)); | ||
| 556 | t->fpsaved[0] = 0; | 682 | t->fpsaved[0] = 0; |
| 557 | 683 | ||
| 558 | if (regs->tstate & TSTATE_PRIV) { | 684 | if (kernel_thread) { |
| 685 | struct sparc_stackf *child_sf = (struct sparc_stackf *) | ||
| 686 | (child_trap_frame + (STACKFRAME_SZ + TRACEREG_SZ)); | ||
| 687 | |||
| 688 | /* Zero terminate the stack backtrace. */ | ||
| 689 | child_sf->fp = NULL; | ||
| 690 | t->kregs->u_regs[UREG_FP] = | ||
| 691 | ((unsigned long) child_sf) - STACK_BIAS; | ||
| 692 | |||
| 559 | /* Special case, if we are spawning a kernel thread from | 693 | /* Special case, if we are spawning a kernel thread from |
| 560 | * a userspace task (via KMOD, NFS, or similar) we must | 694 | * a userspace task (via KMOD, NFS, or similar) we must |
| 561 | * disable performance counters in the child because the | 695 | * disable performance counters in the child because the |
| @@ -566,12 +700,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
| 566 | t->pcr_reg = 0; | 700 | t->pcr_reg = 0; |
| 567 | t->flags &= ~_TIF_PERFCTR; | 701 | t->flags &= ~_TIF_PERFCTR; |
| 568 | } | 702 | } |
| 569 | t->kregs->u_regs[UREG_FP] = t->ksp; | ||
| 570 | t->flags |= ((long)ASI_P << TI_FLAG_CURRENT_DS_SHIFT); | 703 | t->flags |= ((long)ASI_P << TI_FLAG_CURRENT_DS_SHIFT); |
| 571 | flush_register_windows(); | ||
| 572 | memcpy((void *)(t->ksp + STACK_BIAS), | ||
| 573 | (void *)(regs->u_regs[UREG_FP] + STACK_BIAS), | ||
| 574 | sizeof(struct sparc_stackf)); | ||
| 575 | t->kregs->u_regs[UREG_G6] = (unsigned long) t; | 704 | t->kregs->u_regs[UREG_G6] = (unsigned long) t; |
| 576 | t->kregs->u_regs[UREG_G4] = (unsigned long) t->task; | 705 | t->kregs->u_regs[UREG_G4] = (unsigned long) t->task; |
| 577 | } else { | 706 | } else { |
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index 16689b2930db..c6fc695fe1fe 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: rtrap.S,v 1.61 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
| 2 | * rtrap.S: Preparing for return from trap on Sparc V9. | 2 | * rtrap.S: Preparing for return from trap on Sparc V9. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
| @@ -363,6 +363,7 @@ kern_rtt: rdpr %canrestore, %g1 | |||
| 363 | brz,pn %g1, kern_rtt_fill | 363 | brz,pn %g1, kern_rtt_fill |
| 364 | nop | 364 | nop |
| 365 | kern_rtt_restore: | 365 | kern_rtt_restore: |
| 366 | stw %g0, [%sp + PTREGS_OFF + PT_V9_MAGIC] | ||
| 366 | restore | 367 | restore |
| 367 | retry | 368 | retry |
| 368 | 369 | ||
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index fa2827c4a3ad..e33a8a660e9e 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: sbus.c,v 1.19 2002/01/23 11:27:32 davem Exp $ | 1 | /* |
| 2 | * sbus.c: UltraSparc SBUS controller support. | 2 | * sbus.c: UltraSparc SBUS controller support. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1999 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index da5e6ee0c661..c8b03a4f68bf 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: setup.c,v 1.72 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
| 2 | * linux/arch/sparc64/kernel/setup.c | 2 | * linux/arch/sparc64/kernel/setup.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 6e4dc67d16af..9667e96fd513 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: signal.c,v 1.60 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
| 2 | * arch/sparc64/kernel/signal.c | 2 | * arch/sparc64/kernel/signal.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1991, 1992 Linus Torvalds | 4 | * Copyright (C) 1991, 1992 Linus Torvalds |
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 0d6403a630ac..fa63c68a1819 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
| @@ -900,6 +900,9 @@ extern unsigned long xcall_flush_tlb_mm; | |||
| 900 | extern unsigned long xcall_flush_tlb_pending; | 900 | extern unsigned long xcall_flush_tlb_pending; |
| 901 | extern unsigned long xcall_flush_tlb_kernel_range; | 901 | extern unsigned long xcall_flush_tlb_kernel_range; |
| 902 | extern unsigned long xcall_report_regs; | 902 | extern unsigned long xcall_report_regs; |
| 903 | #ifdef CONFIG_MAGIC_SYSRQ | ||
| 904 | extern unsigned long xcall_fetch_glob_regs; | ||
| 905 | #endif | ||
| 903 | extern unsigned long xcall_receive_signal; | 906 | extern unsigned long xcall_receive_signal; |
| 904 | extern unsigned long xcall_new_mmu_context_version; | 907 | extern unsigned long xcall_new_mmu_context_version; |
| 905 | #ifdef CONFIG_KGDB | 908 | #ifdef CONFIG_KGDB |
| @@ -1080,6 +1083,13 @@ void smp_report_regs(void) | |||
| 1080 | smp_cross_call(&xcall_report_regs, 0, 0, 0); | 1083 | smp_cross_call(&xcall_report_regs, 0, 0, 0); |
| 1081 | } | 1084 | } |
| 1082 | 1085 | ||
| 1086 | #ifdef CONFIG_MAGIC_SYSRQ | ||
| 1087 | void smp_fetch_global_regs(void) | ||
| 1088 | { | ||
| 1089 | smp_cross_call(&xcall_fetch_glob_regs, 0, 0, 0); | ||
| 1090 | } | ||
| 1091 | #endif | ||
| 1092 | |||
| 1083 | /* We know that the window frames of the user have been flushed | 1093 | /* We know that the window frames of the user have been flushed |
| 1084 | * to the stack before we get here because all callers of us | 1094 | * to the stack before we get here because all callers of us |
| 1085 | * are flush_tlb_*() routines, and these run after flush_cache_*() | 1095 | * are flush_tlb_*() routines, and these run after flush_cache_*() |
diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c index 01b52f561af4..c73ce3f4197e 100644 --- a/arch/sparc64/kernel/stacktrace.c +++ b/arch/sparc64/kernel/stacktrace.c | |||
| @@ -19,7 +19,7 @@ void save_stack_trace(struct stack_trace *trace) | |||
| 19 | fp = ksp + STACK_BIAS; | 19 | fp = ksp + STACK_BIAS; |
| 20 | thread_base = (unsigned long) tp; | 20 | thread_base = (unsigned long) tp; |
| 21 | do { | 21 | do { |
| 22 | struct reg_window *rw; | 22 | struct sparc_stackf *sf; |
| 23 | struct pt_regs *regs; | 23 | struct pt_regs *regs; |
| 24 | unsigned long pc; | 24 | unsigned long pc; |
| 25 | 25 | ||
| @@ -28,15 +28,17 @@ void save_stack_trace(struct stack_trace *trace) | |||
| 28 | fp >= (thread_base + THREAD_SIZE)) | 28 | fp >= (thread_base + THREAD_SIZE)) |
| 29 | break; | 29 | break; |
| 30 | 30 | ||
| 31 | rw = (struct reg_window *) fp; | 31 | sf = (struct sparc_stackf *) fp; |
| 32 | regs = (struct pt_regs *) (rw + 1); | 32 | regs = (struct pt_regs *) (sf + 1); |
| 33 | 33 | ||
| 34 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { | 34 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { |
| 35 | if (!(regs->tstate & TSTATE_PRIV)) | ||
| 36 | break; | ||
| 35 | pc = regs->tpc; | 37 | pc = regs->tpc; |
| 36 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; | 38 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; |
| 37 | } else { | 39 | } else { |
| 38 | pc = rw->ins[7]; | 40 | pc = sf->callers_pc; |
| 39 | fp = rw->ins[6] + STACK_BIAS; | 41 | fp = (unsigned long)sf->fp + STACK_BIAS; |
| 40 | } | 42 | } |
| 41 | 43 | ||
| 42 | if (trace->skip > 0) | 44 | if (trace->skip > 0) |
diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c index b930fee7708a..7461581b3bb9 100644 --- a/arch/sparc64/kernel/starfire.c +++ b/arch/sparc64/kernel/starfire.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: starfire.c,v 1.10 2001/04/14 21:13:45 davem Exp $ | 1 | /* |
| 2 | * starfire.c: Starfire/E10000 support. | 2 | * starfire.c: Starfire/E10000 support. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1998 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1998 David S. Miller (davem@redhat.com) |
diff --git a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S index 010a737908ee..ade18ba0c686 100644 --- a/arch/sparc64/kernel/sys32.S +++ b/arch/sparc64/kernel/sys32.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: sys32.S,v 1.12 2000/03/24 04:17:37 davem Exp $ | 1 | /* |
| 2 | * sys32.S: I-cache tricks for 32-bit compatibility layer simple | 2 | * sys32.S: I-cache tricks for 32-bit compatibility layer simple |
| 3 | * conversions. | 3 | * conversions. |
| 4 | * | 4 | * |
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index 56ff55211341..704a3afcfd06 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: trampoline.S,v 1.26 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
| 2 | * trampoline.S: Jump start slave processors on sparc64. | 2 | * trampoline.S: Jump start slave processors on sparc64. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index d9b8d46707d1..369749262653 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
| @@ -2116,7 +2116,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
| 2116 | printk("\n"); | 2116 | printk("\n"); |
| 2117 | #endif | 2117 | #endif |
| 2118 | do { | 2118 | do { |
| 2119 | struct reg_window *rw; | 2119 | struct sparc_stackf *sf; |
| 2120 | struct pt_regs *regs; | 2120 | struct pt_regs *regs; |
| 2121 | unsigned long pc; | 2121 | unsigned long pc; |
| 2122 | 2122 | ||
| @@ -2124,15 +2124,17 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
| 2124 | if (fp < (thread_base + sizeof(struct thread_info)) || | 2124 | if (fp < (thread_base + sizeof(struct thread_info)) || |
| 2125 | fp >= (thread_base + THREAD_SIZE)) | 2125 | fp >= (thread_base + THREAD_SIZE)) |
| 2126 | break; | 2126 | break; |
| 2127 | rw = (struct reg_window *)fp; | 2127 | sf = (struct sparc_stackf *) fp; |
| 2128 | regs = (struct pt_regs *) (rw + 1); | 2128 | regs = (struct pt_regs *) (sf + 1); |
| 2129 | 2129 | ||
| 2130 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { | 2130 | if ((regs->magic & ~0x1ff) == PT_REGS_MAGIC) { |
| 2131 | if (!(regs->tstate & TSTATE_PRIV)) | ||
| 2132 | break; | ||
| 2131 | pc = regs->tpc; | 2133 | pc = regs->tpc; |
| 2132 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; | 2134 | fp = regs->u_regs[UREG_I6] + STACK_BIAS; |
| 2133 | } else { | 2135 | } else { |
| 2134 | pc = rw->ins[7]; | 2136 | pc = sf->callers_pc; |
| 2135 | fp = rw->ins[6] + STACK_BIAS; | 2137 | fp = (unsigned long)sf->fp + STACK_BIAS; |
| 2136 | } | 2138 | } |
| 2137 | 2139 | ||
| 2138 | printk(" [%016lx] ", pc); | 2140 | printk(" [%016lx] ", pc); |
diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c index 1a511e9f0d3e..afa7fc4f5193 100644 --- a/arch/sparc64/kernel/unaligned.c +++ b/arch/sparc64/kernel/unaligned.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: unaligned.c,v 1.24 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
| 2 | * unaligned.c: Unaligned load/store trap handling with special | 2 | * unaligned.c: Unaligned load/store trap handling with special |
| 3 | * cases for the kernel to do them more quickly. | 3 | * cases for the kernel to do them more quickly. |
| 4 | * | 4 | * |
diff --git a/arch/sparc64/lib/PeeCeeI.c b/arch/sparc64/lib/PeeCeeI.c index 3c6cfbb20360..8b313f11bc8d 100644 --- a/arch/sparc64/lib/PeeCeeI.c +++ b/arch/sparc64/lib/PeeCeeI.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: PeeCeeI.c,v 1.4 1999/09/06 01:17:35 davem Exp $ | 1 | /* |
| 2 | * PeeCeeI.c: The emerging standard... | 2 | * PeeCeeI.c: The emerging standard... |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/lib/VISsave.S b/arch/sparc64/lib/VISsave.S index a0ded5c5aa5c..b320ae9e2e2e 100644 --- a/arch/sparc64/lib/VISsave.S +++ b/arch/sparc64/lib/VISsave.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: VISsave.S,v 1.6 2002/02/09 19:49:30 davem Exp $ | 1 | /* |
| 2 | * VISsave.S: Code for saving FPU register state for | 2 | * VISsave.S: Code for saving FPU register state for |
| 3 | * VIS routines. One should not call this directly, | 3 | * VIS routines. One should not call this directly, |
| 4 | * but use macros provided in <asm/visasm.h>. | 4 | * but use macros provided in <asm/visasm.h>. |
diff --git a/arch/sparc64/lib/memcmp.S b/arch/sparc64/lib/memcmp.S index c90ad96c51b9..d3fdaa898566 100644 --- a/arch/sparc64/lib/memcmp.S +++ b/arch/sparc64/lib/memcmp.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: memcmp.S,v 1.3 2000/03/23 07:51:08 davem Exp $ | 1 | /* |
| 2 | * Sparc64 optimized memcmp code. | 2 | * Sparc64 optimized memcmp code. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/lib/memscan.S b/arch/sparc64/lib/memscan.S index 5e72d4911417..5686dfa5dc15 100644 --- a/arch/sparc64/lib/memscan.S +++ b/arch/sparc64/lib/memscan.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: memscan.S,v 1.3 2000/01/31 04:59:10 davem Exp $ | 1 | /* |
| 2 | * memscan.S: Optimized memscan for Sparc64. | 2 | * memscan.S: Optimized memscan for Sparc64. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997,1998 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/lib/strncmp.S b/arch/sparc64/lib/strncmp.S index 6f14f53dbabe..980e83751556 100644 --- a/arch/sparc64/lib/strncmp.S +++ b/arch/sparc64/lib/strncmp.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: strncmp.S,v 1.2 1997/03/11 17:51:44 jj Exp $ | 1 | /* |
| 2 | * Sparc64 optimized strncmp code. | 2 | * Sparc64 optimized strncmp code. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/lib/strncpy_from_user.S b/arch/sparc64/lib/strncpy_from_user.S index b2f499f79427..511c8f136f95 100644 --- a/arch/sparc64/lib/strncpy_from_user.S +++ b/arch/sparc64/lib/strncpy_from_user.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: strncpy_from_user.S,v 1.6 1999/05/25 16:53:05 jj Exp $ | 1 | /* |
| 2 | * strncpy_from_user.S: Sparc64 strncpy from userspace. | 2 | * strncpy_from_user.S: Sparc64 strncpy from userspace. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/math-emu/math.c b/arch/sparc64/math-emu/math.c index 6ee496c2864a..add053e0f3b3 100644 --- a/arch/sparc64/math-emu/math.c +++ b/arch/sparc64/math-emu/math.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: math.c,v 1.11 1999/12/20 05:02:25 davem Exp $ | 1 | /* |
| 2 | * arch/sparc64/math-emu/math.c | 2 | * arch/sparc64/math-emu/math.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997,1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1997,1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/math-emu/sfp-util.h b/arch/sparc64/math-emu/sfp-util.h index 31e474738cf6..425d3cf01af4 100644 --- a/arch/sparc64/math-emu/sfp-util.h +++ b/arch/sparc64/math-emu/sfp-util.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: sfp-util.h,v 1.5 2001/06/10 06:48:46 davem Exp $ | 1 | /* |
| 2 | * arch/sparc64/math-emu/sfp-util.h | 2 | * arch/sparc64/math-emu/sfp-util.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) | 4 | * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) |
diff --git a/arch/sparc64/mm/Makefile b/arch/sparc64/mm/Makefile index e415bf942bcd..68d04c0370f4 100644 --- a/arch/sparc64/mm/Makefile +++ b/arch/sparc64/mm/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: Makefile,v 1.8 2000/12/14 22:57:25 davem Exp $ | ||
| 2 | # Makefile for the linux Sparc64-specific parts of the memory manager. | 1 | # Makefile for the linux Sparc64-specific parts of the memory manager. |
| 3 | # | 2 | # |
| 4 | 3 | ||
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 2650d0d33ac2..236f4d228d2b 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: fault.c,v 1.59 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
| 2 | * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. | 2 | * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/mm/generic.c b/arch/sparc64/mm/generic.c index af9d81db0b38..f362c2037013 100644 --- a/arch/sparc64/mm/generic.c +++ b/arch/sparc64/mm/generic.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: generic.c,v 1.18 2001/12/21 04:56:15 davem Exp $ | 1 | /* |
| 2 | * generic.c: Generic Sparc mm routines that are not dependent upon | 2 | * generic.c: Generic Sparc mm routines that are not dependent upon |
| 3 | * MMU type but are Sparc specific. | 3 | * MMU type but are Sparc specific. |
| 4 | * | 4 | * |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 3c7b9471eafb..84898c44dd4d 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: init.c,v 1.209 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
| 2 | * arch/sparc64/mm/init.c | 2 | * arch/sparc64/mm/init.c |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996-1999 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index 796e005dad8b..9bb2d90a9df6 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* $Id: ultra.S,v 1.72 2002/02/09 19:49:31 davem Exp $ | 1 | /* |
| 2 | * ultra.S: Don't expand these all over the place... | 2 | * ultra.S: Don't expand these all over the place... |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1997, 2000 David S. Miller (davem@redhat.com) | 4 | * Copyright (C) 1997, 2000, 2008 David S. Miller (davem@davemloft.net) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <asm/asi.h> | 7 | #include <asm/asi.h> |
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <asm/thread_info.h> | 15 | #include <asm/thread_info.h> |
| 16 | #include <asm/cacheflush.h> | 16 | #include <asm/cacheflush.h> |
| 17 | #include <asm/hypervisor.h> | 17 | #include <asm/hypervisor.h> |
| 18 | #include <asm/cpudata.h> | ||
| 18 | 19 | ||
| 19 | /* Basically, most of the Spitfire vs. Cheetah madness | 20 | /* Basically, most of the Spitfire vs. Cheetah madness |
| 20 | * has to do with the fact that Cheetah does not support | 21 | * has to do with the fact that Cheetah does not support |
| @@ -514,6 +515,32 @@ xcall_report_regs: | |||
| 514 | b rtrap_xcall | 515 | b rtrap_xcall |
| 515 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 | 516 | ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1 |
| 516 | 517 | ||
| 518 | #ifdef CONFIG_MAGIC_SYSRQ | ||
| 519 | .globl xcall_fetch_glob_regs | ||
| 520 | xcall_fetch_glob_regs: | ||
| 521 | sethi %hi(global_reg_snapshot), %g1 | ||
| 522 | or %g1, %lo(global_reg_snapshot), %g1 | ||
| 523 | __GET_CPUID(%g2) | ||
| 524 | sllx %g2, 6, %g3 | ||
| 525 | add %g1, %g3, %g1 | ||
| 526 | rdpr %tstate, %g7 | ||
| 527 | stx %g7, [%g1 + GR_SNAP_TSTATE] | ||
| 528 | rdpr %tpc, %g7 | ||
| 529 | stx %g7, [%g1 + GR_SNAP_TPC] | ||
| 530 | rdpr %tnpc, %g7 | ||
| 531 | stx %g7, [%g1 + GR_SNAP_TNPC] | ||
| 532 | stx %o7, [%g1 + GR_SNAP_O7] | ||
| 533 | stx %i7, [%g1 + GR_SNAP_I7] | ||
| 534 | sethi %hi(trap_block), %g7 | ||
| 535 | or %g7, %lo(trap_block), %g7 | ||
| 536 | sllx %g2, TRAP_BLOCK_SZ_SHIFT, %g2 | ||
| 537 | add %g7, %g2, %g7 | ||
| 538 | ldx [%g7 + TRAP_PER_CPU_THREAD], %g3 | ||
| 539 | membar #StoreStore | ||
| 540 | stx %g3, [%g1 + GR_SNAP_THREAD] | ||
| 541 | retry | ||
| 542 | #endif /* CONFIG_MAGIC_SYSRQ */ | ||
| 543 | |||
| 517 | #ifdef DCACHE_ALIASING_POSSIBLE | 544 | #ifdef DCACHE_ALIASING_POSSIBLE |
| 518 | .align 32 | 545 | .align 32 |
| 519 | .globl xcall_flush_dcache_page_cheetah | 546 | .globl xcall_flush_dcache_page_cheetah |
diff --git a/arch/sparc64/prom/Makefile b/arch/sparc64/prom/Makefile index 3d33ed27bc27..8c94483ca54d 100644 --- a/arch/sparc64/prom/Makefile +++ b/arch/sparc64/prom/Makefile | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | # $Id: Makefile,v 1.7 2000/12/14 22:57:25 davem Exp $ | ||
| 2 | # Makefile for the Sun Boot PROM interface library under | 1 | # Makefile for the Sun Boot PROM interface library under |
| 3 | # Linux. | 2 | # Linux. |
| 4 | # | 3 | # |
diff --git a/arch/sparc64/prom/bootstr.c b/arch/sparc64/prom/bootstr.c index a7278614e99d..ab9ccc63b388 100644 --- a/arch/sparc64/prom/bootstr.c +++ b/arch/sparc64/prom/bootstr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: bootstr.c,v 1.6 1999/08/31 06:55:01 davem Exp $ | 1 | /* |
| 2 | * bootstr.c: Boot string/argument acquisition from the PROM. | 2 | * bootstr.c: Boot string/argument acquisition from the PROM. |
| 3 | * | 3 | * |
| 4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright(C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/prom/devops.c b/arch/sparc64/prom/devops.c index 4641839eb39a..9dbd803e46e1 100644 --- a/arch/sparc64/prom/devops.c +++ b/arch/sparc64/prom/devops.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: devops.c,v 1.3 1997/10/29 07:43:28 ecd Exp $ | 1 | /* |
| 2 | * devops.c: Device operations using the PROM. | 2 | * devops.c: Device operations using the PROM. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) |
diff --git a/arch/sparc64/prom/init.c b/arch/sparc64/prom/init.c index 87e7c7ea0ee6..7b00f89490a4 100644 --- a/arch/sparc64/prom/init.c +++ b/arch/sparc64/prom/init.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: init.c,v 1.10 1999/09/21 14:35:59 davem Exp $ | 1 | /* |
| 2 | * init.c: Initialize internal variables used by the PROM | 2 | * init.c: Initialize internal variables used by the PROM |
| 3 | * library functions. | 3 | * library functions. |
| 4 | * | 4 | * |
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c index 47a877a15abd..9b0c0760901e 100644 --- a/arch/sparc64/prom/misc.c +++ b/arch/sparc64/prom/misc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: misc.c,v 1.20 2001/09/21 03:17:07 kanoj Exp $ | 1 | /* |
| 2 | * misc.c: Miscellaneous prom functions that don't belong | 2 | * misc.c: Miscellaneous prom functions that don't belong |
| 3 | * anywhere else. | 3 | * anywhere else. |
| 4 | * | 4 | * |
diff --git a/arch/sparc64/prom/p1275.c b/arch/sparc64/prom/p1275.c index 7fcccc0e19cf..4b7c937bba61 100644 --- a/arch/sparc64/prom/p1275.c +++ b/arch/sparc64/prom/p1275.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: p1275.c,v 1.22 2001/10/18 09:40:00 davem Exp $ | 1 | /* |
| 2 | * p1275.c: Sun IEEE 1275 PROM low level interface routines | 2 | * p1275.c: Sun IEEE 1275 PROM low level interface routines |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) | 4 | * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) |
diff --git a/arch/sparc64/prom/tree.c b/arch/sparc64/prom/tree.c index a99ccd7fb1b0..281aea44790b 100644 --- a/arch/sparc64/prom/tree.c +++ b/arch/sparc64/prom/tree.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $Id: tree.c,v 1.10 1998/01/10 22:39:00 ecd Exp $ | 1 | /* |
| 2 | * tree.c: Basic device tree traversal/scanning for the Linux | 2 | * tree.c: Basic device tree traversal/scanning for the Linux |
| 3 | * prom library. | 3 | * prom library. |
| 4 | * | 4 | * |
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index dba8e05f0287..6976812cfb18 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
| @@ -259,6 +259,8 @@ if BROKEN | |||
| 259 | source "drivers/mtd/Kconfig" | 259 | source "drivers/mtd/Kconfig" |
| 260 | endif | 260 | endif |
| 261 | 261 | ||
| 262 | source "drivers/leds/Kconfig" | ||
| 263 | |||
| 262 | #This is just to shut up some Kconfig warnings, so no prompt. | 264 | #This is just to shut up some Kconfig warnings, so no prompt. |
| 263 | config INPUT | 265 | config INPUT |
| 264 | bool | 266 | bool |
diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c index e9809356c530..5f903587d69e 100644 --- a/arch/um/drivers/pcap_user.c +++ b/arch/um/drivers/pcap_user.c | |||
| @@ -50,7 +50,7 @@ static int pcap_open(void *data) | |||
| 50 | return -EIO; | 50 | return -EIO; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | pri->compiled = kmalloc(sizeof(struct bpf_program), | 53 | pri->compiled = uml_kmalloc(sizeof(struct bpf_program), |
| 54 | UM_GFP_KERNEL); | 54 | UM_GFP_KERNEL); |
| 55 | if (pri->compiled == NULL) { | 55 | if (pri->compiled == NULL) { |
| 56 | printk(UM_KERN_ERR "pcap_open : kmalloc failed\n"); | 56 | printk(UM_KERN_ERR "pcap_open : kmalloc failed\n"); |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 44ad1607be2d..b58fb8941d8d 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #include "irq_user.h" | 49 | #include "irq_user.h" |
| 50 | #include "irq_kern.h" | 50 | #include "irq_kern.h" |
| 51 | #include "ubd_user.h" | 51 | #include "ubd_user.h" |
| 52 | #include "kern_util.h" | ||
| 53 | #include "os.h" | 52 | #include "os.h" |
| 54 | #include "mem.h" | 53 | #include "mem.h" |
| 55 | #include "mem_kern.h" | 54 | #include "mem_kern.h" |
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index e2716ac8889a..db5be46e3e18 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h | |||
| @@ -299,6 +299,6 @@ extern int os_arch_prctl(int pid, int code, unsigned long *addr); | |||
| 299 | extern int get_pty(void); | 299 | extern int get_pty(void); |
| 300 | 300 | ||
| 301 | /* sys-$ARCH/task_size.c */ | 301 | /* sys-$ARCH/task_size.c */ |
| 302 | extern unsigned long os_get_task_size(void); | 302 | extern unsigned long os_get_top_address(void); |
| 303 | 303 | ||
| 304 | #endif | 304 | #endif |
diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c index dcfceca95052..910eda8fca18 100644 --- a/arch/um/kernel/init_task.c +++ b/arch/um/kernel/init_task.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
| 14 | struct mm_struct init_mm = INIT_MM(init_mm); | 14 | struct mm_struct init_mm = INIT_MM(init_mm); |
| 15 | static struct files_struct init_files = INIT_FILES; | ||
| 16 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 17 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 18 | EXPORT_SYMBOL(init_mm); | 17 | EXPORT_SYMBOL(init_mm); |
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c index 66e2a305a8d6..ccc02a616c22 100644 --- a/arch/um/kernel/ksyms.c +++ b/arch/um/kernel/ksyms.c | |||
| @@ -60,6 +60,11 @@ EXPORT_SYMBOL(os_rcv_fd); | |||
| 60 | EXPORT_SYMBOL(run_helper); | 60 | EXPORT_SYMBOL(run_helper); |
| 61 | EXPORT_SYMBOL(start_thread); | 61 | EXPORT_SYMBOL(start_thread); |
| 62 | 62 | ||
| 63 | EXPORT_SYMBOL(add_sigio_fd); | ||
| 64 | EXPORT_SYMBOL(ignore_sigio_fd); | ||
| 65 | EXPORT_SYMBOL(deactivate_fd); | ||
| 66 | EXPORT_SYMBOL(sigio_broken); | ||
| 67 | |||
| 63 | #ifdef CONFIG_SMP | 68 | #ifdef CONFIG_SMP |
| 64 | 69 | ||
| 65 | /* required for SMP */ | 70 | /* required for SMP */ |
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 9db85b2ce698..8d84250324b3 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c | |||
| @@ -274,7 +274,7 @@ int __init linux_main(int argc, char **argv) | |||
| 274 | if (have_root == 0) | 274 | if (have_root == 0) |
| 275 | add_arg(DEFAULT_COMMAND_LINE); | 275 | add_arg(DEFAULT_COMMAND_LINE); |
| 276 | 276 | ||
| 277 | host_task_size = os_get_task_size(); | 277 | host_task_size = os_get_top_address(); |
| 278 | /* | 278 | /* |
| 279 | * TASK_SIZE needs to be PGDIR_SIZE aligned or else exit_mmap craps | 279 | * TASK_SIZE needs to be PGDIR_SIZE aligned or else exit_mmap craps |
| 280 | * out | 280 | * out |
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index 74ca7aabf4e1..30860b89ec58 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <unistd.h> | 7 | #include <unistd.h> |
| 8 | #include <errno.h> | 8 | #include <errno.h> |
| 9 | #include <sched.h> | 9 | #include <sched.h> |
| 10 | #include <linux/limits.h> | ||
| 10 | #include <sys/socket.h> | 11 | #include <sys/socket.h> |
| 11 | #include <sys/wait.h> | 12 | #include <sys/wait.h> |
| 12 | #include "kern_constants.h" | 13 | #include "kern_constants.h" |
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 6be028ca1817..172ad8f72e12 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c | |||
| @@ -55,7 +55,7 @@ static int ptrace_dump_regs(int pid) | |||
| 55 | * Signals that are OK to receive in the stub - we'll just continue it. | 55 | * Signals that are OK to receive in the stub - we'll just continue it. |
| 56 | * SIGWINCH will happen when UML is inside a detached screen. | 56 | * SIGWINCH will happen when UML is inside a detached screen. |
| 57 | */ | 57 | */ |
| 58 | #define STUB_SIG_MASK (1 << SIGVTALRM) | 58 | #define STUB_SIG_MASK ((1 << SIGVTALRM) | (1 << SIGWINCH)) |
| 59 | 59 | ||
| 60 | /* Signals that the stub will finish with - anything else is an error */ | 60 | /* Signals that the stub will finish with - anything else is an error */ |
| 61 | #define STUB_DONE_MASK (1 << SIGTRAP) | 61 | #define STUB_DONE_MASK (1 << SIGTRAP) |
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index b4b36e0f2e89..183db26d01bf 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c | |||
| @@ -121,8 +121,10 @@ static int stop_ptraced_child(int pid, int exitcode, int mustexit) | |||
| 121 | { | 121 | { |
| 122 | int status, n, ret = 0; | 122 | int status, n, ret = 0; |
| 123 | 123 | ||
| 124 | if (ptrace(PTRACE_CONT, pid, 0, 0) < 0) | 124 | if (ptrace(PTRACE_CONT, pid, 0, 0) < 0) { |
| 125 | fatal_perror("stop_ptraced_child : ptrace failed"); | 125 | perror("stop_ptraced_child : ptrace failed"); |
| 126 | return -1; | ||
| 127 | } | ||
| 126 | CATCH_EINTR(n = waitpid(pid, &status, 0)); | 128 | CATCH_EINTR(n = waitpid(pid, &status, 0)); |
| 127 | if (!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) { | 129 | if (!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) { |
| 128 | int exit_with = WEXITSTATUS(status); | 130 | int exit_with = WEXITSTATUS(status); |
| @@ -212,7 +214,7 @@ static void __init check_sysemu(void) | |||
| 212 | if (n < 0) | 214 | if (n < 0) |
| 213 | fatal_perror("check_sysemu : wait failed"); | 215 | fatal_perror("check_sysemu : wait failed"); |
| 214 | if (!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGTRAP)) | 216 | if (!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGTRAP)) |
| 215 | fatal("check_sysemu : expected SIGTRAP, got status = %d", | 217 | fatal("check_sysemu : expected SIGTRAP, got status = %d\n", |
| 216 | status); | 218 | status); |
| 217 | 219 | ||
| 218 | if (ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) | 220 | if (ptrace(PTRACE_GETREGS, pid, 0, regs) < 0) |
| @@ -254,9 +256,11 @@ static void __init check_sysemu(void) | |||
| 254 | 256 | ||
| 255 | if (WIFSTOPPED(status) && | 257 | if (WIFSTOPPED(status) && |
| 256 | (WSTOPSIG(status) == (SIGTRAP|0x80))) { | 258 | (WSTOPSIG(status) == (SIGTRAP|0x80))) { |
| 257 | if (!count) | 259 | if (!count) { |
| 258 | fatal("check_ptrace : SYSEMU_SINGLESTEP " | 260 | non_fatal("check_ptrace : SYSEMU_SINGLESTEP " |
| 259 | "doesn't singlestep"); | 261 | "doesn't singlestep"); |
| 262 | goto fail; | ||
| 263 | } | ||
| 260 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, | 264 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, |
| 261 | os_getpid()); | 265 | os_getpid()); |
| 262 | if (n < 0) | 266 | if (n < 0) |
| @@ -266,9 +270,12 @@ static void __init check_sysemu(void) | |||
| 266 | } | 270 | } |
| 267 | else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) | 271 | else if (WIFSTOPPED(status) && (WSTOPSIG(status) == SIGTRAP)) |
| 268 | count++; | 272 | count++; |
| 269 | else | 273 | else { |
| 270 | fatal("check_ptrace : expected SIGTRAP or " | 274 | non_fatal("check_ptrace : expected SIGTRAP or " |
| 271 | "(SIGTRAP | 0x80), got status = %d", status); | 275 | "(SIGTRAP | 0x80), got status = %d\n", |
| 276 | status); | ||
| 277 | goto fail; | ||
| 278 | } | ||
| 272 | } | 279 | } |
| 273 | if (stop_ptraced_child(pid, 0, 0) < 0) | 280 | if (stop_ptraced_child(pid, 0, 0) < 0) |
| 274 | goto fail_stopped; | 281 | goto fail_stopped; |
diff --git a/arch/um/os-Linux/sys-i386/registers.c b/arch/um/os-Linux/sys-i386/registers.c index c6183e7aec3d..229f7a53d8da 100644 --- a/arch/um/os-Linux/sys-i386/registers.c +++ b/arch/um/os-Linux/sys-i386/registers.c | |||
| @@ -5,7 +5,8 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <errno.h> | 7 | #include <errno.h> |
| 8 | #include <asm/user.h> | 8 | #include <sys/ptrace.h> |
| 9 | #include <sys/user.h> | ||
| 9 | #include "kern_constants.h" | 10 | #include "kern_constants.h" |
| 10 | #include "longjmp.h" | 11 | #include "longjmp.h" |
| 11 | #include "user.h" | 12 | #include "user.h" |
| @@ -75,7 +76,7 @@ int put_fp_registers(int pid, unsigned long *regs) | |||
| 75 | 76 | ||
| 76 | void arch_init_registers(int pid) | 77 | void arch_init_registers(int pid) |
| 77 | { | 78 | { |
| 78 | struct user_fxsr_struct fpx_regs; | 79 | struct user_fpxregs_struct fpx_regs; |
| 79 | int err; | 80 | int err; |
| 80 | 81 | ||
| 81 | err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs); | 82 | err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs); |
diff --git a/arch/um/os-Linux/sys-i386/task_size.c b/arch/um/os-Linux/sys-i386/task_size.c index ccb49b0aff59..be04c1e183bf 100644 --- a/arch/um/os-Linux/sys-i386/task_size.c +++ b/arch/um/os-Linux/sys-i386/task_size.c | |||
| @@ -63,7 +63,7 @@ static int page_ok(unsigned long page) | |||
| 63 | return ok; | 63 | return ok; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | unsigned long os_get_task_size(void) | 66 | unsigned long os_get_top_address(void) |
| 67 | { | 67 | { |
| 68 | struct sigaction sa, old; | 68 | struct sigaction sa, old; |
| 69 | unsigned long bottom = 0; | 69 | unsigned long bottom = 0; |
| @@ -76,9 +76,9 @@ unsigned long os_get_task_size(void) | |||
| 76 | * hosts, but shouldn't hurt otherwise. | 76 | * hosts, but shouldn't hurt otherwise. |
| 77 | */ | 77 | */ |
| 78 | unsigned long top = 0xffffd000 >> UM_KERN_PAGE_SHIFT; | 78 | unsigned long top = 0xffffd000 >> UM_KERN_PAGE_SHIFT; |
| 79 | unsigned long test; | 79 | unsigned long test, original; |
| 80 | 80 | ||
| 81 | printf("Locating the top of the address space ... "); | 81 | printf("Locating the bottom of the address space ... "); |
| 82 | fflush(stdout); | 82 | fflush(stdout); |
| 83 | 83 | ||
| 84 | /* | 84 | /* |
| @@ -89,16 +89,31 @@ unsigned long os_get_task_size(void) | |||
| 89 | sigemptyset(&sa.sa_mask); | 89 | sigemptyset(&sa.sa_mask); |
| 90 | sa.sa_flags = SA_NODEFER; | 90 | sa.sa_flags = SA_NODEFER; |
| 91 | if (sigaction(SIGSEGV, &sa, &old)) { | 91 | if (sigaction(SIGSEGV, &sa, &old)) { |
| 92 | perror("os_get_task_size"); | 92 | perror("os_get_top_address"); |
| 93 | exit(1); | 93 | exit(1); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | if (!page_ok(bottom)) { | 96 | /* Manually scan the address space, bottom-up, until we find |
| 97 | fprintf(stderr, "Address 0x%x no good?\n", | 97 | * the first valid page (or run out of them). |
| 98 | bottom << UM_KERN_PAGE_SHIFT); | 98 | */ |
| 99 | for (bottom = 0; bottom < top; bottom++) { | ||
| 100 | if (page_ok(bottom)) | ||
| 101 | break; | ||
| 102 | } | ||
| 103 | |||
| 104 | /* If we've got this far, we ran out of pages. */ | ||
| 105 | if (bottom == top) { | ||
| 106 | fprintf(stderr, "Unable to determine bottom of address " | ||
| 107 | "space.\n"); | ||
| 99 | exit(1); | 108 | exit(1); |
| 100 | } | 109 | } |
| 101 | 110 | ||
| 111 | printf("0x%x\n", bottom << UM_KERN_PAGE_SHIFT); | ||
| 112 | printf("Locating the top of the address space ... "); | ||
| 113 | fflush(stdout); | ||
| 114 | |||
| 115 | original = bottom; | ||
| 116 | |||
| 102 | /* This could happen with a 4G/4G split */ | 117 | /* This could happen with a 4G/4G split */ |
| 103 | if (page_ok(top)) | 118 | if (page_ok(top)) |
| 104 | goto out; | 119 | goto out; |
| @@ -114,7 +129,7 @@ unsigned long os_get_task_size(void) | |||
| 114 | out: | 129 | out: |
| 115 | /* Restore the old SIGSEGV handling */ | 130 | /* Restore the old SIGSEGV handling */ |
| 116 | if (sigaction(SIGSEGV, &old, NULL)) { | 131 | if (sigaction(SIGSEGV, &old, NULL)) { |
| 117 | perror("os_get_task_size"); | 132 | perror("os_get_top_address"); |
| 118 | exit(1); | 133 | exit(1); |
| 119 | } | 134 | } |
| 120 | top <<= UM_KERN_PAGE_SHIFT; | 135 | top <<= UM_KERN_PAGE_SHIFT; |
diff --git a/arch/um/os-Linux/sys-x86_64/task_size.c b/arch/um/os-Linux/sys-x86_64/task_size.c index fad6f57f8ee3..26a0dd1f349c 100644 --- a/arch/um/os-Linux/sys-x86_64/task_size.c +++ b/arch/um/os-Linux/sys-x86_64/task_size.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | unsigned long os_get_task_size(unsigned long shift) | 1 | unsigned long os_get_top_address(unsigned long shift) |
| 2 | { | 2 | { |
| 3 | /* The old value of CONFIG_TOP_ADDR */ | 3 | /* The old value of CONFIG_TOP_ADDR */ |
| 4 | return 0x7fc0000000; | 4 | return 0x7fc0000000; |
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index bee98f466d66..dec5678fc17f 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c | |||
| @@ -106,6 +106,10 @@ static void deliver_alarm(void) | |||
| 106 | unsigned long long this_tick = os_nsecs(); | 106 | unsigned long long this_tick = os_nsecs(); |
| 107 | int one_tick = UM_NSEC_PER_SEC / UM_HZ; | 107 | int one_tick = UM_NSEC_PER_SEC / UM_HZ; |
| 108 | 108 | ||
| 109 | /* Protection against the host's time going backwards */ | ||
| 110 | if ((last_tick != 0) && (this_tick < last_tick)) | ||
| 111 | this_tick = last_tick; | ||
| 112 | |||
| 109 | if (last_tick == 0) | 113 | if (last_tick == 0) |
| 110 | last_tick = this_tick - one_tick; | 114 | last_tick = this_tick - one_tick; |
| 111 | 115 | ||
| @@ -148,6 +152,9 @@ static int after_sleep_interval(struct timespec *ts) | |||
| 148 | start_usecs = usec; | 152 | start_usecs = usec; |
| 149 | 153 | ||
| 150 | start_usecs -= skew / UM_NSEC_PER_USEC; | 154 | start_usecs -= skew / UM_NSEC_PER_USEC; |
| 155 | if (start_usecs < 0) | ||
| 156 | start_usecs = 0; | ||
| 157 | |||
| 151 | tv = ((struct timeval) { .tv_sec = start_usecs / UM_USEC_PER_SEC, | 158 | tv = ((struct timeval) { .tv_sec = start_usecs / UM_USEC_PER_SEC, |
| 152 | .tv_usec = start_usecs % UM_USEC_PER_SEC }); | 159 | .tv_usec = start_usecs % UM_USEC_PER_SEC }); |
| 153 | interval = ((struct itimerval) { { 0, usec }, tv }); | 160 | interval = ((struct itimerval) { { 0, usec }, tv }); |
diff --git a/arch/um/sys-x86_64/ksyms.c b/arch/um/sys-x86_64/ksyms.c index 4d7d1a812d8f..1db2fce00948 100644 --- a/arch/um/sys-x86_64/ksyms.c +++ b/arch/um/sys-x86_64/ksyms.c | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | #include "linux/module.h" | 1 | #include <linux/module.h> |
| 2 | #include "asm/string.h" | 2 | #include <asm/string.h> |
| 3 | #include <asm/checksum.h> | ||
| 3 | 4 | ||
| 4 | /*XXX: we need them because they would be exported by x86_64 */ | 5 | /*XXX: we need them because they would be exported by x86_64 */ |
| 6 | #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 | ||
| 7 | EXPORT_SYMBOL(memcpy); | ||
| 8 | #else | ||
| 5 | EXPORT_SYMBOL(__memcpy); | 9 | EXPORT_SYMBOL(__memcpy); |
| 10 | #endif | ||
| 11 | EXPORT_SYMBOL(csum_partial); | ||
diff --git a/arch/v850/kernel/init_task.c b/arch/v850/kernel/init_task.c index ed2f93cf7c66..44b274dff33f 100644 --- a/arch/v850/kernel/init_task.c +++ b/arch/v850/kernel/init_task.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
| 22 | 22 | ||
| 23 | static struct fs_struct init_fs = INIT_FS; | 23 | static struct fs_struct init_fs = INIT_FS; |
| 24 | static struct files_struct init_files = INIT_FILES; | ||
| 25 | static struct signal_struct init_signals = INIT_SIGNALS (init_signals); | 24 | static struct signal_struct init_signals = INIT_SIGNALS (init_signals); |
| 26 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 25 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 27 | struct mm_struct init_mm = INIT_MM (init_mm); | 26 | struct mm_struct init_mm = INIT_MM (init_mm); |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fe361ae7ef2f..bf07b6f50fa1 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -26,17 +26,10 @@ config X86 | |||
| 26 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 26 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
| 27 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 27 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
| 28 | 28 | ||
| 29 | config DEFCONFIG_LIST | 29 | config ARCH_DEFCONFIG |
| 30 | string | 30 | string |
| 31 | depends on X86_32 | 31 | default "arch/x86/configs/i386_defconfig" if X86_32 |
| 32 | option defconfig_list | 32 | default "arch/x86/configs/x86_64_defconfig" if X86_64 |
| 33 | default "arch/x86/configs/i386_defconfig" | ||
| 34 | |||
| 35 | config DEFCONFIG_LIST | ||
| 36 | string | ||
| 37 | depends on X86_64 | ||
| 38 | option defconfig_list | ||
| 39 | default "arch/x86/configs/x86_64_defconfig" | ||
| 40 | 33 | ||
| 41 | 34 | ||
| 42 | config GENERIC_LOCKBREAK | 35 | config GENERIC_LOCKBREAK |
| @@ -390,6 +383,7 @@ config VMI | |||
| 390 | config KVM_CLOCK | 383 | config KVM_CLOCK |
| 391 | bool "KVM paravirtualized clock" | 384 | bool "KVM paravirtualized clock" |
| 392 | select PARAVIRT | 385 | select PARAVIRT |
| 386 | select PARAVIRT_CLOCK | ||
| 393 | depends on !(X86_VISWS || X86_VOYAGER) | 387 | depends on !(X86_VISWS || X86_VOYAGER) |
| 394 | help | 388 | help |
| 395 | Turning on this option will allow you to run a paravirtualized clock | 389 | Turning on this option will allow you to run a paravirtualized clock |
| @@ -417,6 +411,10 @@ config PARAVIRT | |||
| 417 | over full virtualization. However, when run without a hypervisor | 411 | over full virtualization. However, when run without a hypervisor |
| 418 | the kernel is theoretically slower and slightly larger. | 412 | the kernel is theoretically slower and slightly larger. |
| 419 | 413 | ||
| 414 | config PARAVIRT_CLOCK | ||
| 415 | bool | ||
| 416 | default n | ||
| 417 | |||
| 420 | endif | 418 | endif |
| 421 | 419 | ||
| 422 | config MEMTEST_BOOTPARAM | 420 | config MEMTEST_BOOTPARAM |
| @@ -968,8 +966,8 @@ config NUMA_EMU | |||
| 968 | number of nodes. This is only useful for debugging. | 966 | number of nodes. This is only useful for debugging. |
| 969 | 967 | ||
| 970 | config NODES_SHIFT | 968 | config NODES_SHIFT |
| 971 | int "Max num nodes shift(1-15)" | 969 | int "Max num nodes shift(1-9)" |
| 972 | range 1 15 if X86_64 | 970 | range 1 9 if X86_64 |
| 973 | default "6" if X86_64 | 971 | default "6" if X86_64 |
| 974 | default "4" if X86_NUMAQ | 972 | default "4" if X86_NUMAQ |
| 975 | default "3" | 973 | default "3" |
| @@ -1515,13 +1513,13 @@ config PCI_GOMMCONFIG | |||
| 1515 | config PCI_GODIRECT | 1513 | config PCI_GODIRECT |
| 1516 | bool "Direct" | 1514 | bool "Direct" |
| 1517 | 1515 | ||
| 1518 | config PCI_GOANY | ||
| 1519 | bool "Any" | ||
| 1520 | |||
| 1521 | config PCI_GOOLPC | 1516 | config PCI_GOOLPC |
| 1522 | bool "OLPC" | 1517 | bool "OLPC" |
| 1523 | depends on OLPC | 1518 | depends on OLPC |
| 1524 | 1519 | ||
| 1520 | config PCI_GOANY | ||
| 1521 | bool "Any" | ||
| 1522 | |||
| 1525 | endchoice | 1523 | endchoice |
| 1526 | 1524 | ||
| 1527 | config PCI_BIOS | 1525 | config PCI_BIOS |
| @@ -1538,9 +1536,8 @@ config PCI_MMCONFIG | |||
| 1538 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1536 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
| 1539 | 1537 | ||
| 1540 | config PCI_OLPC | 1538 | config PCI_OLPC |
| 1541 | bool | 1539 | def_bool y |
| 1542 | depends on PCI && PCI_GOOLPC | 1540 | depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY) |
| 1543 | default y | ||
| 1544 | 1541 | ||
| 1545 | config PCI_DOMAINS | 1542 | config PCI_DOMAINS |
| 1546 | def_bool y | 1543 | def_bool y |
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index ac1e31ba4795..18363374d51a 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
| @@ -6,15 +6,19 @@ config TRACE_IRQFLAGS_SUPPORT | |||
| 6 | source "lib/Kconfig.debug" | 6 | source "lib/Kconfig.debug" |
| 7 | 7 | ||
| 8 | config NONPROMISC_DEVMEM | 8 | config NONPROMISC_DEVMEM |
| 9 | bool "Disable promiscuous /dev/mem" | 9 | bool "Filter access to /dev/mem" |
| 10 | help | 10 | help |
| 11 | The /dev/mem file by default only allows userspace access to PCI | 11 | If this option is left off, you allow userspace access to all |
| 12 | space and the BIOS code and data regions. This is sufficient for | 12 | of memory, including kernel and userspace memory. Accidental |
| 13 | dosemu and X and all common users of /dev/mem. With this config | 13 | access to this is obviously disastrous, but specific access can |
| 14 | option, you allow userspace access to all of memory, including | 14 | be used by people debugging the kernel. |
| 15 | kernel and userspace memory. Accidental access to this is | 15 | |
| 16 | obviously disasterous, but specific access can be used by people | 16 | If this option is switched on, the /dev/mem file only allows |
| 17 | debugging the kernel. | 17 | userspace access to PCI space and the BIOS code and data regions. |
| 18 | This is sufficient for dosemu and X and all common users of | ||
| 19 | /dev/mem. | ||
| 20 | |||
| 21 | If in doubt, say Y. | ||
| 18 | 22 | ||
| 19 | config EARLY_PRINTK | 23 | config EARLY_PRINTK |
| 20 | bool "Early printk" if EMBEDDED | 24 | bool "Early printk" if EMBEDDED |
diff --git a/arch/x86/boot/a20.c b/arch/x86/boot/a20.c index 90943f83e84d..e01aafd03bde 100644 --- a/arch/x86/boot/a20.c +++ b/arch/x86/boot/a20.c | |||
| @@ -115,8 +115,6 @@ static void enable_a20_fast(void) | |||
| 115 | 115 | ||
| 116 | int enable_a20(void) | 116 | int enable_a20(void) |
| 117 | { | 117 | { |
| 118 | int loops = A20_ENABLE_LOOPS; | ||
| 119 | |||
| 120 | #if defined(CONFIG_X86_ELAN) | 118 | #if defined(CONFIG_X86_ELAN) |
| 121 | /* Elan croaks if we try to touch the KBC */ | 119 | /* Elan croaks if we try to touch the KBC */ |
| 122 | enable_a20_fast(); | 120 | enable_a20_fast(); |
| @@ -128,6 +126,7 @@ int enable_a20(void) | |||
| 128 | enable_a20_kbc(); | 126 | enable_a20_kbc(); |
| 129 | return 0; | 127 | return 0; |
| 130 | #else | 128 | #else |
| 129 | int loops = A20_ENABLE_LOOPS; | ||
| 131 | while (loops--) { | 130 | while (loops--) { |
| 132 | /* First, check to see if A20 is already enabled | 131 | /* First, check to see if A20 is already enabled |
| 133 | (legacy free, etc.) */ | 132 | (legacy free, etc.) */ |
diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c index c1d00c0274c4..50e47cdbdddd 100644 --- a/arch/x86/boot/printf.c +++ b/arch/x86/boot/printf.c | |||
| @@ -56,7 +56,7 @@ static char *number(char *str, long num, int base, int size, int precision, | |||
| 56 | if (type & LEFT) | 56 | if (type & LEFT) |
| 57 | type &= ~ZEROPAD; | 57 | type &= ~ZEROPAD; |
| 58 | if (base < 2 || base > 36) | 58 | if (base < 2 || base > 36) |
| 59 | return 0; | 59 | return NULL; |
| 60 | c = (type & ZEROPAD) ? '0' : ' '; | 60 | c = (type & ZEROPAD) ? '0' : ' '; |
| 61 | sign = 0; | 61 | sign = 0; |
| 62 | if (type & SIGN) { | 62 | if (type & SIGN) { |
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 5e618c3b4720..77807d4769c9 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -82,6 +82,7 @@ obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o | |||
| 82 | obj-$(CONFIG_KVM_GUEST) += kvm.o | 82 | obj-$(CONFIG_KVM_GUEST) += kvm.o |
| 83 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o | 83 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o |
| 84 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o | 84 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o |
| 85 | obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o | ||
| 85 | 86 | ||
| 86 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o | 87 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o |
| 87 | 88 | ||
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index c49ebcc6c41e..33c5216fd3e1 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -242,12 +242,19 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) | |||
| 242 | 242 | ||
| 243 | static void __cpuinit acpi_register_lapic(int id, u8 enabled) | 243 | static void __cpuinit acpi_register_lapic(int id, u8 enabled) |
| 244 | { | 244 | { |
| 245 | unsigned int ver = 0; | ||
| 246 | |||
| 245 | if (!enabled) { | 247 | if (!enabled) { |
| 246 | ++disabled_cpus; | 248 | ++disabled_cpus; |
| 247 | return; | 249 | return; |
| 248 | } | 250 | } |
| 249 | 251 | ||
| 250 | generic_processor_info(id, 0); | 252 | #ifdef CONFIG_X86_32 |
| 253 | if (boot_cpu_physical_apicid != -1U) | ||
| 254 | ver = apic_version[boot_cpu_physical_apicid]; | ||
| 255 | #endif | ||
| 256 | |||
| 257 | generic_processor_info(id, ver); | ||
| 251 | } | 258 | } |
| 252 | 259 | ||
| 253 | static int __init | 260 | static int __init |
| @@ -767,8 +774,13 @@ static void __init acpi_register_lapic_address(unsigned long address) | |||
| 767 | mp_lapic_addr = address; | 774 | mp_lapic_addr = address; |
| 768 | 775 | ||
| 769 | set_fixmap_nocache(FIX_APIC_BASE, address); | 776 | set_fixmap_nocache(FIX_APIC_BASE, address); |
| 770 | if (boot_cpu_physical_apicid == -1U) | 777 | if (boot_cpu_physical_apicid == -1U) { |
| 771 | boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id()); | 778 | boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id()); |
| 779 | #ifdef CONFIG_X86_32 | ||
| 780 | apic_version[boot_cpu_physical_apicid] = | ||
| 781 | GET_APIC_VERSION(apic_read(APIC_LVR)); | ||
| 782 | #endif | ||
| 783 | } | ||
| 772 | } | 784 | } |
| 773 | 785 | ||
| 774 | static int __init early_acpi_parse_madt_lapic_addr_ovr(void) | 786 | static int __init early_acpi_parse_madt_lapic_addr_ovr(void) |
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 5910020c3f24..0633cfd0dc29 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
| @@ -534,7 +534,7 @@ int setup_profiling_timer(unsigned int multiplier) | |||
| 534 | */ | 534 | */ |
| 535 | void clear_local_APIC(void) | 535 | void clear_local_APIC(void) |
| 536 | { | 536 | { |
| 537 | int maxlvt = lapic_get_maxlvt(); | 537 | int maxlvt; |
| 538 | u32 v; | 538 | u32 v; |
| 539 | 539 | ||
| 540 | /* APIC hasn't been mapped yet */ | 540 | /* APIC hasn't been mapped yet */ |
diff --git a/arch/x86/kernel/cpu/cpufreq/longrun.c b/arch/x86/kernel/cpu/cpufreq/longrun.c index af4a867a097c..777a7ff075de 100644 --- a/arch/x86/kernel/cpu/cpufreq/longrun.c +++ b/arch/x86/kernel/cpu/cpufreq/longrun.c | |||
| @@ -245,7 +245,7 @@ static unsigned int __init longrun_determine_freqs(unsigned int *low_freq, | |||
| 245 | if ((ecx > 95) || (ecx == 0) || (eax < ebx)) | 245 | if ((ecx > 95) || (ecx == 0) || (eax < ebx)) |
| 246 | return -EIO; | 246 | return -EIO; |
| 247 | 247 | ||
| 248 | edx = (eax - ebx) / (100 - ecx); | 248 | edx = ((eax - ebx) * 100) / (100 - ecx); |
| 249 | *low_freq = edx * 1000; /* back to kHz */ | 249 | *low_freq = edx * 1000; /* back to kHz */ |
| 250 | 250 | ||
| 251 | dprintk("low frequency is %u kHz\n", *low_freq); | 251 | dprintk("low frequency is %u kHz\n", *low_freq); |
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c index 46d4034d9f37..206791eb46e3 100644 --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c | |||
| @@ -1127,12 +1127,23 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
| 1127 | * an UP version, and is deprecated by AMD. | 1127 | * an UP version, and is deprecated by AMD. |
| 1128 | */ | 1128 | */ |
| 1129 | if (num_online_cpus() != 1) { | 1129 | if (num_online_cpus() != 1) { |
| 1130 | printk(KERN_ERR PFX "MP systems not supported by PSB BIOS structure\n"); | 1130 | #ifndef CONFIG_ACPI_PROCESSOR |
| 1131 | printk(KERN_ERR PFX "ACPI Processor support is required " | ||
| 1132 | "for SMP systems but is absent. Please load the " | ||
| 1133 | "ACPI Processor module before starting this " | ||
| 1134 | "driver.\n"); | ||
| 1135 | #else | ||
| 1136 | printk(KERN_ERR PFX "Your BIOS does not provide ACPI " | ||
| 1137 | "_PSS objects in a way that Linux understands. " | ||
| 1138 | "Please report this to the Linux ACPI maintainers" | ||
| 1139 | " and complain to your BIOS vendor.\n"); | ||
| 1140 | #endif | ||
| 1131 | kfree(data); | 1141 | kfree(data); |
| 1132 | return -ENODEV; | 1142 | return -ENODEV; |
| 1133 | } | 1143 | } |
| 1134 | if (pol->cpu != 0) { | 1144 | if (pol->cpu != 0) { |
| 1135 | printk(KERN_ERR PFX "No _PSS objects for CPU other than CPU0\n"); | 1145 | printk(KERN_ERR PFX "No ACPI _PSS objects for CPU other than " |
| 1146 | "CPU0. Complain to your BIOS vendor.\n"); | ||
| 1136 | kfree(data); | 1147 | kfree(data); |
| 1137 | return -ENODEV; | 1148 | return -ENODEV; |
| 1138 | } | 1149 | } |
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 2a609dc3271c..c778e4fa55a2 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
| @@ -248,6 +248,7 @@ ENTRY(resume_userspace) | |||
| 248 | DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt | 248 | DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt |
| 249 | # setting need_resched or sigpending | 249 | # setting need_resched or sigpending |
| 250 | # between sampling and the iret | 250 | # between sampling and the iret |
| 251 | TRACE_IRQS_OFF | ||
| 251 | movl TI_flags(%ebp), %ecx | 252 | movl TI_flags(%ebp), %ecx |
| 252 | andl $_TIF_WORK_MASK, %ecx # is there any work to be done on | 253 | andl $_TIF_WORK_MASK, %ecx # is there any work to be done on |
| 253 | # int/exception return? | 254 | # int/exception return? |
diff --git a/arch/x86/kernel/geode_32.c b/arch/x86/kernel/geode_32.c index e8edd63ab000..9b08e852fd1a 100644 --- a/arch/x86/kernel/geode_32.c +++ b/arch/x86/kernel/geode_32.c | |||
| @@ -166,6 +166,8 @@ int geode_has_vsa2(void) | |||
| 166 | static int has_vsa2 = -1; | 166 | static int has_vsa2 = -1; |
| 167 | 167 | ||
| 168 | if (has_vsa2 == -1) { | 168 | if (has_vsa2 == -1) { |
| 169 | u16 val; | ||
| 170 | |||
| 169 | /* | 171 | /* |
| 170 | * The VSA has virtual registers that we can query for a | 172 | * The VSA has virtual registers that we can query for a |
| 171 | * signature. | 173 | * signature. |
| @@ -173,7 +175,8 @@ int geode_has_vsa2(void) | |||
| 173 | outw(VSA_VR_UNLOCK, VSA_VRC_INDEX); | 175 | outw(VSA_VR_UNLOCK, VSA_VRC_INDEX); |
| 174 | outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX); | 176 | outw(VSA_VR_SIGNATURE, VSA_VRC_INDEX); |
| 175 | 177 | ||
| 176 | has_vsa2 = (inw(VSA_VRC_DATA) == VSA_SIG); | 178 | val = inw(VSA_VRC_DATA); |
| 179 | has_vsa2 = (val == AMD_VSA_SIG || val == GSW_VSA_SIG); | ||
| 177 | } | 180 | } |
| 178 | 181 | ||
| 179 | return has_vsa2; | 182 | return has_vsa2; |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index b2cc73768a9d..f7357cc0162c 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
| @@ -189,7 +189,7 @@ default_entry: | |||
| 189 | * this stage. | 189 | * this stage. |
| 190 | */ | 190 | */ |
| 191 | 191 | ||
| 192 | #define KPMDS ((0x100000000-__PAGE_OFFSET) >> 30) /* Number of kernel PMDs */ | 192 | #define KPMDS (((-__PAGE_OFFSET) >> 30) & 3) /* Number of kernel PMDs */ |
| 193 | 193 | ||
| 194 | xorl %ebx,%ebx /* %ebx is kept at zero */ | 194 | xorl %ebx,%ebx /* %ebx is kept at zero */ |
| 195 | 195 | ||
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index e03cc952f233..95e80e5033c3 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c | |||
| @@ -56,6 +56,11 @@ void __cpuinit mxcsr_feature_mask_init(void) | |||
| 56 | 56 | ||
| 57 | void __init init_thread_xstate(void) | 57 | void __init init_thread_xstate(void) |
| 58 | { | 58 | { |
| 59 | if (!HAVE_HWFP) { | ||
| 60 | xstate_size = sizeof(struct i387_soft_struct); | ||
| 61 | return; | ||
| 62 | } | ||
| 63 | |||
| 59 | if (cpu_has_fxsr) | 64 | if (cpu_has_fxsr) |
| 60 | xstate_size = sizeof(struct i387_fxsave_struct); | 65 | xstate_size = sizeof(struct i387_fxsave_struct); |
| 61 | #ifdef CONFIG_X86_32 | 66 | #ifdef CONFIG_X86_32 |
| @@ -94,7 +99,7 @@ void __cpuinit fpu_init(void) | |||
| 94 | int init_fpu(struct task_struct *tsk) | 99 | int init_fpu(struct task_struct *tsk) |
| 95 | { | 100 | { |
| 96 | if (tsk_used_math(tsk)) { | 101 | if (tsk_used_math(tsk)) { |
| 97 | if (tsk == current) | 102 | if (HAVE_HWFP && tsk == current) |
| 98 | unlazy_fpu(tsk); | 103 | unlazy_fpu(tsk); |
| 99 | return 0; | 104 | return 0; |
| 100 | } | 105 | } |
| @@ -109,6 +114,15 @@ int init_fpu(struct task_struct *tsk) | |||
| 109 | return -ENOMEM; | 114 | return -ENOMEM; |
| 110 | } | 115 | } |
| 111 | 116 | ||
| 117 | #ifdef CONFIG_X86_32 | ||
| 118 | if (!HAVE_HWFP) { | ||
| 119 | memset(tsk->thread.xstate, 0, xstate_size); | ||
| 120 | finit(); | ||
| 121 | set_stopped_child_used_math(tsk); | ||
| 122 | return 0; | ||
| 123 | } | ||
| 124 | #endif | ||
| 125 | |||
| 112 | if (cpu_has_fxsr) { | 126 | if (cpu_has_fxsr) { |
| 113 | struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave; | 127 | struct i387_fxsave_struct *fx = &tsk->thread.xstate->fxsave; |
| 114 | 128 | ||
| @@ -148,7 +162,7 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset, | |||
| 148 | int ret; | 162 | int ret; |
| 149 | 163 | ||
| 150 | if (!cpu_has_fxsr) | 164 | if (!cpu_has_fxsr) |
| 151 | return -ENODEV; | 165 | return -EIO; |
| 152 | 166 | ||
| 153 | ret = init_fpu(target); | 167 | ret = init_fpu(target); |
| 154 | if (ret) | 168 | if (ret) |
| @@ -165,7 +179,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset, | |||
| 165 | int ret; | 179 | int ret; |
| 166 | 180 | ||
| 167 | if (!cpu_has_fxsr) | 181 | if (!cpu_has_fxsr) |
| 168 | return -ENODEV; | 182 | return -EIO; |
| 169 | 183 | ||
| 170 | ret = init_fpu(target); | 184 | ret = init_fpu(target); |
| 171 | if (ret) | 185 | if (ret) |
| @@ -330,13 +344,13 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset, | |||
| 330 | struct user_i387_ia32_struct env; | 344 | struct user_i387_ia32_struct env; |
| 331 | int ret; | 345 | int ret; |
| 332 | 346 | ||
| 333 | if (!HAVE_HWFP) | ||
| 334 | return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf); | ||
| 335 | |||
| 336 | ret = init_fpu(target); | 347 | ret = init_fpu(target); |
| 337 | if (ret) | 348 | if (ret) |
| 338 | return ret; | 349 | return ret; |
| 339 | 350 | ||
| 351 | if (!HAVE_HWFP) | ||
| 352 | return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf); | ||
| 353 | |||
| 340 | if (!cpu_has_fxsr) { | 354 | if (!cpu_has_fxsr) { |
| 341 | return user_regset_copyout(&pos, &count, &kbuf, &ubuf, | 355 | return user_regset_copyout(&pos, &count, &kbuf, &ubuf, |
| 342 | &target->thread.xstate->fsave, 0, | 356 | &target->thread.xstate->fsave, 0, |
| @@ -360,15 +374,15 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset, | |||
| 360 | struct user_i387_ia32_struct env; | 374 | struct user_i387_ia32_struct env; |
| 361 | int ret; | 375 | int ret; |
| 362 | 376 | ||
| 363 | if (!HAVE_HWFP) | ||
| 364 | return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf); | ||
| 365 | |||
| 366 | ret = init_fpu(target); | 377 | ret = init_fpu(target); |
| 367 | if (ret) | 378 | if (ret) |
| 368 | return ret; | 379 | return ret; |
| 369 | 380 | ||
| 370 | set_stopped_child_used_math(target); | 381 | set_stopped_child_used_math(target); |
| 371 | 382 | ||
| 383 | if (!HAVE_HWFP) | ||
| 384 | return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf); | ||
| 385 | |||
| 372 | if (!cpu_has_fxsr) { | 386 | if (!cpu_has_fxsr) { |
| 373 | return user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 387 | return user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
| 374 | &target->thread.xstate->fsave, 0, -1); | 388 | &target->thread.xstate->fsave, 0, -1); |
| @@ -474,18 +488,18 @@ static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf) | |||
| 474 | int restore_i387_ia32(struct _fpstate_ia32 __user *buf) | 488 | int restore_i387_ia32(struct _fpstate_ia32 __user *buf) |
| 475 | { | 489 | { |
| 476 | int err; | 490 | int err; |
| 491 | struct task_struct *tsk = current; | ||
| 477 | 492 | ||
| 478 | if (HAVE_HWFP) { | 493 | if (HAVE_HWFP) |
| 479 | struct task_struct *tsk = current; | ||
| 480 | |||
| 481 | clear_fpu(tsk); | 494 | clear_fpu(tsk); |
| 482 | 495 | ||
| 483 | if (!used_math()) { | 496 | if (!used_math()) { |
| 484 | err = init_fpu(tsk); | 497 | err = init_fpu(tsk); |
| 485 | if (err) | 498 | if (err) |
| 486 | return err; | 499 | return err; |
| 487 | } | 500 | } |
| 488 | 501 | ||
| 502 | if (HAVE_HWFP) { | ||
| 489 | if (cpu_has_fxsr) | 503 | if (cpu_has_fxsr) |
| 490 | err = restore_i387_fxsave(buf); | 504 | err = restore_i387_fxsave(buf); |
| 491 | else | 505 | else |
diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c index 3d01e47777db..a4f93b4120c1 100644 --- a/arch/x86/kernel/init_task.c +++ b/arch/x86/kernel/init_task.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <asm/desc.h> | 11 | #include <asm/desc.h> |
| 12 | 12 | ||
| 13 | static struct fs_struct init_fs = INIT_FS; | 13 | static struct fs_struct init_fs = INIT_FS; |
| 14 | static struct files_struct init_files = INIT_FILES; | ||
| 15 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 14 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 16 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 15 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 17 | struct mm_struct init_mm = INIT_MM(init_mm); | 16 | struct mm_struct init_mm = INIT_MM(init_mm); |
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index a40d54fc1fdd..4dc8600d9d20 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
| @@ -2130,14 +2130,10 @@ static inline void __init check_timer(void) | |||
| 2130 | { | 2130 | { |
| 2131 | int apic1, pin1, apic2, pin2; | 2131 | int apic1, pin1, apic2, pin2; |
| 2132 | int vector; | 2132 | int vector; |
| 2133 | unsigned int ver; | ||
| 2134 | unsigned long flags; | 2133 | unsigned long flags; |
| 2135 | 2134 | ||
| 2136 | local_irq_save(flags); | 2135 | local_irq_save(flags); |
| 2137 | 2136 | ||
| 2138 | ver = apic_read(APIC_LVR); | ||
| 2139 | ver = GET_APIC_VERSION(ver); | ||
| 2140 | |||
| 2141 | /* | 2137 | /* |
| 2142 | * get/set the timer IRQ vector: | 2138 | * get/set the timer IRQ vector: |
| 2143 | */ | 2139 | */ |
| @@ -2150,15 +2146,11 @@ static inline void __init check_timer(void) | |||
| 2150 | * mode for the 8259A whenever interrupts are routed | 2146 | * mode for the 8259A whenever interrupts are routed |
| 2151 | * through I/O APICs. Also IRQ0 has to be enabled in | 2147 | * through I/O APICs. Also IRQ0 has to be enabled in |
| 2152 | * the 8259A which implies the virtual wire has to be | 2148 | * the 8259A which implies the virtual wire has to be |
| 2153 | * disabled in the local APIC. Finally timer interrupts | 2149 | * disabled in the local APIC. |
| 2154 | * need to be acknowledged manually in the 8259A for | ||
| 2155 | * timer_interrupt() and for the i82489DX when using | ||
| 2156 | * the NMI watchdog. | ||
| 2157 | */ | 2150 | */ |
| 2158 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 2151 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
| 2159 | init_8259A(1); | 2152 | init_8259A(1); |
| 2160 | timer_ack = !cpu_has_tsc; | 2153 | timer_ack = 1; |
| 2161 | timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); | ||
| 2162 | if (timer_over_8254 > 0) | 2154 | if (timer_over_8254 > 0) |
| 2163 | enable_8259A_irq(0); | 2155 | enable_8259A_irq(0); |
| 2164 | 2156 | ||
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 4bc1be5d5472..87edf1ceb1df 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/clocksource.h> | 19 | #include <linux/clocksource.h> |
| 20 | #include <linux/kvm_para.h> | 20 | #include <linux/kvm_para.h> |
| 21 | #include <asm/pvclock.h> | ||
| 21 | #include <asm/arch_hooks.h> | 22 | #include <asm/arch_hooks.h> |
| 22 | #include <asm/msr.h> | 23 | #include <asm/msr.h> |
| 23 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
| @@ -36,83 +37,47 @@ static int parse_no_kvmclock(char *arg) | |||
| 36 | early_param("no-kvmclock", parse_no_kvmclock); | 37 | early_param("no-kvmclock", parse_no_kvmclock); |
| 37 | 38 | ||
| 38 | /* The hypervisor will put information about time periodically here */ | 39 | /* The hypervisor will put information about time periodically here */ |
| 39 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct kvm_vcpu_time_info, hv_clock); | 40 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct pvclock_vcpu_time_info, hv_clock); |
| 40 | #define get_clock(cpu, field) per_cpu(hv_clock, cpu).field | 41 | static struct pvclock_wall_clock wall_clock; |
| 41 | 42 | ||
| 42 | static inline u64 kvm_get_delta(u64 last_tsc) | ||
| 43 | { | ||
| 44 | int cpu = smp_processor_id(); | ||
| 45 | u64 delta = native_read_tsc() - last_tsc; | ||
| 46 | return (delta * get_clock(cpu, tsc_to_system_mul)) >> KVM_SCALE; | ||
| 47 | } | ||
| 48 | |||
| 49 | static struct kvm_wall_clock wall_clock; | ||
| 50 | static cycle_t kvm_clock_read(void); | ||
| 51 | /* | 43 | /* |
| 52 | * The wallclock is the time of day when we booted. Since then, some time may | 44 | * The wallclock is the time of day when we booted. Since then, some time may |
| 53 | * have elapsed since the hypervisor wrote the data. So we try to account for | 45 | * have elapsed since the hypervisor wrote the data. So we try to account for |
| 54 | * that with system time | 46 | * that with system time |
| 55 | */ | 47 | */ |
| 56 | unsigned long kvm_get_wallclock(void) | 48 | static unsigned long kvm_get_wallclock(void) |
| 57 | { | 49 | { |
| 58 | u32 wc_sec, wc_nsec; | 50 | struct pvclock_vcpu_time_info *vcpu_time; |
| 59 | u64 delta; | ||
| 60 | struct timespec ts; | 51 | struct timespec ts; |
| 61 | int version, nsec; | ||
| 62 | int low, high; | 52 | int low, high; |
| 63 | 53 | ||
| 64 | low = (int)__pa(&wall_clock); | 54 | low = (int)__pa(&wall_clock); |
| 65 | high = ((u64)__pa(&wall_clock) >> 32); | 55 | high = ((u64)__pa(&wall_clock) >> 32); |
| 56 | native_write_msr(MSR_KVM_WALL_CLOCK, low, high); | ||
| 66 | 57 | ||
| 67 | delta = kvm_clock_read(); | 58 | vcpu_time = &get_cpu_var(hv_clock); |
| 59 | pvclock_read_wallclock(&wall_clock, vcpu_time, &ts); | ||
| 60 | put_cpu_var(hv_clock); | ||
| 68 | 61 | ||
| 69 | native_write_msr(MSR_KVM_WALL_CLOCK, low, high); | 62 | return ts.tv_sec; |
| 70 | do { | ||
| 71 | version = wall_clock.wc_version; | ||
| 72 | rmb(); | ||
| 73 | wc_sec = wall_clock.wc_sec; | ||
| 74 | wc_nsec = wall_clock.wc_nsec; | ||
| 75 | rmb(); | ||
| 76 | } while ((wall_clock.wc_version != version) || (version & 1)); | ||
| 77 | |||
| 78 | delta = kvm_clock_read() - delta; | ||
| 79 | delta += wc_nsec; | ||
| 80 | nsec = do_div(delta, NSEC_PER_SEC); | ||
| 81 | set_normalized_timespec(&ts, wc_sec + delta, nsec); | ||
| 82 | /* | ||
| 83 | * Of all mechanisms of time adjustment I've tested, this one | ||
| 84 | * was the champion! | ||
| 85 | */ | ||
| 86 | return ts.tv_sec + 1; | ||
| 87 | } | 63 | } |
| 88 | 64 | ||
| 89 | int kvm_set_wallclock(unsigned long now) | 65 | static int kvm_set_wallclock(unsigned long now) |
| 90 | { | 66 | { |
| 91 | return 0; | 67 | return -1; |
| 92 | } | 68 | } |
| 93 | 69 | ||
| 94 | /* | ||
| 95 | * This is our read_clock function. The host puts an tsc timestamp each time | ||
| 96 | * it updates a new time. Without the tsc adjustment, we can have a situation | ||
| 97 | * in which a vcpu starts to run earlier (smaller system_time), but probes | ||
| 98 | * time later (compared to another vcpu), leading to backwards time | ||
| 99 | */ | ||
| 100 | static cycle_t kvm_clock_read(void) | 70 | static cycle_t kvm_clock_read(void) |
| 101 | { | 71 | { |
| 102 | u64 last_tsc, now; | 72 | struct pvclock_vcpu_time_info *src; |
| 103 | int cpu; | 73 | cycle_t ret; |
| 104 | 74 | ||
| 105 | preempt_disable(); | 75 | src = &get_cpu_var(hv_clock); |
| 106 | cpu = smp_processor_id(); | 76 | ret = pvclock_clocksource_read(src); |
| 107 | 77 | put_cpu_var(hv_clock); | |
| 108 | last_tsc = get_clock(cpu, tsc_timestamp); | 78 | return ret; |
| 109 | now = get_clock(cpu, system_time); | ||
| 110 | |||
| 111 | now += kvm_get_delta(last_tsc); | ||
| 112 | preempt_enable(); | ||
| 113 | |||
| 114 | return now; | ||
| 115 | } | 79 | } |
| 80 | |||
| 116 | static struct clocksource kvm_clock = { | 81 | static struct clocksource kvm_clock = { |
| 117 | .name = "kvm-clock", | 82 | .name = "kvm-clock", |
| 118 | .read = kvm_clock_read, | 83 | .read = kvm_clock_read, |
| @@ -123,13 +88,14 @@ static struct clocksource kvm_clock = { | |||
| 123 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 88 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 124 | }; | 89 | }; |
| 125 | 90 | ||
| 126 | static int kvm_register_clock(void) | 91 | static int kvm_register_clock(char *txt) |
| 127 | { | 92 | { |
| 128 | int cpu = smp_processor_id(); | 93 | int cpu = smp_processor_id(); |
| 129 | int low, high; | 94 | int low, high; |
| 130 | low = (int)__pa(&per_cpu(hv_clock, cpu)) | 1; | 95 | low = (int)__pa(&per_cpu(hv_clock, cpu)) | 1; |
| 131 | high = ((u64)__pa(&per_cpu(hv_clock, cpu)) >> 32); | 96 | high = ((u64)__pa(&per_cpu(hv_clock, cpu)) >> 32); |
| 132 | 97 | printk(KERN_INFO "kvm-clock: cpu %d, msr %x:%x, %s\n", | |
| 98 | cpu, high, low, txt); | ||
| 133 | return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high); | 99 | return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high); |
| 134 | } | 100 | } |
| 135 | 101 | ||
| @@ -140,12 +106,20 @@ static void kvm_setup_secondary_clock(void) | |||
| 140 | * Now that the first cpu already had this clocksource initialized, | 106 | * Now that the first cpu already had this clocksource initialized, |
| 141 | * we shouldn't fail. | 107 | * we shouldn't fail. |
| 142 | */ | 108 | */ |
| 143 | WARN_ON(kvm_register_clock()); | 109 | WARN_ON(kvm_register_clock("secondary cpu clock")); |
| 144 | /* ok, done with our trickery, call native */ | 110 | /* ok, done with our trickery, call native */ |
| 145 | setup_secondary_APIC_clock(); | 111 | setup_secondary_APIC_clock(); |
| 146 | } | 112 | } |
| 147 | #endif | 113 | #endif |
| 148 | 114 | ||
| 115 | #ifdef CONFIG_SMP | ||
| 116 | void __init kvm_smp_prepare_boot_cpu(void) | ||
| 117 | { | ||
| 118 | WARN_ON(kvm_register_clock("primary cpu clock")); | ||
| 119 | native_smp_prepare_boot_cpu(); | ||
| 120 | } | ||
| 121 | #endif | ||
| 122 | |||
| 149 | /* | 123 | /* |
| 150 | * After the clock is registered, the host will keep writing to the | 124 | * After the clock is registered, the host will keep writing to the |
| 151 | * registered memory location. If the guest happens to shutdown, this memory | 125 | * registered memory location. If the guest happens to shutdown, this memory |
| @@ -174,7 +148,7 @@ void __init kvmclock_init(void) | |||
| 174 | return; | 148 | return; |
| 175 | 149 | ||
| 176 | if (kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) { | 150 | if (kvmclock && kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) { |
| 177 | if (kvm_register_clock()) | 151 | if (kvm_register_clock("boot clock")) |
| 178 | return; | 152 | return; |
| 179 | pv_time_ops.get_wallclock = kvm_get_wallclock; | 153 | pv_time_ops.get_wallclock = kvm_get_wallclock; |
| 180 | pv_time_ops.set_wallclock = kvm_set_wallclock; | 154 | pv_time_ops.set_wallclock = kvm_set_wallclock; |
| @@ -182,6 +156,9 @@ void __init kvmclock_init(void) | |||
| 182 | #ifdef CONFIG_X86_LOCAL_APIC | 156 | #ifdef CONFIG_X86_LOCAL_APIC |
| 183 | pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock; | 157 | pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock; |
| 184 | #endif | 158 | #endif |
| 159 | #ifdef CONFIG_SMP | ||
| 160 | smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu; | ||
| 161 | #endif | ||
| 185 | machine_ops.shutdown = kvm_shutdown; | 162 | machine_ops.shutdown = kvm_shutdown; |
| 186 | #ifdef CONFIG_KEXEC | 163 | #ifdef CONFIG_KEXEC |
| 187 | machine_ops.crash_shutdown = kvm_crash_shutdown; | 164 | machine_ops.crash_shutdown = kvm_crash_shutdown; |
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 3cad17fe026b..07c0f828f488 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
| @@ -155,6 +155,7 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable) | |||
| 155 | wrmsr(msr, value, dummy); | 155 | wrmsr(msr, value, dummy); |
| 156 | return 0; | 156 | return 0; |
| 157 | } | 157 | } |
| 158 | EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event); | ||
| 158 | 159 | ||
| 159 | int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable) | 160 | int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable) |
| 160 | { | 161 | { |
| @@ -222,6 +223,7 @@ int geode_mfgpt_alloc_timer(int timer, int domain) | |||
| 222 | /* No timers available - too bad */ | 223 | /* No timers available - too bad */ |
| 223 | return -1; | 224 | return -1; |
| 224 | } | 225 | } |
| 226 | EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer); | ||
| 225 | 227 | ||
| 226 | 228 | ||
| 227 | #ifdef CONFIG_GEODE_MFGPT_TIMER | 229 | #ifdef CONFIG_GEODE_MFGPT_TIMER |
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index 11b14bbaa61e..84160f74eeb0 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/smp.h> | 27 | #include <asm/smp.h> |
| 28 | #include <asm/nmi.h> | 28 | #include <asm/nmi.h> |
| 29 | #include <asm/timer.h> | ||
| 30 | 29 | ||
| 31 | #include "mach_traps.h" | 30 | #include "mach_traps.h" |
| 32 | 31 | ||
| @@ -82,7 +81,7 @@ int __init check_nmi_watchdog(void) | |||
| 82 | 81 | ||
| 83 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 82 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); |
| 84 | if (!prev_nmi_count) | 83 | if (!prev_nmi_count) |
| 85 | goto error; | 84 | return -1; |
| 86 | 85 | ||
| 87 | printk(KERN_INFO "Testing NMI watchdog ... "); | 86 | printk(KERN_INFO "Testing NMI watchdog ... "); |
| 88 | 87 | ||
| @@ -119,7 +118,7 @@ int __init check_nmi_watchdog(void) | |||
| 119 | if (!atomic_read(&nmi_active)) { | 118 | if (!atomic_read(&nmi_active)) { |
| 120 | kfree(prev_nmi_count); | 119 | kfree(prev_nmi_count); |
| 121 | atomic_set(&nmi_active, -1); | 120 | atomic_set(&nmi_active, -1); |
| 122 | goto error; | 121 | return -1; |
| 123 | } | 122 | } |
| 124 | printk("OK.\n"); | 123 | printk("OK.\n"); |
| 125 | 124 | ||
| @@ -130,10 +129,6 @@ int __init check_nmi_watchdog(void) | |||
| 130 | 129 | ||
| 131 | kfree(prev_nmi_count); | 130 | kfree(prev_nmi_count); |
| 132 | return 0; | 131 | return 0; |
| 133 | error: | ||
| 134 | timer_ack = !cpu_has_tsc; | ||
| 135 | |||
| 136 | return -1; | ||
| 137 | } | 132 | } |
| 138 | 133 | ||
| 139 | static int __init setup_nmi_watchdog(char *str) | 134 | static int __init setup_nmi_watchdog(char *str) |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index c5ef1af8e79d..dc00a1331ace 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -378,6 +378,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
| 378 | struct page *page; | 378 | struct page *page; |
| 379 | unsigned long dma_mask = 0; | 379 | unsigned long dma_mask = 0; |
| 380 | dma_addr_t bus; | 380 | dma_addr_t bus; |
| 381 | int noretry = 0; | ||
| 381 | 382 | ||
| 382 | /* ignore region specifiers */ | 383 | /* ignore region specifiers */ |
| 383 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); | 384 | gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); |
| @@ -397,20 +398,25 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
| 397 | if (dev->dma_mask == NULL) | 398 | if (dev->dma_mask == NULL) |
| 398 | return NULL; | 399 | return NULL; |
| 399 | 400 | ||
| 400 | /* Don't invoke OOM killer */ | 401 | /* Don't invoke OOM killer or retry in lower 16MB DMA zone */ |
| 401 | gfp |= __GFP_NORETRY; | 402 | if (gfp & __GFP_DMA) |
| 403 | noretry = 1; | ||
| 402 | 404 | ||
| 403 | #ifdef CONFIG_X86_64 | 405 | #ifdef CONFIG_X86_64 |
| 404 | /* Why <=? Even when the mask is smaller than 4GB it is often | 406 | /* Why <=? Even when the mask is smaller than 4GB it is often |
| 405 | larger than 16MB and in this case we have a chance of | 407 | larger than 16MB and in this case we have a chance of |
| 406 | finding fitting memory in the next higher zone first. If | 408 | finding fitting memory in the next higher zone first. If |
| 407 | not retry with true GFP_DMA. -AK */ | 409 | not retry with true GFP_DMA. -AK */ |
| 408 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) | 410 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) { |
| 409 | gfp |= GFP_DMA32; | 411 | gfp |= GFP_DMA32; |
| 412 | if (dma_mask < DMA_32BIT_MASK) | ||
| 413 | noretry = 1; | ||
| 414 | } | ||
| 410 | #endif | 415 | #endif |
| 411 | 416 | ||
| 412 | again: | 417 | again: |
| 413 | page = dma_alloc_pages(dev, gfp, get_order(size)); | 418 | page = dma_alloc_pages(dev, |
| 419 | noretry ? gfp | __GFP_NORETRY : gfp, get_order(size)); | ||
| 414 | if (page == NULL) | 420 | if (page == NULL) |
| 415 | return NULL; | 421 | return NULL; |
| 416 | 422 | ||
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index c07455d1695f..aa8ec928caa8 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kdebug.h> | 26 | #include <linux/kdebug.h> |
| 27 | #include <linux/scatterlist.h> | 27 | #include <linux/scatterlist.h> |
| 28 | #include <linux/iommu-helper.h> | 28 | #include <linux/iommu-helper.h> |
| 29 | #include <linux/sysdev.h> | ||
| 29 | #include <asm/atomic.h> | 30 | #include <asm/atomic.h> |
| 30 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 31 | #include <asm/mtrr.h> | 32 | #include <asm/mtrr.h> |
| @@ -548,6 +549,28 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size) | |||
| 548 | return aper_base; | 549 | return aper_base; |
| 549 | } | 550 | } |
| 550 | 551 | ||
| 552 | static int gart_resume(struct sys_device *dev) | ||
| 553 | { | ||
| 554 | return 0; | ||
| 555 | } | ||
| 556 | |||
| 557 | static int gart_suspend(struct sys_device *dev, pm_message_t state) | ||
| 558 | { | ||
| 559 | return -EINVAL; | ||
| 560 | } | ||
| 561 | |||
| 562 | static struct sysdev_class gart_sysdev_class = { | ||
| 563 | .name = "gart", | ||
| 564 | .suspend = gart_suspend, | ||
| 565 | .resume = gart_resume, | ||
| 566 | |||
| 567 | }; | ||
| 568 | |||
| 569 | static struct sys_device device_gart = { | ||
| 570 | .id = 0, | ||
| 571 | .cls = &gart_sysdev_class, | ||
| 572 | }; | ||
| 573 | |||
| 551 | /* | 574 | /* |
| 552 | * Private Northbridge GATT initialization in case we cannot use the | 575 | * Private Northbridge GATT initialization in case we cannot use the |
| 553 | * AGP driver for some reason. | 576 | * AGP driver for some reason. |
| @@ -558,7 +581,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
| 558 | unsigned aper_base, new_aper_base; | 581 | unsigned aper_base, new_aper_base; |
| 559 | struct pci_dev *dev; | 582 | struct pci_dev *dev; |
| 560 | void *gatt; | 583 | void *gatt; |
| 561 | int i; | 584 | int i, error; |
| 562 | 585 | ||
| 563 | printk(KERN_INFO "PCI-DMA: Disabling AGP.\n"); | 586 | printk(KERN_INFO "PCI-DMA: Disabling AGP.\n"); |
| 564 | aper_size = aper_base = info->aper_size = 0; | 587 | aper_size = aper_base = info->aper_size = 0; |
| @@ -606,6 +629,12 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
| 606 | 629 | ||
| 607 | pci_write_config_dword(dev, 0x90, ctl); | 630 | pci_write_config_dword(dev, 0x90, ctl); |
| 608 | } | 631 | } |
| 632 | |||
| 633 | error = sysdev_class_register(&gart_sysdev_class); | ||
| 634 | if (!error) | ||
| 635 | error = sysdev_register(&device_gart); | ||
| 636 | if (error) | ||
| 637 | panic("Could not register gart_sysdev -- would corrupt data on next suspend"); | ||
| 609 | flush_gart(); | 638 | flush_gart(); |
| 610 | 639 | ||
| 611 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", | 640 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index f8476dfbb60d..e2db9ac5c61c 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
| @@ -333,6 +333,7 @@ void flush_thread(void) | |||
| 333 | /* | 333 | /* |
| 334 | * Forget coprocessor state.. | 334 | * Forget coprocessor state.. |
| 335 | */ | 335 | */ |
| 336 | tsk->fpu_counter = 0; | ||
| 336 | clear_fpu(tsk); | 337 | clear_fpu(tsk); |
| 337 | clear_used_math(); | 338 | clear_used_math(); |
| 338 | } | 339 | } |
| @@ -649,8 +650,11 @@ struct task_struct * __switch_to(struct task_struct *prev_p, struct task_struct | |||
| 649 | /* If the task has used fpu the last 5 timeslices, just do a full | 650 | /* If the task has used fpu the last 5 timeslices, just do a full |
| 650 | * restore of the math state immediately to avoid the trap; the | 651 | * restore of the math state immediately to avoid the trap; the |
| 651 | * chances of needing FPU soon are obviously high now | 652 | * chances of needing FPU soon are obviously high now |
| 653 | * | ||
| 654 | * tsk_used_math() checks prevent calling math_state_restore(), | ||
| 655 | * which can sleep in the case of !tsk_used_math() | ||
| 652 | */ | 656 | */ |
| 653 | if (next_p->fpu_counter > 5) | 657 | if (tsk_used_math(next_p) && next_p->fpu_counter > 5) |
| 654 | math_state_restore(); | 658 | math_state_restore(); |
| 655 | 659 | ||
| 656 | /* | 660 | /* |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index e2319f39988b..c6eb5c91e5f6 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -294,6 +294,7 @@ void flush_thread(void) | |||
| 294 | /* | 294 | /* |
| 295 | * Forget coprocessor state.. | 295 | * Forget coprocessor state.. |
| 296 | */ | 296 | */ |
| 297 | tsk->fpu_counter = 0; | ||
| 297 | clear_fpu(tsk); | 298 | clear_fpu(tsk); |
| 298 | clear_used_math(); | 299 | clear_used_math(); |
| 299 | } | 300 | } |
| @@ -658,8 +659,11 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | |||
| 658 | /* If the task has used fpu the last 5 timeslices, just do a full | 659 | /* If the task has used fpu the last 5 timeslices, just do a full |
| 659 | * restore of the math state immediately to avoid the trap; the | 660 | * restore of the math state immediately to avoid the trap; the |
| 660 | * chances of needing FPU soon are obviously high now | 661 | * chances of needing FPU soon are obviously high now |
| 662 | * | ||
| 663 | * tsk_used_math() checks prevent calling math_state_restore(), | ||
| 664 | * which can sleep in the case of !tsk_used_math() | ||
| 661 | */ | 665 | */ |
| 662 | if (next_p->fpu_counter>5) | 666 | if (tsk_used_math(next_p) && next_p->fpu_counter > 5) |
| 663 | math_state_restore(); | 667 | math_state_restore(); |
| 664 | return prev_p; | 668 | return prev_p; |
| 665 | } | 669 | } |
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c new file mode 100644 index 000000000000..05fbe9a0325a --- /dev/null +++ b/arch/x86/kernel/pvclock.c | |||
| @@ -0,0 +1,141 @@ | |||
| 1 | /* paravirtual clock -- common code used by kvm/xen | ||
| 2 | |||
| 3 | This program is free software; you can redistribute it and/or modify | ||
| 4 | it under the terms of the GNU General Public License as published by | ||
| 5 | the Free Software Foundation; either version 2 of the License, or | ||
| 6 | (at your option) any later version. | ||
| 7 | |||
| 8 | This program is distributed in the hope that it will be useful, | ||
| 9 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | GNU General Public License for more details. | ||
| 12 | |||
| 13 | You should have received a copy of the GNU General Public License | ||
| 14 | along with this program; if not, write to the Free Software | ||
| 15 | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 16 | */ | ||
| 17 | |||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/percpu.h> | ||
| 20 | #include <asm/pvclock.h> | ||
| 21 | |||
| 22 | /* | ||
| 23 | * These are perodically updated | ||
| 24 | * xen: magic shared_info page | ||
| 25 | * kvm: gpa registered via msr | ||
| 26 | * and then copied here. | ||
| 27 | */ | ||
| 28 | struct pvclock_shadow_time { | ||
| 29 | u64 tsc_timestamp; /* TSC at last update of time vals. */ | ||
| 30 | u64 system_timestamp; /* Time, in nanosecs, since boot. */ | ||
| 31 | u32 tsc_to_nsec_mul; | ||
| 32 | int tsc_shift; | ||
| 33 | u32 version; | ||
| 34 | }; | ||
| 35 | |||
| 36 | /* | ||
| 37 | * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, | ||
| 38 | * yielding a 64-bit result. | ||
| 39 | */ | ||
| 40 | static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift) | ||
| 41 | { | ||
| 42 | u64 product; | ||
| 43 | #ifdef __i386__ | ||
| 44 | u32 tmp1, tmp2; | ||
| 45 | #endif | ||
| 46 | |||
| 47 | if (shift < 0) | ||
| 48 | delta >>= -shift; | ||
| 49 | else | ||
| 50 | delta <<= shift; | ||
| 51 | |||
| 52 | #ifdef __i386__ | ||
| 53 | __asm__ ( | ||
| 54 | "mul %5 ; " | ||
| 55 | "mov %4,%%eax ; " | ||
| 56 | "mov %%edx,%4 ; " | ||
| 57 | "mul %5 ; " | ||
| 58 | "xor %5,%5 ; " | ||
| 59 | "add %4,%%eax ; " | ||
| 60 | "adc %5,%%edx ; " | ||
| 61 | : "=A" (product), "=r" (tmp1), "=r" (tmp2) | ||
| 62 | : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); | ||
| 63 | #elif __x86_64__ | ||
| 64 | __asm__ ( | ||
| 65 | "mul %%rdx ; shrd $32,%%rdx,%%rax" | ||
| 66 | : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); | ||
| 67 | #else | ||
| 68 | #error implement me! | ||
| 69 | #endif | ||
| 70 | |||
| 71 | return product; | ||
| 72 | } | ||
| 73 | |||
| 74 | static u64 pvclock_get_nsec_offset(struct pvclock_shadow_time *shadow) | ||
| 75 | { | ||
| 76 | u64 delta = native_read_tsc() - shadow->tsc_timestamp; | ||
| 77 | return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift); | ||
| 78 | } | ||
| 79 | |||
| 80 | /* | ||
| 81 | * Reads a consistent set of time-base values from hypervisor, | ||
| 82 | * into a shadow data area. | ||
| 83 | */ | ||
| 84 | static unsigned pvclock_get_time_values(struct pvclock_shadow_time *dst, | ||
| 85 | struct pvclock_vcpu_time_info *src) | ||
| 86 | { | ||
| 87 | do { | ||
| 88 | dst->version = src->version; | ||
| 89 | rmb(); /* fetch version before data */ | ||
| 90 | dst->tsc_timestamp = src->tsc_timestamp; | ||
| 91 | dst->system_timestamp = src->system_time; | ||
| 92 | dst->tsc_to_nsec_mul = src->tsc_to_system_mul; | ||
| 93 | dst->tsc_shift = src->tsc_shift; | ||
| 94 | rmb(); /* test version after fetching data */ | ||
| 95 | } while ((src->version & 1) || (dst->version != src->version)); | ||
| 96 | |||
| 97 | return dst->version; | ||
| 98 | } | ||
| 99 | |||
| 100 | cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) | ||
| 101 | { | ||
| 102 | struct pvclock_shadow_time shadow; | ||
| 103 | unsigned version; | ||
| 104 | cycle_t ret, offset; | ||
| 105 | |||
| 106 | do { | ||
| 107 | version = pvclock_get_time_values(&shadow, src); | ||
| 108 | barrier(); | ||
| 109 | offset = pvclock_get_nsec_offset(&shadow); | ||
| 110 | ret = shadow.system_timestamp + offset; | ||
| 111 | barrier(); | ||
| 112 | } while (version != src->version); | ||
| 113 | |||
| 114 | return ret; | ||
| 115 | } | ||
| 116 | |||
| 117 | void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock, | ||
| 118 | struct pvclock_vcpu_time_info *vcpu_time, | ||
| 119 | struct timespec *ts) | ||
| 120 | { | ||
| 121 | u32 version; | ||
| 122 | u64 delta; | ||
| 123 | struct timespec now; | ||
| 124 | |||
| 125 | /* get wallclock at system boot */ | ||
| 126 | do { | ||
| 127 | version = wall_clock->version; | ||
| 128 | rmb(); /* fetch version before time */ | ||
| 129 | now.tv_sec = wall_clock->sec; | ||
| 130 | now.tv_nsec = wall_clock->nsec; | ||
| 131 | rmb(); /* fetch time before checking version */ | ||
| 132 | } while ((wall_clock->version & 1) || (version != wall_clock->version)); | ||
| 133 | |||
| 134 | delta = pvclock_clocksource_read(vcpu_time); /* time since system boot */ | ||
| 135 | delta += now.tv_sec * (u64)NSEC_PER_SEC + now.tv_nsec; | ||
| 136 | |||
| 137 | now.tv_nsec = do_div(delta, NSEC_PER_SEC); | ||
| 138 | now.tv_sec = delta; | ||
| 139 | |||
| 140 | set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); | ||
| 141 | } | ||
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 9615eee9b775..05191bbc68b8 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c | |||
| @@ -4,6 +4,8 @@ | |||
| 4 | #include <linux/acpi.h> | 4 | #include <linux/acpi.h> |
| 5 | #include <linux/bcd.h> | 5 | #include <linux/bcd.h> |
| 6 | #include <linux/mc146818rtc.h> | 6 | #include <linux/mc146818rtc.h> |
| 7 | #include <linux/platform_device.h> | ||
| 8 | #include <linux/pnp.h> | ||
| 7 | 9 | ||
| 8 | #include <asm/time.h> | 10 | #include <asm/time.h> |
| 9 | #include <asm/vsyscall.h> | 11 | #include <asm/vsyscall.h> |
| @@ -197,3 +199,35 @@ unsigned long long native_read_tsc(void) | |||
| 197 | } | 199 | } |
| 198 | EXPORT_SYMBOL(native_read_tsc); | 200 | EXPORT_SYMBOL(native_read_tsc); |
| 199 | 201 | ||
| 202 | |||
| 203 | static struct resource rtc_resources[] = { | ||
| 204 | [0] = { | ||
| 205 | .start = RTC_PORT(0), | ||
| 206 | .end = RTC_PORT(1), | ||
| 207 | .flags = IORESOURCE_IO, | ||
| 208 | }, | ||
| 209 | [1] = { | ||
| 210 | .start = RTC_IRQ, | ||
| 211 | .end = RTC_IRQ, | ||
| 212 | .flags = IORESOURCE_IRQ, | ||
| 213 | } | ||
| 214 | }; | ||
| 215 | |||
| 216 | static struct platform_device rtc_device = { | ||
| 217 | .name = "rtc_cmos", | ||
| 218 | .id = -1, | ||
| 219 | .resource = rtc_resources, | ||
| 220 | .num_resources = ARRAY_SIZE(rtc_resources), | ||
| 221 | }; | ||
| 222 | |||
| 223 | static __init int add_rtc_cmos(void) | ||
| 224 | { | ||
| 225 | #ifdef CONFIG_PNP | ||
| 226 | if (!pnp_platform_devices) | ||
| 227 | platform_device_register(&rtc_device); | ||
| 228 | #else | ||
| 229 | platform_device_register(&rtc_device); | ||
| 230 | #endif /* CONFIG_PNP */ | ||
| 231 | return 0; | ||
| 232 | } | ||
| 233 | device_initcall(add_rtc_cmos); | ||
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 2c5f8b213e86..5a2f8e063887 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
| @@ -532,10 +532,16 @@ static void __init reserve_crashkernel(void) | |||
| 532 | (unsigned long)(crash_size >> 20), | 532 | (unsigned long)(crash_size >> 20), |
| 533 | (unsigned long)(crash_base >> 20), | 533 | (unsigned long)(crash_base >> 20), |
| 534 | (unsigned long)(total_mem >> 20)); | 534 | (unsigned long)(total_mem >> 20)); |
| 535 | |||
| 536 | if (reserve_bootmem(crash_base, crash_size, | ||
| 537 | BOOTMEM_EXCLUSIVE) < 0) { | ||
| 538 | printk(KERN_INFO "crashkernel reservation " | ||
| 539 | "failed - memory is in use\n"); | ||
| 540 | return; | ||
| 541 | } | ||
| 542 | |||
| 535 | crashk_res.start = crash_base; | 543 | crashk_res.start = crash_base; |
| 536 | crashk_res.end = crash_base + crash_size - 1; | 544 | crashk_res.end = crash_base + crash_size - 1; |
| 537 | reserve_bootmem(crash_base, crash_size, | ||
| 538 | BOOTMEM_DEFAULT); | ||
| 539 | } else | 545 | } else |
| 540 | printk(KERN_INFO "crashkernel reservation failed - " | 546 | printk(KERN_INFO "crashkernel reservation failed - " |
| 541 | "you have to specify a base address\n"); | 547 | "you have to specify a base address\n"); |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 38988491c622..3e1cecedde42 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -996,7 +996,6 @@ do_rest: | |||
| 996 | #endif | 996 | #endif |
| 997 | cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ | 997 | cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ |
| 998 | cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ | 998 | cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ |
| 999 | cpu_clear(cpu, cpu_possible_map); | ||
| 1000 | cpu_clear(cpu, cpu_present_map); | 999 | cpu_clear(cpu, cpu_present_map); |
| 1001 | per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; | 1000 | per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; |
| 1002 | } | 1001 | } |
| @@ -1190,6 +1189,7 @@ static void __init smp_cpu_index_default(void) | |||
| 1190 | */ | 1189 | */ |
| 1191 | void __init native_smp_prepare_cpus(unsigned int max_cpus) | 1190 | void __init native_smp_prepare_cpus(unsigned int max_cpus) |
| 1192 | { | 1191 | { |
| 1192 | preempt_disable(); | ||
| 1193 | nmi_watchdog_default(); | 1193 | nmi_watchdog_default(); |
| 1194 | smp_cpu_index_default(); | 1194 | smp_cpu_index_default(); |
| 1195 | current_cpu_data = boot_cpu_data; | 1195 | current_cpu_data = boot_cpu_data; |
| @@ -1206,7 +1206,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
| 1206 | if (smp_sanity_check(max_cpus) < 0) { | 1206 | if (smp_sanity_check(max_cpus) < 0) { |
| 1207 | printk(KERN_INFO "SMP disabled\n"); | 1207 | printk(KERN_INFO "SMP disabled\n"); |
| 1208 | disable_smp(); | 1208 | disable_smp(); |
| 1209 | return; | 1209 | goto out; |
| 1210 | } | 1210 | } |
| 1211 | 1211 | ||
| 1212 | preempt_disable(); | 1212 | preempt_disable(); |
| @@ -1246,6 +1246,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
| 1246 | printk(KERN_INFO "CPU%d: ", 0); | 1246 | printk(KERN_INFO "CPU%d: ", 0); |
| 1247 | print_cpu_info(&cpu_data(0)); | 1247 | print_cpu_info(&cpu_data(0)); |
| 1248 | setup_boot_clock(); | 1248 | setup_boot_clock(); |
| 1249 | out: | ||
| 1250 | preempt_enable(); | ||
| 1249 | } | 1251 | } |
| 1250 | /* | 1252 | /* |
| 1251 | * Early setup to make printk work. | 1253 | * Early setup to make printk work. |
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index bde6f63e15d5..08d752de4eee 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
| @@ -544,6 +544,7 @@ vm86_trap: | |||
| 544 | #define DO_ERROR(trapnr, signr, str, name) \ | 544 | #define DO_ERROR(trapnr, signr, str, name) \ |
| 545 | void do_##name(struct pt_regs *regs, long error_code) \ | 545 | void do_##name(struct pt_regs *regs, long error_code) \ |
| 546 | { \ | 546 | { \ |
| 547 | trace_hardirqs_fixup(); \ | ||
| 547 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ | 548 | if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ |
| 548 | == NOTIFY_STOP) \ | 549 | == NOTIFY_STOP) \ |
| 549 | return; \ | 550 | return; \ |
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index e4790728b224..65b70637ad97 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
| @@ -14,7 +14,10 @@ | |||
| 14 | 14 | ||
| 15 | #include "mach_timer.h" | 15 | #include "mach_timer.h" |
| 16 | 16 | ||
| 17 | static int tsc_enabled; | 17 | /* native_sched_clock() is called before tsc_init(), so |
| 18 | we must start with the TSC soft disabled to prevent | ||
| 19 | erroneous rdtsc usage on !cpu_has_tsc processors */ | ||
| 20 | static int tsc_disabled = -1; | ||
| 18 | 21 | ||
| 19 | /* | 22 | /* |
| 20 | * On some systems the TSC frequency does not | 23 | * On some systems the TSC frequency does not |
| @@ -28,8 +31,8 @@ EXPORT_SYMBOL_GPL(tsc_khz); | |||
| 28 | static int __init tsc_setup(char *str) | 31 | static int __init tsc_setup(char *str) |
| 29 | { | 32 | { |
| 30 | printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, " | 33 | printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, " |
| 31 | "cannot disable TSC completely.\n"); | 34 | "cannot disable TSC completely.\n"); |
| 32 | mark_tsc_unstable("user disabled TSC"); | 35 | tsc_disabled = 1; |
| 33 | return 1; | 36 | return 1; |
| 34 | } | 37 | } |
| 35 | #else | 38 | #else |
| @@ -120,7 +123,7 @@ unsigned long long native_sched_clock(void) | |||
| 120 | * very important for it to be as fast as the platform | 123 | * very important for it to be as fast as the platform |
| 121 | * can achive it. ) | 124 | * can achive it. ) |
| 122 | */ | 125 | */ |
| 123 | if (unlikely(!tsc_enabled && !tsc_unstable)) | 126 | if (unlikely(tsc_disabled)) |
| 124 | /* No locking but a rare wrong value is not a big deal: */ | 127 | /* No locking but a rare wrong value is not a big deal: */ |
| 125 | return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); | 128 | return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); |
| 126 | 129 | ||
| @@ -322,7 +325,6 @@ void mark_tsc_unstable(char *reason) | |||
| 322 | { | 325 | { |
| 323 | if (!tsc_unstable) { | 326 | if (!tsc_unstable) { |
| 324 | tsc_unstable = 1; | 327 | tsc_unstable = 1; |
| 325 | tsc_enabled = 0; | ||
| 326 | printk("Marking TSC unstable due to: %s.\n", reason); | 328 | printk("Marking TSC unstable due to: %s.\n", reason); |
| 327 | /* Can be called before registration */ | 329 | /* Can be called before registration */ |
| 328 | if (clocksource_tsc.mult) | 330 | if (clocksource_tsc.mult) |
| @@ -336,7 +338,7 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable); | |||
| 336 | static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d) | 338 | static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d) |
| 337 | { | 339 | { |
| 338 | printk(KERN_NOTICE "%s detected: marking TSC unstable.\n", | 340 | printk(KERN_NOTICE "%s detected: marking TSC unstable.\n", |
| 339 | d->ident); | 341 | d->ident); |
| 340 | tsc_unstable = 1; | 342 | tsc_unstable = 1; |
| 341 | return 0; | 343 | return 0; |
| 342 | } | 344 | } |
| @@ -403,7 +405,7 @@ void __init tsc_init(void) | |||
| 403 | { | 405 | { |
| 404 | int cpu; | 406 | int cpu; |
| 405 | 407 | ||
| 406 | if (!cpu_has_tsc) | 408 | if (!cpu_has_tsc || tsc_disabled > 0) |
| 407 | return; | 409 | return; |
| 408 | 410 | ||
| 409 | cpu_khz = calculate_cpu_khz(); | 411 | cpu_khz = calculate_cpu_khz(); |
| @@ -414,6 +416,9 @@ void __init tsc_init(void) | |||
| 414 | return; | 416 | return; |
| 415 | } | 417 | } |
| 416 | 418 | ||
| 419 | /* now allow native_sched_clock() to use rdtsc */ | ||
| 420 | tsc_disabled = 0; | ||
| 421 | |||
| 417 | printk("Detected %lu.%03lu MHz processor.\n", | 422 | printk("Detected %lu.%03lu MHz processor.\n", |
| 418 | (unsigned long)cpu_khz / 1000, | 423 | (unsigned long)cpu_khz / 1000, |
| 419 | (unsigned long)cpu_khz % 1000); | 424 | (unsigned long)cpu_khz % 1000); |
| @@ -441,8 +446,6 @@ void __init tsc_init(void) | |||
| 441 | if (check_tsc_unstable()) { | 446 | if (check_tsc_unstable()) { |
| 442 | clocksource_tsc.rating = 0; | 447 | clocksource_tsc.rating = 0; |
| 443 | clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; | 448 | clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; |
| 444 | } else | 449 | } |
| 445 | tsc_enabled = 1; | ||
| 446 | |||
| 447 | clocksource_register(&clocksource_tsc); | 450 | clocksource_register(&clocksource_tsc); |
| 448 | } | 451 | } |
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c index fcc16e58609e..1784b8077a12 100644 --- a/arch/x86/kernel/tsc_64.c +++ b/arch/x86/kernel/tsc_64.c | |||
| @@ -227,14 +227,14 @@ void __init tsc_calibrate(void) | |||
| 227 | /* hpet or pmtimer available ? */ | 227 | /* hpet or pmtimer available ? */ |
| 228 | if (!hpet && !pm1 && !pm2) { | 228 | if (!hpet && !pm1 && !pm2) { |
| 229 | printk(KERN_INFO "TSC calibrated against PIT\n"); | 229 | printk(KERN_INFO "TSC calibrated against PIT\n"); |
| 230 | return; | 230 | goto out; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | /* Check, whether the sampling was disturbed by an SMI */ | 233 | /* Check, whether the sampling was disturbed by an SMI */ |
| 234 | if (tsc1 == ULONG_MAX || tsc2 == ULONG_MAX) { | 234 | if (tsc1 == ULONG_MAX || tsc2 == ULONG_MAX) { |
| 235 | printk(KERN_WARNING "TSC calibration disturbed by SMI, " | 235 | printk(KERN_WARNING "TSC calibration disturbed by SMI, " |
| 236 | "using PIT calibration result\n"); | 236 | "using PIT calibration result\n"); |
| 237 | return; | 237 | goto out; |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | tsc2 = (tsc2 - tsc1) * 1000000L; | 240 | tsc2 = (tsc2 - tsc1) * 1000000L; |
| @@ -255,6 +255,7 @@ void __init tsc_calibrate(void) | |||
| 255 | 255 | ||
| 256 | tsc_khz = tsc2 / tsc1; | 256 | tsc_khz = tsc2 / tsc1; |
| 257 | 257 | ||
| 258 | out: | ||
| 258 | for_each_possible_cpu(cpu) | 259 | for_each_possible_cpu(cpu) |
| 259 | set_cyc2ns_scale(tsc_khz, cpu); | 260 | set_cyc2ns_scale(tsc_khz, cpu); |
| 260 | } | 261 | } |
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 3324d90038e4..3829aa7b663f 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
| @@ -200,10 +200,12 @@ int __pit_timer_fn(struct kvm_kpit_state *ps) | |||
| 200 | 200 | ||
| 201 | atomic_inc(&pt->pending); | 201 | atomic_inc(&pt->pending); |
| 202 | smp_mb__after_atomic_inc(); | 202 | smp_mb__after_atomic_inc(); |
| 203 | /* FIXME: handle case where the guest is in guest mode */ | 203 | if (vcpu0) { |
| 204 | if (vcpu0 && waitqueue_active(&vcpu0->wq)) { | 204 | set_bit(KVM_REQ_PENDING_TIMER, &vcpu0->requests); |
| 205 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; | 205 | if (waitqueue_active(&vcpu0->wq)) { |
| 206 | wake_up_interruptible(&vcpu0->wq); | 206 | vcpu0->arch.mp_state = KVM_MP_STATE_RUNNABLE; |
| 207 | wake_up_interruptible(&vcpu0->wq); | ||
| 208 | } | ||
| 207 | } | 209 | } |
| 208 | 210 | ||
| 209 | pt->timer.expires = ktime_add_ns(pt->timer.expires, pt->period); | 211 | pt->timer.expires = ktime_add_ns(pt->timer.expires, pt->period); |
| @@ -216,7 +218,7 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu) | |||
| 216 | { | 218 | { |
| 217 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; | 219 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; |
| 218 | 220 | ||
| 219 | if (pit && vcpu->vcpu_id == 0) | 221 | if (pit && vcpu->vcpu_id == 0 && pit->pit_state.inject_pending) |
| 220 | return atomic_read(&pit->pit_state.pit_timer.pending); | 222 | return atomic_read(&pit->pit_state.pit_timer.pending); |
| 221 | 223 | ||
| 222 | return 0; | 224 | return 0; |
| @@ -237,6 +239,19 @@ static enum hrtimer_restart pit_timer_fn(struct hrtimer *data) | |||
| 237 | return HRTIMER_NORESTART; | 239 | return HRTIMER_NORESTART; |
| 238 | } | 240 | } |
| 239 | 241 | ||
| 242 | void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu) | ||
| 243 | { | ||
| 244 | struct kvm_pit *pit = vcpu->kvm->arch.vpit; | ||
| 245 | struct hrtimer *timer; | ||
| 246 | |||
| 247 | if (vcpu->vcpu_id != 0 || !pit) | ||
| 248 | return; | ||
| 249 | |||
| 250 | timer = &pit->pit_state.pit_timer.timer; | ||
| 251 | if (hrtimer_cancel(timer)) | ||
| 252 | hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS); | ||
| 253 | } | ||
| 254 | |||
| 240 | static void destroy_pit_timer(struct kvm_kpit_timer *pt) | 255 | static void destroy_pit_timer(struct kvm_kpit_timer *pt) |
| 241 | { | 256 | { |
| 242 | pr_debug("pit: execute del timer!\n"); | 257 | pr_debug("pit: execute del timer!\n"); |
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index ce1f583459b1..76d736b5f664 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c | |||
| @@ -94,3 +94,9 @@ void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec) | |||
| 94 | /* TODO: PIT, RTC etc. */ | 94 | /* TODO: PIT, RTC etc. */ |
| 95 | } | 95 | } |
| 96 | EXPORT_SYMBOL_GPL(kvm_timer_intr_post); | 96 | EXPORT_SYMBOL_GPL(kvm_timer_intr_post); |
| 97 | |||
| 98 | void __kvm_migrate_timers(struct kvm_vcpu *vcpu) | ||
| 99 | { | ||
| 100 | __kvm_migrate_apic_timer(vcpu); | ||
| 101 | __kvm_migrate_pit_timer(vcpu); | ||
| 102 | } | ||
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index 1802134b836f..2a15be2275c0 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h | |||
| @@ -84,6 +84,8 @@ void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec); | |||
| 84 | void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); | 84 | void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu); |
| 85 | void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); | 85 | void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu); |
| 86 | void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); | 86 | void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); |
| 87 | void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu); | ||
| 88 | void __kvm_migrate_timers(struct kvm_vcpu *vcpu); | ||
| 87 | 89 | ||
| 88 | int pit_has_pending_timer(struct kvm_vcpu *vcpu); | 90 | int pit_has_pending_timer(struct kvm_vcpu *vcpu); |
| 89 | int apic_has_pending_timer(struct kvm_vcpu *vcpu); | 91 | int apic_has_pending_timer(struct kvm_vcpu *vcpu); |
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 36809d79788b..ebc03f5ae162 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c | |||
| @@ -940,6 +940,7 @@ static int __apic_timer_fn(struct kvm_lapic *apic) | |||
| 940 | wait_queue_head_t *q = &apic->vcpu->wq; | 940 | wait_queue_head_t *q = &apic->vcpu->wq; |
| 941 | 941 | ||
| 942 | atomic_inc(&apic->timer.pending); | 942 | atomic_inc(&apic->timer.pending); |
| 943 | set_bit(KVM_REQ_PENDING_TIMER, &apic->vcpu->requests); | ||
| 943 | if (waitqueue_active(q)) { | 944 | if (waitqueue_active(q)) { |
| 944 | apic->vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; | 945 | apic->vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; |
| 945 | wake_up_interruptible(q); | 946 | wake_up_interruptible(q); |
| @@ -957,7 +958,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu) | |||
| 957 | { | 958 | { |
| 958 | struct kvm_lapic *lapic = vcpu->arch.apic; | 959 | struct kvm_lapic *lapic = vcpu->arch.apic; |
| 959 | 960 | ||
| 960 | if (lapic) | 961 | if (lapic && apic_enabled(lapic) && apic_lvt_enabled(lapic, APIC_LVTT)) |
| 961 | return atomic_read(&lapic->timer.pending); | 962 | return atomic_read(&lapic->timer.pending); |
| 962 | 963 | ||
| 963 | return 0; | 964 | return 0; |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 36c5406b1813..7e7c3969f7a2 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
| @@ -640,6 +640,7 @@ static void rmap_write_protect(struct kvm *kvm, u64 gfn) | |||
| 640 | rmap_remove(kvm, spte); | 640 | rmap_remove(kvm, spte); |
| 641 | --kvm->stat.lpages; | 641 | --kvm->stat.lpages; |
| 642 | set_shadow_pte(spte, shadow_trap_nonpresent_pte); | 642 | set_shadow_pte(spte, shadow_trap_nonpresent_pte); |
| 643 | spte = NULL; | ||
| 643 | write_protected = 1; | 644 | write_protected = 1; |
| 644 | } | 645 | } |
| 645 | spte = rmap_next(kvm, rmapp, spte); | 646 | spte = rmap_next(kvm, rmapp, spte); |
| @@ -658,7 +659,7 @@ static int is_empty_shadow_page(u64 *spt) | |||
| 658 | u64 *end; | 659 | u64 *end; |
| 659 | 660 | ||
| 660 | for (pos = spt, end = pos + PAGE_SIZE / sizeof(u64); pos != end; pos++) | 661 | for (pos = spt, end = pos + PAGE_SIZE / sizeof(u64); pos != end; pos++) |
| 661 | if (*pos != shadow_trap_nonpresent_pte) { | 662 | if (is_shadow_present_pte(*pos)) { |
| 662 | printk(KERN_ERR "%s: %p %llx\n", __func__, | 663 | printk(KERN_ERR "%s: %p %llx\n", __func__, |
| 663 | pos, *pos); | 664 | pos, *pos); |
| 664 | return 0; | 665 | return 0; |
| @@ -1082,10 +1083,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, | |||
| 1082 | struct kvm_mmu_page *shadow; | 1083 | struct kvm_mmu_page *shadow; |
| 1083 | 1084 | ||
| 1084 | spte |= PT_WRITABLE_MASK; | 1085 | spte |= PT_WRITABLE_MASK; |
| 1085 | if (user_fault) { | ||
| 1086 | mmu_unshadow(vcpu->kvm, gfn); | ||
| 1087 | goto unshadowed; | ||
| 1088 | } | ||
| 1089 | 1086 | ||
| 1090 | shadow = kvm_mmu_lookup_page(vcpu->kvm, gfn); | 1087 | shadow = kvm_mmu_lookup_page(vcpu->kvm, gfn); |
| 1091 | if (shadow || | 1088 | if (shadow || |
| @@ -1102,8 +1099,6 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte, | |||
| 1102 | } | 1099 | } |
| 1103 | } | 1100 | } |
| 1104 | 1101 | ||
| 1105 | unshadowed: | ||
| 1106 | |||
| 1107 | if (pte_access & ACC_WRITE_MASK) | 1102 | if (pte_access & ACC_WRITE_MASK) |
| 1108 | mark_page_dirty(vcpu->kvm, gfn); | 1103 | mark_page_dirty(vcpu->kvm, gfn); |
| 1109 | 1104 | ||
| @@ -1580,11 +1575,13 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu, | |||
| 1580 | u64 *spte, | 1575 | u64 *spte, |
| 1581 | const void *new) | 1576 | const void *new) |
| 1582 | { | 1577 | { |
| 1583 | if ((sp->role.level != PT_PAGE_TABLE_LEVEL) | 1578 | if (sp->role.level != PT_PAGE_TABLE_LEVEL) { |
| 1584 | && !vcpu->arch.update_pte.largepage) { | 1579 | if (!vcpu->arch.update_pte.largepage || |
| 1585 | ++vcpu->kvm->stat.mmu_pde_zapped; | 1580 | sp->role.glevels == PT32_ROOT_LEVEL) { |
| 1586 | return; | 1581 | ++vcpu->kvm->stat.mmu_pde_zapped; |
| 1587 | } | 1582 | return; |
| 1583 | } | ||
| 1584 | } | ||
| 1588 | 1585 | ||
| 1589 | ++vcpu->kvm->stat.mmu_pte_updated; | 1586 | ++vcpu->kvm->stat.mmu_pte_updated; |
| 1590 | if (sp->role.glevels == PT32_ROOT_LEVEL) | 1587 | if (sp->role.glevels == PT32_ROOT_LEVEL) |
| @@ -1858,6 +1855,7 @@ static void free_mmu_pages(struct kvm_vcpu *vcpu) | |||
| 1858 | sp = container_of(vcpu->kvm->arch.active_mmu_pages.next, | 1855 | sp = container_of(vcpu->kvm->arch.active_mmu_pages.next, |
| 1859 | struct kvm_mmu_page, link); | 1856 | struct kvm_mmu_page, link); |
| 1860 | kvm_mmu_zap_page(vcpu->kvm, sp); | 1857 | kvm_mmu_zap_page(vcpu->kvm, sp); |
| 1858 | cond_resched(); | ||
| 1861 | } | 1859 | } |
| 1862 | free_page((unsigned long)vcpu->arch.mmu.pae_root); | 1860 | free_page((unsigned long)vcpu->arch.mmu.pae_root); |
| 1863 | } | 1861 | } |
| @@ -1996,7 +1994,7 @@ static struct shrinker mmu_shrinker = { | |||
| 1996 | .seeks = DEFAULT_SEEKS * 10, | 1994 | .seeks = DEFAULT_SEEKS * 10, |
| 1997 | }; | 1995 | }; |
| 1998 | 1996 | ||
| 1999 | void mmu_destroy_caches(void) | 1997 | static void mmu_destroy_caches(void) |
| 2000 | { | 1998 | { |
| 2001 | if (pte_chain_cache) | 1999 | if (pte_chain_cache) |
| 2002 | kmem_cache_destroy(pte_chain_cache); | 2000 | kmem_cache_destroy(pte_chain_cache); |
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 156fe10288ae..934c7b619396 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
| @@ -418,7 +418,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, | |||
| 418 | 418 | ||
| 419 | /* mmio */ | 419 | /* mmio */ |
| 420 | if (is_error_pfn(pfn)) { | 420 | if (is_error_pfn(pfn)) { |
| 421 | pgprintk("gfn %x is mmio\n", walker.gfn); | 421 | pgprintk("gfn %lx is mmio\n", walker.gfn); |
| 422 | kvm_release_pfn_clean(pfn); | 422 | kvm_release_pfn_clean(pfn); |
| 423 | return 1; | 423 | return 1; |
| 424 | } | 424 | } |
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ab22615eee89..6b0d5fa5bab3 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
| @@ -688,7 +688,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
| 688 | delta = vcpu->arch.host_tsc - tsc_this; | 688 | delta = vcpu->arch.host_tsc - tsc_this; |
| 689 | svm->vmcb->control.tsc_offset += delta; | 689 | svm->vmcb->control.tsc_offset += delta; |
| 690 | vcpu->cpu = cpu; | 690 | vcpu->cpu = cpu; |
| 691 | kvm_migrate_apic_timer(vcpu); | 691 | kvm_migrate_timers(vcpu); |
| 692 | } | 692 | } |
| 693 | 693 | ||
| 694 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) | 694 | for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) |
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index bfe4db11989c..540e95179074 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
| @@ -566,7 +566,7 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu) | |||
| 566 | load_transition_efer(vmx); | 566 | load_transition_efer(vmx); |
| 567 | } | 567 | } |
| 568 | 568 | ||
| 569 | static void vmx_load_host_state(struct vcpu_vmx *vmx) | 569 | static void __vmx_load_host_state(struct vcpu_vmx *vmx) |
| 570 | { | 570 | { |
| 571 | unsigned long flags; | 571 | unsigned long flags; |
| 572 | 572 | ||
| @@ -596,6 +596,13 @@ static void vmx_load_host_state(struct vcpu_vmx *vmx) | |||
| 596 | reload_host_efer(vmx); | 596 | reload_host_efer(vmx); |
| 597 | } | 597 | } |
| 598 | 598 | ||
| 599 | static void vmx_load_host_state(struct vcpu_vmx *vmx) | ||
| 600 | { | ||
| 601 | preempt_disable(); | ||
| 602 | __vmx_load_host_state(vmx); | ||
| 603 | preempt_enable(); | ||
| 604 | } | ||
| 605 | |||
| 599 | /* | 606 | /* |
| 600 | * Switches to specified vcpu, until a matching vcpu_put(), but assumes | 607 | * Switches to specified vcpu, until a matching vcpu_put(), but assumes |
| 601 | * vcpu mutex is already taken. | 608 | * vcpu mutex is already taken. |
| @@ -608,7 +615,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
| 608 | 615 | ||
| 609 | if (vcpu->cpu != cpu) { | 616 | if (vcpu->cpu != cpu) { |
| 610 | vcpu_clear(vmx); | 617 | vcpu_clear(vmx); |
| 611 | kvm_migrate_apic_timer(vcpu); | 618 | kvm_migrate_timers(vcpu); |
| 612 | vpid_sync_vcpu_all(vmx); | 619 | vpid_sync_vcpu_all(vmx); |
| 613 | } | 620 | } |
| 614 | 621 | ||
| @@ -654,7 +661,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
| 654 | 661 | ||
| 655 | static void vmx_vcpu_put(struct kvm_vcpu *vcpu) | 662 | static void vmx_vcpu_put(struct kvm_vcpu *vcpu) |
| 656 | { | 663 | { |
| 657 | vmx_load_host_state(to_vmx(vcpu)); | 664 | __vmx_load_host_state(to_vmx(vcpu)); |
| 658 | } | 665 | } |
| 659 | 666 | ||
| 660 | static void vmx_fpu_activate(struct kvm_vcpu *vcpu) | 667 | static void vmx_fpu_activate(struct kvm_vcpu *vcpu) |
| @@ -884,11 +891,8 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) | |||
| 884 | switch (msr_index) { | 891 | switch (msr_index) { |
| 885 | #ifdef CONFIG_X86_64 | 892 | #ifdef CONFIG_X86_64 |
| 886 | case MSR_EFER: | 893 | case MSR_EFER: |
| 894 | vmx_load_host_state(vmx); | ||
| 887 | ret = kvm_set_msr_common(vcpu, msr_index, data); | 895 | ret = kvm_set_msr_common(vcpu, msr_index, data); |
| 888 | if (vmx->host_state.loaded) { | ||
| 889 | reload_host_efer(vmx); | ||
| 890 | load_transition_efer(vmx); | ||
| 891 | } | ||
| 892 | break; | 896 | break; |
| 893 | case MSR_FS_BASE: | 897 | case MSR_FS_BASE: |
| 894 | vmcs_writel(GUEST_FS_BASE, data); | 898 | vmcs_writel(GUEST_FS_BASE, data); |
| @@ -910,11 +914,10 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) | |||
| 910 | guest_write_tsc(data); | 914 | guest_write_tsc(data); |
| 911 | break; | 915 | break; |
| 912 | default: | 916 | default: |
| 917 | vmx_load_host_state(vmx); | ||
| 913 | msr = find_msr_entry(vmx, msr_index); | 918 | msr = find_msr_entry(vmx, msr_index); |
| 914 | if (msr) { | 919 | if (msr) { |
| 915 | msr->data = data; | 920 | msr->data = data; |
| 916 | if (vmx->host_state.loaded) | ||
| 917 | load_msrs(vmx->guest_msrs, vmx->save_nmsrs); | ||
| 918 | break; | 921 | break; |
| 919 | } | 922 | } |
| 920 | ret = kvm_set_msr_common(vcpu, msr_index, data); | 923 | ret = kvm_set_msr_common(vcpu, msr_index, data); |
| @@ -1036,6 +1039,7 @@ static void hardware_enable(void *garbage) | |||
| 1036 | static void hardware_disable(void *garbage) | 1039 | static void hardware_disable(void *garbage) |
| 1037 | { | 1040 | { |
| 1038 | asm volatile (ASM_VMX_VMXOFF : : : "cc"); | 1041 | asm volatile (ASM_VMX_VMXOFF : : : "cc"); |
| 1042 | write_cr4(read_cr4() & ~X86_CR4_VMXE); | ||
| 1039 | } | 1043 | } |
| 1040 | 1044 | ||
| 1041 | static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, | 1045 | static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 21338bdb28ff..63a77caa59f1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -492,8 +492,8 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data) | |||
| 492 | static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | 492 | static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) |
| 493 | { | 493 | { |
| 494 | static int version; | 494 | static int version; |
| 495 | struct kvm_wall_clock wc; | 495 | struct pvclock_wall_clock wc; |
| 496 | struct timespec wc_ts; | 496 | struct timespec now, sys, boot; |
| 497 | 497 | ||
| 498 | if (!wall_clock) | 498 | if (!wall_clock) |
| 499 | return; | 499 | return; |
| @@ -502,10 +502,19 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | |||
| 502 | 502 | ||
| 503 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); | 503 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); |
| 504 | 504 | ||
| 505 | wc_ts = current_kernel_time(); | 505 | /* |
| 506 | wc.wc_sec = wc_ts.tv_sec; | 506 | * The guest calculates current wall clock time by adding |
| 507 | wc.wc_nsec = wc_ts.tv_nsec; | 507 | * system time (updated by kvm_write_guest_time below) to the |
| 508 | wc.wc_version = version; | 508 | * wall clock specified here. guest system time equals host |
| 509 | * system time for us, thus we must fill in host boot time here. | ||
| 510 | */ | ||
| 511 | now = current_kernel_time(); | ||
| 512 | ktime_get_ts(&sys); | ||
| 513 | boot = ns_to_timespec(timespec_to_ns(&now) - timespec_to_ns(&sys)); | ||
| 514 | |||
| 515 | wc.sec = boot.tv_sec; | ||
| 516 | wc.nsec = boot.tv_nsec; | ||
| 517 | wc.version = version; | ||
| 509 | 518 | ||
| 510 | kvm_write_guest(kvm, wall_clock, &wc, sizeof(wc)); | 519 | kvm_write_guest(kvm, wall_clock, &wc, sizeof(wc)); |
| 511 | 520 | ||
| @@ -513,6 +522,45 @@ static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) | |||
| 513 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); | 522 | kvm_write_guest(kvm, wall_clock, &version, sizeof(version)); |
| 514 | } | 523 | } |
| 515 | 524 | ||
| 525 | static uint32_t div_frac(uint32_t dividend, uint32_t divisor) | ||
| 526 | { | ||
| 527 | uint32_t quotient, remainder; | ||
| 528 | |||
| 529 | /* Don't try to replace with do_div(), this one calculates | ||
| 530 | * "(dividend << 32) / divisor" */ | ||
| 531 | __asm__ ( "divl %4" | ||
| 532 | : "=a" (quotient), "=d" (remainder) | ||
| 533 | : "0" (0), "1" (dividend), "r" (divisor) ); | ||
| 534 | return quotient; | ||
| 535 | } | ||
| 536 | |||
| 537 | static void kvm_set_time_scale(uint32_t tsc_khz, struct pvclock_vcpu_time_info *hv_clock) | ||
| 538 | { | ||
| 539 | uint64_t nsecs = 1000000000LL; | ||
| 540 | int32_t shift = 0; | ||
| 541 | uint64_t tps64; | ||
| 542 | uint32_t tps32; | ||
| 543 | |||
| 544 | tps64 = tsc_khz * 1000LL; | ||
| 545 | while (tps64 > nsecs*2) { | ||
| 546 | tps64 >>= 1; | ||
| 547 | shift--; | ||
| 548 | } | ||
| 549 | |||
| 550 | tps32 = (uint32_t)tps64; | ||
| 551 | while (tps32 <= (uint32_t)nsecs) { | ||
| 552 | tps32 <<= 1; | ||
| 553 | shift++; | ||
| 554 | } | ||
| 555 | |||
| 556 | hv_clock->tsc_shift = shift; | ||
| 557 | hv_clock->tsc_to_system_mul = div_frac(nsecs, tps32); | ||
| 558 | |||
| 559 | pr_debug("%s: tsc_khz %u, tsc_shift %d, tsc_mul %u\n", | ||
| 560 | __FUNCTION__, tsc_khz, hv_clock->tsc_shift, | ||
| 561 | hv_clock->tsc_to_system_mul); | ||
| 562 | } | ||
| 563 | |||
| 516 | static void kvm_write_guest_time(struct kvm_vcpu *v) | 564 | static void kvm_write_guest_time(struct kvm_vcpu *v) |
| 517 | { | 565 | { |
| 518 | struct timespec ts; | 566 | struct timespec ts; |
| @@ -523,6 +571,11 @@ static void kvm_write_guest_time(struct kvm_vcpu *v) | |||
| 523 | if ((!vcpu->time_page)) | 571 | if ((!vcpu->time_page)) |
| 524 | return; | 572 | return; |
| 525 | 573 | ||
| 574 | if (unlikely(vcpu->hv_clock_tsc_khz != tsc_khz)) { | ||
| 575 | kvm_set_time_scale(tsc_khz, &vcpu->hv_clock); | ||
| 576 | vcpu->hv_clock_tsc_khz = tsc_khz; | ||
| 577 | } | ||
| 578 | |||
| 526 | /* Keep irq disabled to prevent changes to the clock */ | 579 | /* Keep irq disabled to prevent changes to the clock */ |
| 527 | local_irq_save(flags); | 580 | local_irq_save(flags); |
| 528 | kvm_get_msr(v, MSR_IA32_TIME_STAMP_COUNTER, | 581 | kvm_get_msr(v, MSR_IA32_TIME_STAMP_COUNTER, |
| @@ -537,14 +590,14 @@ static void kvm_write_guest_time(struct kvm_vcpu *v) | |||
| 537 | /* | 590 | /* |
| 538 | * The interface expects us to write an even number signaling that the | 591 | * The interface expects us to write an even number signaling that the |
| 539 | * update is finished. Since the guest won't see the intermediate | 592 | * update is finished. Since the guest won't see the intermediate |
| 540 | * state, we just write "2" at the end | 593 | * state, we just increase by 2 at the end. |
| 541 | */ | 594 | */ |
| 542 | vcpu->hv_clock.version = 2; | 595 | vcpu->hv_clock.version += 2; |
| 543 | 596 | ||
| 544 | shared_kaddr = kmap_atomic(vcpu->time_page, KM_USER0); | 597 | shared_kaddr = kmap_atomic(vcpu->time_page, KM_USER0); |
| 545 | 598 | ||
| 546 | memcpy(shared_kaddr + vcpu->time_offset, &vcpu->hv_clock, | 599 | memcpy(shared_kaddr + vcpu->time_offset, &vcpu->hv_clock, |
| 547 | sizeof(vcpu->hv_clock)); | 600 | sizeof(vcpu->hv_clock)); |
| 548 | 601 | ||
| 549 | kunmap_atomic(shared_kaddr, KM_USER0); | 602 | kunmap_atomic(shared_kaddr, KM_USER0); |
| 550 | 603 | ||
| @@ -599,10 +652,6 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data) | |||
| 599 | /* ...but clean it before doing the actual write */ | 652 | /* ...but clean it before doing the actual write */ |
| 600 | vcpu->arch.time_offset = data & ~(PAGE_MASK | 1); | 653 | vcpu->arch.time_offset = data & ~(PAGE_MASK | 1); |
| 601 | 654 | ||
| 602 | vcpu->arch.hv_clock.tsc_to_system_mul = | ||
| 603 | clocksource_khz2mult(tsc_khz, 22); | ||
| 604 | vcpu->arch.hv_clock.tsc_shift = 22; | ||
| 605 | |||
| 606 | down_read(¤t->mm->mmap_sem); | 655 | down_read(¤t->mm->mmap_sem); |
| 607 | vcpu->arch.time_page = | 656 | vcpu->arch.time_page = |
| 608 | gfn_to_page(vcpu->kvm, data >> PAGE_SHIFT); | 657 | gfn_to_page(vcpu->kvm, data >> PAGE_SHIFT); |
| @@ -2758,7 +2807,9 @@ again: | |||
| 2758 | 2807 | ||
| 2759 | if (vcpu->requests) { | 2808 | if (vcpu->requests) { |
| 2760 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) | 2809 | if (test_and_clear_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests)) |
| 2761 | __kvm_migrate_apic_timer(vcpu); | 2810 | __kvm_migrate_timers(vcpu); |
| 2811 | if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests)) | ||
| 2812 | kvm_x86_ops->tlb_flush(vcpu); | ||
| 2762 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, | 2813 | if (test_and_clear_bit(KVM_REQ_REPORT_TPR_ACCESS, |
| 2763 | &vcpu->requests)) { | 2814 | &vcpu->requests)) { |
| 2764 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; | 2815 | kvm_run->exit_reason = KVM_EXIT_TPR_ACCESS; |
| @@ -2772,6 +2823,7 @@ again: | |||
| 2772 | } | 2823 | } |
| 2773 | } | 2824 | } |
| 2774 | 2825 | ||
| 2826 | clear_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests); | ||
| 2775 | kvm_inject_pending_timer_irqs(vcpu); | 2827 | kvm_inject_pending_timer_irqs(vcpu); |
| 2776 | 2828 | ||
| 2777 | preempt_disable(); | 2829 | preempt_disable(); |
| @@ -2781,21 +2833,13 @@ again: | |||
| 2781 | 2833 | ||
| 2782 | local_irq_disable(); | 2834 | local_irq_disable(); |
| 2783 | 2835 | ||
| 2784 | if (need_resched()) { | 2836 | if (vcpu->requests || need_resched()) { |
| 2785 | local_irq_enable(); | 2837 | local_irq_enable(); |
| 2786 | preempt_enable(); | 2838 | preempt_enable(); |
| 2787 | r = 1; | 2839 | r = 1; |
| 2788 | goto out; | 2840 | goto out; |
| 2789 | } | 2841 | } |
| 2790 | 2842 | ||
| 2791 | if (vcpu->requests) | ||
| 2792 | if (test_bit(KVM_REQ_MMU_RELOAD, &vcpu->requests)) { | ||
| 2793 | local_irq_enable(); | ||
| 2794 | preempt_enable(); | ||
| 2795 | r = 1; | ||
| 2796 | goto out; | ||
| 2797 | } | ||
| 2798 | |||
| 2799 | if (signal_pending(current)) { | 2843 | if (signal_pending(current)) { |
| 2800 | local_irq_enable(); | 2844 | local_irq_enable(); |
| 2801 | preempt_enable(); | 2845 | preempt_enable(); |
| @@ -2825,9 +2869,6 @@ again: | |||
| 2825 | 2869 | ||
| 2826 | kvm_guest_enter(); | 2870 | kvm_guest_enter(); |
| 2827 | 2871 | ||
| 2828 | if (vcpu->requests) | ||
| 2829 | if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests)) | ||
| 2830 | kvm_x86_ops->tlb_flush(vcpu); | ||
| 2831 | 2872 | ||
| 2832 | KVMTRACE_0D(VMENTRY, vcpu, entryexit); | 2873 | KVMTRACE_0D(VMENTRY, vcpu, entryexit); |
| 2833 | kvm_x86_ops->run(vcpu, kvm_run); | 2874 | kvm_x86_ops->run(vcpu, kvm_run); |
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c index f2a696d6a243..932f216d890c 100644 --- a/arch/x86/kvm/x86_emulate.c +++ b/arch/x86/kvm/x86_emulate.c | |||
| @@ -677,8 +677,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt, | |||
| 677 | c->use_modrm_ea = 1; | 677 | c->use_modrm_ea = 1; |
| 678 | 678 | ||
| 679 | if (c->modrm_mod == 3) { | 679 | if (c->modrm_mod == 3) { |
| 680 | c->modrm_val = *(unsigned long *) | 680 | c->modrm_ptr = decode_register(c->modrm_rm, |
| 681 | decode_register(c->modrm_rm, c->regs, c->d & ByteOp); | 681 | c->regs, c->d & ByteOp); |
| 682 | c->modrm_val = *(unsigned long *)c->modrm_ptr; | ||
| 682 | return rc; | 683 | return rc; |
| 683 | } | 684 | } |
| 684 | 685 | ||
| @@ -1005,6 +1006,7 @@ done_prefixes: | |||
| 1005 | if ((c->d & ModRM) && c->modrm_mod == 3) { | 1006 | if ((c->d & ModRM) && c->modrm_mod == 3) { |
| 1006 | c->src.type = OP_REG; | 1007 | c->src.type = OP_REG; |
| 1007 | c->src.val = c->modrm_val; | 1008 | c->src.val = c->modrm_val; |
| 1009 | c->src.ptr = c->modrm_ptr; | ||
| 1008 | break; | 1010 | break; |
| 1009 | } | 1011 | } |
| 1010 | c->src.type = OP_MEM; | 1012 | c->src.type = OP_MEM; |
| @@ -1049,6 +1051,7 @@ done_prefixes: | |||
| 1049 | if ((c->d & ModRM) && c->modrm_mod == 3) { | 1051 | if ((c->d & ModRM) && c->modrm_mod == 3) { |
| 1050 | c->dst.type = OP_REG; | 1052 | c->dst.type = OP_REG; |
| 1051 | c->dst.val = c->dst.orig_val = c->modrm_val; | 1053 | c->dst.val = c->dst.orig_val = c->modrm_val; |
| 1054 | c->dst.ptr = c->modrm_ptr; | ||
| 1052 | break; | 1055 | break; |
| 1053 | } | 1056 | } |
| 1054 | c->dst.type = OP_MEM; | 1057 | c->dst.type = OP_MEM; |
| @@ -1724,7 +1727,8 @@ twobyte_insn: | |||
| 1724 | if (rc) | 1727 | if (rc) |
| 1725 | goto done; | 1728 | goto done; |
| 1726 | 1729 | ||
| 1727 | kvm_emulate_hypercall(ctxt->vcpu); | 1730 | /* Let the processor re-execute the fixed hypercall */ |
| 1731 | c->eip = ctxt->vcpu->arch.rip; | ||
| 1728 | /* Disable writeback. */ | 1732 | /* Disable writeback. */ |
| 1729 | c->dst.type = OP_NONE; | 1733 | c->dst.type = OP_NONE; |
| 1730 | break; | 1734 | break; |
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index af65b2da3ba0..5c7e2fd52075 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
| @@ -582,8 +582,9 @@ static void __init lguest_init_IRQ(void) | |||
| 582 | int vector = FIRST_EXTERNAL_VECTOR + i; | 582 | int vector = FIRST_EXTERNAL_VECTOR + i; |
| 583 | if (vector != SYSCALL_VECTOR) { | 583 | if (vector != SYSCALL_VECTOR) { |
| 584 | set_intr_gate(vector, interrupt[i]); | 584 | set_intr_gate(vector, interrupt[i]); |
| 585 | set_irq_chip_and_handler(i, &lguest_irq_controller, | 585 | set_irq_chip_and_handler_name(i, &lguest_irq_controller, |
| 586 | handle_level_irq); | 586 | handle_level_irq, |
| 587 | "level"); | ||
| 587 | } | 588 | } |
| 588 | } | 589 | } |
| 589 | /* This call is required to set up for 4k stacks, where we have | 590 | /* This call is required to set up for 4k stacks, where we have |
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index 70bebd310408..ee1c3f635157 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S | |||
| @@ -217,19 +217,19 @@ ENTRY(copy_user_generic_unrolled) | |||
| 217 | /* table sorted by exception address */ | 217 | /* table sorted by exception address */ |
| 218 | .section __ex_table,"a" | 218 | .section __ex_table,"a" |
| 219 | .align 8 | 219 | .align 8 |
| 220 | .quad .Ls1,.Ls1e | 220 | .quad .Ls1,.Ls1e /* Ls1-Ls4 have copied zero bytes */ |
| 221 | .quad .Ls2,.Ls2e | 221 | .quad .Ls2,.Ls1e |
| 222 | .quad .Ls3,.Ls3e | 222 | .quad .Ls3,.Ls1e |
| 223 | .quad .Ls4,.Ls4e | 223 | .quad .Ls4,.Ls1e |
| 224 | .quad .Ld1,.Ls1e | 224 | .quad .Ld1,.Ls1e /* Ld1-Ld4 have copied 0-24 bytes */ |
| 225 | .quad .Ld2,.Ls2e | 225 | .quad .Ld2,.Ls2e |
| 226 | .quad .Ld3,.Ls3e | 226 | .quad .Ld3,.Ls3e |
| 227 | .quad .Ld4,.Ls4e | 227 | .quad .Ld4,.Ls4e |
| 228 | .quad .Ls5,.Ls5e | 228 | .quad .Ls5,.Ls5e /* Ls5-Ls8 have copied 32 bytes */ |
| 229 | .quad .Ls6,.Ls6e | 229 | .quad .Ls6,.Ls5e |
| 230 | .quad .Ls7,.Ls7e | 230 | .quad .Ls7,.Ls5e |
| 231 | .quad .Ls8,.Ls8e | 231 | .quad .Ls8,.Ls5e |
| 232 | .quad .Ld5,.Ls5e | 232 | .quad .Ld5,.Ls5e /* Ld5-Ld8 have copied 32-56 bytes */ |
| 233 | .quad .Ld6,.Ls6e | 233 | .quad .Ld6,.Ls6e |
| 234 | .quad .Ld7,.Ls7e | 234 | .quad .Ld7,.Ls7e |
| 235 | .quad .Ld8,.Ls8e | 235 | .quad .Ld8,.Ls8e |
| @@ -244,11 +244,8 @@ ENTRY(copy_user_generic_unrolled) | |||
| 244 | .quad .Le5,.Le_zero | 244 | .quad .Le5,.Le_zero |
| 245 | .previous | 245 | .previous |
| 246 | 246 | ||
| 247 | /* compute 64-offset for main loop. 8 bytes accuracy with error on the | ||
| 248 | pessimistic side. this is gross. it would be better to fix the | ||
| 249 | interface. */ | ||
| 250 | /* eax: zero, ebx: 64 */ | 247 | /* eax: zero, ebx: 64 */ |
| 251 | .Ls1e: addl $8,%eax | 248 | .Ls1e: addl $8,%eax /* eax is bytes left uncopied within the loop (Ls1e: 64 .. Ls8e: 8) */ |
| 252 | .Ls2e: addl $8,%eax | 249 | .Ls2e: addl $8,%eax |
| 253 | .Ls3e: addl $8,%eax | 250 | .Ls3e: addl $8,%eax |
| 254 | .Ls4e: addl $8,%eax | 251 | .Ls4e: addl $8,%eax |
diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S index 5196762b3b0e..9d3d1ab83763 100644 --- a/arch/x86/lib/copy_user_nocache_64.S +++ b/arch/x86/lib/copy_user_nocache_64.S | |||
| @@ -145,19 +145,19 @@ ENTRY(__copy_user_nocache) | |||
| 145 | /* table sorted by exception address */ | 145 | /* table sorted by exception address */ |
| 146 | .section __ex_table,"a" | 146 | .section __ex_table,"a" |
| 147 | .align 8 | 147 | .align 8 |
| 148 | .quad .Ls1,.Ls1e | 148 | .quad .Ls1,.Ls1e /* .Ls[1-4] - 0 bytes copied */ |
| 149 | .quad .Ls2,.Ls2e | 149 | .quad .Ls2,.Ls1e |
| 150 | .quad .Ls3,.Ls3e | 150 | .quad .Ls3,.Ls1e |
| 151 | .quad .Ls4,.Ls4e | 151 | .quad .Ls4,.Ls1e |
| 152 | .quad .Ld1,.Ls1e | 152 | .quad .Ld1,.Ls1e /* .Ld[1-4] - 0..24 bytes coped */ |
| 153 | .quad .Ld2,.Ls2e | 153 | .quad .Ld2,.Ls2e |
| 154 | .quad .Ld3,.Ls3e | 154 | .quad .Ld3,.Ls3e |
| 155 | .quad .Ld4,.Ls4e | 155 | .quad .Ld4,.Ls4e |
| 156 | .quad .Ls5,.Ls5e | 156 | .quad .Ls5,.Ls5e /* .Ls[5-8] - 32 bytes copied */ |
| 157 | .quad .Ls6,.Ls6e | 157 | .quad .Ls6,.Ls5e |
| 158 | .quad .Ls7,.Ls7e | 158 | .quad .Ls7,.Ls5e |
| 159 | .quad .Ls8,.Ls8e | 159 | .quad .Ls8,.Ls5e |
| 160 | .quad .Ld5,.Ls5e | 160 | .quad .Ld5,.Ls5e /* .Ld[5-8] - 32..56 bytes copied */ |
| 161 | .quad .Ld6,.Ls6e | 161 | .quad .Ld6,.Ls6e |
| 162 | .quad .Ld7,.Ls7e | 162 | .quad .Ld7,.Ls7e |
| 163 | .quad .Ld8,.Ls8e | 163 | .quad .Ld8,.Ls8e |
| @@ -172,11 +172,8 @@ ENTRY(__copy_user_nocache) | |||
| 172 | .quad .Le5,.Le_zero | 172 | .quad .Le5,.Le_zero |
| 173 | .previous | 173 | .previous |
| 174 | 174 | ||
| 175 | /* compute 64-offset for main loop. 8 bytes accuracy with error on the | ||
| 176 | pessimistic side. this is gross. it would be better to fix the | ||
| 177 | interface. */ | ||
| 178 | /* eax: zero, ebx: 64 */ | 175 | /* eax: zero, ebx: 64 */ |
| 179 | .Ls1e: addl $8,%eax | 176 | .Ls1e: addl $8,%eax /* eax: bytes left uncopied: Ls1e: 64 .. Ls8e: 8 */ |
| 180 | .Ls2e: addl $8,%eax | 177 | .Ls2e: addl $8,%eax |
| 181 | .Ls3e: addl $8,%eax | 178 | .Ls3e: addl $8,%eax |
| 182 | .Ls4e: addl $8,%eax | 179 | .Ls4e: addl $8,%eax |
diff --git a/arch/x86/lib/delay_32.c b/arch/x86/lib/delay_32.c index 4535e6d147ad..d710f2d167bb 100644 --- a/arch/x86/lib/delay_32.c +++ b/arch/x86/lib/delay_32.c | |||
| @@ -44,13 +44,36 @@ static void delay_loop(unsigned long loops) | |||
| 44 | static void delay_tsc(unsigned long loops) | 44 | static void delay_tsc(unsigned long loops) |
| 45 | { | 45 | { |
| 46 | unsigned long bclock, now; | 46 | unsigned long bclock, now; |
| 47 | int cpu; | ||
| 47 | 48 | ||
| 48 | preempt_disable(); /* TSC's are per-cpu */ | 49 | preempt_disable(); |
| 50 | cpu = smp_processor_id(); | ||
| 49 | rdtscl(bclock); | 51 | rdtscl(bclock); |
| 50 | do { | 52 | for (;;) { |
| 51 | rep_nop(); | ||
| 52 | rdtscl(now); | 53 | rdtscl(now); |
| 53 | } while ((now-bclock) < loops); | 54 | if ((now - bclock) >= loops) |
| 55 | break; | ||
| 56 | |||
| 57 | /* Allow RT tasks to run */ | ||
| 58 | preempt_enable(); | ||
| 59 | rep_nop(); | ||
| 60 | preempt_disable(); | ||
| 61 | |||
| 62 | /* | ||
| 63 | * It is possible that we moved to another CPU, and | ||
| 64 | * since TSC's are per-cpu we need to calculate | ||
| 65 | * that. The delay must guarantee that we wait "at | ||
| 66 | * least" the amount of time. Being moved to another | ||
| 67 | * CPU could make the wait longer but we just need to | ||
| 68 | * make sure we waited long enough. Rebalance the | ||
| 69 | * counter for this CPU. | ||
| 70 | */ | ||
| 71 | if (unlikely(cpu != smp_processor_id())) { | ||
| 72 | loops -= (now - bclock); | ||
| 73 | cpu = smp_processor_id(); | ||
| 74 | rdtscl(bclock); | ||
| 75 | } | ||
| 76 | } | ||
| 54 | preempt_enable(); | 77 | preempt_enable(); |
| 55 | } | 78 | } |
| 56 | 79 | ||
diff --git a/arch/x86/lib/delay_64.c b/arch/x86/lib/delay_64.c index bbc610518516..4c441be92641 100644 --- a/arch/x86/lib/delay_64.c +++ b/arch/x86/lib/delay_64.c | |||
| @@ -31,14 +31,36 @@ int __devinit read_current_timer(unsigned long *timer_value) | |||
| 31 | void __delay(unsigned long loops) | 31 | void __delay(unsigned long loops) |
| 32 | { | 32 | { |
| 33 | unsigned bclock, now; | 33 | unsigned bclock, now; |
| 34 | int cpu; | ||
| 34 | 35 | ||
| 35 | preempt_disable(); /* TSC's are pre-cpu */ | 36 | preempt_disable(); |
| 37 | cpu = smp_processor_id(); | ||
| 36 | rdtscl(bclock); | 38 | rdtscl(bclock); |
| 37 | do { | 39 | for (;;) { |
| 38 | rep_nop(); | ||
| 39 | rdtscl(now); | 40 | rdtscl(now); |
| 41 | if ((now - bclock) >= loops) | ||
| 42 | break; | ||
| 43 | |||
| 44 | /* Allow RT tasks to run */ | ||
| 45 | preempt_enable(); | ||
| 46 | rep_nop(); | ||
| 47 | preempt_disable(); | ||
| 48 | |||
| 49 | /* | ||
| 50 | * It is possible that we moved to another CPU, and | ||
| 51 | * since TSC's are per-cpu we need to calculate | ||
| 52 | * that. The delay must guarantee that we wait "at | ||
| 53 | * least" the amount of time. Being moved to another | ||
| 54 | * CPU could make the wait longer but we just need to | ||
| 55 | * make sure we waited long enough. Rebalance the | ||
| 56 | * counter for this CPU. | ||
| 57 | */ | ||
| 58 | if (unlikely(cpu != smp_processor_id())) { | ||
| 59 | loops -= (now - bclock); | ||
| 60 | cpu = smp_processor_id(); | ||
| 61 | rdtscl(bclock); | ||
| 62 | } | ||
| 40 | } | 63 | } |
| 41 | while ((now-bclock) < loops); | ||
| 42 | preempt_enable(); | 64 | preempt_enable(); |
| 43 | } | 65 | } |
| 44 | EXPORT_SYMBOL(__delay); | 66 | EXPORT_SYMBOL(__delay); |
diff --git a/arch/x86/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c index 6e38d877ea77..c7b06feb139b 100644 --- a/arch/x86/math-emu/fpu_entry.c +++ b/arch/x86/math-emu/fpu_entry.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <asm/uaccess.h> | 30 | #include <asm/uaccess.h> |
| 31 | #include <asm/desc.h> | 31 | #include <asm/desc.h> |
| 32 | #include <asm/user.h> | 32 | #include <asm/user.h> |
| 33 | #include <asm/i387.h> | ||
| 33 | 34 | ||
| 34 | #include "fpu_system.h" | 35 | #include "fpu_system.h" |
| 35 | #include "fpu_emu.h" | 36 | #include "fpu_emu.h" |
| @@ -146,6 +147,13 @@ asmlinkage void math_emulate(long arg) | |||
| 146 | unsigned long code_limit = 0; /* Initialized to stop compiler warnings */ | 147 | unsigned long code_limit = 0; /* Initialized to stop compiler warnings */ |
| 147 | struct desc_struct code_descriptor; | 148 | struct desc_struct code_descriptor; |
| 148 | 149 | ||
| 150 | if (!used_math()) { | ||
| 151 | if (init_fpu(current)) { | ||
| 152 | do_group_exit(SIGKILL); | ||
| 153 | return; | ||
| 154 | } | ||
| 155 | } | ||
| 156 | |||
| 149 | #ifdef RE_ENTRANT_CHECKING | 157 | #ifdef RE_ENTRANT_CHECKING |
| 150 | if (emulating) { | 158 | if (emulating) { |
| 151 | printk("ERROR: wm-FPU-emu is not RE-ENTRANT!\n"); | 159 | printk("ERROR: wm-FPU-emu is not RE-ENTRANT!\n"); |
| @@ -153,11 +161,6 @@ asmlinkage void math_emulate(long arg) | |||
| 153 | RE_ENTRANT_CHECK_ON; | 161 | RE_ENTRANT_CHECK_ON; |
| 154 | #endif /* RE_ENTRANT_CHECKING */ | 162 | #endif /* RE_ENTRANT_CHECKING */ |
| 155 | 163 | ||
| 156 | if (!used_math()) { | ||
| 157 | finit(); | ||
| 158 | set_used_math(); | ||
| 159 | } | ||
| 160 | |||
| 161 | SETUP_DATA_AREA(arg); | 164 | SETUP_DATA_AREA(arg); |
| 162 | 165 | ||
| 163 | FPU_ORIG_EIP = FPU_EIP; | 166 | FPU_ORIG_EIP = FPU_EIP; |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index fd7e1798c75a..8bcb6f40ccb6 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -497,6 +497,11 @@ static int vmalloc_fault(unsigned long address) | |||
| 497 | unsigned long pgd_paddr; | 497 | unsigned long pgd_paddr; |
| 498 | pmd_t *pmd_k; | 498 | pmd_t *pmd_k; |
| 499 | pte_t *pte_k; | 499 | pte_t *pte_k; |
| 500 | |||
| 501 | /* Make sure we are in vmalloc area */ | ||
| 502 | if (!(address >= VMALLOC_START && address < VMALLOC_END)) | ||
| 503 | return -1; | ||
| 504 | |||
| 500 | /* | 505 | /* |
| 501 | * Synchronize this task's top level page-table | 506 | * Synchronize this task's top level page-table |
| 502 | * with the 'reference' page table. | 507 | * with the 'reference' page table. |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 32ba13b0f818..f6d20be7a8f4 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
| @@ -135,7 +135,7 @@ static __init void *spp_getpage(void) | |||
| 135 | return ptr; | 135 | return ptr; |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | static void | 138 | static __init void |
| 139 | set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot) | 139 | set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot) |
| 140 | { | 140 | { |
| 141 | pgd_t *pgd; | 141 | pgd_t *pgd; |
| @@ -206,7 +206,7 @@ void __init cleanup_highmap(void) | |||
| 206 | pmd_t *last_pmd = pmd + PTRS_PER_PMD; | 206 | pmd_t *last_pmd = pmd + PTRS_PER_PMD; |
| 207 | 207 | ||
| 208 | for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) { | 208 | for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) { |
| 209 | if (!pmd_present(*pmd)) | 209 | if (pmd_none(*pmd)) |
| 210 | continue; | 210 | continue; |
| 211 | if (vaddr < (unsigned long) _text || vaddr > end) | 211 | if (vaddr < (unsigned long) _text || vaddr > end) |
| 212 | set_pmd(pmd, __pmd(0)); | 212 | set_pmd(pmd, __pmd(0)); |
| @@ -214,7 +214,7 @@ void __init cleanup_highmap(void) | |||
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | /* NOTE: this is meant to be run only at boot */ | 216 | /* NOTE: this is meant to be run only at boot */ |
| 217 | void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) | 217 | void __init __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) |
| 218 | { | 218 | { |
| 219 | unsigned long address = __fix_to_virt(idx); | 219 | unsigned long address = __fix_to_virt(idx); |
| 220 | 220 | ||
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 71bb3159031a..2b2bb3f9b683 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -593,10 +593,11 @@ void __init early_iounmap(void *addr, unsigned long size) | |||
| 593 | unsigned long offset; | 593 | unsigned long offset; |
| 594 | unsigned int nrpages; | 594 | unsigned int nrpages; |
| 595 | enum fixed_addresses idx; | 595 | enum fixed_addresses idx; |
| 596 | unsigned int nesting; | 596 | int nesting; |
| 597 | 597 | ||
| 598 | nesting = --early_ioremap_nested; | 598 | nesting = --early_ioremap_nested; |
| 599 | WARN_ON(nesting < 0); | 599 | if (WARN_ON(nesting < 0)) |
| 600 | return; | ||
| 600 | 601 | ||
| 601 | if (early_ioremap_debug) { | 602 | if (early_ioremap_debug) { |
| 602 | printk(KERN_INFO "early_iounmap(%p, %08lx) [%d]\n", addr, | 603 | printk(KERN_INFO "early_iounmap(%p, %08lx) [%d]\n", addr, |
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index de3a99812450..06b7a1c90fb8 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -34,7 +34,7 @@ void __cpuinit pat_disable(char *reason) | |||
| 34 | printk(KERN_INFO "%s\n", reason); | 34 | printk(KERN_INFO "%s\n", reason); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | static int nopat(char *str) | 37 | static int __init nopat(char *str) |
| 38 | { | 38 | { |
| 39 | pat_disable("PAT support disabled."); | 39 | pat_disable("PAT support disabled."); |
| 40 | return 0; | 40 | return 0; |
| @@ -151,32 +151,33 @@ static int pat_x_mtrr_type(u64 start, u64 end, unsigned long prot, | |||
| 151 | unsigned long pat_type; | 151 | unsigned long pat_type; |
| 152 | u8 mtrr_type; | 152 | u8 mtrr_type; |
| 153 | 153 | ||
| 154 | mtrr_type = mtrr_type_lookup(start, end); | ||
| 155 | if (mtrr_type == 0xFF) { /* MTRR not enabled */ | ||
| 156 | *ret_prot = prot; | ||
| 157 | return 0; | ||
| 158 | } | ||
| 159 | if (mtrr_type == 0xFE) { /* MTRR match error */ | ||
| 160 | *ret_prot = _PAGE_CACHE_UC; | ||
| 161 | return -1; | ||
| 162 | } | ||
| 163 | if (mtrr_type != MTRR_TYPE_UNCACHABLE && | ||
| 164 | mtrr_type != MTRR_TYPE_WRBACK && | ||
| 165 | mtrr_type != MTRR_TYPE_WRCOMB) { /* MTRR type unhandled */ | ||
| 166 | *ret_prot = _PAGE_CACHE_UC; | ||
| 167 | return -1; | ||
| 168 | } | ||
| 169 | |||
| 170 | pat_type = prot & _PAGE_CACHE_MASK; | 154 | pat_type = prot & _PAGE_CACHE_MASK; |
| 171 | prot &= (~_PAGE_CACHE_MASK); | 155 | prot &= (~_PAGE_CACHE_MASK); |
| 172 | 156 | ||
| 173 | /* Currently doing intersection by hand. Optimize it later. */ | 157 | /* |
| 158 | * We return the PAT request directly for types where PAT takes | ||
| 159 | * precedence with respect to MTRR and for UC_MINUS. | ||
| 160 | * Consistency checks with other PAT requests is done later | ||
| 161 | * while going through memtype list. | ||
| 162 | */ | ||
| 174 | if (pat_type == _PAGE_CACHE_WC) { | 163 | if (pat_type == _PAGE_CACHE_WC) { |
| 175 | *ret_prot = prot | _PAGE_CACHE_WC; | 164 | *ret_prot = prot | _PAGE_CACHE_WC; |
| 165 | return 0; | ||
| 176 | } else if (pat_type == _PAGE_CACHE_UC_MINUS) { | 166 | } else if (pat_type == _PAGE_CACHE_UC_MINUS) { |
| 177 | *ret_prot = prot | _PAGE_CACHE_UC_MINUS; | 167 | *ret_prot = prot | _PAGE_CACHE_UC_MINUS; |
| 178 | } else if (pat_type == _PAGE_CACHE_UC || | 168 | return 0; |
| 179 | mtrr_type == MTRR_TYPE_UNCACHABLE) { | 169 | } else if (pat_type == _PAGE_CACHE_UC) { |
| 170 | *ret_prot = prot | _PAGE_CACHE_UC; | ||
| 171 | return 0; | ||
| 172 | } | ||
| 173 | |||
| 174 | /* | ||
| 175 | * Look for MTRR hint to get the effective type in case where PAT | ||
| 176 | * request is for WB. | ||
| 177 | */ | ||
| 178 | mtrr_type = mtrr_type_lookup(start, end); | ||
| 179 | |||
| 180 | if (mtrr_type == MTRR_TYPE_UNCACHABLE) { | ||
| 180 | *ret_prot = prot | _PAGE_CACHE_UC; | 181 | *ret_prot = prot | _PAGE_CACHE_UC; |
| 181 | } else if (mtrr_type == MTRR_TYPE_WRCOMB) { | 182 | } else if (mtrr_type == MTRR_TYPE_WRCOMB) { |
| 182 | *ret_prot = prot | _PAGE_CACHE_WC; | 183 | *ret_prot = prot | _PAGE_CACHE_WC; |
| @@ -233,14 +234,12 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, | |||
| 233 | 234 | ||
| 234 | if (req_type == -1) { | 235 | if (req_type == -1) { |
| 235 | /* | 236 | /* |
| 236 | * Special case where caller wants to inherit from mtrr or | 237 | * Call mtrr_lookup to get the type hint. This is an |
| 237 | * existing pat mapping, defaulting to UC_MINUS in case of | 238 | * optimization for /dev/mem mmap'ers into WB memory (BIOS |
| 238 | * no match. | 239 | * tools and ACPI tools). Use WB request for WB memory and use |
| 240 | * UC_MINUS otherwise. | ||
| 239 | */ | 241 | */ |
| 240 | u8 mtrr_type = mtrr_type_lookup(start, end); | 242 | u8 mtrr_type = mtrr_type_lookup(start, end); |
| 241 | if (mtrr_type == 0xFE) { /* MTRR match error */ | ||
| 242 | err = -1; | ||
| 243 | } | ||
| 244 | 243 | ||
| 245 | if (mtrr_type == MTRR_TYPE_WRBACK) { | 244 | if (mtrr_type == MTRR_TYPE_WRBACK) { |
| 246 | req_type = _PAGE_CACHE_WB; | 245 | req_type = _PAGE_CACHE_WB; |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 3890234e5b26..99649dccad28 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
| @@ -97,36 +97,9 @@ static __init inline int srat_disabled(void) | |||
| 97 | return numa_off || acpi_numa < 0; | 97 | return numa_off || acpi_numa < 0; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | /* | ||
| 101 | * A lot of BIOS fill in 10 (= no distance) everywhere. This messes | ||
| 102 | * up the NUMA heuristics which wants the local node to have a smaller | ||
| 103 | * distance than the others. | ||
| 104 | * Do some quick checks here and only use the SLIT if it passes. | ||
| 105 | */ | ||
| 106 | static __init int slit_valid(struct acpi_table_slit *slit) | ||
| 107 | { | ||
| 108 | int i, j; | ||
| 109 | int d = slit->locality_count; | ||
| 110 | for (i = 0; i < d; i++) { | ||
| 111 | for (j = 0; j < d; j++) { | ||
| 112 | u8 val = slit->entry[d*i + j]; | ||
| 113 | if (i == j) { | ||
| 114 | if (val != LOCAL_DISTANCE) | ||
| 115 | return 0; | ||
| 116 | } else if (val <= LOCAL_DISTANCE) | ||
| 117 | return 0; | ||
| 118 | } | ||
| 119 | } | ||
| 120 | return 1; | ||
| 121 | } | ||
| 122 | |||
| 123 | /* Callback for SLIT parsing */ | 100 | /* Callback for SLIT parsing */ |
| 124 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | 101 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) |
| 125 | { | 102 | { |
| 126 | if (!slit_valid(slit)) { | ||
| 127 | printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n"); | ||
| 128 | return; | ||
| 129 | } | ||
| 130 | acpi_slit = slit; | 103 | acpi_slit = slit; |
| 131 | } | 104 | } |
| 132 | 105 | ||
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 8545c8a9d107..940185ecaeda 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
| @@ -302,18 +302,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { | |||
| 302 | }, | 302 | }, |
| 303 | { | 303 | { |
| 304 | .callback = set_bf_sort, | 304 | .callback = set_bf_sort, |
| 305 | .ident = "HP ProLiant DL385 G2", | 305 | .ident = "HP ProLiant DL360", |
| 306 | .matches = { | 306 | .matches = { |
| 307 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 307 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
| 308 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), | 308 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"), |
| 309 | }, | 309 | }, |
| 310 | }, | 310 | }, |
| 311 | { | 311 | { |
| 312 | .callback = set_bf_sort, | 312 | .callback = set_bf_sort, |
| 313 | .ident = "HP ProLiant DL585 G2", | 313 | .ident = "HP ProLiant DL380", |
| 314 | .matches = { | 314 | .matches = { |
| 315 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 315 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
| 316 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), | 316 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"), |
| 317 | }, | 317 | }, |
| 318 | }, | 318 | }, |
| 319 | #ifdef __i386__ | 319 | #ifdef __i386__ |
| @@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { | |||
| 328 | #endif | 328 | #endif |
| 329 | { | 329 | { |
| 330 | .callback = set_bf_sort, | 330 | .callback = set_bf_sort, |
| 331 | .ident = "HP ProLiant DL385 G2", | 331 | .ident = "HP ProLiant DL360", |
| 332 | .matches = { | 332 | .matches = { |
| 333 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 333 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
| 334 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"), | 334 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"), |
| 335 | }, | 335 | }, |
| 336 | }, | 336 | }, |
| 337 | { | 337 | { |
| 338 | .callback = set_bf_sort, | 338 | .callback = set_bf_sort, |
| 339 | .ident = "HP ProLiant DL585 G2", | 339 | .ident = "HP ProLiant DL380", |
| 340 | .matches = { | 340 | .matches = { |
| 341 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), | 341 | DMI_MATCH(DMI_SYS_VENDOR, "HP"), |
| 342 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), | 342 | DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"), |
| 343 | }, | 343 | }, |
| 344 | }, | 344 | }, |
| 345 | {} | 345 | {} |
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index e70b9c57b88e..b821f4462d99 100644 --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c | |||
| @@ -15,7 +15,8 @@ static __init int pci_access_init(void) | |||
| 15 | pci_mmcfg_early_init(); | 15 | pci_mmcfg_early_init(); |
| 16 | 16 | ||
| 17 | #ifdef CONFIG_PCI_OLPC | 17 | #ifdef CONFIG_PCI_OLPC |
| 18 | pci_olpc_init(); | 18 | if (!pci_olpc_init()) |
| 19 | return 0; /* skip additional checks if it's an XO */ | ||
| 19 | #endif | 20 | #endif |
| 20 | #ifdef CONFIG_PCI_BIOS | 21 | #ifdef CONFIG_PCI_BIOS |
| 21 | pci_pcbios_init(); | 22 | pci_pcbios_init(); |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 0908fca901bf..ca8df9c260bc 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
| @@ -621,6 +621,13 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 621 | */ | 621 | */ |
| 622 | device = PCI_DEVICE_ID_VIA_8235; | 622 | device = PCI_DEVICE_ID_VIA_8235; |
| 623 | break; | 623 | break; |
| 624 | case PCI_DEVICE_ID_VIA_8237: | ||
| 625 | /** | ||
| 626 | * Asus a7v600 bios wrongly reports 8237 | ||
| 627 | * as 586-compatible | ||
| 628 | */ | ||
| 629 | device = PCI_DEVICE_ID_VIA_8237; | ||
| 630 | break; | ||
| 624 | } | 631 | } |
| 625 | } | 632 | } |
| 626 | 633 | ||
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c index 5e7636558c02..e11e9e803d5f 100644 --- a/arch/x86/pci/olpc.c +++ b/arch/x86/pci/olpc.c | |||
| @@ -302,12 +302,13 @@ static struct pci_raw_ops pci_olpc_conf = { | |||
| 302 | .write = pci_olpc_write, | 302 | .write = pci_olpc_write, |
| 303 | }; | 303 | }; |
| 304 | 304 | ||
| 305 | void __init pci_olpc_init(void) | 305 | int __init pci_olpc_init(void) |
| 306 | { | 306 | { |
| 307 | if (!machine_is_olpc() || olpc_has_vsa()) | 307 | if (!machine_is_olpc() || olpc_has_vsa()) |
| 308 | return; | 308 | return -ENODEV; |
| 309 | 309 | ||
| 310 | printk(KERN_INFO "PCI: Using configuration type OLPC\n"); | 310 | printk(KERN_INFO "PCI: Using configuration type OLPC\n"); |
| 311 | raw_pci_ops = &pci_olpc_conf; | 311 | raw_pci_ops = &pci_olpc_conf; |
| 312 | is_lx = is_geode_lx(); | 312 | is_lx = is_geode_lx(); |
| 313 | return 0; | ||
| 313 | } | 314 | } |
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index f3972b12c60a..720c4c554534 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h | |||
| @@ -101,7 +101,7 @@ extern struct pci_raw_ops pci_direct_conf1; | |||
| 101 | extern int pci_direct_probe(void); | 101 | extern int pci_direct_probe(void); |
| 102 | extern void pci_direct_init(int type); | 102 | extern void pci_direct_init(int type); |
| 103 | extern void pci_pcbios_init(void); | 103 | extern void pci_pcbios_init(void); |
| 104 | extern void pci_olpc_init(void); | 104 | extern int pci_olpc_init(void); |
| 105 | 105 | ||
| 106 | /* pci-mmconfig.c */ | 106 | /* pci-mmconfig.c */ |
| 107 | 107 | ||
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c index 23476c2ebfc4..efa2ba7c6005 100644 --- a/arch/x86/vdso/vclock_gettime.c +++ b/arch/x86/vdso/vclock_gettime.c | |||
| @@ -106,9 +106,9 @@ int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) | |||
| 106 | do_realtime((struct timespec *)tv); | 106 | do_realtime((struct timespec *)tv); |
| 107 | tv->tv_usec /= 1000; | 107 | tv->tv_usec /= 1000; |
| 108 | if (unlikely(tz != NULL)) { | 108 | if (unlikely(tz != NULL)) { |
| 109 | /* This relies on gcc inlining the memcpy. We'll notice | 109 | /* Avoid memcpy. Some old compilers fail to inline it */ |
| 110 | if it ever fails to do so. */ | 110 | tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest; |
| 111 | memcpy(tz, >od->sys_tz, sizeof(struct timezone)); | 111 | tz->tz_dsttime = gtod->sys_tz.tz_dsttime; |
| 112 | } | 112 | } |
| 113 | return 0; | 113 | return 0; |
| 114 | } | 114 | } |
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 2e641be2737e..6c388e593bc8 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig | |||
| @@ -5,8 +5,9 @@ | |||
| 5 | config XEN | 5 | config XEN |
| 6 | bool "Xen guest support" | 6 | bool "Xen guest support" |
| 7 | select PARAVIRT | 7 | select PARAVIRT |
| 8 | select PARAVIRT_CLOCK | ||
| 8 | depends on X86_32 | 9 | depends on X86_32 |
| 9 | depends on X86_CMPXCHG && X86_TSC && !(X86_VISWS || X86_VOYAGER) | 10 | depends on X86_CMPXCHG && X86_TSC && X86_PAE && !(X86_VISWS || X86_VOYAGER) |
| 10 | help | 11 | help |
| 11 | This is the Linux Xen port. Enabling this will allow the | 12 | This is the Linux Xen port. Enabling this will allow the |
| 12 | kernel to boot in a paravirtualized environment under the | 13 | kernel to boot in a paravirtualized environment under the |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index c8a56e457d61..f09c1c69c37a 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
| @@ -785,38 +785,35 @@ static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) | |||
| 785 | static __init void xen_pagetable_setup_start(pgd_t *base) | 785 | static __init void xen_pagetable_setup_start(pgd_t *base) |
| 786 | { | 786 | { |
| 787 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; | 787 | pgd_t *xen_pgd = (pgd_t *)xen_start_info->pt_base; |
| 788 | int i; | ||
| 788 | 789 | ||
| 789 | /* special set_pte for pagetable initialization */ | 790 | /* special set_pte for pagetable initialization */ |
| 790 | pv_mmu_ops.set_pte = xen_set_pte_init; | 791 | pv_mmu_ops.set_pte = xen_set_pte_init; |
| 791 | 792 | ||
| 792 | init_mm.pgd = base; | 793 | init_mm.pgd = base; |
| 793 | /* | 794 | /* |
| 794 | * copy top-level of Xen-supplied pagetable into place. For | 795 | * copy top-level of Xen-supplied pagetable into place. This |
| 795 | * !PAE we can use this as-is, but for PAE it is a stand-in | 796 | * is a stand-in while we copy the pmd pages. |
| 796 | * while we copy the pmd pages. | ||
| 797 | */ | 797 | */ |
| 798 | memcpy(base, xen_pgd, PTRS_PER_PGD * sizeof(pgd_t)); | 798 | memcpy(base, xen_pgd, PTRS_PER_PGD * sizeof(pgd_t)); |
| 799 | 799 | ||
| 800 | if (PTRS_PER_PMD > 1) { | 800 | /* |
| 801 | int i; | 801 | * For PAE, need to allocate new pmds, rather than |
| 802 | /* | 802 | * share Xen's, since Xen doesn't like pmd's being |
| 803 | * For PAE, need to allocate new pmds, rather than | 803 | * shared between address spaces. |
| 804 | * share Xen's, since Xen doesn't like pmd's being | 804 | */ |
| 805 | * shared between address spaces. | 805 | for (i = 0; i < PTRS_PER_PGD; i++) { |
| 806 | */ | 806 | if (pgd_val_ma(xen_pgd[i]) & _PAGE_PRESENT) { |
| 807 | for (i = 0; i < PTRS_PER_PGD; i++) { | 807 | pmd_t *pmd = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); |
| 808 | if (pgd_val_ma(xen_pgd[i]) & _PAGE_PRESENT) { | ||
| 809 | pmd_t *pmd = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); | ||
| 810 | 808 | ||
| 811 | memcpy(pmd, (void *)pgd_page_vaddr(xen_pgd[i]), | 809 | memcpy(pmd, (void *)pgd_page_vaddr(xen_pgd[i]), |
| 812 | PAGE_SIZE); | 810 | PAGE_SIZE); |
| 813 | 811 | ||
| 814 | make_lowmem_page_readonly(pmd); | 812 | make_lowmem_page_readonly(pmd); |
| 815 | 813 | ||
| 816 | set_pgd(&base[i], __pgd(1 + __pa(pmd))); | 814 | set_pgd(&base[i], __pgd(1 + __pa(pmd))); |
| 817 | } else | 815 | } else |
| 818 | pgd_clear(&base[i]); | 816 | pgd_clear(&base[i]); |
| 819 | } | ||
| 820 | } | 817 | } |
| 821 | 818 | ||
| 822 | /* make sure zero_page is mapped RO so we can use it in pagetables */ | 819 | /* make sure zero_page is mapped RO so we can use it in pagetables */ |
| @@ -873,17 +870,7 @@ static __init void xen_pagetable_setup_done(pgd_t *base) | |||
| 873 | 870 | ||
| 874 | /* Actually pin the pagetable down, but we can't set PG_pinned | 871 | /* Actually pin the pagetable down, but we can't set PG_pinned |
| 875 | yet because the page structures don't exist yet. */ | 872 | yet because the page structures don't exist yet. */ |
| 876 | { | 873 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); |
| 877 | unsigned level; | ||
| 878 | |||
| 879 | #ifdef CONFIG_X86_PAE | ||
| 880 | level = MMUEXT_PIN_L3_TABLE; | ||
| 881 | #else | ||
| 882 | level = MMUEXT_PIN_L2_TABLE; | ||
| 883 | #endif | ||
| 884 | |||
| 885 | pin_pagetable_pfn(level, PFN_DOWN(__pa(base))); | ||
| 886 | } | ||
| 887 | } | 874 | } |
| 888 | 875 | ||
| 889 | /* This is called once we have the cpu_possible_map */ | 876 | /* This is called once we have the cpu_possible_map */ |
| @@ -1093,7 +1080,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
| 1093 | .make_pte = xen_make_pte, | 1080 | .make_pte = xen_make_pte, |
| 1094 | .make_pgd = xen_make_pgd, | 1081 | .make_pgd = xen_make_pgd, |
| 1095 | 1082 | ||
| 1096 | #ifdef CONFIG_X86_PAE | ||
| 1097 | .set_pte_atomic = xen_set_pte_atomic, | 1083 | .set_pte_atomic = xen_set_pte_atomic, |
| 1098 | .set_pte_present = xen_set_pte_at, | 1084 | .set_pte_present = xen_set_pte_at, |
| 1099 | .set_pud = xen_set_pud, | 1085 | .set_pud = xen_set_pud, |
| @@ -1102,7 +1088,6 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
| 1102 | 1088 | ||
| 1103 | .make_pmd = xen_make_pmd, | 1089 | .make_pmd = xen_make_pmd, |
| 1104 | .pmd_val = xen_pmd_val, | 1090 | .pmd_val = xen_pmd_val, |
| 1105 | #endif /* PAE */ | ||
| 1106 | 1091 | ||
| 1107 | .activate_mm = xen_activate_mm, | 1092 | .activate_mm = xen_activate_mm, |
| 1108 | .dup_mmap = xen_dup_mmap, | 1093 | .dup_mmap = xen_dup_mmap, |
| @@ -1228,6 +1213,11 @@ asmlinkage void __init xen_start_kernel(void) | |||
| 1228 | if (xen_feature(XENFEAT_supervisor_mode_kernel)) | 1213 | if (xen_feature(XENFEAT_supervisor_mode_kernel)) |
| 1229 | pv_info.kernel_rpl = 0; | 1214 | pv_info.kernel_rpl = 0; |
| 1230 | 1215 | ||
| 1216 | /* Prevent unwanted bits from being set in PTEs. */ | ||
| 1217 | __supported_pte_mask &= ~_PAGE_GLOBAL; | ||
| 1218 | if (!is_initial_xendomain()) | ||
| 1219 | __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD); | ||
| 1220 | |||
| 1231 | /* set the limit of our address space */ | 1221 | /* set the limit of our address space */ |
| 1232 | xen_reserve_top(); | 1222 | xen_reserve_top(); |
| 1233 | 1223 | ||
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 126766d43aea..df40bf74ea75 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -60,7 +60,7 @@ xmaddr_t arbitrary_virt_to_machine(unsigned long address) | |||
| 60 | { | 60 | { |
| 61 | unsigned int level; | 61 | unsigned int level; |
| 62 | pte_t *pte = lookup_address(address, &level); | 62 | pte_t *pte = lookup_address(address, &level); |
| 63 | unsigned offset = address & PAGE_MASK; | 63 | unsigned offset = address & ~PAGE_MASK; |
| 64 | 64 | ||
| 65 | BUG_ON(pte == NULL); | 65 | BUG_ON(pte == NULL); |
| 66 | 66 | ||
| @@ -179,50 +179,56 @@ out: | |||
| 179 | preempt_enable(); | 179 | preempt_enable(); |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | pteval_t xen_pte_val(pte_t pte) | 182 | /* Assume pteval_t is equivalent to all the other *val_t types. */ |
| 183 | static pteval_t pte_mfn_to_pfn(pteval_t val) | ||
| 184 | { | ||
| 185 | if (val & _PAGE_PRESENT) { | ||
| 186 | unsigned long mfn = (val & PTE_MASK) >> PAGE_SHIFT; | ||
| 187 | pteval_t flags = val & ~PTE_MASK; | ||
| 188 | val = (mfn_to_pfn(mfn) << PAGE_SHIFT) | flags; | ||
| 189 | } | ||
| 190 | |||
| 191 | return val; | ||
| 192 | } | ||
| 193 | |||
| 194 | static pteval_t pte_pfn_to_mfn(pteval_t val) | ||
| 183 | { | 195 | { |
| 184 | pteval_t ret = pte.pte; | 196 | if (val & _PAGE_PRESENT) { |
| 197 | unsigned long pfn = (val & PTE_MASK) >> PAGE_SHIFT; | ||
| 198 | pteval_t flags = val & ~PTE_MASK; | ||
| 199 | val = (pfn_to_mfn(pfn) << PAGE_SHIFT) | flags; | ||
| 200 | } | ||
| 185 | 201 | ||
| 186 | if (ret & _PAGE_PRESENT) | 202 | return val; |
| 187 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | 203 | } |
| 188 | 204 | ||
| 189 | return ret; | 205 | pteval_t xen_pte_val(pte_t pte) |
| 206 | { | ||
| 207 | return pte_mfn_to_pfn(pte.pte); | ||
| 190 | } | 208 | } |
| 191 | 209 | ||
| 192 | pgdval_t xen_pgd_val(pgd_t pgd) | 210 | pgdval_t xen_pgd_val(pgd_t pgd) |
| 193 | { | 211 | { |
| 194 | pgdval_t ret = pgd.pgd; | 212 | return pte_mfn_to_pfn(pgd.pgd); |
| 195 | if (ret & _PAGE_PRESENT) | ||
| 196 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | ||
| 197 | return ret; | ||
| 198 | } | 213 | } |
| 199 | 214 | ||
| 200 | pte_t xen_make_pte(pteval_t pte) | 215 | pte_t xen_make_pte(pteval_t pte) |
| 201 | { | 216 | { |
| 202 | if (pte & _PAGE_PRESENT) { | 217 | pte = pte_pfn_to_mfn(pte); |
| 203 | pte = phys_to_machine(XPADDR(pte)).maddr; | 218 | return native_make_pte(pte); |
| 204 | pte &= ~(_PAGE_PCD | _PAGE_PWT); | ||
| 205 | } | ||
| 206 | |||
| 207 | return (pte_t){ .pte = pte }; | ||
| 208 | } | 219 | } |
| 209 | 220 | ||
| 210 | pgd_t xen_make_pgd(pgdval_t pgd) | 221 | pgd_t xen_make_pgd(pgdval_t pgd) |
| 211 | { | 222 | { |
| 212 | if (pgd & _PAGE_PRESENT) | 223 | pgd = pte_pfn_to_mfn(pgd); |
| 213 | pgd = phys_to_machine(XPADDR(pgd)).maddr; | 224 | return native_make_pgd(pgd); |
| 214 | |||
| 215 | return (pgd_t){ pgd }; | ||
| 216 | } | 225 | } |
| 217 | 226 | ||
| 218 | pmdval_t xen_pmd_val(pmd_t pmd) | 227 | pmdval_t xen_pmd_val(pmd_t pmd) |
| 219 | { | 228 | { |
| 220 | pmdval_t ret = native_pmd_val(pmd); | 229 | return pte_mfn_to_pfn(pmd.pmd); |
| 221 | if (ret & _PAGE_PRESENT) | ||
| 222 | ret = machine_to_phys(XMADDR(ret)).paddr | _PAGE_PRESENT; | ||
| 223 | return ret; | ||
| 224 | } | 230 | } |
| 225 | #ifdef CONFIG_X86_PAE | 231 | |
| 226 | void xen_set_pud(pud_t *ptr, pud_t val) | 232 | void xen_set_pud(pud_t *ptr, pud_t val) |
| 227 | { | 233 | { |
| 228 | struct multicall_space mcs; | 234 | struct multicall_space mcs; |
| @@ -267,17 +273,9 @@ void xen_pmd_clear(pmd_t *pmdp) | |||
| 267 | 273 | ||
| 268 | pmd_t xen_make_pmd(pmdval_t pmd) | 274 | pmd_t xen_make_pmd(pmdval_t pmd) |
| 269 | { | 275 | { |
| 270 | if (pmd & _PAGE_PRESENT) | 276 | pmd = pte_pfn_to_mfn(pmd); |
| 271 | pmd = phys_to_machine(XPADDR(pmd)).maddr; | ||
| 272 | |||
| 273 | return native_make_pmd(pmd); | 277 | return native_make_pmd(pmd); |
| 274 | } | 278 | } |
| 275 | #else /* !PAE */ | ||
| 276 | void xen_set_pte(pte_t *ptep, pte_t pte) | ||
| 277 | { | ||
| 278 | *ptep = pte; | ||
| 279 | } | ||
| 280 | #endif /* CONFIG_X86_PAE */ | ||
| 281 | 279 | ||
| 282 | /* | 280 | /* |
| 283 | (Yet another) pagetable walker. This one is intended for pinning a | 281 | (Yet another) pagetable walker. This one is intended for pinning a |
| @@ -430,8 +428,6 @@ static int pin_page(struct page *page, enum pt_level level) | |||
| 430 | read-only, and can be pinned. */ | 428 | read-only, and can be pinned. */ |
| 431 | void xen_pgd_pin(pgd_t *pgd) | 429 | void xen_pgd_pin(pgd_t *pgd) |
| 432 | { | 430 | { |
| 433 | unsigned level; | ||
| 434 | |||
| 435 | xen_mc_batch(); | 431 | xen_mc_batch(); |
| 436 | 432 | ||
| 437 | if (pgd_walk(pgd, pin_page, TASK_SIZE)) { | 433 | if (pgd_walk(pgd, pin_page, TASK_SIZE)) { |
| @@ -441,14 +437,7 @@ void xen_pgd_pin(pgd_t *pgd) | |||
| 441 | xen_mc_batch(); | 437 | xen_mc_batch(); |
| 442 | } | 438 | } |
| 443 | 439 | ||
| 444 | #ifdef CONFIG_X86_PAE | 440 | xen_do_pin(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(pgd))); |
| 445 | level = MMUEXT_PIN_L3_TABLE; | ||
| 446 | #else | ||
| 447 | level = MMUEXT_PIN_L2_TABLE; | ||
| 448 | #endif | ||
| 449 | |||
| 450 | xen_do_pin(level, PFN_DOWN(__pa(pgd))); | ||
| 451 | |||
| 452 | xen_mc_issue(0); | 441 | xen_mc_issue(0); |
| 453 | } | 442 | } |
| 454 | 443 | ||
diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index b5e189b1519d..5fe961caffd4 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h | |||
| @@ -37,14 +37,13 @@ void xen_exit_mmap(struct mm_struct *mm); | |||
| 37 | void xen_pgd_pin(pgd_t *pgd); | 37 | void xen_pgd_pin(pgd_t *pgd); |
| 38 | //void xen_pgd_unpin(pgd_t *pgd); | 38 | //void xen_pgd_unpin(pgd_t *pgd); |
| 39 | 39 | ||
| 40 | #ifdef CONFIG_X86_PAE | 40 | pteval_t xen_pte_val(pte_t); |
| 41 | unsigned long long xen_pte_val(pte_t); | 41 | pmdval_t xen_pmd_val(pmd_t); |
| 42 | unsigned long long xen_pmd_val(pmd_t); | 42 | pgdval_t xen_pgd_val(pgd_t); |
| 43 | unsigned long long xen_pgd_val(pgd_t); | ||
| 44 | 43 | ||
| 45 | pte_t xen_make_pte(unsigned long long); | 44 | pte_t xen_make_pte(pteval_t); |
| 46 | pmd_t xen_make_pmd(unsigned long long); | 45 | pmd_t xen_make_pmd(pmdval_t); |
| 47 | pgd_t xen_make_pgd(unsigned long long); | 46 | pgd_t xen_make_pgd(pgdval_t); |
| 48 | 47 | ||
| 49 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, | 48 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, |
| 50 | pte_t *ptep, pte_t pteval); | 49 | pte_t *ptep, pte_t pteval); |
| @@ -53,15 +52,4 @@ void xen_set_pud(pud_t *ptr, pud_t val); | |||
| 53 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); | 52 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); |
| 54 | void xen_pmd_clear(pmd_t *pmdp); | 53 | void xen_pmd_clear(pmd_t *pmdp); |
| 55 | 54 | ||
| 56 | |||
| 57 | #else | ||
| 58 | unsigned long xen_pte_val(pte_t); | ||
| 59 | unsigned long xen_pmd_val(pmd_t); | ||
| 60 | unsigned long xen_pgd_val(pgd_t); | ||
| 61 | |||
| 62 | pte_t xen_make_pte(unsigned long); | ||
| 63 | pmd_t xen_make_pmd(unsigned long); | ||
| 64 | pgd_t xen_make_pgd(unsigned long); | ||
| 65 | #endif | ||
| 66 | |||
| 67 | #endif /* _XEN_MMU_H */ | 55 | #endif /* _XEN_MMU_H */ |
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index c39e1a5aa241..41e217503c96 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c | |||
| @@ -12,7 +12,9 @@ | |||
| 12 | #include <linux/clocksource.h> | 12 | #include <linux/clocksource.h> |
| 13 | #include <linux/clockchips.h> | 13 | #include <linux/clockchips.h> |
| 14 | #include <linux/kernel_stat.h> | 14 | #include <linux/kernel_stat.h> |
| 15 | #include <linux/math64.h> | ||
| 15 | 16 | ||
| 17 | #include <asm/pvclock.h> | ||
| 16 | #include <asm/xen/hypervisor.h> | 18 | #include <asm/xen/hypervisor.h> |
| 17 | #include <asm/xen/hypercall.h> | 19 | #include <asm/xen/hypercall.h> |
| 18 | 20 | ||
| @@ -30,17 +32,6 @@ | |||
| 30 | 32 | ||
| 31 | static cycle_t xen_clocksource_read(void); | 33 | static cycle_t xen_clocksource_read(void); |
| 32 | 34 | ||
| 33 | /* These are perodically updated in shared_info, and then copied here. */ | ||
| 34 | struct shadow_time_info { | ||
| 35 | u64 tsc_timestamp; /* TSC at last update of time vals. */ | ||
| 36 | u64 system_timestamp; /* Time, in nanosecs, since boot. */ | ||
| 37 | u32 tsc_to_nsec_mul; | ||
| 38 | int tsc_shift; | ||
| 39 | u32 version; | ||
| 40 | }; | ||
| 41 | |||
| 42 | static DEFINE_PER_CPU(struct shadow_time_info, shadow_time); | ||
| 43 | |||
| 44 | /* runstate info updated by Xen */ | 35 | /* runstate info updated by Xen */ |
| 45 | static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate); | 36 | static DEFINE_PER_CPU(struct vcpu_runstate_info, runstate); |
| 46 | 37 | ||
| @@ -150,11 +141,7 @@ static void do_stolen_accounting(void) | |||
| 150 | if (stolen < 0) | 141 | if (stolen < 0) |
| 151 | stolen = 0; | 142 | stolen = 0; |
| 152 | 143 | ||
| 153 | ticks = 0; | 144 | ticks = iter_div_u64_rem(stolen, NS_PER_TICK, &stolen); |
| 154 | while (stolen >= NS_PER_TICK) { | ||
| 155 | ticks++; | ||
| 156 | stolen -= NS_PER_TICK; | ||
| 157 | } | ||
| 158 | __get_cpu_var(residual_stolen) = stolen; | 145 | __get_cpu_var(residual_stolen) = stolen; |
| 159 | account_steal_time(NULL, ticks); | 146 | account_steal_time(NULL, ticks); |
| 160 | 147 | ||
| @@ -166,11 +153,7 @@ static void do_stolen_accounting(void) | |||
| 166 | if (blocked < 0) | 153 | if (blocked < 0) |
| 167 | blocked = 0; | 154 | blocked = 0; |
| 168 | 155 | ||
| 169 | ticks = 0; | 156 | ticks = iter_div_u64_rem(blocked, NS_PER_TICK, &blocked); |
| 170 | while (blocked >= NS_PER_TICK) { | ||
| 171 | ticks++; | ||
| 172 | blocked -= NS_PER_TICK; | ||
| 173 | } | ||
| 174 | __get_cpu_var(residual_blocked) = blocked; | 157 | __get_cpu_var(residual_blocked) = blocked; |
| 175 | account_steal_time(idle_task(smp_processor_id()), ticks); | 158 | account_steal_time(idle_task(smp_processor_id()), ticks); |
| 176 | } | 159 | } |
| @@ -218,7 +201,7 @@ unsigned long long xen_sched_clock(void) | |||
| 218 | unsigned long xen_cpu_khz(void) | 201 | unsigned long xen_cpu_khz(void) |
| 219 | { | 202 | { |
| 220 | u64 xen_khz = 1000000ULL << 32; | 203 | u64 xen_khz = 1000000ULL << 32; |
| 221 | const struct vcpu_time_info *info = | 204 | const struct pvclock_vcpu_time_info *info = |
| 222 | &HYPERVISOR_shared_info->vcpu_info[0].time; | 205 | &HYPERVISOR_shared_info->vcpu_info[0].time; |
| 223 | 206 | ||
| 224 | do_div(xen_khz, info->tsc_to_system_mul); | 207 | do_div(xen_khz, info->tsc_to_system_mul); |
| @@ -230,121 +213,26 @@ unsigned long xen_cpu_khz(void) | |||
| 230 | return xen_khz; | 213 | return xen_khz; |
| 231 | } | 214 | } |
| 232 | 215 | ||
| 233 | /* | ||
| 234 | * Reads a consistent set of time-base values from Xen, into a shadow data | ||
| 235 | * area. | ||
| 236 | */ | ||
| 237 | static unsigned get_time_values_from_xen(void) | ||
| 238 | { | ||
| 239 | struct vcpu_time_info *src; | ||
| 240 | struct shadow_time_info *dst; | ||
| 241 | |||
| 242 | /* src is shared memory with the hypervisor, so we need to | ||
| 243 | make sure we get a consistent snapshot, even in the face of | ||
| 244 | being preempted. */ | ||
| 245 | src = &__get_cpu_var(xen_vcpu)->time; | ||
| 246 | dst = &__get_cpu_var(shadow_time); | ||
| 247 | |||
| 248 | do { | ||
| 249 | dst->version = src->version; | ||
| 250 | rmb(); /* fetch version before data */ | ||
| 251 | dst->tsc_timestamp = src->tsc_timestamp; | ||
| 252 | dst->system_timestamp = src->system_time; | ||
| 253 | dst->tsc_to_nsec_mul = src->tsc_to_system_mul; | ||
| 254 | dst->tsc_shift = src->tsc_shift; | ||
| 255 | rmb(); /* test version after fetching data */ | ||
| 256 | } while ((src->version & 1) | (dst->version ^ src->version)); | ||
| 257 | |||
| 258 | return dst->version; | ||
| 259 | } | ||
| 260 | |||
| 261 | /* | ||
| 262 | * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction, | ||
| 263 | * yielding a 64-bit result. | ||
| 264 | */ | ||
| 265 | static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift) | ||
| 266 | { | ||
| 267 | u64 product; | ||
| 268 | #ifdef __i386__ | ||
| 269 | u32 tmp1, tmp2; | ||
| 270 | #endif | ||
| 271 | |||
| 272 | if (shift < 0) | ||
| 273 | delta >>= -shift; | ||
| 274 | else | ||
| 275 | delta <<= shift; | ||
| 276 | |||
| 277 | #ifdef __i386__ | ||
| 278 | __asm__ ( | ||
| 279 | "mul %5 ; " | ||
| 280 | "mov %4,%%eax ; " | ||
| 281 | "mov %%edx,%4 ; " | ||
| 282 | "mul %5 ; " | ||
| 283 | "xor %5,%5 ; " | ||
| 284 | "add %4,%%eax ; " | ||
| 285 | "adc %5,%%edx ; " | ||
| 286 | : "=A" (product), "=r" (tmp1), "=r" (tmp2) | ||
| 287 | : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); | ||
| 288 | #elif __x86_64__ | ||
| 289 | __asm__ ( | ||
| 290 | "mul %%rdx ; shrd $32,%%rdx,%%rax" | ||
| 291 | : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); | ||
| 292 | #else | ||
| 293 | #error implement me! | ||
| 294 | #endif | ||
| 295 | |||
| 296 | return product; | ||
| 297 | } | ||
| 298 | |||
| 299 | static u64 get_nsec_offset(struct shadow_time_info *shadow) | ||
| 300 | { | ||
| 301 | u64 now, delta; | ||
| 302 | now = native_read_tsc(); | ||
| 303 | delta = now - shadow->tsc_timestamp; | ||
| 304 | return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift); | ||
| 305 | } | ||
| 306 | |||
| 307 | static cycle_t xen_clocksource_read(void) | 216 | static cycle_t xen_clocksource_read(void) |
| 308 | { | 217 | { |
| 309 | struct shadow_time_info *shadow = &get_cpu_var(shadow_time); | 218 | struct pvclock_vcpu_time_info *src; |
| 310 | cycle_t ret; | 219 | cycle_t ret; |
| 311 | unsigned version; | ||
| 312 | |||
| 313 | do { | ||
| 314 | version = get_time_values_from_xen(); | ||
| 315 | barrier(); | ||
| 316 | ret = shadow->system_timestamp + get_nsec_offset(shadow); | ||
| 317 | barrier(); | ||
| 318 | } while (version != __get_cpu_var(xen_vcpu)->time.version); | ||
| 319 | |||
| 320 | put_cpu_var(shadow_time); | ||
| 321 | 220 | ||
| 221 | src = &get_cpu_var(xen_vcpu)->time; | ||
| 222 | ret = pvclock_clocksource_read(src); | ||
| 223 | put_cpu_var(xen_vcpu); | ||
| 322 | return ret; | 224 | return ret; |
| 323 | } | 225 | } |
| 324 | 226 | ||
| 325 | static void xen_read_wallclock(struct timespec *ts) | 227 | static void xen_read_wallclock(struct timespec *ts) |
| 326 | { | 228 | { |
| 327 | const struct shared_info *s = HYPERVISOR_shared_info; | 229 | struct shared_info *s = HYPERVISOR_shared_info; |
| 328 | u32 version; | 230 | struct pvclock_wall_clock *wall_clock = &(s->wc); |
| 329 | u64 delta; | 231 | struct pvclock_vcpu_time_info *vcpu_time; |
| 330 | struct timespec now; | ||
| 331 | |||
| 332 | /* get wallclock at system boot */ | ||
| 333 | do { | ||
| 334 | version = s->wc_version; | ||
| 335 | rmb(); /* fetch version before time */ | ||
| 336 | now.tv_sec = s->wc_sec; | ||
| 337 | now.tv_nsec = s->wc_nsec; | ||
| 338 | rmb(); /* fetch time before checking version */ | ||
| 339 | } while ((s->wc_version & 1) | (version ^ s->wc_version)); | ||
| 340 | 232 | ||
| 341 | delta = xen_clocksource_read(); /* time since system boot */ | 233 | vcpu_time = &get_cpu_var(xen_vcpu)->time; |
| 342 | delta += now.tv_sec * (u64)NSEC_PER_SEC + now.tv_nsec; | 234 | pvclock_read_wallclock(wall_clock, vcpu_time, ts); |
| 343 | 235 | put_cpu_var(xen_vcpu); | |
| 344 | now.tv_nsec = do_div(delta, NSEC_PER_SEC); | ||
| 345 | now.tv_sec = delta; | ||
| 346 | |||
| 347 | set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); | ||
| 348 | } | 236 | } |
| 349 | 237 | ||
| 350 | unsigned long xen_get_wallclock(void) | 238 | unsigned long xen_get_wallclock(void) |
| @@ -352,7 +240,6 @@ unsigned long xen_get_wallclock(void) | |||
| 352 | struct timespec ts; | 240 | struct timespec ts; |
| 353 | 241 | ||
| 354 | xen_read_wallclock(&ts); | 242 | xen_read_wallclock(&ts); |
| 355 | |||
| 356 | return ts.tv_sec; | 243 | return ts.tv_sec; |
| 357 | } | 244 | } |
| 358 | 245 | ||
| @@ -576,8 +463,6 @@ __init void xen_time_init(void) | |||
| 576 | { | 463 | { |
| 577 | int cpu = smp_processor_id(); | 464 | int cpu = smp_processor_id(); |
| 578 | 465 | ||
| 579 | get_time_values_from_xen(); | ||
| 580 | |||
| 581 | clocksource_register(&xen_clocksource); | 466 | clocksource_register(&xen_clocksource); |
| 582 | 467 | ||
| 583 | if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) { | 468 | if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) { |
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 288d587ce73c..6ec3b4f7719b 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S | |||
| @@ -17,7 +17,7 @@ ENTRY(startup_xen) | |||
| 17 | 17 | ||
| 18 | __FINIT | 18 | __FINIT |
| 19 | 19 | ||
| 20 | .pushsection .bss.page_aligned | 20 | .pushsection .text |
| 21 | .align PAGE_SIZE_asm | 21 | .align PAGE_SIZE_asm |
| 22 | ENTRY(hypercall_page) | 22 | ENTRY(hypercall_page) |
| 23 | .skip 0x1000 | 23 | .skip 0x1000 |
| @@ -30,11 +30,7 @@ ENTRY(hypercall_page) | |||
| 30 | ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long startup_xen) | 30 | ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long startup_xen) |
| 31 | ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long hypercall_page) | 31 | ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long hypercall_page) |
| 32 | ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") | 32 | ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") |
| 33 | #ifdef CONFIG_X86_PAE | ||
| 34 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") | 33 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") |
| 35 | #else | ||
| 36 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "no") | ||
| 37 | #endif | ||
| 38 | ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") | 34 | ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") |
| 39 | 35 | ||
| 40 | #endif /*CONFIG_XEN */ | 36 | #endif /*CONFIG_XEN */ |
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c index 021b4f46ff94..3df469dbe814 100644 --- a/arch/xtensa/kernel/init_task.c +++ b/arch/xtensa/kernel/init_task.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
| 23 | 23 | ||
| 24 | static struct fs_struct init_fs = INIT_FS; | 24 | static struct fs_struct init_fs = INIT_FS; |
| 25 | static struct files_struct init_files = INIT_FILES; | ||
| 26 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | 25 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); |
| 27 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | 26 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); |
| 28 | struct mm_struct init_mm = INIT_MM(init_mm); | 27 | struct mm_struct init_mm = INIT_MM(init_mm); |