From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::232; helo=mail-lf0-x232.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x232.google.com (mail-lf0-x232.google.com [IPv6:2a00:1450:4010:c07::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E5B2A21EA15DA for ; Wed, 11 Oct 2017 03:12:37 -0700 (PDT) Received: by mail-lf0-x232.google.com with SMTP id r129so1488644lff.8 for ; Wed, 11 Oct 2017 03:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ERF9HvlYQnMbUGuFfMQwRjWyGHd1d9LCnLFZMee85d8=; b=EbJVVZQzTcC2oFWixgi9s5MjTvDXR5/r1uBE32/5f+U8dfTH3irVAE5cZsV39NmUur mKAyd/0QEYkM4EIXQI5SKjpCn1OFmJ3v6FbBohCJJkaYUuHByZZqT1zJyYPvG1ObJMjY 942+z4e8m8RLWlcVb7TnWqrScfod1/LQpgLK1DbLpDuTVvamnFldLYRX7XsT62PzeIcM 2oSaRzxK3XwU7wcT33iiCyUXVQnUTrokEKy6h3EHeU1CeYViHMaRR4jZTeeNSPLxsqD+ jnJegcJoQToINMziMpRLrHx+IyzBmsf93PuFyGxtig8D/hF1SYikoOcIQeODf2CIrHIP 0JgQ== 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; bh=ERF9HvlYQnMbUGuFfMQwRjWyGHd1d9LCnLFZMee85d8=; b=ErlWWqO4lyInqj56snBhm1+O5QjazQwaZwBP0Fa13w1khqKbAJU6n9kb/Tbd18Qjqp QbmZVDxwYQipOsJiiYfvRz8g+fltRXotc1eV8X1qlHI8a1TSwO5H69MCJOIjurpP4OaN hFCn8F0qvRSIVBI/ve7unX/+7ZX1pSCgMoyaC9/KMVLjmV9qOxIX6vDWnf6zhSW8OuZN z799ce/XqQZo+KyBlE6b/44d3fQN+NrcByR1hq8pn9mA8Y9OwdEexB783XL5/WKu/sjR ODX8KuI44OL1BJ1DS+2+5t9QiciuIjtRp324zjRhsJuz+O3mRjKK4qXrAFMDoK0o3yRZ BRAQ== X-Gm-Message-State: AMCzsaWSAD0HWTv2CCBUJTFnRmG3Kujn1eJ82fmBpkr8JpXW6qlDhhtS GtoOkvDrER5qoBHaGeTupUf8oWydws8= X-Google-Smtp-Source: AOwi7QBSdYGalVjHXZ7Z665cg6pxZWw9xOozZWpsv5F5W81otRkX/+EIjT0JqCCujtm1LEKPWnNOww== X-Received: by 10.25.167.85 with SMTP id q82mr2539972lfe.171.1507716965114; Wed, 11 Oct 2017 03:16:05 -0700 (PDT) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id 84sm1539781ljc.67.2017.10.11.03.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 03:16:04 -0700 (PDT) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, neta@marvell.com, kostap@marvell.com, jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com Date: Wed, 11 Oct 2017 12:15:32 +0200 Message-Id: <1507716939-31798-6-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507716939-31798-1-git-send-email-mw@semihalf.com> References: <1507716939-31798-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v2 05/12] Marvell/Armada: Switch to generic BDS X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Oct 2017 10:12:38 -0000 From: Ard Biesheuvel Switch from the Intel BDS to the generic BDS, which is preferred for ARM platforms given that it is completely legacy free. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Signed-off-by: Marcin Wojtas Reviewed-by: Leif Lindholm --- Platform/Marvell/Armada/Armada.dsc.inc | 19 ++++++++++++++++--- Platform/Marvell/Armada/Armada70x0.fdf | 3 ++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc index 1b4e713..e920461 100644 --- a/Platform/Marvell/Armada/Armada.dsc.inc +++ b/Platform/Marvell/Armada/Armada.dsc.inc @@ -126,8 +126,9 @@ # BDS Libraries CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf - GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf - PlatformBdsLib|ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf + BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf @@ -350,6 +351,12 @@ # Shell. gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + # GUID of the generic BDS UiApp + gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } + + # use the 'TTYTERM' terminal type for optimal compatibility with Linux terminal emulators + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 + # ARM Pcds gArmTokenSpaceGuid.PcdSystemMemoryBase|0 gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000 @@ -459,7 +466,13 @@ MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + MdeModulePkg/Application/UiApp/UiApp.inf { + + NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf + NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf + NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf + } # UEFI application (Shell Embedded Boot Loader) ShellPkg/Application/Shell/Shell.inf { diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf index b3d1c60..999b968 100644 --- a/Platform/Marvell/Armada/Armada70x0.fdf +++ b/Platform/Marvell/Armada/Armada70x0.fdf @@ -175,7 +175,8 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Application/UiApp/UiApp.inf # PEI phase firmware volume -- 2.7.4