Changeset 46c20c8 in mainline for boot/arch/arm32/include/main.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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 (moved) (moved from boot/arch/arm32/loader/print/print.c ) (2 diffs)

boot/arch/arm32/include/main.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2007 Michal Kebrt
- * Copyright (c) 2009 Vineeth Pillai
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +28 @@
  */
 
-
 /** @addtogroup arm32boot
  * @{
  */
 /** @file
- *  @brief bootloader output logic
- */ 
+ * @brief Boot related declarations.
+ */
+
+#ifndef BOOT_arm32_MAIN_H
+#define BOOT_arm32_MAIN_H
+
+/** Address where characters to be printed are expected. */
+
+/** 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
 
 
-#include <printf.h>
+/** GXemul testarm serial console output register */
+#define TESTARM_SCONS_ADDR      0x10000000
 
+/** IntegratorCP serial console output register */
+#define ICP_SCONS_ADDR          0x16000000
 
-/** Address where characters to be printed are expected. */
-#ifdef MACHINE_testarm
-        #define PUTC_ADDRESS  0x10000000
+extern void bootstrap(void);
+
 #endif
-
-#ifdef MACHINE_integratorcp
-        #define PUTC_ADDRESS  0x16000000
-#endif
-
-
-
-/** Prints a character to the console.
- *
- * @param ch Character to be printed.
- */
-static void putc(char ch)
-{
-        if (ch == '\n')
-                *((volatile char *) PUTC_ADDRESS) = '\r';
-        *((volatile char *) PUTC_ADDRESS) = ch;
-}
-
-
-/** Prints a string to the console.
- *
- * @param str String to be printed.
- * @param len Number of characters to be printed.
- */
-void write(const char *str, const int len)
-{
-        int i;
-        for (i = 0; i < len; ++i) {
-                putc(str[i]);
-        }
-}
 
 /** @}
  */
-