Changeset 4aa2a27 in mainline for kernel/arch

Timestamp:

2014-01-07T11:29:16Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4edd71f6

Parents:

fd07e57b (diff), 226f72e (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 from lp:~bengal/helenos/raspberrypi.

Location:

kernel/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (1 diff)
• include/arch/cp15.h (modified) (1 diff)
• include/arch/mach/integratorcp/integratorcp.h (modified) (1 diff)
• include/arch/mach/raspberrypi/raspberrypi.h (added)
• include/arch/mm/frame.h (modified) (1 diff)
• include/arch/mm/page_armv6.h (modified) (1 diff)
• src/mach/integratorcp/integratorcp.c (modified) (4 diffs)
• src/mach/raspberrypi/raspberrypi.c (added)
• src/machine_func.c (modified) (2 diffs)

kernel/arch/arm32/Makefile.inc

@@ -89 +89 @@
 endif
 
+ifeq ($(MACHINE),raspberrypi)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/raspberrypi/raspberrypi.c
+endif
+
 ifeq ($(CONFIG_PL050),y)
         ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c

kernel/arch/arm32/_link.ld.in

@@ -13 +13 @@
 #elif defined MACHINE_beaglebone
 #define KERNEL_LOAD_ADDRESS 0x80a00000
+#elif defined MACHINE_raspberrypi
+#define KERNEL_LOAD_ADDRESS 0x80a08000
 #else
 #define KERNEL_LOAD_ADDRESS 0x80a00000

kernel/arch/arm32/include/arch/cp15.h

@@ -231 +231 @@
         SCTLR_FAST_IRQ_EN_FLAG       = 1 << 21, /* Disable impl. specific feat*/
         SCTLR_UNALIGNED_EN_FLAG      = 1 << 22, /* Must be 1 on armv7 */
+        SCTLR_EXTENDED_PT_EN_FLAG    = 1 << 23,
         SCTLR_IRQ_VECTORS_EN_FLAG    = 1 << 24,
         SCTLR_BIG_ENDIAN_EXC_FLAG    = 1 << 25,

kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h

@@ -46 +46 @@
 #define ICP_IRQC_MAX_IRQ  8
 #define ICP_KBD_IRQ       3
-#define ICP_TIMER_IRQ    6
+#define ICP_TIMER_IRQ     6
+#define ICP_UART0_IRQ     1
 
 /** Timer frequency */

kernel/arch/arm32/include/arch/mm/frame.h

@@ -63 +63 @@
 #define BOOT_PAGE_TABLE_ADDRESS  0x80008000
 
+#elif defined MACHINE_raspberrypi
+
+#define PHYSMEM_START_ADDR       0x00000000
+#define BOOT_PAGE_TABLE_ADDRESS  0x00010000
+
 #else
 

kernel/arch/arm32/include/arch/mm/page_armv6.h

@@ -278 +278 @@
         }
         
+#if defined(PROCESSOR_ARCH_armv6)
+        /* FIXME: this disables caches */
+        p->shareable = 1;
+#else
         /* Shareable is ignored for devices (non-cacheable),
          * turn it off for normal memory. */
         p->shareable = 0;
+#endif
         
         p->non_global = !(flags & PAGE_GLOBAL);

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -37 +37 @@
 #include <ipc/irq.h>
 #include <console/chardev.h>
+#include <genarch/drivers/pl011/pl011.h>
 #include <genarch/drivers/pl050/pl050.h>
-#include <genarch/drivers/arm926_uart/arm926_uart.h>
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
@@ -61 +61 @@
         icp_hw_map_t hw_map;
         irq_t timer_irq;
-        arm926_uart_t uart;
+        pl011_uart_t uart;
 } icp;
 
@@ -315 +315 @@
                 stdout_wire(fbdev);
 #endif
-#ifdef CONFIG_ARM926_UART
-        if (arm926_uart_init(&icp.uart, ARM926_UART0_IRQ,
-            ARM926_UART0_BASE_ADDRESS, sizeof(arm926_uart_regs_t)))
+#ifdef CONFIG_PL011_UART
+        if (pl011_uart_init(&icp.uart, ICP_UART0_IRQ, ICP_UART))
                 stdout_wire(&icp.uart.outdev);
 #endif
@@ -351 +350 @@
             ICP_KBD);
 
-#ifdef CONFIG_ARM926_UART
+#ifdef CONFIG_PL011_UART
         srln_instance_t *srln_instance = srln_init();
         if (srln_instance) {
                 indev_t *sink = stdin_wire();
                 indev_t *srln = srln_wire(srln_instance, sink);
-                arm926_uart_input_wire(&icp.uart, srln);
-                icp_irqc_unmask(ARM926_UART0_IRQ);
+                pl011_uart_input_wire(&icp.uart, srln);
+                icp_irqc_unmask(ICP_UART0_IRQ);
         }
 #endif

kernel/arch/arm32/src/machine_func.c

@@ -43 +43 @@
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
 #include <arch/mach/beaglebone/beaglebone.h>
+#include <arch/mach/raspberrypi/raspberrypi.h>
 
 /** Pointer to machine_ops structure being used. */
@@ -58 +59 @@
 #elif defined(MACHINE_beaglebone)
         machine_ops = &bbone_machine_ops;
+#elif defined(MACHINE_raspberrypi)
+        machine_ops = &raspberrypi_machine_ops;
 #else
 #error Machine type not defined.