diff options
Diffstat (limited to 'arch/arm/boot/compressed')
-rw-r--r-- | arch/arm/boot/compressed/head-at91rm9200.S | 6 | ||||
-rw-r--r-- | arch/arm/boot/compressed/ll_char_wr.S | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S index 57a3b163b2cb..d68b9acd826e 100644 --- a/arch/arm/boot/compressed/head-at91rm9200.S +++ b/arch/arm/boot/compressed/head-at91rm9200.S | |||
@@ -61,6 +61,12 @@ | |||
61 | cmp r7, r3 | 61 | cmp r7, r3 |
62 | beq 99f | 62 | beq 99f |
63 | 63 | ||
64 | @ Ajeco 1ARM : 1075 | ||
65 | mov r3, #(MACH_TYPE_ONEARM & 0xff) | ||
66 | orr r3, r3, #(MACH_TYPE_ONEARM & 0xff00) | ||
67 | cmp r7, r3 | ||
68 | beq 99f | ||
69 | |||
64 | @ Unknown board, use the AT91RM9200DK board | 70 | @ Unknown board, use the AT91RM9200DK board |
65 | @ mov r7, #MACH_TYPE_AT91RM9200 | 71 | @ mov r7, #MACH_TYPE_AT91RM9200 |
66 | mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff) | 72 | mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff) |
diff --git a/arch/arm/boot/compressed/ll_char_wr.S b/arch/arm/boot/compressed/ll_char_wr.S index d7bbd9da2fca..8517c8606b4a 100644 --- a/arch/arm/boot/compressed/ll_char_wr.S +++ b/arch/arm/boot/compressed/ll_char_wr.S | |||
@@ -77,7 +77,7 @@ Lrow4bpplp: | |||
77 | subne r1, r1, #1 | 77 | subne r1, r1, #1 |
78 | ldrneb r7, [r6, r1] | 78 | ldrneb r7, [r6, r1] |
79 | bne Lrow4bpplp | 79 | bne Lrow4bpplp |
80 | LOADREGS(fd, sp!, {r4 - r7, pc}) | 80 | ldmfd sp!, {r4 - r7, pc} |
81 | 81 | ||
82 | @ | 82 | @ |
83 | @ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc) | 83 | @ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc) |
@@ -105,7 +105,7 @@ Lrow8bpplp: | |||
105 | subne r1, r1, #1 | 105 | subne r1, r1, #1 |
106 | ldrneb r7, [r6, r1] | 106 | ldrneb r7, [r6, r1] |
107 | bne Lrow8bpplp | 107 | bne Lrow8bpplp |
108 | LOADREGS(fd, sp!, {r4 - r7, pc}) | 108 | ldmfd sp!, {r4 - r7, pc} |
109 | 109 | ||
110 | @ | 110 | @ |
111 | @ Smashable regs: {r0 - r3}, [r4], {r5, r6}, [r7], (r8 - fp), [ip], (sp), [lr], (pc) | 111 | @ Smashable regs: {r0 - r3}, [r4], {r5, r6}, [r7], (r8 - fp), [ip], (sp), [lr], (pc) |
@@ -127,7 +127,7 @@ Lrow1bpp: | |||
127 | strb r7, [r0], r5 | 127 | strb r7, [r0], r5 |
128 | mov r7, r7, lsr #8 | 128 | mov r7, r7, lsr #8 |
129 | strb r7, [r0], r5 | 129 | strb r7, [r0], r5 |
130 | LOADREGS(fd, sp!, {r4 - r7, pc}) | 130 | ldmfd sp!, {r4 - r7, pc} |
131 | 131 | ||
132 | .bss | 132 | .bss |
133 | ENTRY(con_charconvtable) | 133 | ENTRY(con_charconvtable) |