Changeset 0ab362c in mainline for boot/arch/arm32/src/putchar.c

Timestamp:

2012-11-22T14:36:04Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e32720ff

Parents:

1f7753a (diff), 0f2c80a (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 support for BeagleBoard-xM (armv7).

Most of the changes outside arm arch are pio_* stuff (addition of pio_trace capability, header consolidation)

File:

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

boot/arch/arm32/src/putchar.c

@@ -40 +40 @@
 #include <putchar.h>
 #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
@@ -97 +119 @@
 static void scons_sendb(uint8_t byte)
 {
+#ifdef MACHINE_beagleboardxm
+        scons_sendb_bbxm(byte);
+#endif
 #ifdef MACHINE_gta02
         scons_sendb_gta02(byte);