Changeset 03362fbd in mainline for kernel/Makefile

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/Makefile (modified) (1 diff)

kernel/Makefile

@@ -257 +257 @@
         generic/src/ipc/ipc.c \
         generic/src/ipc/sysipc.c \
+        generic/src/ipc/sysipc_ops.c \
+        generic/src/ipc/ops/clnestab.c \
+        generic/src/ipc/ops/conctmeto.c \
+        generic/src/ipc/ops/concttome.c \
+        generic/src/ipc/ops/connclone.c \
+        generic/src/ipc/ops/dataread.c \
+        generic/src/ipc/ops/datawrite.c \
+        generic/src/ipc/ops/debug.c \
+        generic/src/ipc/ops/sharein.c \
+        generic/src/ipc/ops/shareout.c \
+        generic/src/ipc/ops/stchngath.c \
         generic/src/ipc/ipcrsc.c \
         generic/src/ipc/irq.c \