Changeset db71e2a in mainline for kernel/arch/arm32/src/machine_func.c

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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 changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

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

kernel/arch/arm32/src/machine_func.c

@@ -42 +42 @@
 #include <arch/mach/integratorcp/integratorcp.h>
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
+#include <arch/mach/beaglebone/beaglebone.h>
 
 /** Pointer to machine_ops structure being used. */
@@ -55 +56 @@
 #elif defined(MACHINE_beagleboardxm)
         machine_ops = &bbxm_machine_ops;
+#elif defined(MACHINE_beaglebone)
+        machine_ops = &bbone_machine_ops;
 #else
 #error Machine type not defined.