Changeset 03362fbd in mainline for kernel/generic/include/config.h

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/generic/include/config.h (modified) (2 diffs)

kernel/generic/include/config.h

@@ -45 +45 @@
 #define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
 
+#define STACK_SIZE_USER (1 * 1024 * 1024)
+
 #define CONFIG_INIT_TASKS        32
 #define CONFIG_TASK_NAME_BUFLEN  32
+#define CONFIG_TASK_ARGUMENTS_BUFLEN 64
+
+/**
+ * Maximum buffer size allowed for IPC_M_DATA_WRITE and IPC_M_DATA_READ
+ * requests.
+ */
+#define DATA_XFER_LIMIT  (64 * 1024)
 
 #ifndef __ASM__
@@ -56 +65 @@
         size_t size;
         char name[CONFIG_TASK_NAME_BUFLEN];
+        char arguments[CONFIG_TASK_ARGUMENTS_BUFLEN];
 } init_task_t;