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:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (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 319652035A7DE for ; Thu, 16 Nov 2017 09:43:11 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id a63so1812000wrc.12 for ; Thu, 16 Nov 2017 09:47:20 -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=lrd6MpmE/czHCZwyNcnflDCjOS9US5RhZXrKTMhrvkU=; b=iTqV6V/G8eWEOmVOd4op7uIR+48YIKc3YPIxa9wVz49z5xR613jwiF8pSlyc5pwwiZ E2MJ991VDLEdV9HX8EzBdTcKl7z/Et5/7lpQaZ4TejdXr39sg4T76ih0HW3MCy5yo6hq A4HTwjZYrKP6lquaPD/Y+WxTbp2/Ih/ZqPlOE= 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=lrd6MpmE/czHCZwyNcnflDCjOS9US5RhZXrKTMhrvkU=; b=TCx9bhVOeZHudcPYj4GsAyXbNSOLud/byVcJ/4qUVtLrw83kmoDwMEV8LE9uApV6Gw lUrka7S1BA1GXZ3quc078Gjic3s/PBQ3bIR/t7omiCG2mokDKhaY0dt/qlxw0veOa7+A 2n2Z+PyaPk8TcvVfifkQSfngBoBgGn+zbFsq9nQ1dHf70qVkoF+pPp5RzniSizgIAt08 y33MKUF7TziPojlczyji9SBwmpAzipDhP1Nhz83sJhzqA2IV55sicSLm1OV7C0qu2V/Z Qqowp9y5k2wfgxUNG0bSByPnWkFdxtDRCDXo2qQ8PsQbgLzV5/aHFx3hJr7g2Ple+1EP VGIQ== X-Gm-Message-State: AJaThX5AM+X/IyPQQoVNcONpclx7KUbWJaV5HtRwd2Pu8WEmwpVQ6Tyc XQnsqqggThnyrcyi6Wsy729mNP3otOg= X-Google-Smtp-Source: AGs4zMa7qMVzOEJrF0S8LBofhfMGaL4UhtFyA3a1zxWYhUeld/WlZ9MRVntv5gYTzrRhYU05h+iYjA== X-Received: by 10.223.135.179 with SMTP id b48mr2433990wrb.24.1510854439408; Thu, 16 Nov 2017 09:47:19 -0800 (PST) Received: from localhost.localdomain ([160.167.170.128]) by smtp.gmail.com with ESMTPSA id 55sm2772135wrw.60.2017.11.16.09.47.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Nov 2017 09:47:18 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Cc: lersek@redhat.com, Ard Biesheuvel Date: Thu, 16 Nov 2017 17:47:08 +0000 Message-Id: <20171116174708.24964-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171116174708.24964-1-ard.biesheuvel@linaro.org> References: <20171116174708.24964-1-ard.biesheuvel@linaro.org> Subject: [PATCH v2 2/2] ArmVirtPkg: switch to new PL011UartLib implementation 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: Thu, 16 Nov 2017 17:43:11 -0000 Switch to the new, cleaned up PL011UartLib implementation so we will be able to remove the old one. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 2 +- ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c | 5 ++--- ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index c92a69281ae4..50eb8675d1c0 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -106,7 +106,7 @@ [LibraryClasses.common] RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf # ARM PL011 UART Driver - PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf + PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf # diff --git a/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c index e28750f3b4c4..d9fd0ef98359 100644 --- a/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c +++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c @@ -16,14 +16,13 @@ **/ -#include +#include #include +#include #include #include -#include - RETURN_STATUS EFIAPI SerialPortInitialize ( diff --git a/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c index 05d3547fda91..c161dd6349d3 100644 --- a/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c +++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c @@ -17,9 +17,10 @@ **/ -#include +#include #include +#include #include #include #include @@ -28,8 +29,6 @@ #include #include -#include - STATIC UINTN mSerialBaseAddress; RETURN_STATUS -- 2.11.0