Changeset 40898df in mainline

Timestamp:

2011-12-08T20:31:32Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

38650da

Parents:

c5ebb59

Message:

allow the boot framebuffer to be optional again

Location:

kernel

Files:

• arch/amd64/src/boot/multiboot2.S (modified) (3 diffs)
• arch/ia32/src/boot/multiboot2.S (modified) (3 diffs)
• genarch/src/multiboot/multiboot2.c (modified) (2 diffs)

kernel/arch/amd64/src/boot/multiboot2.S

@@ -55 +55 @@
                 .long MULTIBOOT2_TAG_MODULE
                 .long MULTIBOOT2_TAG_MEMMAP
+#ifdef CONFIG_FB
                 .long MULTIBOOT2_TAG_FBINFO
+#endif
         tag_info_req_end:
         
@@ -85 +87 @@
         tag_flags_end:
         
+#ifdef CONFIG_FB
         /* Framebuffer tag */
         tag_framebuffer_start:
@@ -94 +97 @@
                 .long CONFIG_BFB_BPP
         tag_framebuffer_end:
+#endif
         
         /* Module alignment tag */

kernel/arch/ia32/src/boot/multiboot2.S

@@ -53 +53 @@
                 .long MULTIBOOT2_TAG_MODULE
                 .long MULTIBOOT2_TAG_MEMMAP
+#ifdef CONFIG_FB
                 .long MULTIBOOT2_TAG_FBINFO
+#endif
         tag_info_req_end:
         
@@ -83 +85 @@
         tag_flags_end:
         
+#ifdef CONFIG_FB
         /* Framebuffer tag */
         tag_framebuffer_start:
@@ -92 +95 @@
                 .long CONFIG_BFB_BPP
         tag_framebuffer_end:
+#endif
         
         /* Module alignment tag */

kernel/genarch/src/multiboot/multiboot2.c

@@ -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
 }