Commit f9c21a6e authored by Hyok S. Choi's avatar Hyok S. Choi Committed by Russell King

[ARM] nommu: avoid selecting TLB and CPU specific copy code

Since uclinux doesn't make use of the TLB, including the TLB
maintainence and CPU-optimised copypage functions does not
make sense.  Remove them.

(This is part of one of Hyok's patches.)
Signed-off-by: default avatarHyok S. Choi <hyok.choi@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9641c7cc
...@@ -15,8 +15,8 @@ config CPU_ARM610 ...@@ -15,8 +15,8 @@ config CPU_ARM610
select CPU_32v3 select CPU_32v3
select CPU_CACHE_V3 select CPU_CACHE_V3
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V3 select CPU_COPY_V3 if MMU
select CPU_TLB_V3 select CPU_TLB_V3 if MMU
help help
The ARM610 is the successor to the ARM3 processor The ARM610 is the successor to the ARM3 processor
and was produced by VLSI Technology Inc. and was produced by VLSI Technology Inc.
...@@ -31,8 +31,8 @@ config CPU_ARM710 ...@@ -31,8 +31,8 @@ config CPU_ARM710
select CPU_32v3 select CPU_32v3
select CPU_CACHE_V3 select CPU_CACHE_V3
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V3 select CPU_COPY_V3 if MMU
select CPU_TLB_V3 select CPU_TLB_V3 if MMU
help help
A 32-bit RISC microprocessor based on the ARM7 processor core A 32-bit RISC microprocessor based on the ARM7 processor core
designed by Advanced RISC Machines Ltd. The ARM710 is the designed by Advanced RISC Machines Ltd. The ARM710 is the
...@@ -50,8 +50,8 @@ config CPU_ARM720T ...@@ -50,8 +50,8 @@ config CPU_ARM720T
select CPU_ABRT_LV4T select CPU_ABRT_LV4T
select CPU_CACHE_V4 select CPU_CACHE_V4
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WT select CPU_COPY_V4WT if MMU
select CPU_TLB_V4WT select CPU_TLB_V4WT if MMU
help help
A 32-bit RISC processor with 8kByte Cache, Write Buffer and A 32-bit RISC processor with 8kByte Cache, Write Buffer and
MMU built around an ARM7TDMI core. MMU built around an ARM7TDMI core.
...@@ -68,8 +68,8 @@ config CPU_ARM920T ...@@ -68,8 +68,8 @@ config CPU_ARM920T
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_CACHE_V4WT select CPU_CACHE_V4WT
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB select CPU_COPY_V4WB if MMU
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
help help
The ARM920T is licensed to be produced by numerous vendors, The ARM920T is licensed to be produced by numerous vendors,
and is used in the Maverick EP9312 and the Samsung S3C2410. and is used in the Maverick EP9312 and the Samsung S3C2410.
...@@ -89,8 +89,8 @@ config CPU_ARM922T ...@@ -89,8 +89,8 @@ config CPU_ARM922T
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_CACHE_V4WT select CPU_CACHE_V4WT
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB select CPU_COPY_V4WB if MMU
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
help help
The ARM922T is a version of the ARM920T, but with smaller The ARM922T is a version of the ARM920T, but with smaller
instruction and data caches. It is used in Altera's instruction and data caches. It is used in Altera's
...@@ -108,8 +108,8 @@ config CPU_ARM925T ...@@ -108,8 +108,8 @@ config CPU_ARM925T
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_CACHE_V4WT select CPU_CACHE_V4WT
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB select CPU_COPY_V4WB if MMU
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
help help
The ARM925T is a mix between the ARM920T and ARM926T, but with The ARM925T is a mix between the ARM920T and ARM926T, but with
different instruction and data caches. It is used in TI's OMAP different instruction and data caches. It is used in TI's OMAP
...@@ -126,8 +126,8 @@ config CPU_ARM926T ...@@ -126,8 +126,8 @@ config CPU_ARM926T
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5TJ select CPU_ABRT_EV5TJ
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB select CPU_COPY_V4WB if MMU
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
help help
This is a variant of the ARM920. It has slightly different This is a variant of the ARM920. It has slightly different
instruction sequences for cache and TLB operations. Curiously, instruction sequences for cache and TLB operations. Curiously,
...@@ -144,8 +144,8 @@ config CPU_ARM1020 ...@@ -144,8 +144,8 @@ config CPU_ARM1020
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_CACHE_V4WT select CPU_CACHE_V4WT
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB select CPU_COPY_V4WB if MMU
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
help help
The ARM1020 is the 32K cached version of the ARM10 processor, The ARM1020 is the 32K cached version of the ARM10 processor,
with an addition of a floating-point unit. with an addition of a floating-point unit.
...@@ -161,8 +161,8 @@ config CPU_ARM1020E ...@@ -161,8 +161,8 @@ config CPU_ARM1020E
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_CACHE_V4WT select CPU_CACHE_V4WT
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB select CPU_COPY_V4WB if MMU
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
depends on n depends on n
# ARM1022E # ARM1022E
...@@ -172,8 +172,8 @@ config CPU_ARM1022 ...@@ -172,8 +172,8 @@ config CPU_ARM1022
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV4T select CPU_ABRT_EV4T
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB # can probably do better select CPU_COPY_V4WB if MMU # can probably do better
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
help help
The ARM1022E is an implementation of the ARMv5TE architecture The ARM1022E is an implementation of the ARMv5TE architecture
based upon the ARM10 integer core with a 16KiB L1 Harvard cache, based upon the ARM10 integer core with a 16KiB L1 Harvard cache,
...@@ -189,8 +189,8 @@ config CPU_ARM1026 ...@@ -189,8 +189,8 @@ config CPU_ARM1026
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB # can probably do better select CPU_COPY_V4WB if MMU # can probably do better
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
help help
The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture
based upon the ARM10 integer core. based upon the ARM10 integer core.
...@@ -207,8 +207,8 @@ config CPU_SA110 ...@@ -207,8 +207,8 @@ config CPU_SA110
select CPU_ABRT_EV4 select CPU_ABRT_EV4
select CPU_CACHE_V4WB select CPU_CACHE_V4WB
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_COPY_V4WB select CPU_COPY_V4WB if MMU
select CPU_TLB_V4WB select CPU_TLB_V4WB if MMU
help help
The Intel StrongARM(R) SA-110 is a 32-bit microprocessor and The Intel StrongARM(R) SA-110 is a 32-bit microprocessor and
is available at five speeds ranging from 100 MHz to 233 MHz. is available at five speeds ranging from 100 MHz to 233 MHz.
...@@ -227,7 +227,7 @@ config CPU_SA1100 ...@@ -227,7 +227,7 @@ config CPU_SA1100
select CPU_ABRT_EV4 select CPU_ABRT_EV4
select CPU_CACHE_V4WB select CPU_CACHE_V4WB
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_TLB_V4WB select CPU_TLB_V4WB if MMU
# XScale # XScale
config CPU_XSCALE config CPU_XSCALE
...@@ -237,7 +237,7 @@ config CPU_XSCALE ...@@ -237,7 +237,7 @@ config CPU_XSCALE
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5T select CPU_ABRT_EV5T
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
# XScale Core Version 3 # XScale Core Version 3
config CPU_XSC3 config CPU_XSC3
...@@ -247,7 +247,7 @@ config CPU_XSC3 ...@@ -247,7 +247,7 @@ config CPU_XSC3
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5T select CPU_ABRT_EV5T
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
select CPU_TLB_V4WBI select CPU_TLB_V4WBI if MMU
select IO_36 select IO_36
# ARMv6 # ARMv6
...@@ -258,8 +258,8 @@ config CPU_V6 ...@@ -258,8 +258,8 @@ config CPU_V6
select CPU_ABRT_EV6 select CPU_ABRT_EV6
select CPU_CACHE_V6 select CPU_CACHE_V6
select CPU_CACHE_VIPT select CPU_CACHE_VIPT
select CPU_COPY_V6 select CPU_COPY_V6 if MMU
select CPU_TLB_V6 select CPU_TLB_V6 if MMU
# ARMv6k # ARMv6k
config CPU_32v6K config CPU_32v6K
...@@ -334,6 +334,7 @@ config CPU_CACHE_VIVT ...@@ -334,6 +334,7 @@ config CPU_CACHE_VIVT
config CPU_CACHE_VIPT config CPU_CACHE_VIPT
bool bool
if MMU
# The copy-page model # The copy-page model
config CPU_COPY_V3 config CPU_COPY_V3
bool bool
...@@ -372,6 +373,8 @@ config CPU_TLB_V4WBI ...@@ -372,6 +373,8 @@ config CPU_TLB_V4WBI
config CPU_TLB_V6 config CPU_TLB_V6
bool bool
endif
# #
# CPU supports 36-bit I/O # CPU supports 36-bit I/O
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment