From: Huacai Chen <chenhuacai@loongson.cn>
Date: Mon, 3 Oct 2022 14:08:38 +0000 (+0800)
Subject: Merge tag 'efi-next-for-v6.1' into loongarch-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1625c8cba77086a90c4a037f2ab4597ebfdce08e;p=linux.git

Merge tag 'efi-next-for-v6.1' into loongarch-next

LoongArch architecture changes for 6.1 depend on the efi changes to
work, so merge them to create a base.
---

1625c8cba77086a90c4a037f2ab4597ebfdce08e
diff --cc arch/loongarch/kernel/head.S
index 331864369e49e,8f89f39fd31b0..7e57ae8741b1a
--- a/arch/loongarch/kernel/head.S
+++ b/arch/loongarch/kernel/head.S
@@@ -12,10 -12,28 +12,30 @@@
  #include <asm/loongarch.h>
  #include <asm/stackframe.h>
  
+ #ifdef CONFIG_EFI_STUB
+ 
+ #include "efi-header.S"
+ 
+ 	__HEAD
+ 
+ _head:
+ 	.word	MZ_MAGIC		/* "MZ", MS-DOS header */
+ 	.org	0x3c			/* 0x04 ~ 0x3b reserved */
+ 	.long	pe_header - _head	/* Offset to the PE header */
+ 
+ pe_header:
+ 	__EFI_PE_HEADER
+ 
+ SYM_DATA(kernel_asize, .long _end - _text);
+ SYM_DATA(kernel_fsize, .long _edata - _text);
+ SYM_DATA(kernel_offset, .long kernel_offset - _text);
+ 
+ #endif
+ 
  	__REF
  
 +	.align 12
 +
  SYM_CODE_START(kernel_entry)			# kernel entry point
  
  	/* Config direct window and set PG */