Changes in boot/arch/arm32/src/putchar.c [8f9d70b:9f8a07d3] in mainline

File:

• boot/arch/arm32/src/putchar.c (modified) (2 diffs)

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.
  *
@@ -181 +139 @@
 #ifdef MACHINE_integratorcp
         scons_sendb_icp(byte);
-#endif
-#ifdef MACHINE_raspberrypi
-        scons_sendb_raspi(byte);
 #endif
 }