Changeset bc73be3 in mainline for kernel/generic/src/main

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (1 diff)
• main.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -291 +291 @@
                         log(LF_OTHER, LVL_ERROR,
                             "init[%zu]: Init binary load failed "
-                            "(error %s, loader status %u)", i,
-                            str_error_name(rc), programs[i].loader_status);
+                            "(error %s, loader status %s)", i,
+                            str_error_name(rc), str_error_name(programs[i].loader_status));
                 }
         }

kernel/generic/src/main/main.c

@@ -160 +160 @@
  *
  */
-NO_TRACE void main_bsp(void)
+_NO_TRACE void main_bsp(void)
 {
         config.cpu_count = 1;