diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-11-21 18:16:48 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-11-24 16:46:44 -0500 |
| commit | 34adb28d500e644cc260da4ceb66ba6dc0beaf93 (patch) | |
| tree | d47596d498c031e9140f7fca3a5bc8b4a393a08d /arch/mips/Kconfig | |
| parent | f98614072c5d43421a2cfa6f9b911a071e6e6d5f (diff) | |
MIPS: Replace MIPS-specific 64BIT_PHYS_ADDR with generic PHYS_ADDR_T_64BIT
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d9393963e6d6..0a8e88d06b99 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -63,7 +63,7 @@ choice | |||
| 63 | 63 | ||
| 64 | config MIPS_ALCHEMY | 64 | config MIPS_ALCHEMY |
| 65 | bool "Alchemy processor based machines" | 65 | bool "Alchemy processor based machines" |
| 66 | select 64BIT_PHYS_ADDR | 66 | select ARCH_PHYS_ADDR_T_64BIT |
| 67 | select CEVT_R4K | 67 | select CEVT_R4K |
| 68 | select CSRC_R4K | 68 | select CSRC_R4K |
| 69 | select IRQ_CPU | 69 | select IRQ_CPU |
| @@ -771,7 +771,7 @@ config MIKROTIK_RB532 | |||
| 771 | config CAVIUM_OCTEON_SOC | 771 | config CAVIUM_OCTEON_SOC |
| 772 | bool "Cavium Networks Octeon SoC based boards" | 772 | bool "Cavium Networks Octeon SoC based boards" |
| 773 | select CEVT_R4K | 773 | select CEVT_R4K |
| 774 | select 64BIT_PHYS_ADDR | 774 | select ARCH_PHYS_ADDR_T_64BIT |
| 775 | select DMA_COHERENT | 775 | select DMA_COHERENT |
| 776 | select SYS_SUPPORTS_64BIT_KERNEL | 776 | select SYS_SUPPORTS_64BIT_KERNEL |
| 777 | select SYS_SUPPORTS_BIG_ENDIAN | 777 | select SYS_SUPPORTS_BIG_ENDIAN |
| @@ -813,7 +813,7 @@ config NLM_XLR_BOARD | |||
| 813 | select SWAP_IO_SPACE | 813 | select SWAP_IO_SPACE |
| 814 | select SYS_SUPPORTS_32BIT_KERNEL | 814 | select SYS_SUPPORTS_32BIT_KERNEL |
| 815 | select SYS_SUPPORTS_64BIT_KERNEL | 815 | select SYS_SUPPORTS_64BIT_KERNEL |
| 816 | select 64BIT_PHYS_ADDR | 816 | select ARCH_PHYS_ADDR_T_64BIT |
| 817 | select SYS_SUPPORTS_BIG_ENDIAN | 817 | select SYS_SUPPORTS_BIG_ENDIAN |
| 818 | select SYS_SUPPORTS_HIGHMEM | 818 | select SYS_SUPPORTS_HIGHMEM |
| 819 | select DMA_COHERENT | 819 | select DMA_COHERENT |
| @@ -839,7 +839,7 @@ config NLM_XLP_BOARD | |||
| 839 | select HW_HAS_PCI | 839 | select HW_HAS_PCI |
| 840 | select SYS_SUPPORTS_32BIT_KERNEL | 840 | select SYS_SUPPORTS_32BIT_KERNEL |
| 841 | select SYS_SUPPORTS_64BIT_KERNEL | 841 | select SYS_SUPPORTS_64BIT_KERNEL |
| 842 | select 64BIT_PHYS_ADDR | 842 | select ARCH_PHYS_ADDR_T_64BIT |
| 843 | select SYS_SUPPORTS_BIG_ENDIAN | 843 | select SYS_SUPPORTS_BIG_ENDIAN |
| 844 | select SYS_SUPPORTS_LITTLE_ENDIAN | 844 | select SYS_SUPPORTS_LITTLE_ENDIAN |
| 845 | select SYS_SUPPORTS_HIGHMEM | 845 | select SYS_SUPPORTS_HIGHMEM |
| @@ -979,7 +979,7 @@ config FW_CFE | |||
| 979 | bool | 979 | bool |
| 980 | 980 | ||
| 981 | config ARCH_DMA_ADDR_T_64BIT | 981 | config ARCH_DMA_ADDR_T_64BIT |
| 982 | def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT | 982 | def_bool (HIGHMEM && ARCH_PHYS_ADDR_T_64BIT) || 64BIT |
| 983 | 983 | ||
| 984 | config DMA_MAYBE_COHERENT | 984 | config DMA_MAYBE_COHERENT |
| 985 | select DMA_NONCOHERENT | 985 | select DMA_NONCOHERENT |
| @@ -2124,11 +2124,8 @@ config SB1_PASS_2_1_WORKAROUNDS | |||
| 2124 | default y | 2124 | default y |
| 2125 | 2125 | ||
| 2126 | 2126 | ||
| 2127 | config 64BIT_PHYS_ADDR | ||
| 2128 | bool | ||
| 2129 | |||
| 2130 | config ARCH_PHYS_ADDR_T_64BIT | 2127 | config ARCH_PHYS_ADDR_T_64BIT |
| 2131 | def_bool 64BIT_PHYS_ADDR | 2128 | bool |
| 2132 | 2129 | ||
| 2133 | config CPU_HAS_SMARTMIPS | 2130 | config CPU_HAS_SMARTMIPS |
| 2134 | depends on SYS_SUPPORTS_SMARTMIPS | 2131 | depends on SYS_SUPPORTS_SMARTMIPS |