From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=tBNepIrL; spf=pass (domain: linaro.org, ip: 209.85.221.66, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by groups.io with SMTP; Mon, 10 Jun 2019 07:20:18 -0700 Received: by mail-wr1-f66.google.com with SMTP id d18so9382226wrs.5 for ; Mon, 10 Jun 2019 07:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WU96A9dG3cLJvFdVViaDc3ciInBUi+PLjkGthIGVDC8=; b=tBNepIrL54Fb6DPEtrorOOOPPGVdeFadNaxgPtbjYCPanb3iylQlCyRNAcn4nAJ3CB Ps1G9HIwmxVCGsXAWuC/FNyhKtXvwcWIdKQhUwal5HuVS2uY0ybDmN0yyVn7Aja/Od+i 2X/2Qr1TUJLObB74v/Ry6S1tkSfWzKpPIR+xWAgKVhwFrfZySBuYtWxgXVylM+7EmYYr VhFCd+FdCC1RGMPrpTmJEpS4c8+PlviOwoQsleLZBuRjVxwaGL0SuiQ1a6ZkANDdDoC7 BGv0py6jjsCetop2x/CVmTrRwjPan4bRfKyQQbycOP85YmuTe3Uq0tFY57V4Zb25jhEt GgqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WU96A9dG3cLJvFdVViaDc3ciInBUi+PLjkGthIGVDC8=; b=XOeGM1RlZCCUzBnxFcCz83y9d+Fox++TrUMprFb6itDvO24jEF7rVM1GUoO2PtK0oa HPqAJNLz51Ok4tD3y4PYtcbhTUQBCSZlgwBuiEol5qS7Iw2VApaIvX5O0WHR8GsvymR7 Idt01+XlBUCRn6jcEndJZ+4RcZQDt2uK2MpgiZ4pXo1VS+jBcj+xO24ve6tNhqlROqq6 liu1C6DR6c6rsQ64yhzBqfhME8gYIWyL/pohfNyb6Aau3hTy/1RwCexP79fnB3KKbU35 xBUgW71+3D3mNWc7AwSE0UD2HTBowIVZ2l6n6efIjScbL4llWlxBJzQlnuer2AJ6bvjn IQmQ== X-Gm-Message-State: APjAAAWMzFvuD6NyyaSloPx1HkI2W183pUMrDyTrMS+yAttgRxYE7daJ CnQ8lFfQGllTtpz9ggDwYI876w64/LmmVw== X-Google-Smtp-Source: APXvYqybzqBhUnVdwiKrFRDkfcnF2kXjTxTmkUIkxD+ttY9mj/Vcnsivx9jEFG8CkDSKonT/Hf6ZaA== X-Received: by 2002:a05:6000:a:: with SMTP id h10mr26299148wrx.215.1560176416754; Mon, 10 Jun 2019 07:20:16 -0700 (PDT) Return-Path: Received: from sudo.home ([2a01:cb1d:112:6f00:fc6b:c1c2:30ed:eca3]) by smtp.gmail.com with ESMTPSA id z5sm9237693wma.36.2019.06.10.07.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 07:20:15 -0700 (PDT) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [PATCH edk2-platforms 4/5] Platform/RDKQemu: fix platform build Date: Mon, 10 Jun 2019 16:20:05 +0200 Message-Id: <20190610142006.30007-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190610142006.30007-1-ard.biesheuvel@linaro.org> References: <20190610142006.30007-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Update RDKQemu.dsc to remove unnecessary Network libs, and add the missing status code router dependencies that have been added to the upstream ArmVirtQemu platform which this platform is based on. Signed-off-by: Ard Biesheuvel --- Platform/Comcast/RDKQemu/RDKQemu.dsc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc index 64b6699ae78e..f0ed4f11e81d 100644 --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc @@ -36,6 +36,7 @@ [Defines] DEFINE NETWORK_TLS_ENABLE = FALSE DEFINE NETWORK_IP6_ENABLE = FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE = TRUE + DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE !include ArmVirtPkg/ArmVirt.dsc.inc @@ -57,6 +58,7 @@ [LibraryClasses.common] CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf + PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf @@ -65,13 +67,13 @@ [LibraryClasses.common] PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf RdkBootManagerLib|Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf -!if $(HTTP_BOOT_ENABLE) == TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif [LibraryClasses.common.PEIM] ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf +[LibraryClasses.common.DXE_DRIVER] + ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf + [LibraryClasses.common.UEFI_DRIVER] UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf @@ -127,9 +129,6 @@ [PcdsFixedAtBuild.common] # gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0 -!if $(HTTP_BOOT_ENABLE) == TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif # System Memory Base -- fixed at 0x4000_0000 gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000 @@ -154,6 +153,8 @@ [PcdsFixedAtBuild.common] gRdkTokenSpaceGuid.PcdRdkConfFileName|L"Rdk.conf" gRdkTokenSpaceGuid.PcdRdkConfFileDevicePath|L"PciRoot(0x0)/Pci(0x2,0x0)" + gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3 + [PcdsFixedAtBuild.AARCH64] # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point, # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the @@ -407,6 +408,10 @@ [Components.common] Platform/Comcast/Application/SecureBoot/SecureBoot.inf Platform/Comcast/Application/DriSecureBoot/DriSecureBoot.inf + # Status Code Routing + # + MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf + [Components.AARCH64] MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf { @@ -414,8 +419,5 @@ [Components.AARCH64] NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf } -[PcdsFixedAtBuild] - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE - [BuildOptions] GCC:*_*_*_CC_FLAGS = -UDISABLE_NEW_DEPRECATED_INTERFACES -- 2.20.1