Ignore:
Timestamp:
2016-04-05T19:04:11Z (9 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3a34852
Parents:
3876300
Message:

Update Grub. For i386-pc platform add generated core.img for installer. Make necessary changes: grub.conf location, alignment of multiboot 2 tags.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/src/boot/multiboot2.S

    r3876300 rcfb1217  
    4747       
    4848        /* Information request tag */
     49        .align 8
    4950        tag_info_req_start:
    5051                .word MULTIBOOT2_TAG_INFO_REQ
     
    5960       
    6061        /* Address tag */
     62        .align 8
    6163        tag_address_start:
    6264                .word MULTIBOOT2_TAG_ADDRESS
     
    7072       
    7173        /* Entry address tag */
     74        .align 8
    7275        tag_entry_address_start:
    7376                .word MULTIBOOT2_TAG_ENTRY_ADDRESS
     
    7881       
    7982        /* Flags tag */
     83        .align 8
    8084        tag_flags_start:
    8185                .word MULTIBOOT2_TAG_FLAGS
     
    8791#ifdef CONFIG_FB
    8892        /* Framebuffer tag */
     93        .align 8
    8994        tag_framebuffer_start:
    9095                .word MULTIBOOT2_TAG_FRAMEBUFFER
     
    98103       
    99104        /* Module alignment tag */
     105        .align 8
    100106        tag_module_align_start:
    101107                .word MULTIBOOT2_TAG_MODULE_ALIGN
     
    106112       
    107113        /* Tag terminator */
     114        .align 8
    108115        tag_terminator_start:
    109116                .word MULTIBOOT2_TAG_TERMINATOR
Note: See TracChangeset for help on using the changeset viewer.