Skip to content

Commit c441d4a

Browse files
Maciej W. Rozyckiralfbaechle
authored andcommitted
MIPS: mm: Only build one microassembler that is suitable
The microMIPS microassembler is only suitable for configurations where the kernel itself is built to microMIPS machine code and not where only user microMIPS software is supported. The former is controlled with the CPU_MICROMIPS configuration setting, whereas SYS_SUPPORTS_MICROMIPS is used for the latter. Not only that, but with a given microMIPS vs standard MIPS kernel configuration only one microassembler is needed, that matches the ISA selected -- CP0.Config3.ISAOnExc is mandatory on microMIPS processors, so there is never a need to mix microMIPS and standard MIPS code. Consequently build only the microassembler that matches the ISA selected for the kernel. Signed-off-by: Maciej W. Rozycki <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/8479/ Signed-off-by: Ralf Baechle <[email protected]>
1 parent 424ebcd commit c441d4a

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

arch/mips/mm/Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44

55
obj-y += cache.o dma-default.o extable.o fault.o \
66
gup.o init.o mmap.o page.o page-funcs.o \
7-
tlbex.o tlbex-fault.o tlb-funcs.o uasm-mips.o
7+
tlbex.o tlbex-fault.o tlb-funcs.o
8+
9+
ifdef CONFIG_CPU_MICROMIPS
10+
obj-y += uasm-micromips.o
11+
else
12+
obj-y += uasm-mips.o
13+
endif
814

915
obj-$(CONFIG_32BIT) += ioremap.o pgtable-32.o
1016
obj-$(CONFIG_64BIT) += pgtable-64.o
@@ -22,5 +28,3 @@ obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
2228
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
2329
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
2430
obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o
25-
26-
obj-$(CONFIG_SYS_SUPPORTS_MICROMIPS) += uasm-micromips.o

0 commit comments

Comments
 (0)