Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3d1f174 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)
  MIPS: PowerTV: Separate PowerTV USB support from non-USB code
  MIPS: strip the un-needed sections of vmlinuz
  MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS
  MIPS: Clean up arch/mips/boot/compressed/decompress.c
  MIPS: Clean up arch/mips/boot/compressed/ld.script
  MIPS: Unify the suffix of compressed vmlinux.bin
  MIPS: PowerTV: Add Gaia platform definitions.
  MIPS: BCM47xx: Fix nvram_getenv return value.
  MIPS: Octeon: Allow more than 3.75GB of memory with PCIe
  MIPS: Clean up notify_die() usage.
  MIPS: Remove unused task_struct.trap_no field.
  Documentation: Mention that KProbes is supported on MIPS
  SAMPLES: kprobe_example: Make it print something on MIPS.
  MIPS: kprobe: Add support.
  MIPS: Add instrunction format for BREAK and SYSCALL
  MIPS: kprobes: Define regs_return_value()
  MIPS: Ritually kill stupid printk.
  MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.
  MIPS: Octeon: Support 256 MSI on PCIe
  MIPS: Decode core number for R2 CPUs.
  ...
parents 66eddbfc 0d365753

Documentation/kprobes.txt

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ architectures: 
- sparc64 (Return probes not yet implemented.)

- arm

- ppc

- mips



3. Configuring Kprobes

arch/mips/Kbuild

0 → 100644
+15 −0
Original line number Diff line number Diff line 
# Fail on warnings - also for files referenced in subdirs

# -Werror can be disabled for specific files using:

# CFLAGS_<file.o> := -Wno-error

subdir-ccflags-y := -Werror



# platform specific definitions

include arch/mips/Kbuild.platforms

obj-y := $(platform-y)



# mips object files

# The object files are linked as core-y files would be linked



obj-y += kernel/

obj-y += mm/

obj-y += math-emu/

arch/mips/Kbuild.platforms

0 → 100644
+32 −0
Original line number Diff line number Diff line 
# All platforms listed in alphabetic order



platforms += alchemy

platforms += ar7

platforms += bcm47xx

platforms += bcm63xx

platforms += cavium-octeon

platforms += cobalt

platforms += dec

platforms += emma

platforms += jazz

platforms += jz4740

platforms += lasat

platforms += loongson

platforms += mipssim

platforms += mti-malta

platforms += pmc-sierra

platforms += pnx833x

platforms += pnx8550

platforms += powertv

platforms += rb532

platforms += sgi-ip22

platforms += sgi-ip27

platforms += sgi-ip32

platforms += sibyte

platforms += sni

platforms += txx9

platforms += vr41xx

platforms += wrppmc



# include the platform specific files

include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))

arch/mips/Kconfig

+29 −1
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ config MIPS 
	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select RTC_LIB if !MACH_LOONGSON



mainmenu "Linux/MIPS Kernel Configuration"
@@ -23,8 +25,17 @@ choice 
	prompt "System type"

	default SGI_IP22



config MACH_ALCHEMY

config MIPS_ALCHEMY

	bool "Alchemy processor based machines"

	select 64BIT_PHYS_ADDR

	select CEVT_R4K_LIB

	select CSRC_R4K_LIB

	select IRQ_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_APM_EMULATION

	select GENERIC_GPIO

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select SYS_SUPPORTS_ZBOOT



config AR7
@@ -62,6 +73,7 @@ config BCM47XX 
	select SSB_DRIVER_MIPS

	select SSB_DRIVER_EXTIF

	select SSB_EMBEDDED

	select SSB_B43_PCI_BRIDGE if PCI

	select SSB_PCICORE_HOSTMODE if PCI

	select GENERIC_GPIO

	select SYS_HAS_EARLY_PRINTK
@@ -162,6 +174,18 @@ config MACH_JAZZ 
	 Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and

	 Olivetti M700-10 workstations.



config MACH_JZ4740

	bool "Ingenic JZ4740 based machines"

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select DMA_NONCOHERENT

	select IRQ_CPU

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select SYS_HAS_EARLY_PRINTK

	select HAVE_PWM



config LASAT

	bool "LASAT Networks platforms"

	select CEVT_R4K
@@ -686,6 +710,7 @@ endchoice 
source "arch/mips/alchemy/Kconfig"

source "arch/mips/bcm63xx/Kconfig"

source "arch/mips/jazz/Kconfig"

