Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (e8a82fd0) · Commits · e / devices / android_kernel_sony_msm8994

arch/mips/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -595,6 +595,7 @@ config SGI_IP32
		select SYS_HAS_CPU_R5000
		select SYS_HAS_CPU_R10000 if BROKEN
		select SYS_HAS_CPU_RM7000
		select SYS_HAS_CPU_NEVADA
		select SYS_SUPPORTS_64BIT_KERNEL
		select SYS_SUPPORTS_BIG_ENDIAN
		help

arch/mips/Makefile

+23 −2

Original line number	Diff line number	Diff line
		@@ -53,14 +53,17 @@ CROSS_COMPILE := $(tool-prefix)
		endif

		CHECKFLAGS-y += -D__linux__ -D__mips__ \
		-D_MIPS_SZINT=32 \
		-D_ABIO32=1 \
		-D_ABIN32=2 \
		-D_ABI64=3
		CHECKFLAGS-$(CONFIG_32BIT) += -D_MIPS_SIM=_ABIO32 \
		-D_MIPS_SZLONG=32 \
		-D_MIPS_SZPTR=32 \
		-D__PTRDIFF_TYPE__=int
		CHECKFLAGS-$(CONFIG_64BIT) += -m64 -D_MIPS_SIM=_ABI64 \
		-D_MIPS_SZLONG=64 \
		-D_MIPS_SZPTR=64 \
		-D__PTRDIFF_TYPE__="long int"
		CHECKFLAGS-$(CONFIG_CPU_BIG_ENDIAN) += -D__MIPSEB__
		CHECKFLAGS-$(CONFIG_CPU_LITTLE_ENDIAN) += -D__MIPSEL__
		@@ -166,79 +169,97 @@ echo $$gcc_abi $$gcc_opt$$gcc_cpu $$gcc_isa $$gas_abi $$gas_opt$$gas_cpu $$gas_i
		#
		cflags-$(CONFIG_CPU_R3000) += \
		$(call set_gccflags,r3000,mips1,r3000,mips1,mips1)
		CHECKFLAGS-$(CONFIG_CPU_R3000) += -D_MIPS_ISA=_MIPS_ISA_MIPS1

		cflags-$(CONFIG_CPU_TX39XX) += \
		$(call set_gccflags,r3900,mips1,r3000,mips1,mips1)
		CHECKFLAGS-$(CONFIG_CPU_TX39XX) += -D_MIPS_ISA=_MIPS_ISA_MIPS1

		cflags-$(CONFIG_CPU_R6000) += \
		$(call set_gccflags,r6000,mips2,r6000,mips2,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_R6000) += -D_MIPS_ISA=_MIPS_ISA_MIPS2

		cflags-$(CONFIG_CPU_R4300) += \
		$(call set_gccflags,r4300,mips3,r4300,mips3,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_R4300) += -D_MIPS_ISA=_MIPS_ISA_MIPS3

		cflags-$(CONFIG_CPU_VR41XX) += \
		$(call set_gccflags,r4100,mips3,r4600,mips3,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_VR41XX) += -D_MIPS_ISA=_MIPS_ISA_MIPS3

		cflags-$(CONFIG_CPU_R4X00) += \
		$(call set_gccflags,r4600,mips3,r4600,mips3,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_R4X00) += -D_MIPS_ISA=_MIPS_ISA_MIPS3

		cflags-$(CONFIG_CPU_TX49XX) += \
		$(call set_gccflags,r4600,mips3,r4600,mips3,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_TX49XX) += -D_MIPS_ISA=_MIPS_ISA_MIPS3

		cflags-$(CONFIG_CPU_MIPS32_R1) += \
		$(call set_gccflags,mips32,mips32,r4600,mips3,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_MIPS32_R1) += -D_MIPS_ISA=_MIPS_ISA_MIPS32

		cflags-$(CONFIG_CPU_MIPS32_R2) += \
		$(call set_gccflags,mips32r2,mips32r2,r4600,mips3,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_MIPS32_R2) += -D_MIPS_ISA=_MIPS_ISA_MIPS32

		cflags-$(CONFIG_CPU_MIPS64_R1) += \
		$(call set_gccflags,mips64,mips64,r4600,mips3,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_MIPS64_R1) += -D_MIPS_ISA=_MIPS_ISA_MIPS64

		cflags-$(CONFIG_CPU_MIPS64_R2) += \
		$(call set_gccflags,mips64r2,mips64r2,r4600,mips3,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_MIPS64_R2) += -D_MIPS_ISA=_MIPS_ISA_MIPS64

		cflags-$(CONFIG_CPU_R5000) += \
		$(call set_gccflags,r5000,mips4,r5000,mips4,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_R5000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4

		cflags-$(CONFIG_CPU_R5432) += \
		$(call set_gccflags,r5400,mips4,r5000,mips4,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_R5432) += -D_MIPS_ISA=_MIPS_ISA_MIPS4

		cflags-$(CONFIG_CPU_NEVADA) += \
		$(call set_gccflags,rm5200,mips4,r5000,mips4,mips2) \
		-Wa,--trap
		# $(call cc-option,-mmad)
		CHECKFLAGS-$(CONFIG_CPU_NEVADA) += -D_MIPS_ISA=_MIPS_ISA_MIPS4

		cflags-$(CONFIG_CPU_RM7000) += \
		$(call set_gccflags,rm7000,mips4,r5000,mips4,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_RM7000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4

		cflags-$(CONFIG_CPU_RM9000) += \
		$(call set_gccflags,rm9000,mips4,r5000,mips4,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_RM9000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4


		cflags-$(CONFIG_CPU_SB1) += \
		$(call set_gccflags,sb1,mips64,r5000,mips4,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_SB1) += -D_MIPS_ISA=_MIPS_ISA_MIPS64

		cflags-$(CONFIG_CPU_R8000) += \
		$(call set_gccflags,r8000,mips4,r8000,mips4,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_R8000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4

		cflags-$(CONFIG_CPU_R10000) += \
		$(call set_gccflags,r10000,mips4,r8000,mips4,mips2) \
		-Wa,--trap
		CHECKFLAGS-$(CONFIG_CPU_R10000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4

		ifdef CONFIG_CPU_SB1
		ifdef CONFIG_SB1_PASS_1_WORKAROUNDS
		@@ -369,7 +390,7 @@ load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000
		# Cobalt Server
		#
		core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/
		cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/cobalt
		cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/mach-cobalt
		load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000

		#

arch/mips/au1000/common/reset.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ void au1000_restart(char *command)
		}

		set_c0_status(ST0_BEV \| ST0_ERL);
		set_c0_config(CONF_CM_UNCACHED);
		change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
		flush_cache_all();
		write_c0_wired(0);

arch/mips/au1000/common/setup.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include <linux/delay.h>
		#include <linux/interrupt.h>
		#include <linux/module.h>
		#include <linux/pm.h>

		#include <asm/cpu.h>
		#include <asm/bootinfo.h>
		@@ -125,7 +126,7 @@ void __init plat_setup(void)
		#endif
		_machine_restart = au1000_restart;
		_machine_halt = au1000_halt;
		_machine_power_off = au1000_power_off;
		pm_power_off = au1000_power_off;
		board_time_init = au1xxx_time_init;
		board_timer_setup = au1xxx_timer_setup;

arch/mips/cobalt/int-handler.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		*/
		#include <asm/asm.h>
		#include <asm/mipsregs.h>
		#include <asm/cobalt/cobalt.h>
		#include <asm/mach-cobalt/cobalt.h>
		#include <asm/regdef.h>
		#include <asm/stackframe.h>