diff options
author | Jon Loeliger <jdl@freescale.com> | 2008-06-06 10:48:31 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2008-06-06 10:48:31 -0500 |
commit | 1a247ba7fa5fb09f56892a09a990f03ce564b3e2 (patch) | |
tree | 9dab0ef013cc6dc7883454808ecf6ba4d7a7a94e /board/netstar | |
parent | 2c289e320dcfb3760e99cf1d765cb067194a1202 (diff) | |
parent | 8155efbd7ae9c65564ca98affe94631d612ae088 (diff) | |
download | u-boot-imx-1a247ba7fa5fb09f56892a09a990f03ce564b3e2.zip u-boot-imx-1a247ba7fa5fb09f56892a09a990f03ce564b3e2.tar.gz u-boot-imx-1a247ba7fa5fb09f56892a09a990f03ce564b3e2.tar.bz2 |
Merge commit 'wd/master'
Diffstat (limited to 'board/netstar')
-rw-r--r-- | board/netstar/crcek.S | 4 | ||||
-rw-r--r-- | board/netstar/eeprom_start.S | 4 | ||||
-rw-r--r-- | board/netstar/setup.S | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/board/netstar/crcek.S b/board/netstar/crcek.S index a74abf9..af35662 100644 --- a/board/netstar/crcek.S +++ b/board/netstar/crcek.S @@ -33,7 +33,7 @@ ldr r4, [r3, r4, lsl#2] eor r0, r4, r0, lsr#8 subs r2, r2, #0x1 - bne 1b + bne 1b eor r0, r0, r5 .endm @@ -58,7 +58,7 @@ mov \reg, #0x100000 3: subs \reg, \reg, #0x1 - bne 3b + bne 3b .endm .text diff --git a/board/netstar/eeprom_start.S b/board/netstar/eeprom_start.S index 75d9f05..1306485 100644 --- a/board/netstar/eeprom_start.S +++ b/board/netstar/eeprom_start.S @@ -29,7 +29,7 @@ _start: b eeprom ldr r4, [r3, r4, lsl#2] eor r0, r4, r0, lsr#8 subs r2, r2, #0x1 - bne 1b + bne 1b eor r0, r0, r5 .endm @@ -58,7 +58,7 @@ _start: b eeprom mov \reg, #0x1000 3: subs \reg, \reg, #0x1 - bne 3b + bne 3b .endm .text diff --git a/board/netstar/setup.S b/board/netstar/setup.S index 5dacc9c..3c2d467 100644 --- a/board/netstar/setup.S +++ b/board/netstar/setup.S @@ -277,7 +277,7 @@ ulocking: mov r0, #0x4000 sdelay: subs r0, r0, #0x1 - bne sdelay + bne sdelay /* back to arch calling code */ mov pc, lr |