Changeset fcc6224 in mainline

Timestamp:

2012-03-05T21:37:27Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

161fbda

Parents:

d2707fc

Message:

boot,arm32: Make arm32 bootstrap code BeagleBoard-xM aware.

Location:

boot/arch/arm32

Files:

• include/arch.h (modified) (3 diffs)
• include/main.h (modified) (1 diff)
• src/mm.c (modified) (1 diff)
• src/putchar.c (modified) (2 diffs)

boot/arch/arm32/include/arch.h

@@ -42 +42 @@
 #ifdef MACHINE_gta02
 #define BOOT_BASE       0x30008000
+#elif defined MACHINE_beagleboardxm
+#define BOOT_BASE       0x80000000
 #else
 #define BOOT_BASE       0x00000000
@@ -47 +49 @@
 
 #define BOOT_OFFSET     (BOOT_BASE + 0xa00000)
+
+#ifdef MACHINE_beagleboardxm
+        #define PA2KA(addr)  (addr)
+#else
 
 #ifndef __ASM__
@@ -56 +62 @@
 #endif
 
+#endif
+
 /** @}
  */

boot/arch/arm32/include/main.h

@@ -40 +40 @@
 /** Address where characters to be printed are expected. */
 
+
+/** BeagleBoard-xM UART register address
+ *
+ * This is UART3 of AM/DM37x CPU
+ */
+#define BBXM_SCONS_THR          0x49020000
+#define BBXM_SCONS_SSR          0x49020044
+
+/* Check this bit before writing (tx fifo full) */
+#define BBXM_THR_FULL           0x00000001
+
+
 /** GTA02 serial console UART register addresses.
  *

boot/arch/arm32/src/mm.c

@@ -67 +67 @@
 static void init_boot_pt(void)
 {
-        pfn_t split_page = 0x800;
-        
+/* BeagleBoard-xM (MD37x) memory starts at 2GB border,
+ * thus mapping only lower 2GB is not not enough.
+ * Map entire AS 1:1 instead and hope it works. */
+#ifdef MACHINE_beagleboardxm
+        const pfn_t split_page = PTL0_ENTRIES;
+#else
+        const pfn_t split_page = 0x800;
+#endif
         /* Create 1:1 virtual-physical mapping (in lower 2 GB). */
         pfn_t page;

boot/arch/arm32/src/putchar.c

@@ -40 +40 @@
 #include <putchar.h>
 #include <str.h>
+
+#ifdef MACHINE_beagleboardxm
+
+/** Send a byte to the amdm37x serial console.
+ *
+ * @param byte          Byte to send.
+ */
+static void scons_sendb_bbxm(uint8_t byte)
+{
+        volatile uint32_t *thr =
+            (volatile uint32_t *)BBXM_SCONS_THR;
+        volatile uint32_t *ssr =
+            (volatile uint32_t *)BBXM_SCONS_SSR;
+
+        /* Wait until transmitter is empty. */
+        while ((*ssr & BBXM_THR_FULL) == 1) ;
+
+        /* Transmit byte. */
+        *thr = (uint32_t) byte;
+}
+
+#endif
 
 #ifdef MACHINE_gta02
@@ -97 +119 @@
 static void scons_sendb(uint8_t byte)
 {
+#ifdef MACHINE_beagleboardxm
+        scons_sendb_bbxm(byte);
+#endif
 #ifdef MACHINE_gta02
         scons_sendb_gta02(byte);