source "arch/mips/jz4740/Kconfig"

source "arch/mips/lasat/Kconfig"

source "arch/mips/pmc-sierra/Kconfig"

source "arch/mips/powertv/Kconfig"
@@ -892,6 +917,9 @@ config CPU_LITTLE_ENDIAN 


endchoice



config EXPORT_UASM

	bool



config SYS_SUPPORTS_APM_EMULATION

	bool

arch/mips/Makefile

+17 −505
Original line number Diff line number Diff line
@@ -130,26 +130,6 @@ cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap 
cflags-$(CONFIG_CPU_VR41XX)	+= -march=r4100 -Wa,--trap

cflags-$(CONFIG_CPU_R4X00)	+= -march=r4600 -Wa,--trap

cflags-$(CONFIG_CPU_TX49XX)	+= -march=r4600 -Wa,--trap

# only gcc >= 4.4 have the loongson-specific support

cflags-$(CONFIG_CPU_LOONGSON2)	+= -Wa,--trap

cflags-$(CONFIG_CPU_LOONGSON2E) += \

	$(call cc-option,-march=loongson2e,-march=r4600)

cflags-$(CONFIG_CPU_LOONGSON2F) += \

	$(call cc-option,-march=loongson2f,-march=r4600)

# enable the workarounds for loongson2f

ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS

  ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),)

    $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-nop)

  else

    cflags-$(CONFIG_CPU_NOP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-nop

  endif

  ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-jump,),)

    $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-jump)

  else

    cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-jump

  endif

endif



cflags-$(CONFIG_CPU_MIPS32_R1)	+= $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \

			-Wa,-mips32 -Wa,--trap

cflags-$(CONFIG_CPU_MIPS32_R2)	+= $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
@@ -209,455 +189,7 @@ endif 
#

# Board-dependent options and extra files

#



#

# Texas Instruments AR7

#

core-$(CONFIG_AR7)		+= arch/mips/ar7/

cflags-$(CONFIG_AR7)		+= -I$(srctree)/arch/mips/include/asm/mach-ar7

load-$(CONFIG_AR7)		+= 0xffffffff94100000



#

# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.

#

core-$(CONFIG_MACH_JAZZ)	+= arch/mips/jazz/

cflags-$(CONFIG_MACH_JAZZ)	+= -I$(srctree)/arch/mips/include/asm/mach-jazz

load-$(CONFIG_MACH_JAZZ)	+= 0xffffffff80080000



#

# Common Alchemy Au1x00 stuff

#

core-$(CONFIG_SOC_AU1X00)	+= arch/mips/alchemy/common/



#

# AMD Alchemy Pb1000 eval board

#

core-$(CONFIG_MIPS_PB1000)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1000)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1100 eval board

#

core-$(CONFIG_MIPS_PB1100)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1100)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1100)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1500 eval board

#

core-$(CONFIG_MIPS_PB1500)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1500)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1500)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1550 eval board

#

core-$(CONFIG_MIPS_PB1550)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1550)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1550)	+= 0xffffffff80100000



#

# AMD Alchemy Pb1200 eval board

#

core-$(CONFIG_MIPS_PB1200)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_PB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-pb1x00

load-$(CONFIG_MIPS_PB1200)	+= 0xffffffff80100000



#

# AMD Alchemy Db1000 eval board

#

core-$(CONFIG_MIPS_DB1000)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1000)	+= 0xffffffff80100000



#

# AMD Alchemy Db1100 eval board

#

core-$(CONFIG_MIPS_DB1100)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1100)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1100)	+= 0xffffffff80100000



#

# AMD Alchemy Db1500 eval board

#

core-$(CONFIG_MIPS_DB1500)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1500)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1500)	+= 0xffffffff80100000



#

# AMD Alchemy Db1550 eval board

#

core-$(CONFIG_MIPS_DB1550)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1550)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1550)	+= 0xffffffff80100000



#

# AMD Alchemy Db1200 eval board

#

core-$(CONFIG_MIPS_DB1200)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_DB1200)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_DB1200)	+= 0xffffffff80100000



#

# AMD Alchemy Bosporus eval board

#

core-$(CONFIG_MIPS_BOSPORUS)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_BOSPORUS)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_BOSPORUS)	+= 0xffffffff80100000



#

# AMD Alchemy Mirage eval board

#

core-$(CONFIG_MIPS_MIRAGE)	+= arch/mips/alchemy/devboards/

