Changeset 6be2c13 in mainline for kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c

Timestamp:

2018-03-16T20:58:20Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

973be387 (diff), 4b1c7c6f (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-16 20:58:20)

git-committer:

GitHub <noreply@…> (2018-03-16 20:58:20)

Message:

Merge 4b1c7c6ff1e7b982f389a8f841b71af2a85e8cfb into 973be38782462a672111ff6833f8dbb40d2a44bf

File:

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

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

@@ -102 +102 @@
         /* Initialize interrupt controller */
         raspi.irc = (void *) km_map(BCM2835_IRC_ADDR, sizeof(bcm2835_irc_t),
-                                    PAGE_NOT_CACHEABLE);
+                                    0);
         assert(raspi.irc);
         bcm2835_irc_init(raspi.irc);
@@ -109 +109 @@
         raspi.timer = (void *) km_map(BCM2835_TIMER_ADDR,
                                       sizeof(bcm2835_timer_t),
-                                      PAGE_NOT_CACHEABLE);
+                                      0);
 }