Changeset 4aa2a27 in mainline for kernel/arch/arm32/include

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/include/arch

Files:

• cp15.h (modified) (1 diff)
• mach/integratorcp/integratorcp.h (modified) (1 diff)
• mach/raspberrypi/raspberrypi.h (added)
• mm/frame.h (modified) (1 diff)
• mm/page_armv6.h (modified) (1 diff)

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);