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

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

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3388/1: ixp23xx: add core ixp23xx support
  [ARM] 3417/1: add support for logicpd pxa270 card engine
  [ARM] 3387/1: ixp23xx: add defconfig
  [ARM] 3377/2: add support for intel xsc3 core
  [ARM] Move ice-dcc code into misc.c
  [ARM] Fix decompressor serial IO to give CRLF not LFCR
  [ARM] proc-v6: mark page table walks outer-cacheable, shared.  Enable NX.
  [ARM] nommu: trivial patch for arch/arm/lib/Makefile
  [ARM] 3416/1: Update LART site URL
  [ARM] 3415/1: Akita: Add missing EXPORT_SYMBOL
  [ARM] 3414/1: ep93xx: reset ethernet controller before uncompressing
parents d4965b3e c4713074

Documentation/arm/SA1100/Assabet

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ Installing a bootloader 




A couple of bootloaders able to boot Linux on Assabet are available:

A couple of bootloaders able to boot Linux on Assabet are available:





BLOB (http://www.lart.tudelft.nl/lartware/blob/)

BLOB (http://www.lartmaker.nl/lartware/blob/)





   BLOB is a bootloader used within the LART project.  Some contributed

   BLOB is a bootloader used within the LART project.  Some contributed

   patches were merged into BLOB to add support for Assabet.

   patches were merged into BLOB to add support for Assabet.

Documentation/arm/SA1100/LART

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,4 +11,4 @@ is under development, with plenty of others in different stages of 
planning.

planning.





The hardware designs for this board have been released under an open license;

The hardware designs for this board have been released under an open license;

see the LART page at http://www.lart.tudelft.nl/ for more information.
 
see the LART page at http://www.lartmaker.nl/ for more information.

arch/arm/Kconfig

+10 −1
Original line number Original line Diff line number Diff line
@@ -153,6 +153,12 @@ config ARCH_IXP2000 
	help

	help

	  Support for Intel's IXP2400/2800 (XScale) family of processors.

	  Support for Intel's IXP2400/2800 (XScale) family of processors.





config ARCH_IXP23XX

 	bool "IXP23XX-based"

 	select PCI

	help

	  Support for Intel's IXP23xx (XScale) family of processors.



config ARCH_L7200

config ARCH_L7200

	bool "LinkUp-L7200"

	bool "LinkUp-L7200"

	select FIQ

	select FIQ
@@ -274,6 +280,8 @@ source "arch/arm/mach-ixp4xx/Kconfig" 




source "arch/arm/mach-ixp2000/Kconfig"

source "arch/arm/mach-ixp2000/Kconfig"





source "arch/arm/mach-ixp23xx/Kconfig"



source "arch/arm/mach-pxa/Kconfig"

source "arch/arm/mach-pxa/Kconfig"





source "arch/arm/mach-sa1100/Kconfig"

source "arch/arm/mach-sa1100/Kconfig"
@@ -792,7 +800,8 @@ source "drivers/acorn/block/Kconfig" 




if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \

if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \

	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \

	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE

	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \

	|| ARCH_IXP23XX

source "drivers/ide/Kconfig"

source "drivers/ide/Kconfig"

endif

endif

arch/arm/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi 
tune-$(CONFIG_CPU_SA110)	:=-mtune=strongarm110

tune-$(CONFIG_CPU_SA110)	:=-mtune=strongarm110

tune-$(CONFIG_CPU_SA1100)	:=-mtune=strongarm1100

tune-$(CONFIG_CPU_SA1100)	:=-mtune=strongarm1100

tune-$(CONFIG_CPU_XSCALE)	:=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale

tune-$(CONFIG_CPU_XSCALE)	:=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale

tune-$(CONFIG_CPU_XSC3)		:=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale

tune-$(CONFIG_CPU_V6)		:=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)

tune-$(CONFIG_CPU_V6)		:=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)





ifeq ($(CONFIG_AEABI),y)

ifeq ($(CONFIG_AEABI),y)
@@ -97,6 +98,7 @@ endif 
 machine-$(CONFIG_ARCH_IOP3XX)	   := iop3xx

 machine-$(CONFIG_ARCH_IOP3XX)	   := iop3xx

 machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx

 machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx

 machine-$(CONFIG_ARCH_IXP2000)    := ixp2000

 machine-$(CONFIG_ARCH_IXP2000)    := ixp2000

 machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx

 machine-$(CONFIG_ARCH_OMAP1)	   := omap1

 machine-$(CONFIG_ARCH_OMAP1)	   := omap1

 machine-$(CONFIG_ARCH_OMAP2)	   := omap2

 machine-$(CONFIG_ARCH_OMAP2)	   := omap2

  incdir-$(CONFIG_ARCH_OMAP)	   := omap

  incdir-$(CONFIG_ARCH_OMAP)	   := omap

arch/arm/boot/compressed/Makefile

+0 −4
Original line number Original line Diff line number Diff line
@@ -50,10 +50,6 @@ ifeq ($(CONFIG_ARCH_AT91RM9200),y) 
OBJS		+= head-at91rm9200.o

OBJS		+= head-at91rm9200.o

endif

endif





ifeq ($(CONFIG_DEBUG_ICEDCC),y)

OBJS            += ice-dcc.o

endif



ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)

ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)

OBJS		+= big-endian.o

OBJS		+= big-endian.o

endif

endif