Changeset e1a27be in mainline for boot

Timestamp:

2012-12-29T10:48:35Z (13 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:

8f88beb7 (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

Location:

boot/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• include/main.h (modified) (1 diff)
• src/putchar.c (modified) (2 diffs)

boot/arch/arm32/Makefile.inc

@@ -57 +57 @@
 endif
 
-ifeq ($(MACHINE), gxemul)
-RD_SRVS_NON_ESSENTIAL += \
-        $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
-endif
-
 RD_DRVS += \
         infrastructure/rootamdm37x \

boot/arch/arm32/include/main.h

@@ -63 +63 @@
 
 
-/** GXemul testarm serial console output register */
-#define TESTARM_SCONS_ADDR      0x10000000
-
 /** IntegratorCP serial console output register */
 #define ICP_SCONS_ADDR          0x16000000

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);