sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch: x86_64: move the disable multiboot2 marco around to retain labels

Browse Source
This commit is contained in:
Yang Chung-Fan 2020-05-05 15:30:01 +09:00 committed by Brennan Ashton
parent 235d905001
commit 9ab6b92ad7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86_64/src/intel64/intel64_head.S
View File

@ -89,11 +89,11 @@
.set HEADER_LENGTH, header_end - header_start .set HEADER_LENGTH, header_end - header_start
.set CHECKSUM, -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + HEADER_LENGTH) .set CHECKSUM, -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + HEADER_LENGTH)
#ifndef CONFIG_ARCH_EXCLUDE_MULTIBOOT
.section ".multiboot", "a" .section ".multiboot", "a"
.align 8 .align 8
header_start: header_start:
#ifndef CONFIG_ARCH_EXCLUDE_MULTIBOOT
.long MULTIBOOT2_HEADER_MAGIC .long MULTIBOOT2_HEADER_MAGIC
.long MULTIBOOT_ARCHITECTURE_I386 .long MULTIBOOT_ARCHITECTURE_I386
.long HEADER_LENGTH .long HEADER_LENGTH
@ -104,9 +104,9 @@ header_start:
.short MULTIBOOT_HEADER_TAG_END .short MULTIBOOT_HEADER_TAG_END
.short 0 // flags, none set .short 0 // flags, none set
.long 8 // size, including itself (short + short + long) .long 8 // size, including itself (short + short + long)
#endif
header_end: header_end:
#endif
/**************************************************************************** /****************************************************************************
* .text * .text