diff options
author | Florian Fainelli <florian@openwrt.org> | 2014-01-14 12:54:38 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-01-24 16:39:55 -0500 |
commit | 930beb5ac09aaeee48d81c57aec0d17a42a33ce8 (patch) | |
tree | 3a146ffc4fa1fb74b4cf673b4040a7e54e5240f2 | |
parent | dc4d7b377c1e07918eeca704477851ddef37d472 (diff) |
MIPS: introduce MIPS_L1_CACHE_SHIFT_<N>
In order to avoid keeping an ever growing list of chips which need to
select a specific MIPS_L1_CACHE_SHIFT value introduce multiple internal
and non-exposed Kconfig symbols for the various MIPS_L1_CACHE_SHIFT
values out there and update the relevant Kconfig symbols to select them.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
-rw-r--r-- | arch/mips/Kconfig | 19 | ||||
-rw-r--r-- | arch/mips/pmcs-msp71xx/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/ralink/Kconfig | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3d9f9a8b62bd..664c9974521f 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -182,6 +182,7 @@ config MACH_DECSTATION | |||
182 | select SYS_SUPPORTS_128HZ | 182 | select SYS_SUPPORTS_128HZ |
183 | select SYS_SUPPORTS_256HZ | 183 | select SYS_SUPPORTS_256HZ |
184 | select SYS_SUPPORTS_1024HZ | 184 | select SYS_SUPPORTS_1024HZ |
185 | select MIPS_L1_CACHE_SHIFT_4 | ||
185 | help | 186 | help |
186 | This enables support for DEC's MIPS based workstations. For details | 187 | This enables support for DEC's MIPS based workstations. For details |
187 | see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the | 188 | see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the |
@@ -467,6 +468,7 @@ config SGI_IP22 | |||
467 | select SYS_SUPPORTS_32BIT_KERNEL | 468 | select SYS_SUPPORTS_32BIT_KERNEL |
468 | select SYS_SUPPORTS_64BIT_KERNEL | 469 | select SYS_SUPPORTS_64BIT_KERNEL |
469 | select SYS_SUPPORTS_BIG_ENDIAN | 470 | select SYS_SUPPORTS_BIG_ENDIAN |
471 | select MIPS_L1_CACHE_SHIFT_7 | ||
470 | help | 472 | help |
471 | This are the SGI Indy, Challenge S and Indigo2, as well as certain | 473 | This are the SGI Indy, Challenge S and Indigo2, as well as certain |
472 | OEM variants like the Tandem CMN B006S. To compile a Linux kernel | 474 | OEM variants like the Tandem CMN B006S. To compile a Linux kernel |
@@ -487,6 +489,7 @@ config SGI_IP27 | |||
487 | select SYS_SUPPORTS_BIG_ENDIAN | 489 | select SYS_SUPPORTS_BIG_ENDIAN |
488 | select SYS_SUPPORTS_NUMA | 490 | select SYS_SUPPORTS_NUMA |
489 | select SYS_SUPPORTS_SMP | 491 | select SYS_SUPPORTS_SMP |
492 | select MIPS_L1_CACHE_SHIFT_7 | ||
490 | help | 493 | help |
491 | This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics | 494 | This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics |
492 | workstations. To compile a Linux kernel that runs on these, say Y | 495 | workstations. To compile a Linux kernel that runs on these, say Y |
@@ -693,6 +696,7 @@ config MIKROTIK_RB532 | |||
693 | select SWAP_IO_SPACE | 696 | select SWAP_IO_SPACE |
694 | select BOOT_RAW | 697 | select BOOT_RAW |
695 | select ARCH_REQUIRE_GPIOLIB | 698 | select ARCH_REQUIRE_GPIOLIB |
699 | select MIPS_L1_CACHE_SHIFT_4 | ||
696 | help | 700 | help |
697 | Support the Mikrotik(tm) RouterBoard 532 series, | 701 | Support the Mikrotik(tm) RouterBoard 532 series, |
698 | based on the IDT RC32434 SoC. | 702 | based on the IDT RC32434 SoC. |
@@ -1092,6 +1096,18 @@ config FW_SNIPROM | |||
1092 | config BOOT_ELF32 | 1096 | config BOOT_ELF32 |
1093 | bool | 1097 | bool |
1094 | 1098 | ||
1099 | config MIPS_L1_CACHE_SHIFT_4 | ||
1100 | bool | ||
1101 | |||
1102 | config MIPS_L1_CACHE_SHIFT_5 | ||
1103 | bool | ||
1104 | |||
1105 | config MIPS_L1_CACHE_SHIFT_6 | ||
1106 | bool | ||
1107 | |||
1108 | config MIPS_L1_CACHE_SHIFT_7 | ||
1109 | bool | ||
1110 | |||
1095 | config MIPS_L1_CACHE_SHIFT | 1111 | config MIPS_L1_CACHE_SHIFT |
1096 | int | 1112 | int |
1097 | default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || SOC_RT288X | 1113 | default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || SOC_RT288X |
@@ -1376,6 +1392,8 @@ config CPU_CAVIUM_OCTEON | |||
1376 | select LIBFDT | 1392 | select LIBFDT |
1377 | select USE_OF | 1393 | select USE_OF |
1378 | select USB_EHCI_BIG_ENDIAN_MMIO | 1394 | select USB_EHCI_BIG_ENDIAN_MMIO |
1395 | select SYS_HAS_DMA_OPS | ||
1396 | select MIPS_L1_CACHE_SHIFT_7 | ||
1379 | help | 1397 | help |
1380 | The Cavium Octeon processor is a highly integrated chip containing | 1398 | The Cavium Octeon processor is a highly integrated chip containing |
1381 | many ethernet hardware widgets for networking tasks. The processor | 1399 | many ethernet hardware widgets for networking tasks. The processor |
@@ -1798,6 +1816,7 @@ config IP22_CPU_SCACHE | |||
1798 | config MIPS_CPU_SCACHE | 1816 | config MIPS_CPU_SCACHE |
1799 | bool | 1817 | bool |
1800 | select BOARD_SCACHE | 1818 | select BOARD_SCACHE |
1819 | select MIPS_L1_CACHE_SHIFT_6 | ||
1801 | 1820 | ||
1802 | config R5000_CPU_SCACHE | 1821 | config R5000_CPU_SCACHE |
1803 | bool | 1822 | bool |
diff --git a/arch/mips/pmcs-msp71xx/Kconfig b/arch/mips/pmcs-msp71xx/Kconfig index 3482b8c8640c..6073ca456d11 100644 --- a/arch/mips/pmcs-msp71xx/Kconfig +++ b/arch/mips/pmcs-msp71xx/Kconfig | |||
@@ -6,6 +6,7 @@ config PMC_MSP4200_EVAL | |||
6 | bool "PMC-Sierra MSP4200 Eval Board" | 6 | bool "PMC-Sierra MSP4200 Eval Board" |
7 | select IRQ_MSP_SLP | 7 | select IRQ_MSP_SLP |
8 | select HW_HAS_PCI | 8 | select HW_HAS_PCI |
9 | select MIPS_L1_CACHE_SHIFT_4 | ||
9 | 10 | ||
10 | config PMC_MSP4200_GW | 11 | config PMC_MSP4200_GW |
11 | bool "PMC-Sierra MSP4200 VoIP Gateway" | 12 | bool "PMC-Sierra MSP4200 VoIP Gateway" |
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig index 424f03496d14..1bfd1c17b3c2 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig | |||
@@ -15,6 +15,7 @@ choice | |||
15 | 15 | ||
16 | config SOC_RT288X | 16 | config SOC_RT288X |
17 | bool "RT288x" | 17 | bool "RT288x" |
18 | select MIPS_L1_CACHE_SHIFT_4 | ||
18 | 19 | ||
19 | config SOC_RT305X | 20 | config SOC_RT305X |
20 | bool "RT305x" | 21 | bool "RT305x" |