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

Timestamp:

2017-10-17T13:11:35Z (7 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/beagleboardxm/beagleboardxm.c (modified) (4 diffs)

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

@@ -35 +35 @@
 #include <arch/exception.h>
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
+#include <assert.h>
 #include <genarch/drivers/amdm37x/uart.h>
 #include <genarch/drivers/amdm37x/irc.h>
@@ -43 +44 @@
 #include <mm/km.h>
 #include <ddi/ddi.h>
-#include <ddi/device.h>
 
 static void bbxm_init(void);
@@ -102 +102 @@
             (void *) km_map(AMDM37x_IRC_BASE_ADDRESS, AMDM37x_IRC_SIZE,
             PAGE_NOT_CACHEABLE);
-        ASSERT(beagleboard.irc_addr);
+        assert(beagleboard.irc_addr);
         omap_irc_init(beagleboard.irc_addr);
 
@@ -116 +116 @@
         static irq_t timer_irq;
         irq_initialize(&timer_irq);
-        timer_irq.devno = device_assign_devno();
         timer_irq.inr = AMDM37x_GPT1_IRQ;
         timer_irq.claim = bb_timer_irq_claim;