Changeset 2673b3b in mainline for boot

Timestamp:

2012-09-03T14:37: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:

936b72e

Parents:

a8ca607b (diff), 8ec4144 (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:

Mainline changes.

File:

• boot/arch/arm32/include/main.h (modified) (1 diff)

boot/arch/arm32/include/main.h

@@ -64 +64 @@
 
 /** GXemul testarm serial console output register */
-#define TESTARM_SCONS_ADDR      0x10000000
+#define TESTARM_SCONS_ADDR      0x10000000
 
 /** IntegratorCP serial console output register */
-#define ICP_SCONS_ADDR          0x16000000
+#define ICP_SCONS_ADDR          0x16000000
 
 extern void bootstrap(void);