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

Commit 87fee013 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Russell King
Browse files

[ARM] 4647/1: at91rm9200: Remove redundant machine-type verification and manipulation 



AT91RM9200 needlessly verifies machine-type numbers of
supported / known platforms and overwrites it for unknown
ones. Remove it.

Signed-off-by: default avatarGuennadi Liakhovetski <lg@denx.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 51708748

arch/arm/boot/compressed/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ ifeq ($(CONFIG_PXA_SHARPSL),y) 
OBJS		+= head-sharpsl.o

endif



ifeq ($(CONFIG_ARCH_AT91RM9200),y)

OBJS		+= head-at91rm9200.o

endif



ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)

ifeq ($(CONFIG_CPU_CP15),y)

OBJS		+= big-endian.o

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

deleted100644 → 0
+0 −81
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



		@ Embest ATEB9200 : 923

		mov	r3,	#(MACH_TYPE_ATEB9200 & 0xff)

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

		cmp	r7, r3

		beq	99f



		@ Sperry-Sun KAFA : 662

		mov	r3,	#(MACH_TYPE_KAFA & 0xff)

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

		cmp	r7, r3

		beq	99f



		@ picotux 200 : 963

		mov	r3,	#(MACH_TYPE_PICOTUX2XX & 0xff)

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

		cmp	r7, r3

		beq	99f



		@ Ajeco 1ARM : 1075

		mov	r3,	#(MACH_TYPE_ONEARM & 0xff)

		orr	r3, r3, #(MACH_TYPE_ONEARM & 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: