[Balloon-svn] r485 - balloon/trunk/bootldr

Author: nick
Date: 2008-05-15 18:29:50 +0100 (Thu, 15 May 2008)
New Revision: 485

Modified:
balloon/trunk/bootldr/boot-pxa.s
Log:
testing cd /home/nick/balloonboard/balloon/trunk/bootldr Do not use cd /home/nick/balloonboard/balloon/trunk/bootldr

Modified: balloon/trunk/bootldr/boot-pxa.s
===================================================================
--- balloon/trunk/bootldr/boot-pxa.s    2008-05-14 14:22:44 UTC (rev 484)
+++ balloon/trunk/bootldr/boot-pxa.s    2008-05-15 17:29:50 UTC (rev 485)
@@ -391,6 +391,12 @@

//;    Reset entry point
HiReset:
+    /* First, mask **ALL** interrupts */
+    ldr        r0, =ICMR
+    mov        r1, #0x00
+    str        r1, [r0]
+
+#if 1    
    //; Workaround for PXA250 early termination of SDRAM auto-refresh
    //; (Erratum #114)
    mov    r0, #0x48000000            //; MEM_BASE
@@ -413,6 +419,7 @@
//; keep track of whether button was pushed in r12
    ldr r12, boot_flags_init_val
    //; btw, r12 is sp
+#endif

    //; must configure memory interface properly before accessing ASICs
    ldr    r0, GPIO_BASE
@@ -499,23 +506,24 @@
    str    r1, [r0, #__OFFSET(GAFR2_U)]    
#endif

-#if 0
+#if 1
+    
+#    mov    r10, #0x8000
+    mov    r10, #0xf000
+111:
    LED0_OFF
    LED1_OFF
-    
-    mov    r10, #0x8000
-111:
-    TXD_HIGH
-    TXD_HIGH
-    TXD_LOW
-    TXD_LOW
+#    TXD_HIGH
+#    TXD_HIGH
+#    TXD_LOW
+#    TXD_LOW
    sub    r10,r10,#1
    cmp    r10,#0
+
+    LED1_ON
+    LED0_ON
    bne    111b
    
-    LED1_ON
-    LED0_ON
-
    // make TDX uarty
    ldr    r1, GAFR1L_Init_BALLOON3
    str    r1, [r0, #__OFFSET(GAFR1_L)]    
@@ -530,6 +538,49 @@
    str    r0,[r2]


+#if 0
+    LED0_OFF
+    LED1_ON
+    LED1_OFF
+    LED0_ON
+
+    LED0_OFF
+    LED1_ON
+    LED1_OFF
+    LED0_ON
+
+    LED0_OFF
+    LED1_ON
+    LED1_OFF
+    LED0_ON
+
+    LED0_OFF
+    LED1_ON
+    LED1_OFF
+    LED0_ON
+
+    LED0_OFF
+    LED1_ON
+    LED1_OFF
+    LED0_ON
+
+    LED0_OFF
+    LED1_ON
+    LED1_OFF
+    LED0_ON
+
+    LED0_OFF
+    LED1_ON
+    LED1_OFF
+    LED0_ON
+
+    LED0_OFF
+    LED1_ON
+    LED1_OFF
+    LED0_ON
+
+#endif
+
#if !defined(CONFIG_MACH_BALLOON) // FIXME - this is needed for NAND
    //; set up MSC2
    ldr    r0, MEM_BASE
@@ -588,8 +639,8 @@
    //; clear whatever status we found
    str    r0, [r1, #__OFFSET(RCSR)]

- teq r0, #RCSR_SMR
- beq WakeupStart
+// teq r0, #RCSR_SMR
+// beq WakeupStart

    b    BootldrStart