[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Boot Order
Add "Commit Changes and Exit" option on "Change Boot Order" setup page. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: xianhu2x <xianhuix@intel.com> --- Core/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/Core/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c index bdf26141d..f3bd35ce9 100644 --- a/Core/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c +++ b/Core/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c @@ -548,7 +548,7 @@ UpdateOrderPage ( EFI_QUESTION_ID QuestionId; UINT16VarOffset; - + CallbackData->BmmAskSaveOrNot = TRUE; UpdatePageStart (CallbackData); CreateMenuStringToken (CallbackData, CallbackData->BmmHiiHandle, OptionMenu); -- 2.14.1.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Logo
Change QR code from https://minnowboard.org to https://minnowboard.org/setup
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: xianhu2x <xianhuix@intel.com>
---
.../Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp | Bin 54670 -> 29754 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
index
7d7796e18777e34b802728bfe8ac7815da05256e..073b4cb7149a8fa76f49d7cd655dbca865d88892
100644
GIT binary patch
literal 29754
zcmeIwL5gkF5`<v|+pp~q9Dxm+um48j6da=S()6Ck$AOR_*V1#jja^X1PsE>@i%tFa
zf4}_p-It%A=kHJR`|JOIzyI#XFZmDC|NfuX@0Vcy{PFzkzQFUXcHikQ>-kpCx7vS!
zz4`oKJ>P2o1@`9ifAxH;{TJAq&;Ql)t@dAFZ$AH5&$rrtfxWr>zZ{CLklS@O5D
zHUpX@fdkUXWaJDpvGWcryc;i5HUqLGfdkUXWaJDpvGWcryc;i5HUqLGfdkUXWaJDp
zIofGFr%Iwq$c5=h$e>i54a}aU_PV%{Ir+$vs1kBvIubG{6=wspXQ{m|Ze
zT$ql83`)h>!0cISuZv_4NJvMLU_7f#$l%DysZ4UAWMo_*cS;iMQArXujwv!w0Tsxq
zB|-U6t_m2>L<KfZ%4JFga=av}gjtwjCgrXQ7~dphU<#na|E+z<2y%|
zB&1Uk6(|eSk$@b}gnR_EXX86ZmL#N85)~*5(~*E2{BPn1HM*>R4
zDPa5#X7gsy1IUtubR-4r;YdKKI0cN~!ED|PdH`9HkdCB)Jsb%r6{mplJDAOzK@Zr-
zoHC^XrZ%vd;v{TNq%(Um%*45@N>Zj(NGsQ{Bg_~sdEVb9gjm+^#2~Yvm1~yZi
zgw2U`W>1Eh<hi57LQ|3g<O0SynH*Kd6J}3_nK*X`78;inAQv#s$>gXqo-lhd%*44n
zu+X@q0J(s1P9{f{@r2ov;pY<125w0bIDjKb;DF*}mC5YM@NWPV5=?C>a)H@X+PlizHsdKvK-t4d
zFtw@31!hlaRpnf9Or;|!kmF=k0taw1$%>OOa)z1M2{um3ndBZxkyQ!C0Vk8JI0++X
zn2DWW<D{HP?vWH(m0%ojGRcaQFmi^Qq+GeH95tT60UXKaU~b(lFOR~Yb2XG{x
zgSmCLygc%*@(kk%9Kex$4(8To`O%ZeAWx_OCll2Xlszi2**x-6d#yc^%S%+i=1f#a
zQ1+<6X7k8P?X~tuE-z65n=?@zLD{1Mo6RF{v~*laNLfNYO31*T1kMJGFXfGvjw=Z%
zOUOqF8Q7D+*?{q-ywTEeB_U-A`6wX+dlEPsFus(Rnzb)5C6@pdPyrRlDw86sz-F9N
zU>25E<u1rd0?0rGR3NKNimU>gaZZ6*SX!04AS($V0~Jt#tTHLG3T(zX1!iGs|MklI
zffEv-`bJ<L_BCJPI{?=uK=qBlJnU<}#CHI$OMvPdfqB^GCEkArP8k1O;=~bnPk~uj
zTGi3rlylGLlDxi2yr;nIDXnUAt~j~pb4htdsl2DajF(pBiev*hB>}ld1vnCrm1G0C
zr%a7pTGi3cGGz}S0~I)`$Q#HLWoqQos*ZM+DSH4JsK8N0-awuxQzMsFl{+N~n<);k
zClggd%9$KZ8Bdr!8D`>~N|KOHNlKNQGr1ctQ>uiyo?#{)sgfk5Q<75U=1lI!%akf%
zu4kBuN2(+V=}16MWm04nFrJADq$4RX<E2%VD=JW?vNDxWWEC);i3+46DKO)uRh26$
zP^Pjnl~80AFrJADq$4RX<E2%VD=Kg|WgOU(kWNWdz`{_t8iN$!*+7*}PYDqt$X
zl~uP^MG~GoE24<%$XzFNvyvJqe~%B~gJgrAnCb3^U0q>12{qnV8CIlaz5)fjrUW
z(yESjmZ`EQt4|*qyw6jc=Jy~s%a!XYpPjtDoDm(AM9*}#ok^oZ@pt=Kl
z3e4uxs_q_O${wHsSxG?3S#gfQo@KDcb{zqauS%#W?~e3e3XNKGpjdc)r#9
z*XaCwtNwl7+vi)oe~r%1x9Z>Ly?wsb``76Fe5?L_-rMI}y?>3)&$sH|=e>Qt)%(}z
U{Cunaecs#WTfKjc`3)`b
literal 54670
zcmeI4Ka%H25rstr1{P<K$qBF(`1qJQicY{8WNdH_8CZB2co_0<*T)!Mx3aqXQ@>w!
zs(XeA?bgh^Exr8nGApxs*4T*s)1UwPui^REAAdUxf6&)|0>2r4_iX>mKZoJ(zd!J7
zc=^XN4Ei%H%W>$R`W&`x8@7LM!_WWt+c1oiFbi^wtFQ_CFie9m3i_C4VG=4
z2VoQ@L1bQpRoH|*>W(@mVHOr)6*gfX27M0eC``gEEW#>m!mcI<VH74|78YR@HenwI
z{TcRAn1oqagjLvteV7KdIgG;7?^#%cRoI06xY{`CoP=3egjLvt{kZlt>YRjGScFyB
zg#8%FJnEc;Sy+Ts*o6HU*D~sygjraGRoI06809+ZoP=3egjLvt{TTB$>YRjGScFyB
zg#CF1(?05)gjraGRoH}mSakno7=@>s&%)F1RoH}mSjIsZg-Mu*pIbMqs~c~
zg+*9}P1ui>}Hg-zIxb*sp-Ou{TI!YXXSemsSB)Hw;Wun4QL3H$L(wo
z%)%n9!Y1s`PiWakos%#Ni?9ltun(K=zYU`>3A3;WtMK%DKc3b&>YRjGScFyBg#CDS
z)2MS2W?>OlVH5V_NzS9rNtlI2ScOg4kLS9KIwxTk7GV`OVLzVoI_jK+Sy+Ts*o6If
z=G&-q5@ul$*5T*>ej9#L+#<bU`1br~`1bATOVIBp(-Z%7{Ob4oW$n4|v+whc6X@^u
zj$3=+1%07_j$*yJ?^>h^YLu%=;`~s<JKPc-1qr-Hh1*|vk9+R>d_0>w
zdip-^xV6VU_kBK|%^f{`pLg8a<DS!f>OaL?`xSK}=`za_3XMFz
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] TPM Device
"TPM Device" setup display redundant items. Remove "TPM Device" "dTPM 1.2" and "dTPM 2.0" options Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: xianhu2x <xianhuix@intel.com> --- .../Common/PlatformSettings/PlatformSetupDxe/Security.vfi | 2 -- 1 file changed, 2 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi index 2d6b30873..d338a45c0 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi @@ -117,8 +117,6 @@ form formid = SECURITY_CONFIGURATION_FORM_ID, help= STRING_TOKEN(STR_TPM_HELP), option text = STRING_TOKEN(STR_DISABLE), value = 0x00, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED; option text = STRING_TOKEN(STR_TPM_PTT), value = 0x01, flags = RESET_REQUIRED; -option text = STRING_TOKEN(STR_TPM_DTPM_1_2), value = 0x02, flags = RESET_REQUIRED; -option text = STRING_TOKEN(STR_TPM_DTPM_2_0), value = 0x03, flags = RESET_REQUIRED; endoneof; suppressif NOT ideqval Setup.TPM == 1; -- 2.14.1.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Ubuntu boot
Add Ubuntu boot loader file path \\EFI\\UBUNTU\\GRUBX64.EFI into known OS
loader list.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: xianhu2x <xianhuix@intel.com>
---
.../Library/GenericBdsLib/BdsBoot.c| 28 ++
Core/MdePkg/Include/Uefi/UefiSpec.h| 11 +
2 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
b/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index d1da635f3..ce1dd4a0b 100644
--- a/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -2384,6 +2384,22 @@ BdsLibBootViaBootOption (
0,
);
+
+ if (EFI_ERROR(Status)) {
+//
+//Try Ubuntu boot loader
+//
+FilePath = FileDevicePath (Handle,
EFI_REMOVABLE_MEDIA_FILE_NAME_UBUNTU_X64);
+Status = gBS->LoadImage (
+TRUE,
+gImageHandle,
+FilePath,
+NULL,
+0,
+
+);
+ }
+
}
}
}
@@ -3721,6 +3737,18 @@ BdsLibGetBootableHandle (
,
Hdr
);
+
+ if (EFI_ERROR(Status)) {
+//
+//Try Ubuntu boot loader
+//
+Status = BdsLibGetImageHeader (
+ SimpleFileSystemHandles[Index],
+ EFI_REMOVABLE_MEDIA_FILE_NAME_UBUNTU_X64,
+ ,
+ Hdr
+ );
+ }
if (!EFI_ERROR (Status) &&
EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Hdr.Pe32->FileHeader.Machine) &&
Hdr.Pe32->OptionalHeader.Subsystem ==
EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION) {
diff --git a/Core/MdePkg/Include/Uefi/UefiSpec.h
b/Core/MdePkg/Include/Uefi/UefiSpec.h
index 57cb4e804..e5556952b 100644
--- a/Core/MdePkg/Include/Uefi/UefiSpec.h
+++ b/Core/MdePkg/Include/Uefi/UefiSpec.h
@@ -2166,11 +2166,12 @@ typedef struct {
//
// EFI File location to boot from on removable media devices
//
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_IA32L"\\EFI\\BOOT\\BOOTIA32.EFI"
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_IA64L"\\EFI\\BOOT\\BOOTIA64.EFI"
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_X64 L"\\EFI\\BOOT\\BOOTX64.EFI"
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_ARM L"\\EFI\\BOOT\\BOOTARM.EFI"
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_AARCH64 L"\\EFI\\BOOT\\BOOTAA64.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_IA32 L"\\EFI\\BOOT\\BOOTIA32.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_IA64 L"\\EFI\\BOOT\\BOOTIA64.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_X64L"\\EFI\\BOOT\\BOOTX64.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_ARML"\\EFI\\BOOT\\BOOTARM.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_AARCH64L"\\EFI\\BOOT\\BOOTAA64.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_UBUNTU_X64 L"\\EFI\\UBUNTU\\GRUBX64.EFI"
#if defined (MDE_CPU_IA32)
#define EFI_REMOVABLE_MEDIA_FILE_NAME EFI_REMOVABLE_MEDIA_FILE_NAME_IA32
--
2.14.1.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Ubuntu boot
Add Ubuntu boot loader file path \\EFI\\UBUNTU\\GRUBX64.EFI into known OS
loader list.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: xianhu2x <xianhuix@intel.com>
---
.../Library/GenericBdsLib/BdsBoot.c| 26 ++
Core/MdePkg/Include/Uefi/UefiSpec.h| 11 -
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
b/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index d1da635f3..dec5d8cef 100644
--- a/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -2384,6 +2384,21 @@ BdsLibBootViaBootOption (
0,
);
+ //
+ //Try UBUNTU boot loader
+ //
+ if (EFI_ERROR(Status)) {
+FilePath = FileDevicePath (Handle,
EFI_REMOVABLE_MEDIA_FILE_NAME_UBUNTU);
+Status = gBS->LoadImage (
+TRUE,
+gImageHandle,
+FilePath,
+NULL,
+0,
+
+);
+ }
+
}
}
}
@@ -3721,6 +3736,17 @@ BdsLibGetBootableHandle (
,
Hdr
);
+ //
+ //Try UBUNTU boot loader
+ //
+ if (EFI_ERROR(Status)) {
+Status = BdsLibGetImageHeader (
+ SimpleFileSystemHandles[Index],
+ EFI_REMOVABLE_MEDIA_FILE_NAME_UBUNTU,
+ ,
+ Hdr
+ );
+ }
if (!EFI_ERROR (Status) &&
EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Hdr.Pe32->FileHeader.Machine) &&
Hdr.Pe32->OptionalHeader.Subsystem ==
EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION) {
diff --git a/Core/MdePkg/Include/Uefi/UefiSpec.h
b/Core/MdePkg/Include/Uefi/UefiSpec.h
index 57cb4e804..e5556952b 100644
--- a/Core/MdePkg/Include/Uefi/UefiSpec.h
+++ b/Core/MdePkg/Include/Uefi/UefiSpec.h
@@ -2166,11 +2166,12 @@ typedef struct {
//
// EFI File location to boot from on removable media devices
//
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_IA32L"\\EFI\\BOOT\\BOOTIA32.EFI"
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_IA64L"\\EFI\\BOOT\\BOOTIA64.EFI"
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_X64 L"\\EFI\\BOOT\\BOOTX64.EFI"
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_ARM L"\\EFI\\BOOT\\BOOTARM.EFI"
-#define EFI_REMOVABLE_MEDIA_FILE_NAME_AARCH64 L"\\EFI\\BOOT\\BOOTAA64.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_IA32 L"\\EFI\\BOOT\\BOOTIA32.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_IA64 L"\\EFI\\BOOT\\BOOTIA64.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_X64L"\\EFI\\BOOT\\BOOTX64.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_ARML"\\EFI\\BOOT\\BOOTARM.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_AARCH64L"\\EFI\\BOOT\\BOOTAA64.EFI"
+#define EFI_REMOVABLE_MEDIA_FILE_NAME_UBUNTU_X64 L"\\EFI\\UBUNTU\\GRUBX64.EFI"
#if defined (MDE_CPU_IA32)
#define EFI_REMOVABLE_MEDIA_FILE_NAME EFI_REMOVABLE_MEDIA_FILE_NAME_IA32
--
2.14.1.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] QR code display under EFI Shell
Showing QR code and website link to screen under EFI shell for MinnowBoard.
Output website link to serial port too.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: xianhu2x <xianhuix@intel.com>
---
.../MinnowBoard3/BoardInitPostMem/BoardInit.c | 5 +
.../BoardInitPostMem/BoardInitPostMem.inf | 1 +
.../Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp| Bin 0 -> 54670 bytes
.../Common/PlatformSettings/PlatformDxe/Logo.c | 520 +
.../Common/PlatformSettings/PlatformDxe/Logo.h | 27 ++
.../Common/PlatformSettings/PlatformDxe/Platform.c | 21 +-
.../PlatformSettings/PlatformDxe/PlatformDxe.inf | 10 +
Platform/BroxtonPlatformPkg/PlatformPkg.dec| 3 +
Platform/BroxtonPlatformPkg/PlatformPkg.fdf| 3 +
9 files changed, 589 insertions(+), 1 deletion(-)
create mode 100644
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
create mode 100644
Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Logo.c
create mode 100644
Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/Logo.h
diff --git
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
index 0aa9246f4..fc8250fd3 100644
--- Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
+++ Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c
@@ -101,6 +101,11 @@ MinnowBoard3PostMemInitCallback (
// Set PcdSueCreek
//
PcdSetBool (PcdSueCreek, FALSE);
+
+ //
+ //Set PcdLogoDisplay
+ //
+ PcdSetBool (PcdLogoDisplay, TRUE);
//
// Add init steps here
diff --git
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf
index 8fa5ffa64..7651103d1 100644
---
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf
+++
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf
@@ -60,6 +60,7 @@
gPlatformModuleTokenSpaceGuid.PcdResetType
gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid
gPlatformModuleTokenSpaceGuid.PcdSueCreek
+ gPlatformModuleTokenSpaceGuid.PcdLogoDisplay
[Guids]
gEfiPlatformInfoGuid
diff --git
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Logo/MinnowBoardLogo.bmp
new file mode 100644
index
..7d7796e18777e34b802728bfe8ac7815da05256e
GIT binary patch
literal 54670
zcmeI4Ka%H25rstr1{P<K$qBF(`1qJQicY{8WNdH_8CZB2co_0<*T)!Mx3aqXQ@>w!
zs(XeA?bgh^Exr8nGApxs*4T*s)1UwPui^REAAdUxf6&)|0>2r4_iX>mKZoJ(zd!J7
zc=^XN4Ei%H%W>$R`W&`x8@7LM!_WWt+c1oiFbi^wtFQ_CFie9m3i_C4VG=4
z2VoQ@L1bQpRoH|*>W(@mVHOr)6*gfX27M0eC``gEEW#>m!mcI<VH74|78YR@HenwI
z{TcRAn1oqagjLvteV7KdIgG;7?^#%cRoI06xY{`CoP=3egjLvt{kZlt>YRjGScFyB
zg#8%FJnEc;Sy+Ts*o6HU*D~sygjraGRoI06809+ZoP=3egjLvt{TTB$>YRjGScFyB
zg#CF1(?05)gjraGRoH}mSakno7=@>s&%)F1RoH}mSjIsZg-Mu*pIbMqs~c~
zg+*9}P1ui>}Hg-zIxb*sp-Ou{TI!YXXSemsSB)Hw;Wun4QL3H$L(wo
z%)%n9!Y1s`PiWakos%#Ni?9ltun(K=zYU`>3A3;WtMK%DKc3b&>YRjGScFyBg#CDS
z)2MS2W?>OlVH5V_NzS9rNtlI2ScOg4kLS9KIwxTk7GV`OVLzVoI_jK+Sy+Ts*o6If
z=G&-q5@ul$*5T*>ej9#L+#<bU`1br~`1bATOVIBp(-Z%7{Ob4oW$n4|v+whc6X@^u
zj$3=+1%07_j$*yJ?^>h^YLu%=;`~s<JKPc-1qr-Hh1*|vk9+R>d_0>w
zdip-^xV6VU_kBK|%^f{`pLg8a<DS!f>OaL?`xSK}=`za_3XMFz
[edk2] [Patch][edk2-platforms/devel-MinnowBoardMax-UDK2017] Section Auth
Add DxeImageAuthenticationStatusLib to SecurityStub driver and verify the
driver before dispatch
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: xianhu2x <xianhuix@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 +
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 +
Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 1 +
3 files changed, 3 insertions(+)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 19176de4d..8779e046f 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1173,6 +1173,7 @@
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf{
+
NULL|SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index c6134777d..978e7f47f 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1169,6 +1169,7 @@
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf{
+
NULL|SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 893708833..da1ba4b5e 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1171,6 +1171,7 @@
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf{
+
NULL|SecurityPkg/Library/DxeImageAuthenticationStatusLib/DxeImageAuthenticationStatusLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!endif
--
2.14.1.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] fTPM
Boot failed after PTT is enabled with gcc-built image
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: xianhu2x <xianhuix@intel.com>
---
.../Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c | 44 ++
1 file changed, 29 insertions(+), 15 deletions(-)
diff --git
a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c
b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c
index 24e8c5bb6..89251fa19 100644
---
a/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c
+++
b/Silicon/BroxtonSoC/BroxtonSiPkg/Txe/Library/PeiDxePttPtpLib/PeiDxePttPtpLib.c
@@ -228,6 +228,8 @@ PttHciSend(
{
UINT32 ControlStatus;
UINT32 WaitTime;
+ UINTN StartAddress;
+ UINT32 *ReturnBuffer;
//
// Make sure that previous command was in fact completed if not, must not
@@ -290,12 +292,15 @@ PttHciSend(
DataLength += (4 - (DataLength % 4));
DEBUG ((DEBUG_INFO, "to %d\n", DataLength));
}
-
- MmioWriteBuffer32 ((UINTN) R_PTT_HCI_BASE_ADDRESS +
+ ReturnBuffer = (UINT32 *)PttBuffer;
+ StartAddress = (UINTN) R_PTT_HCI_BASE_ADDRESS +
( TPM_LOCALITY_0 * TPM_LOCALITY_BUFFER_SIZE )+
- 0x80,
- DataLength,
- (UINT32 *) PttBuffer );
+ 0x80;
+ while (DataLength != 0) {
+MmioWrite32 ((UINTN) StartAddress, *(ReturnBuffer++));
+StartAddress += sizeof (UINT32);
+DataLength-= sizeof (UINT32);
+ }
//
// Trigger Command processing by writing to start register
@@ -334,6 +339,9 @@ PttHciReceive (
UINT16 Data16;
UINT32 Data32;
EFI_STATUS Status;
+ UINT32 *ReturnBuffer;
+ UINTN StartAddress;
+ UINT32 DataLength;
Status = EFI_SUCCESS;
DEBUG ((DEBUG_INFO, "PTT: PttHciReceive start\n"));
@@ -365,11 +373,14 @@ PttHciReceive (
//
// Read the response data header
//
- MmioReadBuffer32 ((UINTN) R_PTT_HCI_BASE_ADDRESS +
- ( TPM_LOCALITY_0 * TPM_LOCALITY_BUFFER_SIZE )+
- 0x80,
- PTT_HCI_RESPONSE_HEADER_SIZE,
- (UINT32 *) PttBuffer);
+ ReturnBuffer = (UINT32 *)PttBuffer;
+ StartAddress = (UINTN) R_PTT_HCI_BASE_ADDRESS + ( TPM_LOCALITY_0 *
TPM_LOCALITY_BUFFER_SIZE ) + 0x80;
+ DataLength = PTT_HCI_RESPONSE_HEADER_SIZE;
+ while (DataLength != 0) {
+*(ReturnBuffer ++) = MmioRead32 (StartAddress);
+StartAddress += sizeof (UINT32);
+DataLength -= sizeof (UINT32);
+ }
//
// Check the reponse data header (tag, parasize and returncode)
@@ -411,11 +422,14 @@ PttHciReceive (
//
// Read the entire response data header
//
- MmioReadBuffer32 ((UINTN) R_PTT_HCI_BASE_ADDRESS +
- (TPM_LOCALITY_0 * TPM_LOCALITY_BUFFER_SIZE)+
- 0x80,
- *RespSize,
- (UINT32 *) PttBuffer);
+ ReturnBuffer = (UINT32 *)PttBuffer;
+ StartAddress = (UINTN) R_PTT_HCI_BASE_ADDRESS + ( TPM_LOCALITY_0 *
TPM_LOCALITY_BUFFER_SIZE ) + 0x80;
+ DataLength = *RespSize;
+ while (DataLength != 0) {
+*(ReturnBuffer ++) = MmioRead32 (StartAddress);
+StartAddress += sizeof (UINT32);
+DataLength -= sizeof (UINT32);
+ }
Exit:
return Status;
--
2.14.1.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Boot Option Fix
Detect if EFI Shell file is present before adding boot option for it.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: xianhu2x
---
.../PlatformBootManagerLib/PlatformBootOption.c| 51 ++
1 file changed, 22 insertions(+), 29 deletions(-)
diff --git
a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootOption.c
b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootOption.c
index c77b20f686..0eec6ca081 100644
---
a/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootOption.c
+++
b/Platform/BroxtonPlatformPkg/Common/Library/PlatformBootManagerLib/PlatformBootOption.c
@@ -272,35 +272,34 @@ CreateFvBootOption (
EfiInitializeFwVolDevicepathNode (, FileGuid);
- if (!CompareGuid (, FileGuid)) {
+ Status = gBS->HandleProtocol (
+ gImageHandle,
+ ,
+ (VOID **)
+ );
+ if (!EFI_ERROR (Status)) {
Status = gBS->HandleProtocol (
-gImageHandle,
-,
-(VOID **)
+LoadedImage->DeviceHandle,
+,
+(VOID **)
);
if (!EFI_ERROR (Status)) {
- Status = gBS->HandleProtocol (
- LoadedImage->DeviceHandle,
- ,
- (VOID **)
+ Buffer = NULL;
+ Size= 0;
+ Status = Fv->ReadSection (
+ Fv,
+ FileGuid,
+ EFI_SECTION_PE32,
+ 0,
+ ,
+ ,
+
);
- if (!EFI_ERROR (Status)) {
-Buffer = NULL;
-Size= 0;
-Status = Fv->ReadSection (
-Fv,
-FileGuid,
-EFI_SECTION_PE32,
-0,
-,
-,
-
-);
-if (Buffer != NULL) {
- FreePool (Buffer);
-}
+ if (Buffer != NULL) {
+FreePool (Buffer);
}
}
+ }
if (EFI_ERROR (Status)) {
return EFI_NOT_FOUND;
}
@@ -309,12 +308,6 @@ CreateFvBootOption (
DevicePathFromHandle (LoadedImage->DeviceHandle),
(EFI_DEVICE_PATH_PROTOCOL *)
);
- } else {
-DevicePath = AppendDevicePathNode (
- BdsCreateShellDevicePath (),
- (EFI_DEVICE_PATH_PROTOCOL *)
- );
- }
Status = EfiBootManagerInitializeLoadOption (
BootOption,
--
2.14.1.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Network Setup Fix
Remove setup variable EfiNetworkSupport since it's not used by BdsEntry anymore. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: xianhu2x --- .../Common/PlatformSettings/PlatformSetupDxe/Boot.vfi | 7 --- 1 file changed, 7 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi index 65f772c6c5..6b6f262efd 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi @@ -74,13 +74,6 @@ form formid = BOOT_CONFIGURATION_FORM_ID, key= 0; endif; - oneof varid = Setup.EfiNetworkSupport, -prompt = STRING_TOKEN(STR_EFI_NETWORK_CONTROL), -help = STRING_TOKEN(STR_EFI_NETWORK_CONTROL_HELP), -option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED; -option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = 0 | RESET_REQUIRED; - endoneof; - endform; -- 2.14.1.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-IntelAtomProcessorE3900] Enable Vtd in setup option
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: xianhu2x --- .../Common/PlatformSettings/PlatformSetupDxe/Cpu.vfi | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Cpu.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Cpu.vfi index 9094794de2..f98673c65a 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Cpu.vfi +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Cpu.vfi @@ -42,16 +42,16 @@ form formid = CPU_CONFIGURATION_FORM_ID, oneof varid = Setup.VTdEnable, prompt = STRING_TOKEN(STR_VTD_PROMPT), help= STRING_TOKEN(STR_VTD_HELP), -option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = MANUFACTURING | DEFAULT | RESET_REQUIRED; -option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED; +option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = RESET_REQUIRED; +option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = MANUFACTURING | DEFAULT | RESET_REQUIRED; endoneof; grayoutif ideqval Setup.VTdEnable == 0; oneof varid = Setup.PrebootVTdEnable, prompt = STRING_TOKEN(STR_PREBOOT_VTD_PROMPT), help= STRING_TOKEN(STR_PREBOOT_VTD_HELP), -option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = MANUFACTURING | DEFAULT | RESET_REQUIRED; -option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED; +option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = RESET_REQUIRED; +option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = MANUFACTURING | DEFAULT | RESET_REQUIRED; endoneof; endif; endif; -- 2.14.1.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
