diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-14 17:27:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-14 17:27:45 -0500 |
commit | cebfa85eb86d92bf85d3b041c6b044184517a988 (patch) | |
tree | be0a374556fe335ce96dfdb296c89537750d5868 /arch/mips/Kconfig | |
parent | d42b3a2906a10b732ea7d7f849d49be79d242ef0 (diff) | |
parent | 241738bd51cb0efe58e6c570223153e970afe3ae (diff) |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
"The MIPS bits for 3.8. This also includes a bunch fixes that were
sitting in the linux-mips.org git tree for a long time. This pull
request contains updates to several OCTEON drivers and the board
support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
updates to the SSB bus support, MIPS kexec code and adds support for
kdump.
When pulling this, there are two expected merge conflicts in
include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
resolve, just remove the conflict markers and keep both alternatives."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
MIPS: PMC-Sierra Yosemite: Remove support.
VIDEO: Newport Fix console crashes
MIPS: wrppmc: Fix build of PCI code.
MIPS: IP22/IP28: Fix build of EISA code.
MIPS: RB532: Fix build of prom code.
MIPS: PowerTV: Fix build.
MIPS: IP27: Correct fucked grammar in ops-bridge.c
MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
MIPS: Fix potencial corruption
MIPS: Fix for warning from FPU emulation code
MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
MIPS: Remove unused smvp.h
MIPS/EDAC: Improve OCTEON EDAC support.
MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
MIPS: Remove usage of CEVT_R4K_LIB config option.
...
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 141 |
1 files changed, 65 insertions, 76 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 4183e62f178c..d971d1586f1c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -19,6 +19,7 @@ config MIPS | |||
19 | select HAVE_KRETPROBES | 19 | select HAVE_KRETPROBES |
20 | select HAVE_DEBUG_KMEMLEAK | 20 | select HAVE_DEBUG_KMEMLEAK |
21 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | 21 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE |
22 | select HAVE_ARCH_TRANSPARENT_HUGEPAGE | ||
22 | select RTC_LIB if !MACH_LOONGSON | 23 | select RTC_LIB if !MACH_LOONGSON |
23 | select GENERIC_ATOMIC64 if !64BIT | 24 | select GENERIC_ATOMIC64 if !64BIT |
24 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | 25 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
@@ -55,8 +56,8 @@ choice | |||
55 | config MIPS_ALCHEMY | 56 | config MIPS_ALCHEMY |
56 | bool "Alchemy processor based machines" | 57 | bool "Alchemy processor based machines" |
57 | select 64BIT_PHYS_ADDR | 58 | select 64BIT_PHYS_ADDR |
58 | select CEVT_R4K_LIB | 59 | select CEVT_R4K |
59 | select CSRC_R4K_LIB | 60 | select CSRC_R4K |
60 | select IRQ_CPU | 61 | select IRQ_CPU |
61 | select SYS_HAS_CPU_MIPS32_R1 | 62 | select SYS_HAS_CPU_MIPS32_R1 |
62 | select SYS_SUPPORTS_32BIT_KERNEL | 63 | select SYS_SUPPORTS_32BIT_KERNEL |
@@ -107,16 +108,16 @@ config ATH79 | |||
107 | 108 | ||
108 | config BCM47XX | 109 | config BCM47XX |
109 | bool "Broadcom BCM47XX based boards" | 110 | bool "Broadcom BCM47XX based boards" |
111 | select ARCH_WANT_OPTIONAL_GPIOLIB | ||
110 | select CEVT_R4K | 112 | select CEVT_R4K |
111 | select CSRC_R4K | 113 | select CSRC_R4K |
112 | select DMA_NONCOHERENT | 114 | select DMA_NONCOHERENT |
115 | select FW_CFE | ||
113 | select HW_HAS_PCI | 116 | select HW_HAS_PCI |
114 | select IRQ_CPU | 117 | select IRQ_CPU |
115 | select SYS_SUPPORTS_32BIT_KERNEL | 118 | select SYS_SUPPORTS_32BIT_KERNEL |
116 | select SYS_SUPPORTS_LITTLE_ENDIAN | 119 | select SYS_SUPPORTS_LITTLE_ENDIAN |
117 | select GENERIC_GPIO | ||
118 | select SYS_HAS_EARLY_PRINTK | 120 | select SYS_HAS_EARLY_PRINTK |
119 | select CFE | ||
120 | help | 121 | help |
121 | Support for BCM47XX based boards | 122 | Support for BCM47XX based boards |
122 | 123 | ||
@@ -193,8 +194,8 @@ config MACH_DECSTATION | |||
193 | 194 | ||
194 | config MACH_JAZZ | 195 | config MACH_JAZZ |
195 | bool "Jazz family of machines" | 196 | bool "Jazz family of machines" |
196 | select ARC | 197 | select FW_ARC |
197 | select ARC32 | 198 | select FW_ARC32 |
198 | select ARCH_MAY_HAVE_PC_FDC | 199 | select ARCH_MAY_HAVE_PC_FDC |
199 | select CEVT_R4K | 200 | select CEVT_R4K |
200 | select CSRC_R4K | 201 | select CSRC_R4K |
@@ -417,27 +418,6 @@ config PMC_MSP | |||
417 | of integrated peripherals, interfaces and DSPs in addition to | 418 | of integrated peripherals, interfaces and DSPs in addition to |
418 | a variety of MIPS cores. | 419 | a variety of MIPS cores. |
419 | 420 | ||
420 | config PMC_YOSEMITE | ||
421 | bool "PMC-Sierra Yosemite eval board" | ||
422 | select CEVT_R4K | ||
423 | select CSRC_R4K | ||
424 | select DMA_COHERENT | ||
425 | select HW_HAS_PCI | ||
426 | select IRQ_CPU | ||
427 | select IRQ_CPU_RM7K | ||
428 | select IRQ_CPU_RM9K | ||
429 | select SWAP_IO_SPACE | ||
430 | select SYS_HAS_CPU_RM9000 | ||
431 | select SYS_HAS_EARLY_PRINTK | ||
432 | select SYS_SUPPORTS_32BIT_KERNEL | ||
433 | select SYS_SUPPORTS_64BIT_KERNEL | ||
434 | select SYS_SUPPORTS_BIG_ENDIAN | ||
435 | select SYS_SUPPORTS_HIGHMEM | ||
436 | select SYS_SUPPORTS_SMP | ||
437 | help | ||
438 | Yosemite is an evaluation board for the RM9000x2 processor | ||
439 | manufactured by PMC-Sierra. | ||
440 | |||
441 | config POWERTV | 421 | config POWERTV |
442 | bool "Cisco PowerTV" | 422 | bool "Cisco PowerTV" |
443 | select BOOT_ELF32 | 423 | select BOOT_ELF32 |
@@ -458,8 +438,8 @@ config POWERTV | |||
458 | 438 | ||
459 | config SGI_IP22 | 439 | config SGI_IP22 |
460 | bool "SGI IP22 (Indy/Indigo2)" | 440 | bool "SGI IP22 (Indy/Indigo2)" |
461 | select ARC | 441 | select FW_ARC |
462 | select ARC32 | 442 | select FW_ARC32 |
463 | select BOOT_ELF32 | 443 | select BOOT_ELF32 |
464 | select CEVT_R4K | 444 | select CEVT_R4K |
465 | select CSRC_R4K | 445 | select CSRC_R4K |
@@ -498,8 +478,8 @@ config SGI_IP22 | |||
498 | 478 | ||
499 | config SGI_IP27 | 479 | config SGI_IP27 |
500 | bool "SGI IP27 (Origin200/2000)" | 480 | bool "SGI IP27 (Origin200/2000)" |
501 | select ARC | 481 | select FW_ARC |
502 | select ARC64 | 482 | select FW_ARC64 |
503 | select BOOT_ELF64 | 483 | select BOOT_ELF64 |
504 | select DEFAULT_SGI_PARTITION | 484 | select DEFAULT_SGI_PARTITION |
505 | select DMA_COHERENT | 485 | select DMA_COHERENT |
@@ -519,8 +499,8 @@ config SGI_IP27 | |||
519 | config SGI_IP28 | 499 | config SGI_IP28 |
520 | bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)" | 500 | bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)" |
521 | depends on EXPERIMENTAL | 501 | depends on EXPERIMENTAL |
522 | select ARC | 502 | select FW_ARC |
523 | select ARC64 | 503 | select FW_ARC64 |
524 | select BOOT_ELF64 | 504 | select BOOT_ELF64 |
525 | select CEVT_R4K | 505 | select CEVT_R4K |
526 | select CSRC_R4K | 506 | select CSRC_R4K |
@@ -555,8 +535,8 @@ config SGI_IP28 | |||
555 | 535 | ||
556 | config SGI_IP32 | 536 | config SGI_IP32 |
557 | bool "SGI IP32 (O2)" | 537 | bool "SGI IP32 (O2)" |
558 | select ARC | 538 | select FW_ARC |
559 | select ARC32 | 539 | select FW_ARC32 |
560 | select BOOT_ELF32 | 540 | select BOOT_ELF32 |
561 | select CEVT_R4K | 541 | select CEVT_R4K |
562 | select CSRC_R4K | 542 | select CSRC_R4K |
@@ -674,8 +654,8 @@ config SIBYTE_BIGSUR | |||
674 | 654 | ||
675 | config SNI_RM | 655 | config SNI_RM |
676 | bool "SNI RM200/300/400" | 656 | bool "SNI RM200/300/400" |
677 | select ARC if CPU_LITTLE_ENDIAN | 657 | select FW_ARC if CPU_LITTLE_ENDIAN |
678 | select ARC32 if CPU_LITTLE_ENDIAN | 658 | select FW_ARC32 if CPU_LITTLE_ENDIAN |
679 | select SNIPROM if CPU_BIG_ENDIAN | 659 | select SNIPROM if CPU_BIG_ENDIAN |
680 | select ARCH_MAY_HAVE_PC_FDC | 660 | select ARCH_MAY_HAVE_PC_FDC |
681 | select BOOT_ELF32 | 661 | select BOOT_ELF32 |
@@ -776,6 +756,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD | |||
776 | select DMA_COHERENT | 756 | select DMA_COHERENT |
777 | select SYS_SUPPORTS_64BIT_KERNEL | 757 | select SYS_SUPPORTS_64BIT_KERNEL |
778 | select SYS_SUPPORTS_BIG_ENDIAN | 758 | select SYS_SUPPORTS_BIG_ENDIAN |
759 | select EDAC_SUPPORT | ||
779 | select SYS_SUPPORTS_HOTPLUG_CPU | 760 | select SYS_SUPPORTS_HOTPLUG_CPU |
780 | select SYS_HAS_EARLY_PRINTK | 761 | select SYS_HAS_EARLY_PRINTK |
781 | select SYS_HAS_CPU_CAVIUM_OCTEON | 762 | select SYS_HAS_CPU_CAVIUM_OCTEON |
@@ -819,7 +800,7 @@ config NLM_XLR_BOARD | |||
819 | select CSRC_R4K | 800 | select CSRC_R4K |
820 | select IRQ_CPU | 801 | select IRQ_CPU |
821 | select ARCH_SUPPORTS_MSI | 802 | select ARCH_SUPPORTS_MSI |
822 | select ZONE_DMA if 64BIT | 803 | select ZONE_DMA32 if 64BIT |
823 | select SYNC_R4K | 804 | select SYNC_R4K |
824 | select SYS_HAS_EARLY_PRINTK | 805 | select SYS_HAS_EARLY_PRINTK |
825 | select USB_ARCH_HAS_OHCI if USB_SUPPORT | 806 | select USB_ARCH_HAS_OHCI if USB_SUPPORT |
@@ -847,7 +828,7 @@ config NLM_XLP_BOARD | |||
847 | select CEVT_R4K | 828 | select CEVT_R4K |
848 | select CSRC_R4K | 829 | select CSRC_R4K |
849 | select IRQ_CPU | 830 | select IRQ_CPU |
850 | select ZONE_DMA if 64BIT | 831 | select ZONE_DMA32 if 64BIT |
851 | select SYNC_R4K | 832 | select SYNC_R4K |
852 | select SYS_HAS_EARLY_PRINTK | 833 | select SYS_HAS_EARLY_PRINTK |
853 | select USE_OF | 834 | select USE_OF |
@@ -908,7 +889,7 @@ config SCHED_OMIT_FRAME_POINTER | |||
908 | # | 889 | # |
909 | # Select some configuration options automatically based on user selections. | 890 | # Select some configuration options automatically based on user selections. |
910 | # | 891 | # |
911 | config ARC | 892 | config FW_ARC |
912 | bool | 893 | bool |
913 | 894 | ||
914 | config ARCH_MAY_HAVE_PC_FDC | 895 | config ARCH_MAY_HAVE_PC_FDC |
@@ -926,11 +907,7 @@ config CEVT_DS1287 | |||
926 | config CEVT_GT641XX | 907 | config CEVT_GT641XX |
927 | bool | 908 | bool |
928 | 909 | ||
929 | config CEVT_R4K_LIB | ||
930 | bool | ||
931 | |||
932 | config CEVT_R4K | 910 | config CEVT_R4K |
933 | select CEVT_R4K_LIB | ||
934 | bool | 911 | bool |
935 | 912 | ||
936 | config CEVT_SB1250 | 913 | config CEVT_SB1250 |
@@ -948,11 +925,7 @@ config CSRC_IOASIC | |||
948 | config CSRC_POWERTV | 925 | config CSRC_POWERTV |
949 | bool | 926 | bool |
950 | 927 | ||
951 | config CSRC_R4K_LIB | ||
952 | bool | ||
953 | |||
954 | config CSRC_R4K | 928 | config CSRC_R4K |
955 | select CSRC_R4K_LIB | ||
956 | bool | 929 | bool |
957 | 930 | ||
958 | config CSRC_SB1250 | 931 | config CSRC_SB1250 |
@@ -963,7 +936,7 @@ config GPIO_TXX9 | |||
963 | select ARCH_REQUIRE_GPIOLIB | 936 | select ARCH_REQUIRE_GPIOLIB |
964 | bool | 937 | bool |
965 | 938 | ||
966 | config CFE | 939 | config FW_CFE |
967 | bool | 940 | bool |
968 | 941 | ||
969 | config ARCH_DMA_ADDR_T_64BIT | 942 | config ARCH_DMA_ADDR_T_64BIT |
@@ -1079,15 +1052,15 @@ config SYS_SUPPORTS_HUGETLBFS | |||
1079 | depends on CPU_SUPPORTS_HUGEPAGES && 64BIT | 1052 | depends on CPU_SUPPORTS_HUGEPAGES && 64BIT |
1080 | default y | 1053 | default y |
1081 | 1054 | ||
1055 | config MIPS_HUGE_TLB_SUPPORT | ||
1056 | def_bool HUGETLB_PAGE || TRANSPARENT_HUGEPAGE | ||
1057 | |||
1082 | config IRQ_CPU | 1058 | config IRQ_CPU |
1083 | bool | 1059 | bool |
1084 | 1060 | ||
1085 | config IRQ_CPU_RM7K | 1061 | config IRQ_CPU_RM7K |
1086 | bool | 1062 | bool |
1087 | 1063 | ||
1088 | config IRQ_CPU_RM9K | ||
1089 | bool | ||
1090 | |||
1091 | config IRQ_MSP_SLP | 1064 | config IRQ_MSP_SLP |
1092 | bool | 1065 | bool |
1093 | 1066 | ||
@@ -1112,10 +1085,6 @@ config PCI_GT64XXX_PCI0 | |||
1112 | config NO_EXCEPT_FILL | 1085 | config NO_EXCEPT_FILL |
1113 | bool | 1086 | bool |
1114 | 1087 | ||
1115 | config MIPS_RM9122 | ||
1116 | bool | ||
1117 | select SERIAL_RM9000 | ||
1118 | |||
1119 | config SOC_EMMA2RH | 1088 | config SOC_EMMA2RH |
1120 | bool | 1089 | bool |
1121 | select CEVT_R4K | 1090 | select CEVT_R4K |
@@ -1161,9 +1130,6 @@ config SOC_PNX8550 | |||
1161 | config SWAP_IO_SPACE | 1130 | config SWAP_IO_SPACE |
1162 | bool | 1131 | bool |
1163 | 1132 | ||
1164 | config SERIAL_RM9000 | ||
1165 | bool | ||
1166 | |||
1167 | config SGI_HAS_INDYDOG | 1133 | config SGI_HAS_INDYDOG |
1168 | bool | 1134 | bool |
1169 | 1135 | ||
@@ -1185,7 +1151,7 @@ config SGI_HAS_I8042 | |||
1185 | config DEFAULT_SGI_PARTITION | 1151 | config DEFAULT_SGI_PARTITION |
1186 | bool | 1152 | bool |
1187 | 1153 | ||
1188 | config ARC32 | 1154 | config FW_ARC32 |
1189 | bool | 1155 | bool |
1190 | 1156 | ||
1191 | config SNIPROM | 1157 | config SNIPROM |
@@ -1218,7 +1184,7 @@ config ARC_PROMLIB | |||
1218 | depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP28 || SGI_IP32 | 1184 | depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP28 || SGI_IP32 |
1219 | default y | 1185 | default y |
1220 | 1186 | ||
1221 | config ARC64 | 1187 | config FW_ARC64 |
1222 | bool | 1188 | bool |
1223 | 1189 | ||
1224 | config BOOT_ELF64 | 1190 | config BOOT_ELF64 |
@@ -1370,6 +1336,7 @@ config CPU_R4X00 | |||
1370 | depends on SYS_HAS_CPU_R4X00 | 1336 | depends on SYS_HAS_CPU_R4X00 |
1371 | select CPU_SUPPORTS_32BIT_KERNEL | 1337 | select CPU_SUPPORTS_32BIT_KERNEL |
1372 | select CPU_SUPPORTS_64BIT_KERNEL | 1338 | select CPU_SUPPORTS_64BIT_KERNEL |
1339 | select CPU_SUPPORTS_HUGEPAGES | ||
1373 | help | 1340 | help |
1374 | MIPS Technologies R4000-series processors other than 4300, including | 1341 | MIPS Technologies R4000-series processors other than 4300, including |
1375 | the R4000, R4400, R4600, and 4700. | 1342 | the R4000, R4400, R4600, and 4700. |
@@ -1380,12 +1347,14 @@ config CPU_TX49XX | |||
1380 | select CPU_HAS_PREFETCH | 1347 | select CPU_HAS_PREFETCH |
1381 | select CPU_SUPPORTS_32BIT_KERNEL | 1348 | select CPU_SUPPORTS_32BIT_KERNEL |
1382 | select CPU_SUPPORTS_64BIT_KERNEL | 1349 | select CPU_SUPPORTS_64BIT_KERNEL |
1350 | select CPU_SUPPORTS_HUGEPAGES | ||
1383 | 1351 | ||
1384 | config CPU_R5000 | 1352 | config CPU_R5000 |
1385 | bool "R5000" | 1353 | bool "R5000" |
1386 | depends on SYS_HAS_CPU_R5000 | 1354 | depends on SYS_HAS_CPU_R5000 |
1387 | select CPU_SUPPORTS_32BIT_KERNEL | 1355 | select CPU_SUPPORTS_32BIT_KERNEL |
1388 | select CPU_SUPPORTS_64BIT_KERNEL | 1356 | select CPU_SUPPORTS_64BIT_KERNEL |
1357 | select CPU_SUPPORTS_HUGEPAGES | ||
1389 | help | 1358 | help |
1390 | MIPS Technologies R5000-series processors other than the Nevada. | 1359 | MIPS Technologies R5000-series processors other than the Nevada. |
1391 | 1360 | ||
@@ -1394,6 +1363,7 @@ config CPU_R5432 | |||
1394 | depends on SYS_HAS_CPU_R5432 | 1363 | depends on SYS_HAS_CPU_R5432 |
1395 | select CPU_SUPPORTS_32BIT_KERNEL | 1364 | select CPU_SUPPORTS_32BIT_KERNEL |
1396 | select CPU_SUPPORTS_64BIT_KERNEL | 1365 | select CPU_SUPPORTS_64BIT_KERNEL |
1366 | select CPU_SUPPORTS_HUGEPAGES | ||
1397 | 1367 | ||
1398 | config CPU_R5500 | 1368 | config CPU_R5500 |
1399 | bool "R5500" | 1369 | bool "R5500" |
@@ -1419,6 +1389,7 @@ config CPU_NEVADA | |||
1419 | depends on SYS_HAS_CPU_NEVADA | 1389 | depends on SYS_HAS_CPU_NEVADA |
1420 | select CPU_SUPPORTS_32BIT_KERNEL | 1390 | select CPU_SUPPORTS_32BIT_KERNEL |
1421 | select CPU_SUPPORTS_64BIT_KERNEL | 1391 | select CPU_SUPPORTS_64BIT_KERNEL |
1392 | select CPU_SUPPORTS_HUGEPAGES | ||
1422 | help | 1393 | help |
1423 | QED / PMC-Sierra RM52xx-series ("Nevada") processors. | 1394 | QED / PMC-Sierra RM52xx-series ("Nevada") processors. |
1424 | 1395 | ||
@@ -1439,6 +1410,7 @@ config CPU_R10000 | |||
1439 | select CPU_SUPPORTS_32BIT_KERNEL | 1410 | select CPU_SUPPORTS_32BIT_KERNEL |
1440 | select CPU_SUPPORTS_64BIT_KERNEL | 1411 | select CPU_SUPPORTS_64BIT_KERNEL |
1441 | select CPU_SUPPORTS_HIGHMEM | 1412 | select CPU_SUPPORTS_HIGHMEM |
1413 | select CPU_SUPPORTS_HUGEPAGES | ||
1442 | help | 1414 | help |
1443 | MIPS Technologies R10000-series processors. | 1415 | MIPS Technologies R10000-series processors. |
1444 | 1416 | ||
@@ -1449,15 +1421,7 @@ config CPU_RM7000 | |||
1449 | select CPU_SUPPORTS_32BIT_KERNEL | 1421 | select CPU_SUPPORTS_32BIT_KERNEL |
1450 | select CPU_SUPPORTS_64BIT_KERNEL | 1422 | select CPU_SUPPORTS_64BIT_KERNEL |
1451 | select CPU_SUPPORTS_HIGHMEM | 1423 | select CPU_SUPPORTS_HIGHMEM |
1452 | 1424 | select CPU_SUPPORTS_HUGEPAGES | |
1453 | config CPU_RM9000 | ||
1454 | bool "RM9000" | ||
1455 | depends on SYS_HAS_CPU_RM9000 | ||
1456 | select CPU_HAS_PREFETCH | ||
1457 | select CPU_SUPPORTS_32BIT_KERNEL | ||
1458 | select CPU_SUPPORTS_64BIT_KERNEL | ||
1459 | select CPU_SUPPORTS_HIGHMEM | ||
1460 | select WEAK_ORDERING | ||
1461 | 1425 | ||
1462 | config CPU_SB1 | 1426 | config CPU_SB1 |
1463 | bool "SB1" | 1427 | bool "SB1" |
@@ -1465,6 +1429,7 @@ config CPU_SB1 | |||
1465 | select CPU_SUPPORTS_32BIT_KERNEL | 1429 | select CPU_SUPPORTS_32BIT_KERNEL |
1466 | select CPU_SUPPORTS_64BIT_KERNEL | 1430 | select CPU_SUPPORTS_64BIT_KERNEL |
1467 | select CPU_SUPPORTS_HIGHMEM | 1431 | select CPU_SUPPORTS_HIGHMEM |
1432 | select CPU_SUPPORTS_HUGEPAGES | ||
1468 | select WEAK_ORDERING | 1433 | select WEAK_ORDERING |
1469 | 1434 | ||
1470 | config CPU_CAVIUM_OCTEON | 1435 | config CPU_CAVIUM_OCTEON |
@@ -1528,9 +1493,9 @@ config CPU_XLR | |||
1528 | select CPU_SUPPORTS_32BIT_KERNEL | 1493 | select CPU_SUPPORTS_32BIT_KERNEL |
1529 | select CPU_SUPPORTS_64BIT_KERNEL | 1494 | select CPU_SUPPORTS_64BIT_KERNEL |
1530 | select CPU_SUPPORTS_HIGHMEM | 1495 | select CPU_SUPPORTS_HIGHMEM |
1496 | select CPU_SUPPORTS_HUGEPAGES | ||
1531 | select WEAK_ORDERING | 1497 | select WEAK_ORDERING |
1532 | select WEAK_REORDERING_BEYOND_LLSC | 1498 | select WEAK_REORDERING_BEYOND_LLSC |
1533 | select CPU_SUPPORTS_HUGEPAGES | ||
1534 | help | 1499 | help |
1535 | Netlogic Microsystems XLR/XLS processors. | 1500 | Netlogic Microsystems XLR/XLS processors. |
1536 | 1501 | ||
@@ -1544,6 +1509,7 @@ config CPU_XLP | |||
1544 | select WEAK_ORDERING | 1509 | select WEAK_ORDERING |
1545 | select WEAK_REORDERING_BEYOND_LLSC | 1510 | select WEAK_REORDERING_BEYOND_LLSC |
1546 | select CPU_HAS_PREFETCH | 1511 | select CPU_HAS_PREFETCH |
1512 | select CPU_MIPSR2 | ||
1547 | help | 1513 | help |
1548 | Netlogic Microsystems XLP processors. | 1514 | Netlogic Microsystems XLP processors. |
1549 | endchoice | 1515 | endchoice |
@@ -1591,6 +1557,7 @@ config CPU_LOONGSON2 | |||
1591 | select CPU_SUPPORTS_32BIT_KERNEL | 1557 | select CPU_SUPPORTS_32BIT_KERNEL |
1592 | select CPU_SUPPORTS_64BIT_KERNEL | 1558 | select CPU_SUPPORTS_64BIT_KERNEL |
1593 | select CPU_SUPPORTS_HIGHMEM | 1559 | select CPU_SUPPORTS_HIGHMEM |
1560 | select CPU_SUPPORTS_HUGEPAGES | ||
1594 | 1561 | ||
1595 | config CPU_LOONGSON1 | 1562 | config CPU_LOONGSON1 |
1596 | bool | 1563 | bool |
@@ -1675,9 +1642,6 @@ config SYS_HAS_CPU_R10000 | |||
1675 | config SYS_HAS_CPU_RM7000 | 1642 | config SYS_HAS_CPU_RM7000 |
1676 | bool | 1643 | bool |
1677 | 1644 | ||
1678 | config SYS_HAS_CPU_RM9000 | ||
1679 | bool | ||
1680 | |||
1681 | config SYS_HAS_CPU_SB1 | 1645 | config SYS_HAS_CPU_SB1 |
1682 | bool | 1646 | bool |
1683 | 1647 | ||
@@ -1757,7 +1721,7 @@ config CPU_SUPPORTS_UNCACHED_ACCELERATED | |||
1757 | bool | 1721 | bool |
1758 | config MIPS_PGD_C0_CONTEXT | 1722 | config MIPS_PGD_C0_CONTEXT |
1759 | bool | 1723 | bool |
1760 | default y if 64BIT && CPU_MIPSR2 | 1724 | default y if 64BIT && CPU_MIPSR2 && !CPU_XLP |
1761 | 1725 | ||
1762 | # | 1726 | # |
1763 | # Set to y for ptrace access to watch registers. | 1727 | # Set to y for ptrace access to watch registers. |
@@ -2188,7 +2152,7 @@ config NODES_SHIFT | |||
2188 | 2152 | ||
2189 | config HW_PERF_EVENTS | 2153 | config HW_PERF_EVENTS |
2190 | bool "Enable hardware performance counter support for perf events" | 2154 | bool "Enable hardware performance counter support for perf events" |
2191 | depends on PERF_EVENTS && !MIPS_MT_SMTC && OPROFILE=n && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON) | 2155 | depends on PERF_EVENTS && !MIPS_MT_SMTC && OPROFILE=n && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON || CPU_XLP) |
2192 | default y | 2156 | default y |
2193 | help | 2157 | help |
2194 | Enable hardware performance counter support for perf events. If | 2158 | Enable hardware performance counter support for perf events. If |
@@ -2366,6 +2330,29 @@ config KEXEC | |||
2366 | support. As of this writing the exact hardware interface is | 2330 | support. As of this writing the exact hardware interface is |
2367 | strongly in flux, so no good recommendation can be made. | 2331 | strongly in flux, so no good recommendation can be made. |
2368 | 2332 | ||
2333 | config CRASH_DUMP | ||
2334 | bool "Kernel crash dumps" | ||
2335 | help | ||
2336 | Generate crash dump after being started by kexec. | ||
2337 | This should be normally only set in special crash dump kernels | ||
2338 | which are loaded in the main kernel with kexec-tools into | ||
2339 | a specially reserved region and then later executed after | ||
2340 | a crash by kdump/kexec. The crash dump kernel must be compiled | ||
2341 | to a memory address not used by the main kernel or firmware using | ||
2342 | PHYSICAL_START. | ||
2343 | |||
2344 | config PHYSICAL_START | ||
2345 | hex "Physical address where the kernel is loaded" | ||
2346 | default "0xffffffff84000000" if 64BIT | ||
2347 | default "0x84000000" if 32BIT | ||
2348 | depends on CRASH_DUMP | ||
2349 | help | ||
2350 | This gives the CKSEG0 or KSEG0 address where the kernel is loaded. | ||
2351 | If you plan to use kernel for capturing the crash dump change | ||
2352 | this value to start of the reserved region (the "X" value as | ||
2353 | specified in the "crashkernel=YM@XM" command line boot parameter | ||
2354 | passed to the panic-ed kernel). | ||
2355 | |||
2369 | config SECCOMP | 2356 | config SECCOMP |
2370 | bool "Enable seccomp to safely compute untrusted bytecode" | 2357 | bool "Enable seccomp to safely compute untrusted bytecode" |
2371 | depends on PROC_FS | 2358 | depends on PROC_FS |
@@ -2572,6 +2559,8 @@ source "net/Kconfig" | |||
2572 | 2559 | ||
2573 | source "drivers/Kconfig" | 2560 | source "drivers/Kconfig" |
2574 | 2561 | ||
2562 | source "drivers/firmware/Kconfig" | ||
2563 | |||
2575 | source "fs/Kconfig" | 2564 | source "fs/Kconfig" |
2576 | 2565 | ||
2577 | source "arch/mips/Kconfig.debug" | 2566 | source "arch/mips/Kconfig.debug" |