cflags-$(CONFIG_MIPS_MIRAGE)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00

load-$(CONFIG_MIPS_MIRAGE)	+= 0xffffffff80100000



#

# 4G-Systems eval board

#

libs-$(CONFIG_MIPS_MTX1)	+= arch/mips/alchemy/mtx-1/

load-$(CONFIG_MIPS_MTX1)	+= 0xffffffff80100000



#

# MyCable eval board

#

libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips/alchemy/xxs1500/

load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000



# must be last for Alchemy systems for GPIO to work properly

cflags-$(CONFIG_SOC_AU1X00)	+= -I$(srctree)/arch/mips/include/asm/mach-au1x00





#

# Cobalt Server

#

core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/

cflags-$(CONFIG_MIPS_COBALT)	+= -I$(srctree)/arch/mips/include/asm/mach-cobalt

load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000



#

# DECstation family

#

core-$(CONFIG_MACH_DECSTATION)	+= arch/mips/dec/

cflags-$(CONFIG_MACH_DECSTATION)+= -I$(srctree)/arch/mips/include/asm/mach-dec

libs-$(CONFIG_MACH_DECSTATION)	+= arch/mips/dec/prom/

load-$(CONFIG_MACH_DECSTATION)	+= 0xffffffff80040000



#

# Wind River PPMC Board (4KC + GT64120)

#

core-$(CONFIG_WR_PPMC)		+= arch/mips/gt64120/wrppmc/

cflags-$(CONFIG_WR_PPMC)		+= -I$(srctree)/arch/mips/include/asm/mach-wrppmc

load-$(CONFIG_WR_PPMC)		+= 0xffffffff80100000



#

# Loongson family

#

core-$(CONFIG_MACH_LOONGSON) += arch/mips/loongson/

cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson \

                    -mno-branch-likely

load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000

load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000



#

# MIPS Malta board

#

core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mti-malta/

cflags-$(CONFIG_MIPS_MALTA)	+= -I$(srctree)/arch/mips/include/asm/mach-malta

load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000

all-$(CONFIG_MIPS_MALTA)	:= $(COMPRESSION_FNAME).bin



#

# MIPS SIM

#

core-$(CONFIG_MIPS_SIM)		+= arch/mips/mipssim/

cflags-$(CONFIG_MIPS_SIM)	+= -I$(srctree)/arch/mips/include/asm/mach-mipssim

load-$(CONFIG_MIPS_SIM)		+= 0x80100000



#

# PMC-Sierra MSP SOCs

#

core-$(CONFIG_PMC_MSP)		+= arch/mips/pmc-sierra/msp71xx/

cflags-$(CONFIG_PMC_MSP)	+= -I$(srctree)/arch/mips/include/asm/pmc-sierra/msp71xx \

					-mno-branch-likely

load-$(CONFIG_PMC_MSP)		+= 0xffffffff80100000



#

# PMC-Sierra Yosemite

#

core-$(CONFIG_PMC_YOSEMITE)	+= arch/mips/pmc-sierra/yosemite/

cflags-$(CONFIG_PMC_YOSEMITE)	+= -I$(srctree)/arch/mips/include/asm/mach-yosemite

load-$(CONFIG_PMC_YOSEMITE)	+= 0xffffffff80100000



#

# LASAT platforms

#

core-$(CONFIG_LASAT)		+= arch/mips/lasat/

cflags-$(CONFIG_LASAT)		+= -I$(srctree)/arch/mips/include/asm/mach-lasat

load-$(CONFIG_LASAT)		+= 0xffffffff80000000



#

# Common VR41xx

#

core-$(CONFIG_MACH_VR41XX)	+= arch/mips/vr41xx/common/

cflags-$(CONFIG_MACH_VR41XX)	+= -I$(srctree)/arch/mips/include/asm/mach-vr41xx



#

# ZAO Networks Capcella (VR4131)

#

load-$(CONFIG_ZAO_CAPCELLA)	+= 0xffffffff80000000



#

# Victor MP-C303/304 (VR4122)

#

load-$(CONFIG_VICTOR_MPC30X)	+= 0xffffffff80001000



#

# IBM WorkPad z50 (VR4121)

#

core-$(CONFIG_IBM_WORKPAD)	+= arch/mips/vr41xx/ibm-workpad/

load-$(CONFIG_IBM_WORKPAD)	+= 0xffffffff80004000



