diff --git a/Docs/SampleCustom.plist b/Docs/SampleCustom.plist
index 162721e5..26f74340 100644
--- a/Docs/SampleCustom.plist
+++ b/Docs/SampleCustom.plist
@@ -1979,6 +1979,150 @@
Path
Ext4Dxe.efi
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ DpcDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ SnpDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ MnpDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ ArpDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ Dhcp4Dxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ Ip4Dxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ Udp4Dxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ TcpDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ DnsDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ HttpDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ HttpUtilitiesDxe.efi
+
+
+ Arguments
+
+ Comment
+
+ Enabled
+
+ LoadEarly
+
+ Path
+ HttpBootDxe.efi
+
Arguments
diff --git a/OpenCorePkg.dec b/OpenCorePkg.dec
index a68602de..9443b4f1 100755
--- a/OpenCorePkg.dec
+++ b/OpenCorePkg.dec
@@ -2,13 +2,13 @@
# Copyright (C) 2018, vit9696. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-#
+#
# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-#
+#
# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-#
+#
# 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
##
diff --git a/OpenCorePkg.dsc b/OpenCorePkg.dsc
index 5df45052..570a28b5 100755
--- a/OpenCorePkg.dsc
+++ b/OpenCorePkg.dsc
@@ -23,6 +23,23 @@
SKUID_IDENTIFIER = DEFAULT
DSC_SPECIFICATION = 0x00010006
+ #
+ # Network definition
+ #
+ DEFINE NETWORK_ENABLE = TRUE
+ DEFINE NETWORK_SNP_ENABLE = TRUE
+ DEFINE NETWORK_IP4_ENABLE = TRUE
+ DEFINE NETWORK_IP6_ENABLE = FALSE
+ DEFINE NETWORK_TLS_ENABLE = FALSE
+ DEFINE NETWORK_HTTP_ENABLE = TRUE
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = TRUE
+ DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE
+ DEFINE NETWORK_ISCSI_MD5_ENABLE = FALSE
+ DEFINE NETWORK_VLAN_ENABLE = FALSE
+
+!include NetworkPkg/NetworkDefines.dsc.inc
+
!include MdePkg/MdeLibs.dsc.inc
[LibraryClasses]
@@ -334,6 +351,11 @@
# Ext4 driver
Ext4Pkg/Ext4Dxe/Ext4Dxe.inf
+ #
+ # Network Support
+ #
+ !include NetworkPkg/NetworkComponents.dsc.inc
+
[LibraryClasses]
NULL|OpenCorePkg/Library/OcCompilerIntrinsicsLib/OcCompilerIntrinsicsLib.inf
@@ -367,6 +389,10 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialPciDeviceInfo|{0xFF,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialExtendedTxFifoSize|64
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1
+ #
+ # Network Pcds
+ #
+ !include NetworkPkg/NetworkPcds.dsc.inc
[BuildOptions]
# While there are no PCDs as of now, there at least are some custom macros.
@@ -395,3 +421,5 @@
XCODE:*_*_*_MTOC_FLAGS = -align 0x1000
CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096 /FILEALIGN:512
CLANGGCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
+
+ !include NetworkPkg/NetworkBuildOptions.dsc.inc
diff --git a/OpenDuetPkg.dec b/OpenDuetPkg.dec
index 27b87560..adb75f25 100644
--- a/OpenDuetPkg.dec
+++ b/OpenDuetPkg.dec
@@ -1,4 +1,4 @@
-## @file
+## @file
#
# This Package provides all definitions(including functions, MACROs, structures and library classes)
# and libraries instances, which are only used by Duet platform.
@@ -33,10 +33,10 @@
## Include/Duet/Guid/FlashMapHob.h
gEfiFlashMapHobGuid = {0xb091e7d2, 0x05a0, 0x4198, {0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59 }}
-
+
## Include/Duet/Guid/PciOptionRomTable.h
gEfiPciOptionRomTableGuid = {0x7462660F, 0x1CBD, 0x48DA, {0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }}
-
+
## Include/Duet/Guid/DxeCoreFileName.h
gDxeCoreFileNameGuid = {0xD6A2CB7F, 0x6A18, 0x4e2f, {0xB4, 0x3B, 0x99, 0x20, 0xA7, 0x33, 0x70, 0x0A }}
diff --git a/OpenDuetPkg.fdf b/OpenDuetPkg.fdf
index b44180bf..2292809b 100644
--- a/OpenDuetPkg.fdf
+++ b/OpenDuetPkg.fdf
@@ -16,7 +16,7 @@
[Defines]
!if ($(ARCH) == X64)
[FV.DuetEfiMainFvX64]
-!else
+!else
[FV.DuetEfiMainFvIA32]
!endif
diff --git a/build_oc.tool b/build_oc.tool
index 26034001..343fcbd1 100755
--- a/build_oc.tool
+++ b/build_oc.tool
@@ -159,11 +159,20 @@ package() {
cp "${arch}/Shell.efi" "${dstdir}/${arch}/EFI/OC/Tools/OpenShell.efi" || exit 1
efiDrivers=(
+ "ArpDxe.efi"
"AudioDxe.efi"
"BiosVideo.efi"
"CrScreenshotDxe.efi"
+ "Dhcp4Dxe.efi"
+ "DnsDxe.efi"
+ "DpcDxe.efi"
"Ext4Dxe.efi"
"HiiDatabase.efi"
+ "HttpBootDxe.efi"
+ "HttpDxe.efi"
+ "HttpUtilitiesDxe.efi"
+ "Ip4Dxe.efi"
+ "MnpDxe.efi"
"NvmExpressDxe.efi"
"OpenCanopy.efi"
"OpenHfsPlus.efi"
@@ -172,12 +181,15 @@ package() {
"OpenPartitionDxe.efi"
"OpenRuntime.efi"
"OpenUsbKbDxe.efi"
+ "OpenVariableRuntimeDxe.efi"
"Ps2KeyboardDxe.efi"
"Ps2MouseDxe.efi"
"ResetNvramEntry.efi"
+ "SnpDxe.efi"
+ "TcpDxe.efi"
"ToggleSipEntry.efi"
+ "Udp4Dxe.efi"
"UsbMouseDxe.efi"
- "OpenVariableRuntimeDxe.efi"
"XhciDxe.efi"
)
for efiDriver in "${efiDrivers[@]}"; do