Changeset 1c7a170 in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

Timestamp:

2018-03-27T16:49:29Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

f303afc6 (diff), 94d211e (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-27 16:49:29)

git-committer:

GitHub <noreply@…> (2018-03-27 16:49:29)

Message:

Merge 94d211e1f212626c420cf42c22b056ac1db9c0f1 into f303afc69bfdfc798071487501f775a7c4d8c475

File:

• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (2 diffs)

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

@@ -135 +135 @@
 {
         icp.hw_map.uart = km_map(ICP_UART, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
-        icp.hw_map.kbd_ctrl = km_map(ICP_KBD, PAGE_SIZE, PAGE_NOT_CACHEABLE);
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
+        icp.hw_map.kbd_ctrl = km_map(ICP_KBD, PAGE_SIZE,
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
         icp.hw_map.kbd_stat = icp.hw_map.kbd_ctrl + ICP_KBD_STAT;
         icp.hw_map.kbd_data = icp.hw_map.kbd_ctrl + ICP_KBD_DATA;
         icp.hw_map.kbd_intstat = icp.hw_map.kbd_ctrl + ICP_KBD_INTR_STAT;
         icp.hw_map.rtc = km_map(ICP_RTC, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
         icp.hw_map.rtc1_load = icp.hw_map.rtc + ICP_RTC1_LOAD_OFFSET;
         icp.hw_map.rtc1_read = icp.hw_map.rtc + ICP_RTC1_READ_OFFSET;
@@ -150 +151 @@
 
         icp.hw_map.irqc = km_map(ICP_IRQC, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
         icp.hw_map.irqc_mask = icp.hw_map.irqc + ICP_IRQC_MASK_OFFSET;
         icp.hw_map.irqc_unmask = icp.hw_map.irqc + ICP_IRQC_UNMASK_OFFSET;
         icp.hw_map.cmcr = km_map(ICP_CMCR, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
         icp.hw_map.sdramcr = icp.hw_map.cmcr + ICP_SDRAMCR_OFFSET;
         icp.hw_map.vga = km_map(ICP_VGA, PAGE_SIZE,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
 
         hw_map_init_called = true;