REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3901
There is no padding for ARCH_IA32, so it is not 4K alignment.
When including ResetVector.ia32.*.raw into fdf, it will cause
"4G - FitTablePointerOffset is occupied!" build issue.
Cc: Ray Ni <ray...@intel.com>
Cc: Zhang, Di <di.zh...@intel.com>
Signed-off-by: Huang Long <long1.hu...@intel.com>
---
.../Vtf0/Bin/IA32/ResetVector.ia32.port80.raw | Bin 532 -> 4100 bytes
.../Vtf0/Bin/IA32/ResetVector.ia32.raw | Bin 500 -> 4100 bytes
.../Vtf0/Bin/IA32/ResetVector.ia32.serial.raw | Bin 900 -> 4100 bytes
.../ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm | 8 ++++++++
4 files changed, 8 insertions(+)
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw
b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.port80.raw
index
a3601274c25dde665872ff375f1deadf1c838476..6963d7cdf9aeb6d964c2547a58b003729358a974
100644
GIT binary patch
literal 4100
zcmeH~!D|yi6vkh&cCCtTD8UA-rqqD-5HUeTiGgTQ^ia&9lo%25ve&|P2NqAeEICXQ
z)&)UO5fnUmTJg|@DjA89+8z`<7zj#KT)Ul1b15p4and04Z;*M1_lB8|@6G$oX<XNJ
zGb9Z$fII*&?W$$OZjt#JbkH*5tNE2_6t|4T%eg~$(H_ef!#_^kM^T#MD&u>thMHWJ
zUl_ZBUU1dDllUfj&Q+C0`U84u8!13fa6>AMqla{_=LM!;=YgBFhnwEBzzoX~fJ_^I
z#%pTz`te9h%TcMIovIK$Ym=Q?I`wm*G`iUs*Vn6;;?@_&80>nhe~P@)quNK)7?F@n
zlNEwwyi8Xz1iz_lBH7yrOugrIxj*AGakCpXNt{`pFPVlE(+}`GqGziK>s#NCH!avi
z(sHRkv~80es&#t0jMB<t>1?E7<%$;oP*R$jq)C2=8>*F?Eu($X)UZt^mBnlF(H0%@
zc^e3IZs+X}%->6};k1`(-D9c}8CCtm00m`&sOxiG#$w<XWB_HN<7ER=^@qV}ImGEW
zYtDOm*-gSDF5-`}E&AsD;Fkrs^KMWd{HwR2e!fU|*UuH{kcwZ^DE$>0EIiU<EPTup
z?yz8+8DDOhi6jUJ0)l`bAP5Kof`A|(2nYg#fFSVS5eUC_w?2UV!DeSJg6oE>gPp;@
F@Gt7a`wRd8
delta 72
zcmZosn8LClno*?Yzg`+Yqj=g5Wd;TZex(Cxuj2nt&Sz9+n(%+}6vhOF*Ow=N0Rs?(
Qg}5<HnDBZJL<B+t0L~O0rvLx|
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw
b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.raw
index
6124f3f9a40e4e58cc672b54cbf5cc33360b3858..af724495a2ceed168fe48854ce3a73cd98f7acbf
100644
GIT binary patch
literal 4100
zcmeH~!D|yi6vp3XZEO|XPyz{9O{qE5L!>DxN(^i*mR^cEloDHtc-d=Vy90}O$gt!v
zO<5NNLB*RVJ$mS3l}uez+Imp%U?3<FQM(<G=2BEj#z{l{C!BZq24+6KH}7|Qp67X4
znt>QV9ssy`1KY9Nba5J;!gl;^erpQFv7LOiaQZ$vj_m>R<NQMuVQJyAzb!ALnsDWp
z2Ck!*!u8++xrLq!S2@UhKu;Yz4d@98)Z!p|%=-MQC{kl>QVYivfNX<&Cfi13enhF8
zIi~97#WJ-<9eUKvq<<|H6MMm+wNsgl<1d_Z=-aeDDQi~5{8+O4RTO23GDT6c!M3uL
zte5vt#A=5>#S9|krbCmLHx`Q}Ta8&Kh4x#cl_dV!$q~(ThpJ{Sz0VpBJ!0TXQ?n?e
ztrV{)0nQb!0icvRKFm_$kpu?L&CH?`>Ugh1hqaZt=-E2!@kJX5?})fRtFY@fR;|`K
zLsJrle+EF;hN!VK*Wx?|z8(e8hMI=o3vS(|Zqwa%-!t7yK}i?{d{LdSPKnO}+<VtO
zA03`|p?bBzj#bABtj8d4ScLs%B%Ew>9=;Gln*4h==ARyfNs$C30ZBj-kOU+FNk9^i
h1SA1TKoa=x2!yX&2fJZs@R{ie@VxL@_ollt{smtA<&^*c
delta 72
zcmZos_`<xwol&Iazg`+Yqj=g5Wd;TZex(Cxud@G7j%Ji+n(%*e4P%7D>&p|sfB^`?
PLfjZ8OnAKqA_5@+-isa1
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw
b/UefiCpuPkg/ResetVector/Vtf0/Bin/IA32/ResetVector.ia32.serial.raw
index
48b46e3473e77a1179bf818a1f1deafb7e46cf3e..f3f6bb51a95b9782ed7ecceeba750eb3fa208071
100644
GIT binary patch
literal 4100
zcmbO*VZwx6znM3*zuWbbc>}|{T|byNFuntcu)lk$%4~Q*mqCDm!Ipu6;eSzNV}(G~
zf#Q%-*~SWy)3&F4OGO$hB=+XZO)KSYtdQw^ZZfNs>9q<_RmIbup3<X0RkmF+{-t|>
zs%DyYCYEjns%kx~d%1K~bA<{+>5|UF%n=Hub6<O=?fT37W`#n@_cW0GN$*hk255X<
zG(Ok69s7Zx^XTh;okvl%q8nw1rWMnumsU&+42HKm?{&UN>y9;GyisKLn%SYqvh_fT
zY4ZX0A_J8lT@m8n4l9(r>h=(6eE9$We+JHzC3hJQmM|4vZ>SJrF6DeV9T;A%2TIvG
zPrN>Ec%buG>$g%TREMRZIfSquOa9?Efe5dqFoK*_65o74!tz9ML_-C$K#4Sv6e=<5
zmS}to@(R$u4$TLci>y`tyuRIhfF-Tb!Z)f^mw$VN4ddZP>i|~<hEjQEXN}kLK*`R-
zX^qxlQKfv$&K%7LH2AkivuWOV&AJ2Vdxn>P{{8<Cjn*HaST%fy%risb@uKj!-u>Fm
z@S*SaZm!RIY5a`hX*-k|7##SO4y3)>`04+D0frq8Yzz$iN)J#2#276|jnMd*ah<k<
zgQ4$6-+{gdeJ}bhytbPl&miy_7zj`RW=%fN0H$Zd=zfO%P64lZ_d5o>=1A*2^76o+
z*G#X!y%hfc^8BCw|6d;b`~QFEga6Nf`3eSL=8e*$Aut*OqaiRF0;3@?8UmvsFd71*
jAut*Oqai@+5O^8%8Qc{C*%KDx#xP;ROKXS-q=y0kYT?QX
delta 72
zcmZosXkp(lmr11Szg`+Yqj=g5Wd;TZex(CxuMGcB-pCZsG~xebA?6^3*Ow=N0Rs?(
Qg}5<HnDBZJL<B+t0N6zxt^fc4
diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
b/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
index 7538192876..214c213c60 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
+++ b/UefiCpuPkg/ResetVector/Vtf0/Ia16/ResetVectorVtf0.asm
@@ -24,6 +24,14 @@ ALIGN 16
TIMES (0x1000 - ($ - EndOfPageTables) - 0x20) DB 0
%endif
+;
+; Pad the image size to 4k for ARCH_IA32
+;
+%ifdef ARCH_IA32
+ReservedData:
+ TIMES (0x1000 - ($ - $$) - 0x20) DB 0
+%endif
+
applicationProcessorEntryPoint:
;
; Application Processors entry point
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#88857): https://edk2.groups.io/g/devel/message/88857
Mute This Topic: https://groups.io/mt/90435817/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
