Changeset cfb1217 in mainline for kernel/arch/amd64/src/boot/multiboot2.S

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:

• kernel/arch/amd64/src/boot/multiboot2.S (modified) (7 diffs)

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

@@ -49 +49 @@
         
         /* Information request tag */
+        .align 8
         tag_info_req_start:
                 .word MULTIBOOT2_TAG_INFO_REQ
@@ -61 +62 @@
         
         /* Address tag */
+        .align 8
         tag_address_start:
                 .word MULTIBOOT2_TAG_ADDRESS
@@ -72 +74 @@
         
         /* Entry address tag */
+        .align 8
         tag_entry_address_start:
                 .word MULTIBOOT2_TAG_ENTRY_ADDRESS
@@ -80 +83 @@
         
         /* Flags tag */
+        .align 8
         tag_flags_start:
                 .word MULTIBOOT2_TAG_FLAGS
@@ -89 +93 @@
 #ifdef CONFIG_FB
         /* Framebuffer tag */
+        .align 8
         tag_framebuffer_start:
                 .word MULTIBOOT2_TAG_FRAMEBUFFER
@@ -100 +105 @@
         
         /* Module alignment tag */
+        .align 8
         tag_module_align_start:
                 .word MULTIBOOT2_TAG_MODULE_ALIGN
@@ -108 +114 @@
         
         /* Tag terminator */
+        .align 8
         tag_terminator_start:
                 .word MULTIBOOT2_TAG_TERMINATOR