Changeset 95c675b in mainline for kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (4 diffs)

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

@@ -36 +36 @@
 #include <arch/exception.h>
 #include <arch/mach/beaglebone/beaglebone.h>
+#include <assert.h>
 #include <genarch/drivers/am335x/irc.h>
 #include <genarch/drivers/am335x/uart.h>
@@ -45 +46 @@
 #include <interrupt.h>
 #include <ddi/ddi.h>
-#include <ddi/device.h>
 #include <mm/km.h>
 
@@ -98 +98 @@
             AM335x_CTRL_MODULE_SIZE, PAGE_NOT_CACHEABLE);
 
-        ASSERT(bbone.irc_addr != NULL);
-        ASSERT(bbone.cm_per_addr != NULL);
-        ASSERT(bbone.cm_dpll_addr != NULL);
-        ASSERT(bbone.ctrl_module != NULL);
+        assert(bbone.irc_addr != NULL);
+        assert(bbone.cm_per_addr != NULL);
+        assert(bbone.cm_dpll_addr != NULL);
+        assert(bbone.ctrl_module != NULL);
 
         /* Initialize the interrupt controller */
@@ -128 +128 @@
         static irq_t timer_irq;
         irq_initialize(&timer_irq);
-        timer_irq.devno = device_assign_devno();
         timer_irq.inr = AM335x_DMTIMER2_IRQ;
         timer_irq.claim = bbone_timer_irq_claim;