Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Kconfig and Makefile update for Netlogic XLR/XLS

Add NLM_XLR_BOARD, CPU_XLR and other config options
Makefile updates, mostly based on r4k

Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2334/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Jayachandran C and committed by
Ralf Baechle
7f058e85 5c642506

+67
+42
arch/mips/Kconfig
··· 736 736 Hikari 737 737 Say Y here for most Octeon reference boards. 738 738 739 + config NLM_XLR_BOARD 740 + bool "Netlogic XLR/XLS based systems" 741 + depends on EXPERIMENTAL 742 + select BOOT_ELF32 743 + select NLM_COMMON 744 + select NLM_XLR 745 + select SYS_HAS_CPU_XLR 746 + select SYS_SUPPORTS_SMP 747 + select HW_HAS_PCI 748 + select SWAP_IO_SPACE 749 + select SYS_SUPPORTS_32BIT_KERNEL 750 + select SYS_SUPPORTS_64BIT_KERNEL 751 + select 64BIT_PHYS_ADDR 752 + select SYS_SUPPORTS_BIG_ENDIAN 753 + select SYS_SUPPORTS_HIGHMEM 754 + select DMA_COHERENT 755 + select NR_CPUS_DEFAULT_32 756 + select CEVT_R4K 757 + select CSRC_R4K 758 + select IRQ_CPU 759 + select ZONE_DMA if 64BIT 760 + select SYNC_R4K 761 + select SYS_HAS_EARLY_PRINTK 762 + help 763 + Support for systems based on Netlogic XLR and XLS processors. 764 + Say Y here if you have a XLR or XLS based board. 765 + 739 766 endchoice 740 767 741 768 source "arch/mips/alchemy/Kconfig" ··· 779 752 source "arch/mips/vr41xx/Kconfig" 780 753 source "arch/mips/cavium-octeon/Kconfig" 781 754 source "arch/mips/loongson/Kconfig" 755 + source "arch/mips/netlogic/Kconfig" 782 756 783 757 endmenu 784 758 ··· 1448 1420 help 1449 1421 Broadcom BMIPS5000 processors. 1450 1422 1423 + config CPU_XLR 1424 + bool "Netlogic XLR SoC" 1425 + depends on SYS_HAS_CPU_XLR 1426 + select CPU_SUPPORTS_32BIT_KERNEL 1427 + select CPU_SUPPORTS_64BIT_KERNEL 1428 + select CPU_SUPPORTS_HIGHMEM 1429 + select WEAK_ORDERING 1430 + select WEAK_REORDERING_BEYOND_LLSC 1431 + select CPU_SUPPORTS_HUGEPAGES 1432 + help 1433 + Netlogic Microsystems XLR/XLS processors. 1451 1434 endchoice 1452 1435 1453 1436 if CPU_LOONGSON2F ··· 1587 1548 bool 1588 1549 1589 1550 config SYS_HAS_CPU_BMIPS5000 1551 + bool 1552 + 1553 + config SYS_HAS_CPU_XLR 1590 1554 bool 1591 1555 1592 1556 #
+12
arch/mips/Makefile
··· 191 191 # 192 192 include $(srctree)/arch/mips/Kbuild.platforms 193 193 194 + # 195 + # NETLOGIC SOC Common (common) 196 + # 197 + cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic 198 + cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic 199 + 200 + # 201 + # NETLOGIC XLR/XLS SoC, Simulator and boards 202 + # 203 + core-$(CONFIG_NLM_XLR) += arch/mips/netlogic/xlr/ 204 + load-$(CONFIG_NLM_XLR_BOARD) += 0xffffffff84000000 205 + 194 206 cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic 195 207 drivers-$(CONFIG_PCI) += arch/mips/pci/ 196 208
+1
arch/mips/kernel/Makefile
··· 52 52 obj-$(CONFIG_CPU_TX49XX) += r4k_fpu.o r4k_switch.o 53 53 obj-$(CONFIG_CPU_VR41XX) += r4k_fpu.o r4k_switch.o 54 54 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += octeon_switch.o 55 + obj-$(CONFIG_CPU_XLR) += r4k_fpu.o r4k_switch.o 55 56 56 57 obj-$(CONFIG_SMP) += smp.o 57 58 obj-$(CONFIG_SMP_UP) += smp-up.o
+1
arch/mips/lib/Makefile
··· 28 28 obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o 29 29 obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o 30 30 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += dump_tlb.o 31 + obj-$(CONFIG_CPU_XLR) += dump_tlb.o 31 32 32 33 # libgcc-style stuff needed in the kernel 33 34 obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o
+1
arch/mips/mm/Makefile
··· 29 29 obj-$(CONFIG_CPU_TX49XX) += c-r4k.o cex-gen.o tlb-r4k.o 30 30 obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex-gen.o tlb-r4k.o 31 31 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += c-octeon.o cex-oct.o tlb-r4k.o 32 + obj-$(CONFIG_CPU_XLR) += c-r4k.o tlb-r4k.o cex-gen.o 32 33 33 34 obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o 34 35 obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
+5
arch/mips/netlogic/Kconfig
··· 1 + config NLM_COMMON 2 + bool 3 + 4 + config NLM_XLR 5 + bool
+5
arch/mips/netlogic/xlr/Makefile
··· 1 + obj-y += setup.o platform.o irq.o setup.o time.o 2 + obj-$(CONFIG_SMP) += smp.o smpboot.o 3 + obj-$(CONFIG_EARLY_PRINTK) += xlr_console.o 4 + 5 + EXTRA_CFLAGS += -Werror