#

# CASIO CASSIPEIA E-55/65 (VR4111)

#

core-$(CONFIG_CASIO_E55)	+= arch/mips/vr41xx/casio-e55/

load-$(CONFIG_CASIO_E55)	+= 0xffffffff80004000



#

# TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131)

#

load-$(CONFIG_TANBAC_TB022X)	+= 0xffffffff80000000



# NXP STB225

core-$(CONFIG_SOC_PNX833X)		+= arch/mips/nxp/pnx833x/common/

cflags-$(CONFIG_SOC_PNX833X)	+= -Iarch/mips/include/asm/mach-pnx833x

libs-$(CONFIG_NXP_STB220)		+= arch/mips/nxp/pnx833x/stb22x/

load-$(CONFIG_NXP_STB220)		+= 0xffffffff80001000

libs-$(CONFIG_NXP_STB225)		+= arch/mips/nxp/pnx833x/stb22x/

load-$(CONFIG_NXP_STB225)		+= 0xffffffff80001000



#

# Common NXP PNX8550

#

core-$(CONFIG_SOC_PNX8550)	+= arch/mips/nxp/pnx8550/common/

cflags-$(CONFIG_SOC_PNX8550)	+= -I$(srctree)/arch/mips/include/asm/mach-pnx8550



#

# NXP PNX8550 JBS board

#

libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/nxp/pnx8550/jbs/

#cflags-$(CONFIG_PNX8550_JBS)	+= -I$(srctree)/arch/mips/include/asm/mach-pnx8550

load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000



# NXP PNX8550 STB810 board

#

libs-$(CONFIG_PNX8550_STB810)	+= arch/mips/nxp/pnx8550/stb810/

load-$(CONFIG_PNX8550_STB810)	+= 0xffffffff80060000



#

# Common NEC EMMAXXX

#

core-$(CONFIG_SOC_EMMA2RH)	+= arch/mips/emma/common/

cflags-$(CONFIG_SOC_EMMA2RH)	+= -I$(srctree)/arch/mips/include/asm/mach-emma2rh



#

# NEC EMMA2RH Mark-eins

#

core-$(CONFIG_NEC_MARKEINS)	+= arch/mips/emma/markeins/

load-$(CONFIG_NEC_MARKEINS)	+= 0xffffffff88100000



#

# Cisco PowerTV Platform

#

core-$(CONFIG_POWERTV)		+= arch/mips/powertv/

cflags-$(CONFIG_POWERTV)        += -I$(srctree)/arch/mips/include/asm/mach-powertv

load-$(CONFIG_POWERTV)		+= 0xffffffff90800000



#

# SGI IP22 (Indy/Indigo2)

#

# Set the load address to >= 0xffffffff88069000 if you want to leave space for

# symmon, 0xffffffff80002000 for production kernels.  Note that the value must

# be aligned to a multiple of the kernel stack size or the handling of the

# current variable will break so for 64-bit kernels we have to raise the start

# address by 8kb.

#

core-$(CONFIG_SGI_IP22)		+= arch/mips/sgi-ip22/

cflags-$(CONFIG_SGI_IP22)	+= -I$(srctree)/arch/mips/include/asm/mach-ip22

ifdef CONFIG_32BIT

load-$(CONFIG_SGI_IP22)		+= 0xffffffff88002000

endif

ifdef CONFIG_64BIT

load-$(CONFIG_SGI_IP22)		+= 0xffffffff88004000

endif



#

# SGI-IP27 (Origin200/2000)

#

# Set the load address to >= 0xc000000000300000 if you want to leave space for

# symmon, 0xc00000000001c000 for production kernels.  Note that the value must

# be 16kb aligned or the handling of the current variable will break.

#

ifdef CONFIG_SGI_IP27

core-$(CONFIG_SGI_IP27)		+= arch/mips/sgi-ip27/

cflags-$(CONFIG_SGI_IP27)	+= -I$(srctree)/arch/mips/include/asm/mach-ip27

ifdef CONFIG_MAPPED_KERNEL

load-$(CONFIG_SGI_IP27)		+= 0xc00000004001c000

OBJCOPYFLAGS			:= --change-addresses=0x3fffffff80000000

dataoffset-$(CONFIG_SGI_IP27)	+= 0x01000000

else

load-$(CONFIG_SGI_IP27)		+= 0xa80000000001c000

