Commit 63ae0e5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix port 0 mac address for mips mv6434x platforms
  [SERIAL] serial_txx9 driver update
  Revert "[PATCH] Generic ioremap_page_range: mips conversion"
  [MIPS] Cobalt: Rename "Colo" MTD partition to "firmware".
  [MIPS] SMP: Get smp_tune_scheduling to do something useful.
  [MIPS] Add basic SMARTMIPS ASE support
parents a22a0fab 2e8e2d49

arch/mips/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ config MIPS_ATLAS 
	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL

	select SYS_SUPPORTS_SMARTMIPS

	select GENERIC_HARDIRQS_NO__DO_IRQ

	help

	  This enables support for the MIPS Technologies Atlas evaluation
@@ -305,6 +306,7 @@ config MIPS_MALTA 
	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_SMARTMIPS

	help

	  This enables support for the MIPS Technologies Malta evaluation

	  board.
@@ -322,6 +324,7 @@ config MIPS_SEAD 
	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_SMARTMIPS

	help

	  This enables support for the MIPS Technologies SEAD evaluation

	  board.
@@ -1641,6 +1644,18 @@ config 64BIT_PHYS_ADDR 
config CPU_HAS_LLSC

	bool



config CPU_HAS_SMARTMIPS

	depends on SYS_SUPPORTS_SMARTMIPS

	bool "Support for the SmartMIPS ASE"

	help

	  SmartMIPS is a extension of the MIPS32 architecture aimed at

	  increased security at both hardware and software level for

	  smartcards.  Enabling this option will allow proper use of the

	  SmartMIPS instructions by Linux applications.  However a kernel with

	  this option will not work on a MIPS core without SmartMIPS core.  If

	  you don't know you probably don't have SmartMIPS and should say N

	  here.



config CPU_HAS_WB

	bool
@@ -1704,6 +1719,9 @@ config CPU_SUPPORTS_HIGHMEM 
config SYS_SUPPORTS_HIGHMEM

	bool



config SYS_SUPPORTS_SMARTMIPS

	bool



config ARCH_FLATMEM_ENABLE

	def_bool y

	depends on !NUMA

arch/mips/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ predef-le += -DMIPSEL -D_MIPSEL -D__MIPSEL -D__MIPSEL__ 
cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB $(undef-all) $(predef-be))

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le))



cflags-$(CONFIG_CPU_HAS_SMARTMIPS)	+= $(call cc-option,-msmartmips)



cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \

				   -fno-omit-frame-pointer

arch/mips/cobalt/mtd.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


static struct mtd_partition cobalt_mtd_partitions[] = {

	{

		.name	= "Colo",

		.name	= "firmware",

		.offset	= 0x0,

		.size	= 0x80000,

	},

arch/mips/configs/atlas_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -139,10 +139,12 @@ CONFIG_MIPS_MT_DISABLED=y 
CONFIG_SYS_SUPPORTS_MULTITHREADING=y

# CONFIG_64BIT_PHYS_ADDR is not set

CONFIG_CPU_HAS_LLSC=y

# CONFIG_CPU_HAS_SMARTMIPS is not set

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_CPU_SUPPORTS_HIGHMEM=y

CONFIG_SYS_SUPPORTS_SMARTMIPS=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

arch/mips/configs/bigsur_defconfig

+3 −2
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.20

# Sun Feb 18 21:27:35 2007

# Tue Feb 20 21:47:22 2007

#

CONFIG_MIPS=y
@@ -417,6 +417,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
#

# Plug and Play support

#

# CONFIG_PNPACPI is not set



#

# Block devices
@@ -589,6 +590,7 @@ CONFIG_NET_SB1250_MAC=y 
# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set



#

# Ethernet (10000 Mbit)
@@ -1025,7 +1027,6 @@ CONFIG_FORCED_INLINING=y 
CONFIG_CROSSCOMPILE=y

CONFIG_CMDLINE=""

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_KGDB is not set

# CONFIG_SB1XXX_CORELIS is not set

# CONFIG_RUNTIME_DEBUG is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE