Changeset 5828554 in mainline for boot

Timestamp:

2014-01-19T14:37:22Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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

Location:

boot

Files:

• Makefile (modified) (2 diffs)
• Makefile.common (modified) (5 diffs)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/arm32/include/arch.h (modified) (1 diff)
• arch/arm32/include/main.h (modified) (1 diff)
• arch/arm32/include/mm.h (modified) (1 diff)
• arch/arm32/src/mm.c (modified) (1 diff)
• arch/arm32/src/putchar.c (modified) (2 diffs)
• arch/sparc32/Makefile.inc (added)
• arch/sparc32/_link.ld.in (added)
• arch/sparc32/include/ambapp.h (added)
• arch/sparc32/include/arch.h (added)
• arch/sparc32/include/asm.h (added)
• arch/sparc32/include/main.h (added)
• arch/sparc32/include/mm.h (added)
• arch/sparc32/include/types.h (added)
• arch/sparc32/src/ambapp.c (added)
• arch/sparc32/src/asm.S (added)
• arch/sparc32/src/main.c (added)
• arch/sparc32/src/mm.c (added)
• arch/sparc32/src/putchar.c (added)

boot/Makefile

@@ -80 +80 @@
                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
+        if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \
+                cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \
+        fi
 
 clean: clean_dist
@@ -94 +97 @@
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -rf $(USPACE_PATH)/dist/drv/*
-        rm -f $(USPACE_PATH)/dist/lib/*
+        rm -rf $(USPACE_PATH)/dist/lib/*
         rm -rf $(USPACE_PATH)/dist/inc/*
         rm -f $(USPACE_PATH)/dist/app/*

boot/Makefile.common

@@ -48 +48 @@
 USPACE_PATH = $(ROOT_PATH)/uspace
 DIST_PATH = $(USPACE_PATH)/dist
+DIST_OVERLAY_PATH = $(USPACE_PATH)/overlay
 TOOLS_PATH = $(ROOT_PATH)/tools
 DRVS_PATH = drv
@@ -95 +96 @@
         $(USPACE_PATH)/srv/devman/devman \
         $(USPACE_PATH)/srv/fs/locfs/locfs \
-        $(USPACE_PATH)/srv/hid/compositor/compositor
+        $(USPACE_PATH)/srv/hid/compositor/compositor \
+        $(USPACE_PATH)/srv/klog/klog
 
 RD_SRVS_NON_ESSENTIAL = \
@@ -160 +162 @@
         $(USPACE_PATH)/app/bdsh/bdsh \
         $(USPACE_PATH)/app/getterm/getterm \
-        $(USPACE_PATH)/app/klog/klog \
+        $(USPACE_PATH)/app/kio/kio \
         $(USPACE_PATH)/app/vlaunch/vlaunch \
         $(USPACE_PATH)/app/vterm/vterm
@@ -177 +179 @@
         $(USPACE_PATH)/app/download/download \
         $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/hdisk/hdisk \
         $(USPACE_PATH)/app/inet/inet \
         $(USPACE_PATH)/app/kill/kill \
@@ -205 +208 @@
         $(USPACE_PATH)/app/sysinfo/sysinfo \
         $(USPACE_PATH)/app/top/top \
+        $(USPACE_PATH)/app/untar/untar \
         $(USPACE_PATH)/app/usbinfo/usbinfo \
         $(USPACE_PATH)/app/vuhid/vuh \

boot/arch/arm32/Makefile.inc

@@ -43 +43 @@
 endif
 
+ifeq ($(MACHINE), raspberrypi)
+        BOOT_OUTPUT = image.boot
+        POST_OUTPUT = $(ROOT_PATH)/uImage.bin   
+        LADDR = 0x00008000
+        SADDR = 0x00008000
+        POSTBUILD = Makefile.uboot           
+endif
+
 BFD_NAME = elf32-littlearm
 BFD_OUTPUT = $(BFD_NAME)

boot/arch/arm32/include/arch.h

@@ -46 +46 @@
 #elif defined MACHINE_beaglebone
 #define BOOT_BASE       0x80000000
+#elif defined MACHINE_raspberrypi
+#define BOOT_BASE       0x00008000
 #else
 #define BOOT_BASE       0x00000000

boot/arch/arm32/include/main.h

@@ -75 +75 @@
 #define ICP_SCONS_ADDR          0x16000000
 
+/** Raspberry PI serial console registers */
+#define BCM2835_UART0_BASE      0x20201000
+#define BCM2835_UART0_DR        (BCM2835_UART0_BASE + 0x00)
+#define BCM2835_UART0_FR        (BCM2835_UART0_BASE + 0x18)
+#define BCM2835_UART0_ILPR      (BCM2835_UART0_BASE + 0x20)
+#define BCM2835_UART0_IBRD      (BCM2835_UART0_BASE + 0x24)
+#define BCM2835_UART0_FBRD      (BCM2835_UART0_BASE + 0x28)
+#define BCM2835_UART0_LCRH      (BCM2835_UART0_BASE + 0x2C)
+#define BCM2835_UART0_CR        (BCM2835_UART0_BASE + 0x30)
+#define BCM2835_UART0_ICR       (BCM2835_UART0_BASE + 0x44)
+
+#define BCM2835_UART0_FR_TXFF   (1 << 5)
+#define BCM2835_UART0_LCRH_FEN  (1 << 4)
+#define BCM2835_UART0_LCRH_WL8  ((1 << 5) | (1 << 6))
+#define BCM2835_UART0_CR_UARTEN (1 << 0)
+#define BCM2835_UART0_CR_TXE    (1 << 8)
+#define BCM2835_UART0_CR_RXE    (1 << 9)
+
+
+
 extern void bootstrap(void);
 

boot/arch/arm32/include/mm.h

@@ -68 +68 @@
 #define AM335x_RAM_END     0xC0000000
 
+/** Start of ram memory on BCM2835 */
+#define BCM2835_RAM_START   0
+/** End of ram memory on BCM2835 */
+#define BCM2835_RAM_END     0x20000000
 
 /* Page table level 0 entry - "section" format is used

boot/arch/arm32/src/mm.c

@@ -116 +116 @@
         if (address >= AM335x_RAM_START && address < AM335x_RAM_END)
                 return 1;
+#elif defined MACHINE_raspberrypi
+        if (address < BCM2835_RAM_END)
+                return 1;
 #endif
         return address * 0;

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
 }