Index: boot/arch/arm32/include/main.h
===================================================================
--- boot/arch/arm32/include/main.h	(revision d969a9a5ef26ff6a30b02ed7596a95a0a74f0b6a)
+++ boot/arch/arm32/include/main.h	(revision d7ef14b00a909e507a2742d2e1d5a3af153b293a)
@@ -1,4 +1,5 @@
 /*
  * Copyright (c) 2007 Michal Kebrt
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -39,16 +40,20 @@
 /** 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);