Changeset 03362fbd in mainline for boot/arch/arm32/src/putchar.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• boot/arch/arm32/src/putchar.c (modified) (3 diffs)

boot/arch/arm32/src/putchar.c

@@ -41 +41 @@
 #include <str.h>
 
+#ifdef MACHINE_beagleboardxm
+
+/** Send a byte to the amdm37x serial console.
+ *
+ * @param byte          Byte to send.
+ */
+static void scons_sendb_bbxm(uint8_t byte)
+{
+        volatile uint32_t *thr =
+            (volatile uint32_t *)BBXM_SCONS_THR;
+        volatile uint32_t *ssr =
+            (volatile uint32_t *)BBXM_SCONS_SSR;
+
+        /* Wait until transmitter is empty. */
+        while ((*ssr & BBXM_THR_FULL) == 1) ;
+
+        /* Transmit byte. */
+        *thr = (uint32_t) byte;
+}
+
+#endif
+
 #ifdef MACHINE_gta02
 
@@ -65 +87 @@
 #endif
 
-#ifdef MACHINE_testarm
-
-/** Send a byte to the GXemul testarm serial console.
- *
- * @param byte          Byte to send.
- */
-static void scons_sendb_testarm(uint8_t byte)
-{
-        *((volatile uint8_t *) TESTARM_SCONS_ADDR) = byte;
-}
-
-#endif
-
 #ifdef MACHINE_integratorcp
 
@@ -97 +106 @@
 static void scons_sendb(uint8_t byte)
 {
+#ifdef MACHINE_beagleboardxm
+        scons_sendb_bbxm(byte);
+#endif
 #ifdef MACHINE_gta02
         scons_sendb_gta02(byte);
-#endif
-#ifdef MACHINE_testarm
-        scons_sendb_testarm(byte);
 #endif
 #ifdef MACHINE_integratorcp