Changes in boot/arch/arm32/src/putchar.c [9f8a07d3:f1fc83a] in mainline

File:

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

boot/arch/arm32/src/putchar.c

@@ -41 +41 @@
 #include <str.h>
 
-#ifdef MACHINE_beaglebone
-
-/** Send a byte to the am335x serial console.
- *
- * @param byte          Byte to send.
- */
-static void scons_sendb_bbone(uint8_t byte)
-{
-        volatile uint32_t *thr =
-                (volatile uint32_t *) BBONE_SCONS_THR;
-        volatile uint32_t *ssr =
-                (volatile uint32_t *) BBONE_SCONS_SSR;
-
-        /* Wait until transmitter is empty */
-        while (*ssr & BBONE_TXFIFO_FULL);
-
-        /* Transmit byte */
-        *thr = (uint32_t) byte;
-}
-
-#endif
-
-#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
 
@@ -109 +65 @@
 #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
 
@@ -128 +97 @@
 static void scons_sendb(uint8_t byte)
 {
-#ifdef MACHINE_beaglebone
-        scons_sendb_bbone(byte);
-#endif
-#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