Changeset cc250b3 in mainline for kernel

Timestamp:

2012-09-06T12:31:05Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

504f1756

Parents:

ecd1a0a (diff), 8cf4823 (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:

kernel

Files:

• arch/arm32/src/exception.c (modified) (2 diffs)
• genarch/src/drivers/arm926_uart/arm926_uart.c (modified) (3 diffs)
• generic/include/lib/elf_load.h (modified) (1 diff)

kernel/arch/arm32/src/exception.c

@@ -142 +142 @@
 #elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
         asm volatile (
-                "mrc p15, 0, %[control_reg], c1, c1"
+                "mrc p15, 0, %[control_reg], c1, c0"
                 : [control_reg] "=r" (control_reg)
         );
@@ -157 +157 @@
 #elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
         asm volatile (
-                "mcr p15, 0, %[control_reg], c1, c1"
+                "mcr p15, 0, %[control_reg], c1, c0"
                 :: [control_reg] "r" (control_reg)
         );

kernel/genarch/src/drivers/arm926_uart/arm926_uart.c

@@ -83 +83 @@
         arm926_uart_t *uart = irq->instance;
 
-        // TODO make pio_read accept consts pointers and remove the cast
+        // TODO make pio_read accept const pointers and remove the cast
         while ((pio_read_32((ioport32_t*)&uart->regs->flag) & ARM926_UART_FLAG_RXFE_FLAG) == 0) {
                 /* We ignore all error flags here */
@@ -109 +109 @@
 
         /* Mask all interrupts */
-        uart->regs->interrupt_mask = ARM926_UART_INTERRUPT_ALL;
+        uart->regs->interrupt_mask = 0;
 
         outdev_initialize("arm926_uart_dev", &uart->outdev, &arm926_uart_ops);
@@ -133 +133 @@
         irq_register(&uart->irq);
         /* Enable receive interrupt */
-        uart->regs->interrupt_mask &= ~ARM926_UART_INTERRUPT_RX_FLAG;
+        uart->regs->interrupt_mask |= ARM926_UART_INTERRUPT_RX_FLAG;
 }
 

kernel/generic/include/lib/elf_load.h

@@ -42 +42 @@
  * ELF error return codes
  */
-#define EE_OK                   0       /* No error */
-#define EE_INVALID              1       /* Invalid ELF image */
-#define EE_MEMORY               2       /* Cannot allocate address space */
-#define EE_INCOMPATIBLE         3       /* ELF image is not compatible with current architecture */
-#define EE_UNSUPPORTED          4       /* Non-supported ELF (e.g. dynamic ELFs) */
-#define EE_LOADER               5       /* The image is actually a program loader. */
-#define EE_IRRECOVERABLE        6
+#define EE_OK             0  /* No error */
+#define EE_INVALID        1  /* Invalid ELF image */
+#define EE_MEMORY         2  /* Cannot allocate address space */
+#define EE_INCOMPATIBLE   3  /* ELF image is not compatible with current architecture */
+#define EE_UNSUPPORTED    4  /* Non-supported ELF (e.g. dynamic ELFs) */
+#define EE_LOADER         5  /* The image is actually a program loader. */
+#define EE_IRRECOVERABLE  6  /* Irrecoverable error. */
 
 /**
  * This flags is passed when running the loader, otherwise elf_load()
  * would return with a EE_LOADER error code.
- *
  */
 #define ELD_F_NONE    0