[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: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 5fde99f9d9f93dafbf2e555a646b3f08ebbbc561..de9d9ee50958089bcf8fb7217fd1c48617d6097c 100644 (file)
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -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

diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S
deleted file mode 100644 (file)
index 11782cc..0000000
--- a/arch/arm/boot/compressed/head-at91rm9200.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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: