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

Timestamp:

2012-12-29T10:48:35Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb (diff), c928bb7 (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

File:

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

boot/arch/arm32/src/putchar.c

@@ -87 +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
 
@@ -125 +112 @@
         scons_sendb_gta02(byte);
 #endif
-#ifdef MACHINE_testarm
-        scons_sendb_testarm(byte);
-#endif
 #ifdef MACHINE_integratorcp
         scons_sendb_icp(byte);