Changeset 1590e23 in mainline for boot/arch/arm32/include/main.h

Timestamp:

2010-06-25T19:53:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d7ef14b

Parents:

adf6607

Message:

Drive the gta02 UART properly.

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.
  *
@@ -39 +40 @@
 /** Address where characters to be printed are expected. */
 
-#ifdef MACHINE_gta02
-        /* FIXME: Need real S3C244x UART driver. */
-        #define VIDEORAM_ADDRESS  0x50008020
-#endif
+/** GTA02 serial console UART register addresses.
+ *
+ * This is UART channel 2 of the S3C244x CPU
+ */
+#define GTA02_SCONS_UTRSTAT     0x50008010
+#define GTA02_SCONS_UTXH        0x50008020
 
-#ifdef MACHINE_testarm
-        #define VIDEORAM_ADDRESS  0x10000000
-#endif
+/* Bits in UTXH register */
+#define S3C244X_UTXH_TX_EMPTY   0x00000004
 
-#ifdef MACHINE_integratorcp
-        #define VIDEORAM_ADDRESS  0x16000000
-#endif
+
+/** 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);