tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
MIPS: Hook up Cavium OCTEON in arch/mips.
Take all the OCTEON specific files that were added, and hook them into
the build system for the arch/mips. For versions of GCC that lack
OCTEON support, override gas target architecture.
Signed-off-by: Tomaso Paoletti <tpaoletti@caviumnetworks.com>
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
authored by
David Daney
and committed by
Ralf Baechle
7e69deb8
47d979ec
+19
+16
arch/mips/Makefile
+16
arch/mips/Makefile
···
144
144
cflags-$(CONFIG_CPU_R8000) += -march=r8000 -Wa,--trap
145
145
cflags-$(CONFIG_CPU_R10000) += $(call cc-option,-march=r10000,-march=r8000) \
146
146
-Wa,--trap
147
+
cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += $(call cc-option,-march=octeon) -Wa,--trap
148
+
ifeq (,$(findstring march=octeon, $(cflags-$(CONFIG_CPU_CAVIUM_OCTEON))))
149
+
cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
150
+
endif
147
151
148
152
cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
149
153
cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,)
···
589
585
core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/rbtx4927/
590
586
core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/
591
587
core-$(CONFIG_TOSHIBA_RBTX4939) += arch/mips/txx9/rbtx4939/
588
+
589
+
#
590
+
# Cavium Octeon
591
+
#
592
+
core-$(CONFIG_CPU_CAVIUM_OCTEON) += arch/mips/cavium-octeon/
593
+
cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -I$(srctree)/arch/mips/include/asm/mach-cavium-octeon
594
+
core-$(CONFIG_CPU_CAVIUM_OCTEON) += arch/mips/cavium-octeon/executive/
595
+
ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
596
+
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff84100000
597
+
else
598
+
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
599
+
endif
592
600
593
601
cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic
594
602
drivers-$(CONFIG_PCI) += arch/mips/pci/
+1
arch/mips/kernel/Makefile
+1
arch/mips/kernel/Makefile
···
43
43
obj-$(CONFIG_CPU_TX39XX) += r2300_fpu.o r2300_switch.o
44
44
obj-$(CONFIG_CPU_TX49XX) += r4k_fpu.o r4k_switch.o
45
45
obj-$(CONFIG_CPU_VR41XX) += r4k_fpu.o r4k_switch.o
46
+
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += octeon_switch.o
46
47
47
48
obj-$(CONFIG_SMP) += smp.o
48
49
obj-$(CONFIG_SMP_UP) += smp-up.o
+1
arch/mips/lib/Makefile
+1
arch/mips/lib/Makefile
···
27
27
obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o
28
28
obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o
29
29
obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o
30
+
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += dump_tlb.o
30
31
31
32
# libgcc-style stuff needed in the kernel
32
33
obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o
+1
arch/mips/mm/Makefile
+1
arch/mips/mm/Makefile
···
27
27
obj-$(CONFIG_CPU_TX39XX) += c-tx39.o tlb-r3k.o
28
28
obj-$(CONFIG_CPU_TX49XX) += c-r4k.o cex-gen.o tlb-r4k.o
29
29
obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex-gen.o tlb-r4k.o
30
+
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += c-octeon.o cex-oct.o tlb-r4k.o
30
31
31
32
obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
32
33
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o