Commit f6e1db1b authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Octeon: Migrate to new platform makefile style. 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent f5e8abd6

arch/mips/Kbuild.platforms

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ platforms += alchemy 
platforms += ar7

platforms += bcm47xx

platforms += bcm63xx

platforms += cavium-octeon

platforms += cobalt

platforms += dec

platforms += jazz

arch/mips/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -301,18 +301,6 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/rbtx4927/ 
core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/

core-$(CONFIG_TOSHIBA_RBTX4939) += arch/mips/txx9/rbtx4939/



#

# Cavium Octeon

#

core-$(CONFIG_CPU_CAVIUM_OCTEON)	+= arch/mips/cavium-octeon/

cflags-$(CONFIG_CPU_CAVIUM_OCTEON)	+= -I$(srctree)/arch/mips/include/asm/mach-cavium-octeon

core-$(CONFIG_CPU_CAVIUM_OCTEON)	+= arch/mips/cavium-octeon/executive/

ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL

load-$(CONFIG_CPU_CAVIUM_OCTEON)	+= 0xffffffff84100000

else

load-$(CONFIG_CPU_CAVIUM_OCTEON) 	+= 0xffffffff81100000

endif



cflags-y			+= -I$(srctree)/arch/mips/include/asm/mach-generic

drivers-$(CONFIG_PCI)		+= arch/mips/pci/

arch/mips/cavium-octeon/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
obj-y := cpu.o setup.o serial.o octeon-platform.o octeon-irq.o csrc-octeon.o

obj-y += dma-octeon.o flash_setup.o

obj-y += octeon-memcpy.o

obj-y += executive/



obj-$(CONFIG_SMP)                     += smp.o
 


EXTRA_CFLAGS += -Werror

arch/mips/cavium-octeon/Platform

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#

# Cavium Octeon

#

platform-$(CONFIG_CPU_CAVIUM_OCTEON)	+= cavium-octeon/

cflags-$(CONFIG_CPU_CAVIUM_OCTEON)	+=				\

		-I$(srctree)/arch/mips/include/asm/mach-cavium-octeon

ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL

load-$(CONFIG_CPU_CAVIUM_OCTEON)	+= 0xffffffff84100000

else

load-$(CONFIG_CPU_CAVIUM_OCTEON)	+= 0xffffffff81100000

endif