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

Commit 3995f4c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 05814450 fe38ea56

arch/arm/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -99,13 +99,6 @@ config ARCH_EBSA110 
	  Ethernet interface, two PCMCIA sockets, two serial ports and a

	  parallel port.



config ARCH_CAMELOT

	bool "Epxa10db"

	help

	  This enables support for Altera's Excalibur XA10 development board.

	  If you would like to build your kernel to run on one of these boards

	  then you must say 'Y' here. Otherwise say 'N'



config ARCH_FOOTBRIDGE

	bool "FootBridge"

	select FOOTBRIDGE
@@ -213,12 +206,16 @@ config ARCH_AAEC2000 
	help

	  This enables support for systems based on the Agilent AAEC-2000



config ARCH_AT91RM9200

	bool "AT91RM9200"

	help

	  Say Y here if you intend to run this kernel on an AT91RM9200-based

	  board.



endchoice



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



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



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



source "arch/arm/mach-integrator/Kconfig"
@@ -253,6 +250,8 @@ source "arch/arm/mach-aaec2000/Kconfig" 


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



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



# Definitions to make life easier

config ARCH_ACORN

	bool
@@ -418,7 +417,8 @@ config LEDS 
		   ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \

		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91RM9200

	help

	  If you say Y here, the LEDs on your machine will be used

	  to provide useful information about your current system status.

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ endif 
 machine-$(CONFIG_ARCH_PXA)	   := pxa

 machine-$(CONFIG_ARCH_L7200)	   := l7200

 machine-$(CONFIG_ARCH_INTEGRATOR) := integrator

 machine-$(CONFIG_ARCH_CAMELOT)	   := epxa10db

 textofs-$(CONFIG_ARCH_CLPS711X)   := 0x00028000

 machine-$(CONFIG_ARCH_CLPS711X)   := clps711x

 machine-$(CONFIG_ARCH_IOP3XX)	   := iop3xx
@@ -100,6 +99,7 @@ endif 
 machine-$(CONFIG_ARCH_H720X)	   := h720x

 machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000

 machine-$(CONFIG_ARCH_REALVIEW)   := realview

 machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/boot/compressed/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ ifeq ($(CONFIG_ARCH_SHARK),y) 
OBJS		+= head-shark.o ofw-shark.o

endif



ifeq ($(CONFIG_ARCH_CAMELOT),y)

OBJS		+= head-epxa10db.o

endif



ifeq ($(CONFIG_ARCH_L7200),y)

OBJS		+= head-l7200.o

endif
@@ -50,6 +46,10 @@ ifeq ($(CONFIG_PXA_SHARPSL),y) 
OBJS		+= head-sharpsl.o

endif



ifeq ($(CONFIG_ARCH_AT91RM9200),y)

OBJS		+= head-at91rm9200.o

endif



ifeq ($(CONFIG_DEBUG_ICEDCC),y)

OBJS            += ice-dcc.o

endif

arch/arm/boot/compressed/head-at91rm9200.S

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/boot/compressed/head-at91rm9200.S

 *

 *  Copyright (C) 2003 SAN People

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 */

#include <asm/mach-types.h>



		.section	".start", "ax"



		@ Atmel AT91RM9200-DK : 262

		mov	r3,	#(MACH_TYPE_AT91RM9200DK & 0xff)

		orr	r3, r3, #(MACH_TYPE_AT91RM9200DK & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Cogent CSB337 : 399

		mov	r3,	#(MACH_TYPE_CSB337 & 0xff)

		orr	r3, r3, #(MACH_TYPE_CSB337 & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Cogent CSB637 : 648

		mov	r3,	#(MACH_TYPE_CSB637 & 0xff)

		orr	r3, r3,	#(MACH_TYPE_CSB637 & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Atmel AT91RM9200-EK : 705

		mov	r3,	#(MACH_TYPE_AT91RM9200EK & 0xff)

		orr	r3, r3, #(MACH_TYPE_AT91RM9200EK & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Conitec Carmeva : 769

		mov	r3,	#(MACH_TYPE_CARMEVA & 0xff)

		orr	r3, r3, #(MACH_TYPE_CARMEVA & 0xff00)

		cmp	r7, r3

		beq	99f



		@ KwikByte KB920x : 612

		mov	r3,	#(MACH_TYPE_KB9200 & 0xff)

		orr	r3, r3, #(MACH_TYPE_KB9200 & 0xff00)

		cmp	r7, r3

		beq	99f



		@ Unknown board, use the AT91RM9200DK board

		@ mov	r7, #MACH_TYPE_AT91RM9200

		mov	r7,	#(MACH_TYPE_AT91RM9200DK & 0xff)

		orr	r7, r7, #(MACH_TYPE_AT91RM9200DK & 0xff00)



99:

arch/arm/boot/compressed/head-epxa10db.S

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
#include <asm/mach-types.h>

#include <asm/arch/excalibur.h>



		.section	".start", "ax"

		mov	r7, #MACH_TYPE_CAMELOT