From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (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 9D6FC2220AFA9 for ; Fri, 8 Dec 2017 09:27:48 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id f9so4367259wmh.0 for ; Fri, 08 Dec 2017 09:32:23 -0800 (PST) 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; bh=+cIUGGLBn1hdAPoOtxpp0r5gucvWFvOhw0TOOU7QPpA=; b=iIXSfj7p+af6Yr2i4GK/FaSCgypu4U5+WxxW9JhOoPECoysyRikh+5h8Ctf0U2a6sC Nk1jjFjQrMhuZDc4xN0PmKHVvRK0PxHltj0uDG+GM4ZNA2zOq7ykFdWvWBtT2eVnswG7 pvc1DtPWwpTVkIytx3Qc/mP5Fe87TxhM4kVP8= 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=+cIUGGLBn1hdAPoOtxpp0r5gucvWFvOhw0TOOU7QPpA=; b=tewQqNAVYFUEpeT/zgGtOpMu355xaNl3Y+Z/VvqcjzjhV8HI7Vse33RbkxWv2JhB4B MjfsS9aFJ7Ygp1+chbJSmn4p7waRMQ/jLURApcJ8uN2WAh2kGKZtW8Yol7KeJS6aUAGP rWk/FtbZnN1tPxfkVRqrNbSpaEDsTDiNtZbCgJoa6UwNrLjqsXjZ+Ln+IECMmjb7W2UX Cu7qciQx6azigWpXXq7S4c6QypPNbjZZTf/qjqHTXFVShtC7ZXVQh0qWaNEN/BlGsNuX mfffmoEz08zfZ0QTm4OzgwQkf/HWJi/Mky43Hsriq4OM63IpZSWOGRXexkuff2lQ4Acf CdUA== X-Gm-Message-State: AKGB3mJWCmZvbbdVwa29o//9HbsBRxCOa9ZdwjgmF7/Z3LuC4y06Q1+F DyeFxYlM8xTN0CrjQfQiBoBfAUQidCs= X-Google-Smtp-Source: ACJfBou9uLJNd72aQZpeKuVo55Pd1IvKxRHkLBNv0cGqfVcDrCi8vP/K8trkDAufjndXeYrcVrm6Ag== X-Received: by 10.28.17.75 with SMTP id 72mr1654716wmr.125.1512754341489; Fri, 08 Dec 2017 09:32:21 -0800 (PST) Received: from localhost.localdomain ([160.171.158.223]) by smtp.gmail.com with ESMTPSA id n74sm3540144wmi.1.2017.12.08.09.32.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 09:32:20 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, Ard Biesheuvel , Girish Pathak , Evan Lloyd Date: Fri, 8 Dec 2017 17:31:39 +0000 Message-Id: <20171208173140.28540-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171208173140.28540-1-ard.biesheuvel@linaro.org> References: <20171208173140.28540-1-ard.biesheuvel@linaro.org> Subject: [PATCH edk2-platforms v2 1/2] Platform/ARM: move FVP to the new LcdGraphicsOutputDxe driver 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: Fri, 08 Dec 2017 17:27:48 -0000 Update the FVP .dsc and .fdf files to switch over to the refactored LCD graphics output driver. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 3 ++- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 2 +- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index c7710564df5e..c4fd9124dfbc 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -46,6 +46,7 @@ [LibraryClasses.common] ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf !ifdef EDK2_ENABLE_PL111 + LcdHwLib|ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.inf LcdPlatformLib|Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf !endif @@ -272,7 +273,7 @@ [Components.common] ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf ArmPkg/Drivers/TimerDxe/TimerDxe.inf !ifdef EDK2_ENABLE_PL111 - ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf + ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf !endif ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf index 0bac8ae91dab..305e661a2bdc 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -114,7 +114,7 @@ [FV.FvMain] INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf !ifdef EDK2_ENABLE_PL111 - INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf + INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf !endif INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index c6b88c741627..20552ef1a04a 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -82,10 +82,7 @@ [LibraryClasses.common] ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf NorFlashPlatformLib|Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf -!ifdef EDK2_ENABLE_PL111 - # ARM PL111 Lcd Driver - LcdPlatformLib|Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf -!endif + # ARM PL031 RTC Driver RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf -- 2.11.0