Changeset 20235a3 in mainline for boot/arch/arm32/include/main.h

Timestamp:

2010-09-02T20:55:28Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c39b96

Parents:

0c61955 (diff), 3249673 (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/include/main.h (modified) (2 diffs)

boot/arch/arm32/include/main.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2007 Michal Kebrt
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +39 @@
 
 /** Address where characters to be printed are expected. */
-#ifdef MACHINE_testarm
-        #define VIDEORAM_ADDRESS  0x10000000
-#endif
 
-#ifdef MACHINE_integratorcp
-        #define VIDEORAM_ADDRESS  0x16000000
-#endif
+/** GTA02 serial console UART register addresses.
+ *
+ * This is UART channel 2 of the S3C24xx CPU
+ */
+#define GTA02_SCONS_UTRSTAT     0x50008010
+#define GTA02_SCONS_UTXH        0x50008020
+
+/* Bits in UTXH register */
+#define S3C24XX_UTXH_TX_EMPTY   0x00000004
+
+
+/** GXemul testarm serial console output register */
+#define TESTARM_SCONS_ADDR      0x10000000
+
+/** IntegratorCP serial console output register */
+#define ICP_SCONS_ADDR          0x16000000
 
 extern void bootstrap(void);