Changeset 8f9d70b in mainline for boot/arch/arm32/src

Timestamp:

2013-03-24T14:55:36Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

0dfa93b0

Parents:

119b46e

Message:

Initial support for Raspberry Pi

Location:

boot/arch/arm32/src

Files:

• mm.c (modified) (2 diffs)
• putchar.c (modified) (2 diffs)

boot/arch/arm32/src/mm.c

@@ -75 +75 @@
         if (address >= AM335x_RAM_START && address < AM335x_RAM_END)
                 return 1;
+#elif defined MACHINE_raspberrypi
+        const unsigned long address = section << PTE_SECTION_SHIFT;
+        if (address < BCM2835_RAM_END)
+                return 1;
 #endif
         return 0;
@@ -113 +117 @@
 static void init_boot_pt(void)
 {
+#if defined MACHINE_raspberrypi
+        const pfn_t split_page = 2048;
+#else
         const pfn_t split_page = PTL0_ENTRIES;
+#endif
+
         /* Create 1:1 virtual-physical mapping (in lower 2 GB). */
         pfn_t page;
         for (page = 0; page < split_page; page++)
                 init_ptl0_section(&boot_pt[page], page);
-        
+
+#if defined MACHINE_raspberrypi
+        for (; page < PTL0_ENTRIES; page++)
+                init_ptl0_section(&boot_pt[page], page - split_page);
+#endif  
         asm volatile (
                 "mcr p15, 0, %[pt], c2, c0, 0\n"

boot/arch/arm32/src/putchar.c

@@ -122 +122 @@
 #endif
 
+#ifdef MACHINE_raspberrypi
+
+static int raspi_init;
+
+static inline void write32(uint32_t addr, uint32_t data)
+{
+        *(volatile uint32_t *)(addr) = data;
+}
+
+static inline uint32_t read32(uint32_t addr)
+{
+        return *(volatile uint32_t *)(addr);
+}
+
+static void scons_init_raspi(void)
+{
+        write32(BCM2835_UART0_CR, 0x0);         /* Disable UART */
+        write32(BCM2835_UART0_ICR, 0x7f);       /* Clear interrupts */
+        write32(BCM2835_UART0_IBRD, 1);         /* Set integer baud rate */
+        write32(BCM2835_UART0_FBRD, 40);        /* Set fractional baud rate */
+        write32(BCM2835_UART0_LCRH,
+                BCM2835_UART0_LCRH_FEN |        /* Enable FIFOs */
+                BCM2835_UART0_LCRH_WL8);        /* Word length: 8 */
+        write32(BCM2835_UART0_CR,
+                BCM2835_UART0_CR_UARTEN |       /* Enable UART */
+                BCM2835_UART0_CR_TXE |          /* Enable TX */
+                BCM2835_UART0_CR_RXE);          /* Enable RX */
+}
+
+static void scons_sendb_raspi(uint8_t byte)
+{
+        if (!raspi_init) {
+                scons_init_raspi();
+                raspi_init = 1;
+        }
+
+        while (read32(BCM2835_UART0_FR) & BCM2835_UART0_FR_TXFF);
+
+        write32(BCM2835_UART0_DR, byte);
+}
+#endif
+
 /** Send a byte to the serial console.
  *
@@ -139 +181 @@
 #ifdef MACHINE_integratorcp
         scons_sendb_icp(byte);
+#endif
+#ifdef MACHINE_raspberrypi
+        scons_sendb_raspi(byte);
 #endif
 }