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::243; helo=mail-wm0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (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 7A2F521E0B9E8 for ; Thu, 1 Feb 2018 08:04:50 -0800 (PST) Received: by mail-wm0-x243.google.com with SMTP id 141so6726017wme.3 for ; Thu, 01 Feb 2018 08:10:27 -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=bJ+Ggb/tSJojtiiXnS8KOehMkYtcT4PRYv08sRBZtPA=; b=PxtoAIzm3DUI9kpXBseZFKpQjZSlMCRCFNnx/NjkglepOqKgE1nYHmjv/iP/hQG61s txTZw2c9bimeQvlmPYGwP0nzolLYFM3i94XdrrfjBJ9zNlDctnOA8ZVTrQHSyBbFeGij glGISIZd5PGy0rTF9m436DlmUQZPC+f80vMa0= 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=bJ+Ggb/tSJojtiiXnS8KOehMkYtcT4PRYv08sRBZtPA=; b=kYBQqW9duOF+gpU8m35BdAqUASBdK8tRzsb5CXhY+wyfbs2aIhB/Zy9iynDz4jN45g tK9qg++9Mr0Hha8D1SN8hJJxqhpvrOC03i+ui60HYeuzEkoPuA0AlKpHXL2QaE4p36sU UlX1+WYvtOTUBtXYK+7W0tg5jPBW95XSxr8wPoWUjoLOJ6+GvCNIHFdpWBRr6VoDG2mW L9pCCZNdmTUbQiRP2iNL2cmGlSKdeWk881po74fDfkQsbhU9Sofp5ETle8Nu4ULAUEnq rmprAu3MXOgJX2RAwSrwY+uMPbZwQACxmkLuGBJPQ0N3/wMQvymu89M8x7QoJmw5zVXu i6hg== X-Gm-Message-State: AKwxytcNeor8CoaTvA/14mTAvaAOHfoO7dNfcBxJzShGDc5IlPRwE5t7 yAOZT1v3PmybqLs0Fha3Bzgm6lCgopY= X-Google-Smtp-Source: AH8x224ZlsYOWWYebI/KBEypbex7ozkMwZ9YA/pQ168RSzhl8ttusLFhlPM1+XS+qJPoWE8auDZslw== X-Received: by 10.28.120.15 with SMTP id t15mr8522308wmc.34.1517501426280; Thu, 01 Feb 2018 08:10:26 -0800 (PST) Received: from localhost.localdomain ([160.164.249.13]) by smtp.gmail.com with ESMTPSA id 39sm8204139wrz.85.2018.02.01.08.10.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 08:10:25 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, alan@softiron.co.uk, marc.zyngier@arm.com, Ard Biesheuvel Date: Thu, 1 Feb 2018 16:10:08 +0000 Message-Id: <20180201161008.4037-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180201161008.4037-1-ard.biesheuvel@linaro.org> References: <20180201161008.4037-1-ard.biesheuvel@linaro.org> Subject: [PATCH edk2-platforms 4/4] Platform/Cello, Overdrive: set fw vendor PCD from FIRMWARE_VENDOR X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 16:04:51 -0000 'AMD Seattle' is not a firmware vendor, nor is 'LeMaker Cello' So let's do what other platforms do, and default to 'EDK II' unless it is overridden at build time by setting FIRMWARE_VENDOR. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 4 +++- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index a99a9a1062d4..21edcc8798f4 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -365,7 +365,9 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"AMD Seattle" +!ifdef $(FIRMWARE_VENDOR) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"$(FIRMWARE_VENDOR)" +!endif # Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES) diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index fb9155ce3a0d..cf3df8651415 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -351,7 +351,9 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"LeMaker Cello" +!ifdef $(FIRMWARE_VENDOR) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"$(FIRMWARE_VENDOR)" +!endif # Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES) -- 2.11.0