From 6645008d32633827cacb795ff2843a73cb5e49c9 Mon Sep 17 00:00:00 2001
From: root <root@dwelch-desktop.(none)>
Date: Thu, 13 Sep 2012 23:44:52 -0400
Subject: [PATCH] fixing bootloader05

---
 bootloader05/bootloader05.elf  | Bin 2099721 -> 2099721 bytes
 bootloader05/bootloader05.hex  |   2 +-
 bootloader05/bootloader05.list |   2 +-
 bootloader05/kernel.img        | Bin 2065552 -> 2065552 bytes
 bootloader05/periph.c          |   2 +-
 bootloader05/periph.o          | Bin 2136 -> 2136 bytes
 6 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootloader05/bootloader05.elf b/bootloader05/bootloader05.elf
index 4ff928316c3411274d0eaba6e8f9c8c592d3f8e5..d0df2ffa59bbc015116edbe08baf7bccee8ff36e 100755
GIT binary patch
delta 81
zcmWN=#}R-a006<kj5!BPG-7W&?!%u}tU`;@omuOQuz!QV!zUmlA|^qSl95wTQc=^;
Y($O<8GBLBDSlQS)IGuikx?g?C4-!flDgXcg

delta 81
zcmWN=#}R-a006<k4Cb7bM(mBpefZOgRcKMVGi#j@_HPh)_ymMR#3V=*DH%BhB^5Od
YEgd}rBNH<VD;qlpr_+y6_p2}Y0TJpM8UO$Q

diff --git a/bootloader05/bootloader05.hex b/bootloader05/bootloader05.hex
index 16314cc..8857cf0 100644
--- a/bootloader05/bootloader05.hex
+++ b/bootloader05/bootloader05.hex
@@ -129067,7 +129067,7 @@
 :10009000E3FFFFEB200010E3FBFFFF0A10009FE5EA
 :1000A0000410A0E1D8FFFFEB1040BDE81EFF2FE1D8
 :1000B000545021204050212008402DE910009FE598
-:1000C000D7FFFFEB010C10E3FBFFFF0A0840BDE880
+:1000C000D7FFFFEB010C10E3FBFFFF1A0840BDE870
 :1000D0001EFF2FE15450212038402DE90050A0E1AF
 :1000E0002040A0E3044044E23534A0E10F3003E2B5
 :1000F000090053E33700838230008392E0FFFFEB77
diff --git a/bootloader05/bootloader05.list b/bootloader05/bootloader05.list
index 9da267f..4d5c832 100644
--- a/bootloader05/bootloader05.list
+++ b/bootloader05/bootloader05.list
@@ -83,7 +83,7 @@ Disassembly of section .text:
   2000bc:	e59f0010 	ldr	r0, [pc, #16]	; 2000d4 <uart_flush+0x1c>
   2000c0:	ebffffd7 	bl	200024 <GET32>
   2000c4:	e3100c01 	tst	r0, #256	; 0x100
-  2000c8:	0afffffb 	beq	2000bc <uart_flush+0x4>
+  2000c8:	1afffffb 	bne	2000bc <uart_flush+0x4>
   2000cc:	e8bd4008 	pop	{r3, lr}
   2000d0:	e12fff1e 	bx	lr
   2000d4:	20215054 	eorcs	r5, r1, r4, asr r0
diff --git a/bootloader05/kernel.img b/bootloader05/kernel.img
index c407d3043e63e2c303d349f39cfba86c3860781f..4bb5b37d4a98caccbe5f2bd7ba2dd3f055fe1738 100755
GIT binary patch
delta 79
zcmV~$w+(<W002RO$vFoTys72l8+RTCi3R9jDDIrq&T4~)k02l<A|@dvBd4IGqNbsx
Zqi0}bVrF4Qvaxe;Ug|ZTyg#EJ@dFQV8X5oq

delta 79
zcmV~$w+(<W002ROi6-ZaH?>@R<Ick%u>c(m#htU-S#9v}5d?%p#3ZChGI9z^Dry>9
YI(i01CT12^Hg*oqOTEUE_h-~2eh&Z|3IG5A

diff --git a/bootloader05/periph.c b/bootloader05/periph.c
index 7a396b3..02faee9 100644
--- a/bootloader05/periph.c
+++ b/bootloader05/periph.c
@@ -61,7 +61,7 @@ void uart_flush ( void )
 {
     while(1)
     {
-        if(GET32(AUX_MU_LSR_REG)&0x100) break;
+        if((GET32(AUX_MU_LSR_REG)&0x100)==0) break;
     }
 }
 //------------------------------------------------------------------------
diff --git a/bootloader05/periph.o b/bootloader05/periph.o
index 21b521e86dbb99e4a783f9fe548b4066d84bba46..95480fb90e345c724827a8cbcc62e5094a7ce51b 100644
GIT binary patch
delta 12
Ucmca1a6@3iVMeKqN2ag?03>(?PXGV_

delta 12
Ucmca1a6@3iVMeZvN2ag?03;{{KL7v#