Changeset 40898df in mainline for kernel/arch


Ignore:
Timestamp:
2011-12-08T20:31:32Z (14 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/arch
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    rc5ebb59 r40898df  
    5555                .long MULTIBOOT2_TAG_MODULE
    5656                .long MULTIBOOT2_TAG_MEMMAP
     57#ifdef CONFIG_FB
    5758                .long MULTIBOOT2_TAG_FBINFO
     59#endif
    5860        tag_info_req_end:
    5961       
    … …  
    8587        tag_flags_end:
    8688       
     89#ifdef CONFIG_FB
    8790        /* Framebuffer tag */
    8891        tag_framebuffer_start:
    … …  
    9497                .long CONFIG_BFB_BPP
    9598        tag_framebuffer_end:
     99#endif
    96100       
    97101        /* Module alignment tag */

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

    rc5ebb59 r40898df  
    5353                .long MULTIBOOT2_TAG_MODULE
    5454                .long MULTIBOOT2_TAG_MEMMAP
     55#ifdef CONFIG_FB
    5556                .long MULTIBOOT2_TAG_FBINFO
     57#endif
    5658        tag_info_req_end:
    5759       
    … …  
    8385        tag_flags_end:
    8486       
     87#ifdef CONFIG_FB
    8588        /* Framebuffer tag */
    8689        tag_framebuffer_start:
    … …  
    9295                .long CONFIG_BFB_BPP
    9396        tag_framebuffer_end:
     97#endif
    9498       
    9599        /* Module alignment tag */
Note: See TracChangeset for help on using the changeset viewer.