Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / arch / arm / boot / compressed / head-at91rm9200.S

diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S
index 2119ea6..d68b9ac 100644 (file)
--- a/arch/arm/boot/compressed/head-at91rm9200.S
+++ b/arch/arm/boot/compressed/head-at91rm9200.S
@@ -49,6 +49,24 @@
                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
+
+               @ 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)