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::236; helo=mail-lf0-x236.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x236.google.com (mail-lf0-x236.google.com [IPv6:2a00:1450:4010:c07::236]) (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 A5FA421EA15D5 for ; Mon, 9 Oct 2017 09:50:45 -0700 (PDT) Received: by mail-lf0-x236.google.com with SMTP id k40so8545675lfi.4 for ; Mon, 09 Oct 2017 09:54:12 -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=zM+e0p6s5F+GtjW/oKA9f7K7ABrI05t/6RpCxpHll9M=; b=0B+HoiwYSXYYv7eGFnMXFyaD488Zl6Nf2n/gR+Uc4LNKG6tSPGG/YnwyiRENUcRwxj CHDu/YEnSbHAjufiOqgoDmC2jo81dGbdBWJCDZlP6Rlykq+dv2dbBceLOHW2bQmefYD1 ePnHxGDJKOWlUnqK21xQb6k52aTmtmU0mZ1w2QMk6Bk1YsXpO+xy4eVTAT4LxhViheXY o2nUhuSK1nB13xZydoI8O+jgNrFMdOeiPSuCHm7Cc9OPPjydq6qHxjsBj6mEBr97cejX ygNkEbDZ0FuDOqiRCB8iyFy7YGhZoP0rLG/JkLUV18W+q0wBa7wLtlfgizePrWqPP5CN /rDg== 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=zM+e0p6s5F+GtjW/oKA9f7K7ABrI05t/6RpCxpHll9M=; b=kW4gNVTWP5j6naSh3iRHMQxzBr/a6lSs9xDHRTOLRIc/vSGLJ6SLhyHBwbPXroGPIB apAxzh7xIp+ed3qHpaa2u+hEaIl3vAzDPI5ViOz5UC4TuJomXkIPQxX1sVK7/v618iT/ +yKrIjunIZ6LhZIVi3qSVPieIXm4Z9QhdPPHG5DEi9nOlR2t1E646t9Vf4/k+tCBlDkl nn1tYkIIggdvg/SxvqczRZQP997nfeWi44qF0k8bU0CkdWwzL+1bO0b8Eqx2JRsaNndC xWG2eMOyf+9v2oghYuFBKTtDAZjVMSBQItQXUFz+mSa11pcvw3Jbp7FL4qFDRqXS3Edc huFg== X-Gm-Message-State: AMCzsaXqEWkyjIgS4xHScyOGixeVwIiqgleq2LCpMddFJqLxmkaEqdD5 kdsxJHLFatQQtYFlwnNoGYEteQGPTVk= X-Google-Smtp-Source: AOwi7QCxh2wdLs79T2LIEVMgPb8xEG2ed0j5um5wQwoZqoYTnpZDWwVSoJm6lH3pqDmBSugvhbUbMg== X-Received: by 10.25.24.105 with SMTP id o102mr3597692lfi.131.1507568051027; Mon, 09 Oct 2017 09:54:11 -0700 (PDT) Received: from enkidu.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id z204sm1421490lff.33.2017.10.09.09.54.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 09:54:10 -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: Mon, 9 Oct 2017 19:00:55 +0200 Message-Id: <1507568462-28775-7-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1507568462-28775-1-git-send-email-mw@semihalf.com> References: <1507568462-28775-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH 06/13] 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: Mon, 09 Oct 2017 16:50:46 -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 --- 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 -- 1.8.3.1