OrgACRN
/
slimbootloader
mirror of https://github.com/slimbootloader/slimbootloader.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rebased to the latest master 

Resolved the conflicts and fixed the build issue.

Signed-off-by: Maurice Ma <maurice.ma@intel.com>
This commit is contained in:
Maurice Ma 2020-04-02 07:49:27 -07:00
parent 72cb08ee7d
commit 1083cce99e
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BootloaderCorePkg/BootloaderCorePkg.fdf
View File

@ -129,7 +129,7 @@ FV = OsLoader
INF BootloaderCorePkg/Stage1A/Stage1A.inf
INF RuleOverride = RESET_VECTOR USE = $(ARCH) $(PLATFORM_PACKAGE)/Stage1A/Ia32/Vtf0/Bin/ResetVector.inf
INF RuleOverride = RESET_VECTOR USE = $(ARCH) BootloaderCorePkg/Stage1A/Ia32/Vtf0/Bin/ResetVector.inf
#------------------------------------------------------------------------------
# STAGE1B FV

3
BootloaderCorePkg/Include/Library/BootloaderCoreLib.h
View File

@ -50,8 +50,7 @@ typedef enum {
} BUF_INFO_ID;
typedef struct {
UINT32 LdrGlobal;
UINT32 Reserved;
UINT64 LdrGlobal;
IA32_IDT_GATE_DESCRIPTOR IdtTable[STAGE_IDT_ENTRY_COUNT];
} STAGE_IDT_TABLE;

1
BootloaderCorePkg/Stage1A/Stage1A.inf
View File

@ -30,7 +30,6 @@
[Sources.X64]
X64/SecEntry.nasm
X64/Stage1AArch.c
[Packages]
MdePkg/MdePkg.dec