tools: kwboot: Replace ARM mov + movt instruction pair by mov + orr

Older Armada SoCs have custom ARMv5te compatible core which does not
support movt instruction. So replace mov + movt instruction pair used for
immediate move construction by mov + orr instructions which are supported
also by ARMv5te.

After this change kwboot ARM code should be compatible with any 32-bit ARM
core compatible by ARMv2 or new. At least GNU AS does not throw any error
or warning.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 84294cadfe129e5fd97a9de119ac3a8c2553861a..62c218ef6462de6c2fc2d5fc98cf8df318c7750c 100644 (file)
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -126,8 +126,8 @@ static unsigned char kwboot_baud_code[] = {
        0xfe, 0x5f, 0x2d, 0xe9, /* push  { r1 - r12, lr }                     */
 
                                /*  ; r0 = UART_BASE                          */
-       0x02, 0x0a, 0xa0, 0xe3, /* mov   r0, #0x2000                          */
-       0x01, 0x00, 0x4d, 0xe3, /* movt  r0, #0xd001                          */
+       0x0d, 0x02, 0xa0, 0xe3, /* mov   r0, #0xd0000000                      */
+       0x12, 0x0a, 0x80, 0xe3, /* orr   r0, r0, #0x12000                     */
 
                                /*  ; r2 = address of preamble string         */
        0xcc, 0x20, 0x8f, 0xe2, /* adr   r2, preamble                         */