From patchwork Sat Dec 7 04:42:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1205376 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="iwZCCfvu"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47VHDC0kx1z9sPL for ; Sat, 7 Dec 2019 15:54:03 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4ECD58173C; Sat, 7 Dec 2019 05:49:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="iwZCCfvu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8CB4481743; Sat, 7 Dec 2019 05:49:05 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A05DB8173C for ; Sat, 7 Dec 2019 05:49:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd41.google.com with SMTP id l17so9526815ioj.3 for ; Fri, 06 Dec 2019 20:49:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qwbvrA2fmIcyU7O7mUhEc3+LrTSBIPfdBnuhHv7KCEM=; b=iwZCCfvu+4cZLf19Iaq+Sw8NXpUcuK1OB/3yFNDzR4eEybGFUUNvNaNjS8Z6rN/cHQ 8rlvUqYAcgtQ4Gz/oalj+RWVu/au2rFMz7vCKBgQ93/cP0Fx6pvCFGP/ga2FyVoxKes6 AVwIILZTgcSfxQFhRj4DwfXb45ffBtzFO1CHY= 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=qwbvrA2fmIcyU7O7mUhEc3+LrTSBIPfdBnuhHv7KCEM=; b=roiPKZYBrNzqtvwapxvI44Pdjwy8jhcR8yMx/VRFi8hHCsw34Xk4eEEyGF+eT52Odx 6HMFYyfG2hOfnqzWO8pmX1OHCHVp8HOZD+uawNe/6qY57Yzs6XDFMR4o/cSxBhinBlLm 3uIffjbbCcamPyFgRysFC7N+G01Cm0lcbaICOnzUNkf/9RTQhjzz1hqE//+IMNlpFmHD s+tbZ1b/lPr5LQQPyG5fpB7f1TXi1ZApXYY0OT8vh9ZLnbW6tbxc2pkq0PzJcAuwAVAq ic3pppYWikksvNpxlC2DRAo8mCLZX/4l5SdftTBsWVKfkQPNZnzWwyeFfPbvWYjlHhn2 veJQ== X-Gm-Message-State: APjAAAUzCEEp9UoB4u0psM4f/ZDkgeE5BhWszO8boEEueohAjVf9tPHM TqTe4AW2Tg1EVLPYg0hoekaODughRaQ= X-Google-Smtp-Source: APXvYqyBEI13oiNP7rrxVfZZEG7LZGjAg67YvOvIVvrbE/3u9f8plPj/Uo0oiKz6GqkOnn1nElf0KA== X-Received: by 2002:a05:6638:285:: with SMTP id c5mr17898982jaq.7.1575694141265; Fri, 06 Dec 2019 20:49:01 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id o7sm4549410ilo.58.2019.12.06.20.49.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 20:49:00 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Subject: [PATCH v6 043/102] x86: fsp: Make graphics support common to FSP1/2 Date: Fri, 6 Dec 2019 21:42:16 -0700 Message-Id: <20191206213936.v6.43.I82038de00e98ce3b9687d5234f68880e473da33a@changeid> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog In-Reply-To: <20191207044315.51770-1-sjg@chromium.org> References: <20191207044315.51770-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Both versions of FSP can use the same graphics support, so move it into the common directory. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None arch/x86/lib/fsp/Makefile | 3 +++ arch/x86/lib/{fsp1 => fsp}/fsp_graphics.c | 2 +- arch/x86/lib/fsp1/Makefile | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) rename arch/x86/lib/{fsp1 => fsp}/fsp_graphics.c (98%) diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp/Makefile index 9e34856473..da6c0a886a 100644 --- a/arch/x86/lib/fsp/Makefile +++ b/arch/x86/lib/fsp/Makefile @@ -4,4 +4,7 @@ obj-y += fsp_common.o obj-y += fsp_dram.o +ifndef CONFIG_SPL_BUILD +obj-$(CONFIG_VIDEO_FSP) += fsp_graphics.o +endif obj-y += fsp_support.o diff --git a/arch/x86/lib/fsp1/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c similarity index 98% rename from arch/x86/lib/fsp1/fsp_graphics.c rename to arch/x86/lib/fsp/fsp_graphics.c index 52e71334f9..91d2d08557 100644 --- a/arch/x86/lib/fsp1/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/lib/fsp1/Makefile b/arch/x86/lib/fsp1/Makefile index 870de71bd7..1cf5e54191 100644 --- a/arch/x86/lib/fsp1/Makefile +++ b/arch/x86/lib/fsp1/Makefile @@ -5,5 +5,4 @@ obj-y += fsp_car.o obj-y += fsp_common.o obj-y += fsp_dram.o -obj-$(CONFIG_VIDEO_FSP) += fsp_graphics.o obj-y += fsp_support.o