OBJCOPYFLAGS			:= --change-addresses=0x57ffffff80000000

endif

endif



#

# SGI IP28 (Indigo2 R10k)

#

# Set the load address to >= 0xa800000020080000 if you want to leave space for

# symmon, 0xa800000020004000 for production kernels ?  Note that the value must

# be 16kb aligned or the handling of the current variable will break.

# Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys

#

ifdef CONFIG_SGI_IP28

  ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)

      $(error gcc doesn't support needed option -mr10k-cache-barrier=store)

  endif

endif

core-$(CONFIG_SGI_IP28)		+= arch/mips/sgi-ip22/

cflags-$(CONFIG_SGI_IP28)	+= -mr10k-cache-barrier=store -I$(srctree)/arch/mips/include/asm/mach-ip28

load-$(CONFIG_SGI_IP28)		+= 0xa800000020004000



#

# SGI-IP32 (O2)

#

# Set the load address to >= 80069000 if you want to leave space for symmon,

# 0xffffffff80004000 for production kernels.  Note that the value must be aligned to

# a multiple of the kernel stack size or the handling of the current variable

# will break.

#

core-$(CONFIG_SGI_IP32)		+= arch/mips/sgi-ip32/

cflags-$(CONFIG_SGI_IP32)	+= -I$(srctree)/arch/mips/include/asm/mach-ip32

load-$(CONFIG_SGI_IP32)		+= 0xffffffff80004000



#

# Sibyte SB1250/BCM1480 SOC

#

# This is a LIB so that it links at the end, and initcalls are later

# the sequence; but it is built as an object so that modules don't get

# removed (as happens, even if they have __initcall/module_init)

#

core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/sb1250/

core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/common/

cflags-$(CONFIG_SIBYTE_BCM112X)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL



core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/sb1250/

core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/common/

cflags-$(CONFIG_SIBYTE_SB1250)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL



core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/bcm1480/

core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/common/

cflags-$(CONFIG_SIBYTE_BCM1x55)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL



core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/bcm1480/

core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/common/

cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -I$(srctree)/arch/mips/include/asm/mach-sibyte \

			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL



#

# Sibyte BCM91120x (Carmel) board

# Sibyte BCM91120C (CRhine) board

# Sibyte BCM91125C (CRhone) board

# Sibyte BCM91125E (Rhone) board

# Sibyte SWARM board

# Sibyte BCM91x80 (BigSur) board

#

core-$(CONFIG_SIBYTE_CARMEL)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_CARMEL)	:= 0xffffffff80100000

core-$(CONFIG_SIBYTE_CRHINE)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_CRHINE)	:= 0xffffffff80100000

core-$(CONFIG_SIBYTE_CRHONE)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_CRHONE)	:= 0xffffffff80100000

core-$(CONFIG_SIBYTE_RHONE)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_RHONE)	:= 0xffffffff80100000

core-$(CONFIG_SIBYTE_SENTOSA)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_SENTOSA)	:= 0xffffffff80100000

core-$(CONFIG_SIBYTE_SWARM)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_SWARM)	:= 0xffffffff80100000

core-$(CONFIG_SIBYTE_BIGSUR)	+= arch/mips/sibyte/swarm/

load-$(CONFIG_SIBYTE_BIGSUR)	:= 0xffffffff80100000



#

# Broadcom BCM47XX boards

#

core-$(CONFIG_BCM47XX)		+= arch/mips/bcm47xx/

cflags-$(CONFIG_BCM47XX)	+= -I$(srctree)/arch/mips/include/asm/mach-bcm47xx

load-$(CONFIG_BCM47XX)		:= 0xffffffff80001000



#

# Broadcom BCM63XX boards

#

core-$(CONFIG_BCM63XX)		+= arch/mips/bcm63xx/

cflags-$(CONFIG_BCM63XX)	+= -I$(srctree)/arch/mips/include/asm/mach-bcm63xx/

load-$(CONFIG_BCM63XX)		:= 0xffffffff80010000



#

# SNI RM

#

core-$(CONFIG_SNI_RM)		+= arch/mips/sni/

cflags-$(CONFIG_SNI_RM)		+= -I$(srctree)/arch/mips/include/asm/mach-rm

ifdef CONFIG_CPU_LITTLE_ENDIAN

load-$(CONFIG_SNI_RM)		+= 0xffffffff80600000

else

load-$(CONFIG_SNI_RM)		+= 0xffffffff80030000

