From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 A672521BADAB9 for ; Tue, 11 Dec 2018 10:35:35 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id s14so3307041wmh.1 for ; Tue, 11 Dec 2018 10:35:35 -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 :mime-version:content-transfer-encoding; bh=acPRjAm1LSHioxJowt59fUDI3OFAO0qahki8/64jPfE=; b=HyyEF/8Br+d7VHeIxjBV7OwrTLh9W2ovgFeEk/k41ee2A0eLD+29bkxYnEVGrVNaY/ A1t2gQfkUin+WTbokmbpF70VkdUJ4MHYKoVSUsWZNrBCa8ySZQx4OWSl1r4dLtCs/XNJ 7DBwLusRKam3A2K+ypBscHFit1CTomOhEwJ5Q= 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=acPRjAm1LSHioxJowt59fUDI3OFAO0qahki8/64jPfE=; b=Sp4xL4z6DF1fAWPuTnent6+5EYpgh9NaA63H8FuJBcMDM8+LLbZEafS10y/XG2ZR1l 5x4y5dH7UUaoGKyUK6mkH5CqLXKE8KFq/EpivAsEGW5TDEp8yuf6U6/kI4k0HqxMnaZA dyEo5Kgw993Im2nu/ODC54AxeyQ2dRV5wnpGOwnrIe2YmmxCcutqJ6VYauyE0EAYR4z9 JAUDDTh4bIPKub9ud9EcwdCMn2NIVZ6WV48G2zNEXSXlGMs9UjpMAG3SBBgE0f4j8wpP Ikd5iyZQT6GodzEKaSsTDPI6PkiHpihUgz8oRTIcqX/MBR+HGnpCJl3yxAJCpwiR3+sN 0/IA== X-Gm-Message-State: AA+aEWbt0Uf+PvuFY57VwucuXHFDEqsjINxjLeeajClOnKB31hx6lfxv KtjdpH/JPJAShP1xPRlSXp9NjrdBgf1JPg== X-Google-Smtp-Source: AFSGD/W2JIYMaALQ67Olw/1as5YaQQSK29v3F0fmssaOlxjDOk51sUfn4fbXcFzcIhV8Y7gFez/CSw== X-Received: by 2002:a1c:8acd:: with SMTP id m196mr3514067wmd.120.1544553333953; Tue, 11 Dec 2018 10:35:33 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id h131sm1026688wmd.17.2018.12.11.10.35.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 10:35:32 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, alan@softiron.co.uk, Ard Biesheuvel Date: Tue, 11 Dec 2018 19:35:12 +0100 Message-Id: <20181211183514.20948-10-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211183514.20948-1-ard.biesheuvel@linaro.org> References: <20181211183514.20948-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [PATCH edk2-platforms 09/11] Silicon/AMD/Styx/StyxDtbLoaderLib: replace DO_KCS macro reference with PCD X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2018 18:35:36 -0000 Content-Transfer-Encoding: 8bit Get rid of the CPP conditionals, and use the new boolean PCD for KCS support instead. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf | 1 + Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf index af57ab24f084..23c5e563bbb6 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf @@ -54,6 +54,7 @@ gArmPlatformTokenSpaceGuid.PcdCoreCount gArmTokenSpaceGuid.PcdArmLinuxFdtMaxOffset gArmTokenSpaceGuid.PcdArmLinuxFdtAlignment + gAmdStyxTokenSpaceGuid.PcdEnableKcs gAmdStyxTokenSpaceGuid.PcdSata1PortCount [Guids] diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index db7d9b077c32..248eda7c8a95 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -247,11 +247,12 @@ SetSocIdStatus ( SetDeviceStatus (Fdt, "gpio@e0020000", IsRevB1); SetDeviceStatus (Fdt, "gpio@e0030000", IsRevB1); SetDeviceStatus (Fdt, "gwdt@e0bb0000", IsRevB1); -#if DO_KCS - SetDeviceStatus (Fdt, "kcs@e0010000", IsRevB1); -#else - SetDeviceStatus (Fdt, "kcs@e0010000", FALSE); -#endif + + if (FixedPcdGetBool (PcdEnableKcs)) { + SetDeviceStatus (Fdt, "kcs@e0010000", IsRevB1); + } else { + SetDeviceStatus (Fdt, "kcs@e0010000", FALSE); + } if (!PcdGetBool (PcdEnableSmmus)) { DisableSmmu (Fdt, "iommu-map", "/smb/smmu@e0a00000", "/smb/pcie@f0000000"); -- 2.19.2