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>

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>
Jayachandran C · Ralf Baechle
1 parent 5c64250674
Showing 7 changed files with 67 additions and 0 deletions Side-by-side Diff
arch/mips/Kconfig
arch/mips/Makefile
arch/mips/kernel/Makefile
arch/mips/lib/Makefile
arch/mips/mm/Makefile
arch/mips/netlogic/Kconfig
arch/mips/netlogic/xlr/Makefile
@@ -736,6 +736,33 @@
 		Hikari
 	  Say Y here for most Octeon reference boards.
  
+config NLM_XLR_BOARD
+	bool "Netlogic XLR/XLS based systems"
+	depends on EXPERIMENTAL
+	select BOOT_ELF32
+	select NLM_COMMON
+	select NLM_XLR
+	select SYS_HAS_CPU_XLR
+	select SYS_SUPPORTS_SMP
+	select HW_HAS_PCI
+	select SWAP_IO_SPACE
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_64BIT_KERNEL
+	select 64BIT_PHYS_ADDR
+	select SYS_SUPPORTS_BIG_ENDIAN
+	select SYS_SUPPORTS_HIGHMEM
+	select DMA_COHERENT
+	select NR_CPUS_DEFAULT_32
+	select CEVT_R4K
+	select CSRC_R4K
+	select IRQ_CPU
+	select ZONE_DMA if 64BIT
+	select SYNC_R4K
+	select SYS_HAS_EARLY_PRINTK
+	help
+	  Support for systems based on Netlogic XLR and XLS processors.
+	  Say Y here if you have a XLR or XLS based board.
+
 endchoice
  
 source "arch/mips/alchemy/Kconfig"
@@ -752,6 +779,7 @@
 source "arch/mips/vr41xx/Kconfig"
 source "arch/mips/cavium-octeon/Kconfig"
 source "arch/mips/loongson/Kconfig"
+source "arch/mips/netlogic/Kconfig"
  
 endmenu
  
@@ -1420,6 +1448,17 @@
 	help
 	  Broadcom BMIPS5000 processors.
  
+config CPU_XLR
+	bool "Netlogic XLR SoC"
+	depends on SYS_HAS_CPU_XLR
+	select CPU_SUPPORTS_32BIT_KERNEL
+	select CPU_SUPPORTS_64BIT_KERNEL
+	select CPU_SUPPORTS_HIGHMEM
+	select WEAK_ORDERING
+	select WEAK_REORDERING_BEYOND_LLSC
+	select CPU_SUPPORTS_HUGEPAGES
+	help
+	  Netlogic Microsystems XLR/XLS processors.
 endchoice
  
 if CPU_LOONGSON2F
@@ -1548,6 +1587,9 @@
 	bool
  
 config SYS_HAS_CPU_BMIPS5000
+	bool
+
+config SYS_HAS_CPU_XLR
 	bool
  
 #
@@ -191,6 +191,18 @@
 #
 include $(srctree)/arch/mips/Kbuild.platforms
  
+#
+# NETLOGIC SOC Common (common)
+#
+cflags-$(CONFIG_NLM_COMMON)		+= -I$(srctree)/arch/mips/include/asm/mach-netlogic
+cflags-$(CONFIG_NLM_COMMON)		+= -I$(srctree)/arch/mips/include/asm/netlogic
+
+#
+# NETLOGIC XLR/XLS SoC, Simulator and boards
+#
+core-$(CONFIG_NLM_XLR)      		+= arch/mips/netlogic/xlr/
+load-$(CONFIG_NLM_XLR_BOARD)		+= 0xffffffff84000000
+
 cflags-y			+= -I$(srctree)/arch/mips/include/asm/mach-generic
 drivers-$(CONFIG_PCI)		+= arch/mips/pci/
  
@@ -52,6 +52,7 @@
 obj-$(CONFIG_CPU_TX49XX)	+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_VR41XX)	+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= octeon_switch.o
+obj-$(CONFIG_CPU_XLR)		+= r4k_fpu.o r4k_switch.o
  
 obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_SMP_UP)		+= smp-up.o
@@ -28,6 +28,7 @@
 obj-$(CONFIG_CPU_TX49XX)	+= dump_tlb.o
 obj-$(CONFIG_CPU_VR41XX)	+= dump_tlb.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= dump_tlb.o
+obj-$(CONFIG_CPU_XLR)		+= dump_tlb.o
  
 # libgcc-style stuff needed in the kernel
 obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o
@@ -29,6 +29,7 @@
 obj-$(CONFIG_CPU_TX49XX)	+= c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_VR41XX)	+= c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= c-octeon.o cex-oct.o tlb-r4k.o
+obj-$(CONFIG_CPU_XLR)		+= c-r4k.o tlb-r4k.o cex-gen.o
  
 obj-$(CONFIG_IP22_CPU_SCACHE)	+= sc-ip22.o
 obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
+config NLM_COMMON
+	bool
+
+config NLM_XLR
+	bool
+obj-y				+= setup.o platform.o irq.o setup.o time.o
+obj-$(CONFIG_SMP)		+= smp.o smpboot.o
+obj-$(CONFIG_EARLY_PRINTK)	+= xlr_console.o
+
+EXTRA_CFLAGS			+= -Werror
...	...	@@ -736,6 +736,33 @@
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"
...	...	@@ -752,6 +779,7 @@
752	779	source "arch/mips/vr41xx/Kconfig"
753	780	source "arch/mips/cavium-octeon/Kconfig"
754	781	source "arch/mips/loongson/Kconfig"
	782	+source "arch/mips/netlogic/Kconfig"
755	783
756	784	endmenu
757	785
...	...	@@ -1420,6 +1448,17 @@
1420	1448	help
1421	1449	Broadcom BMIPS5000 processors.
1422	1450
	1451	+config CPU_XLR
	1452	+ bool "Netlogic XLR SoC"
	1453	+ depends on SYS_HAS_CPU_XLR
	1454	+ select CPU_SUPPORTS_32BIT_KERNEL
	1455	+ select CPU_SUPPORTS_64BIT_KERNEL
	1456	+ select CPU_SUPPORTS_HIGHMEM
	1457	+ select WEAK_ORDERING
	1458	+ select WEAK_REORDERING_BEYOND_LLSC
	1459	+ select CPU_SUPPORTS_HUGEPAGES
	1460	+ help
	1461	+ Netlogic Microsystems XLR/XLS processors.
1423	1462	endchoice
1424	1463
1425	1464	if CPU_LOONGSON2F
...	...	@@ -1548,6 +1587,9 @@
1548	1587	bool
1549	1588
1550	1589	config SYS_HAS_CPU_BMIPS5000
	1590	+ bool
	1591	+
	1592	+config SYS_HAS_CPU_XLR
1551	1593	bool
1552	1594
1553	1595	#
...	...	@@ -191,6 +191,18 @@
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
...	...	@@ -52,6 +52,7 @@
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
...	...	@@ -28,6 +28,7 @@
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
...	...	@@ -29,6 +29,7 @@
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
	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