endif

all-$(CONFIG_SNI_RM)		:= $(COMPRESSION_FNAME).ecoff



#

# Common TXx9

#

core-$(CONFIG_MACH_TX39XX)	+= arch/mips/txx9/generic/

cflags-$(CONFIG_MACH_TX39XX) += -I$(srctree)/arch/mips/include/asm/mach-tx39xx

load-$(CONFIG_MACH_TX39XX)	+= 0xffffffff80050000

core-$(CONFIG_MACH_TX49XX)	+= arch/mips/txx9/generic/

cflags-$(CONFIG_MACH_TX49XX) += -I$(srctree)/arch/mips/include/asm/mach-tx49xx

load-$(CONFIG_MACH_TX49XX)	+= 0xffffffff80100000



#

# Toshiba JMR-TX3927 board

#

core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/txx9/jmr3927/



#

# Routerboard 532 board

#

core-$(CONFIG_MIKROTIK_RB532)	+= arch/mips/rb532/

cflags-$(CONFIG_MIKROTIK_RB532) += -I$(srctree)/arch/mips/include/asm/mach-rc32434

load-$(CONFIG_MIKROTIK_RB532)	+= 0xffffffff80101000



#

# Toshiba RBTX49XX boards

#

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

include $(srctree)/arch/mips/Kbuild.platforms



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

drivers-$(CONFIG_PCI)		+= arch/mips/pci/
@@ -706,7 +238,8 @@ head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o 


libs-y			+= arch/mips/lib/



core-y			+= arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/

# See arch/mips/Kbuild for content of core part of the kernel

core-y += arch/mips/



drivers-$(CONFIG_OPROFILE)	+= arch/mips/oprofile/
@@ -726,6 +259,9 @@ endif 
vmlinux.32: vmlinux

	$(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@





#obj-$(CONFIG_KPROBES)		+= kprobes.o



#

# The 64-bit ELF tools are pretty broken so at this time we generate 64-bit

# ELF files from 32-bit files by conversion.
@@ -733,35 +269,19 @@ vmlinux.32: vmlinux 
vmlinux.64: vmlinux

	$(OBJCOPY) -O $(64bit-bfd) $(OBJCOPYFLAGS) $< $@



makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) $(1)

makezboot =$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \

	   VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $(1)



all:	$(all-y)



vmlinuz: vmlinux FORCE

	+@$(call makezboot,$@)

# boot

vmlinux.bin vmlinux.ecoff vmlinux.srec: $(vmlinux-32) FORCE

	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@



vmlinuz.bin: vmlinux

	+@$(call makezboot,$@)

# boot/compressed

vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE

	$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \

	   VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@



vmlinuz.ecoff: vmlinux

	+@$(call makezboot,$@)



vmlinuz.srec: vmlinux

	+@$(call makezboot,$@)



vmlinux.bin: $(vmlinux-32)

	+@$(call makeboot,$@)



vmlinux.ecoff: $(vmlinux-32)

	+@$(call makeboot,$@)



vmlinux.srec: $(vmlinux-32)

	+@$(call makeboot,$@)



CLEAN_FILES += vmlinux.ecoff \

	       vmlinux.srec

CLEAN_FILES += vmlinux.32 vmlinux.64



archprepare:

ifdef CONFIG_MIPS32_N32
@@ -780,9 +300,9 @@ install: 
	$(Q)install -D -m 644 System.map $(INSTALL_PATH)/System.map-$(KERNELRELEASE)



archclean:

	@$(MAKE) $(clean)=arch/mips/boot

	@$(MAKE) $(clean)=arch/mips/boot/compressed

	@$(MAKE) $(clean)=arch/mips/lasat

	$(Q)$(MAKE) $(clean)=arch/mips/boot

	$(Q)$(MAKE) $(clean)=arch/mips/boot/compressed

	$(Q)$(MAKE) $(clean)=arch/mips/lasat



define archhelp

	echo '  install              - install kernel into $(INSTALL_PATH)'
@@ -796,11 +316,3 @@ define archhelp 
	echo

	echo '  These will be default as apropriate for a configured platform.'

endef
 


CLEAN_FILES += vmlinux.32 \

	       vmlinux.64 \

	       vmlinux.ecoff \

	       vmlinuz \

	       vmlinuz.ecoff \

	       vmlinuz.bin \

	       vmlinuz.srec