libpayload: x86: Move Multiboot header to include file
This moves the multiboot header into its own include file, simplifying head.S and making it easier to include/exclude the multiboot header based on config options. BUG=b:242829490 TEST=Able to build and boot google/rex. Change-Id: I59a22dfe36044b4dd64a5b028a134be7a7d02a48 Signed-off-by: Subrata Banik <subratabanik@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/82533 Reviewed-by: Julius Werner <jwerner@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
@@ -38,37 +38,14 @@
|
||||
* change anything.
|
||||
*/
|
||||
_entry:
|
||||
jmp _init
|
||||
|
||||
.align 4
|
||||
|
||||
#define MB_MAGIC 0x1BADB002
|
||||
#define MB_FLAGS 0x00010003
|
||||
|
||||
mb_header:
|
||||
.long MB_MAGIC
|
||||
.long MB_FLAGS
|
||||
.long -(MB_MAGIC + MB_FLAGS)
|
||||
.long mb_header
|
||||
.long _start
|
||||
.long _edata
|
||||
.long _end
|
||||
.long _init
|
||||
|
||||
/*
|
||||
* This function saves off the previous stack and switches us to our
|
||||
* own execution environment.
|
||||
*/
|
||||
_init:
|
||||
/* Add multiboot header and jump around it when building with multiboot support. */
|
||||
#if CONFIG(LP_MULTIBOOT)
|
||||
#include "multiboot_header.inc"
|
||||
#endif
|
||||
/* No interrupts, please. */
|
||||
cli
|
||||
|
||||
#if CONFIG(LP_MULTIBOOT)
|
||||
/* Store EAX and EBX */
|
||||
movl %eax, loader_eax
|
||||
movl %ebx, loader_ebx
|
||||
#endif
|
||||
|
||||
/* save pointer to coreboot tables */
|
||||
movl 4(%esp), %eax
|
||||
movl %eax, cb_header_ptr
|
||||
|
Reference in New Issue
Block a user