Changeset b7068da in mainline for kernel/genarch/src/multiboot/multiboot2.c

Timestamp:

2012-02-09T20:35:12Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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

File:

• kernel/genarch/src/multiboot/multiboot2.c (modified) (3 diffs)

kernel/genarch/src/multiboot/multiboot2.c

@@ -45 +45 @@
 {
         if (init.cnt < CONFIG_INIT_TASKS) {
-                init.tasks[init.cnt].addr = PA2KA(module->start);
+                init.tasks[init.cnt].paddr = module->start;
                 init.tasks[init.cnt].size = module->end - module->start;
                 multiboot_extract_command(init.tasks[init.cnt].name,
@@ -76 +76 @@
 static void multiboot2_fbinfo(const multiboot2_fbinfo_t *fbinfo)
 {
+#ifdef CONFIG_FB
         if (fbinfo->visual == MULTIBOOT2_VISUAL_RGB) {
                 bfb_addr = fbinfo->addr;
@@ -92 +93 @@
                 bfb_blue_size = fbinfo->rgb.blue_size;
         }
+#endif
 }