@@ -994,60 +994,6 @@ config CAVIUM_OCTEON_SOC
994
994
Hikari
995
995
Say Y here for most Octeon reference boards.
996
996
997
- config NLM_XLR_BOARD
998
- bool "Netlogic XLR/XLS based systems"
999
- select BOOT_ELF32
1000
- select NLM_COMMON
1001
- select SYS_HAS_CPU_XLR
1002
- select SYS_SUPPORTS_SMP
1003
- select HAVE_PCI
1004
- select SWAP_IO_SPACE
1005
- select SYS_SUPPORTS_32BIT_KERNEL
1006
- select SYS_SUPPORTS_64BIT_KERNEL
1007
- select PHYS_ADDR_T_64BIT
1008
- select SYS_SUPPORTS_BIG_ENDIAN
1009
- select SYS_SUPPORTS_HIGHMEM
1010
- select NR_CPUS_DEFAULT_32
1011
- select CEVT_R4K
1012
- select CSRC_R4K
1013
- select IRQ_MIPS_CPU
1014
- select ZONE_DMA32 if 64BIT
1015
- select SYNC_R4K
1016
- select SYS_HAS_EARLY_PRINTK
1017
- select SYS_SUPPORTS_ZBOOT
1018
- select SYS_SUPPORTS_ZBOOT_UART16550
1019
- help
1020
- Support for systems based on Netlogic XLR and XLS processors.
1021
- Say Y here if you have a XLR or XLS based board.
1022
-
1023
- config NLM_XLP_BOARD
1024
- bool "Netlogic XLP based systems"
1025
- select BOOT_ELF32
1026
- select NLM_COMMON
1027
- select SYS_HAS_CPU_XLP
1028
- select SYS_SUPPORTS_SMP
1029
- select HAVE_PCI
1030
- select SYS_SUPPORTS_32BIT_KERNEL
1031
- select SYS_SUPPORTS_64BIT_KERNEL
1032
- select PHYS_ADDR_T_64BIT
1033
- select GPIOLIB
1034
- select SYS_SUPPORTS_BIG_ENDIAN
1035
- select SYS_SUPPORTS_LITTLE_ENDIAN
1036
- select SYS_SUPPORTS_HIGHMEM
1037
- select NR_CPUS_DEFAULT_32
1038
- select CEVT_R4K
1039
- select CSRC_R4K
1040
- select IRQ_MIPS_CPU
1041
- select ZONE_DMA32 if 64BIT
1042
- select SYNC_R4K
1043
- select SYS_HAS_EARLY_PRINTK
1044
- select USE_OF
1045
- select SYS_SUPPORTS_ZBOOT
1046
- select SYS_SUPPORTS_ZBOOT_UART16550
1047
- help
1048
- This board is based on Netlogic XLP Processor.
1049
- Say Y here if you have a XLP based board.
1050
-
1051
997
endchoice
1052
998
1053
999
source "arch/mips/alchemy/Kconfig"
@@ -1070,7 +1016,6 @@ source "arch/mips/cavium-octeon/Kconfig"
1070
1016
source "arch/mips/loongson2ef/Kconfig"
1071
1017
source "arch/mips/loongson32/Kconfig"
1072
1018
source "arch/mips/loongson64/Kconfig"
1073
- source "arch/mips/netlogic/Kconfig"
1074
1019
1075
1020
endmenu
1076
1021
@@ -1786,32 +1731,6 @@ config CPU_BMIPS
1786
1731
help
1787
1732
Support for BMIPS32/3300/4350/4380 and BMIPS5000 processors.
1788
1733
1789
- config CPU_XLR
1790
- bool "Netlogic XLR SoC"
1791
- depends on SYS_HAS_CPU_XLR
1792
- select CPU_SUPPORTS_32BIT_KERNEL
1793
- select CPU_SUPPORTS_64BIT_KERNEL
1794
- select CPU_SUPPORTS_HIGHMEM
1795
- select CPU_SUPPORTS_HUGEPAGES
1796
- select WEAK_ORDERING
1797
- select WEAK_REORDERING_BEYOND_LLSC
1798
- help
1799
- Netlogic Microsystems XLR/XLS processors.
1800
-
1801
- config CPU_XLP
1802
- bool "Netlogic XLP SoC"
1803
- depends on SYS_HAS_CPU_XLP
1804
- select CPU_SUPPORTS_32BIT_KERNEL
1805
- select CPU_SUPPORTS_64BIT_KERNEL
1806
- select CPU_SUPPORTS_HIGHMEM
1807
- select WEAK_ORDERING
1808
- select WEAK_REORDERING_BEYOND_LLSC
1809
- select CPU_HAS_PREFETCH
1810
- select CPU_MIPSR2
1811
- select CPU_SUPPORTS_HUGEPAGES
1812
- select MIPS_ASID_BITS_VARIABLE
1813
- help
1814
- Netlogic Microsystems XLP processors.
1815
1734
endchoice
1816
1735
1817
1736
config CPU_MIPS32_3_5_FEATURES
@@ -2058,12 +1977,6 @@ config SYS_HAS_CPU_BMIPS5000
2058
1977
select SYS_HAS_CPU_BMIPS
2059
1978
select ARCH_HAS_SYNC_DMA_FOR_CPU
2060
1979
2061
- config SYS_HAS_CPU_XLR
2062
- bool
2063
-
2064
- config SYS_HAS_CPU_XLP
2065
- bool
2066
-
2067
1980
#
2068
1981
# CPU may reorder R->R, R->W, W->R, W->W
2069
1982
# Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
@@ -2158,7 +2071,7 @@ config CPU_SUPPORTS_HUGEPAGES
2158
2071
config MIPS_PGD_C0_CONTEXT
2159
2072
bool
2160
2073
depends on 64BIT
2161
- default y if (CPU_MIPSR2 || CPU_MIPSR6) && !CPU_XLP
2074
+ default y if (CPU_MIPSR2 || CPU_MIPSR6)
2162
2075
2163
2076
#
2164
2077
# Set to y for ptrace access to watch registers.
@@ -2841,7 +2754,7 @@ config NODES_SHIFT
2841
2754
2842
2755
config HW_PERF_EVENTS
2843
2756
bool "Enable hardware performance counter support for perf events"
2844
- depends on PERF_EVENTS && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON || CPU_XLP || CPU_LOONGSON64)
2757
+ depends on PERF_EVENTS && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON || CPU_LOONGSON64)
2845
2758
default y
2846
2759
help
2847
2760
Enable hardware performance counter support for perf events. If
0 commit comments