Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DB663C433F5 for ; Fri, 19 Nov 2021 20:28:14 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 54182613C8 for ; Fri, 19 Nov 2021 20:28:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 54182613C8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F3018341B; Fri, 19 Nov 2021 21:26:48 +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=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="O7k6tLiQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 614F98373F; Fri, 19 Nov 2021 21:25:42 +0100 (CET) Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) (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 151E183769 for ; Fri, 19 Nov 2021 21:24:43 +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-ot1-x336.google.com with SMTP id h19-20020a9d3e53000000b0056547b797b2so18487732otg.4 for ; Fri, 19 Nov 2021 12:24:43 -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=oW0W3J3Cx0oT1Sm1shlnlxg9jpvtq03L92BFJntzNTY=; b=O7k6tLiQeDcWVR5fr4V1iWfMnFPkEdM6RUoBn9YqfJQIPIqV5wWDvqGwwfkvY6zuOP ZcUsR2J2AbsKCgpp2T9nI2FCt9dAXoq2vat6FTq4NMrl19S5KANqcXht4p0kBt4hCkaF wZi+Zr99TN9hjUT1VAiNRjVN/Bl5kDZvBCNng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oW0W3J3Cx0oT1Sm1shlnlxg9jpvtq03L92BFJntzNTY=; b=PRBe18U7p2Fw52vEO7nH4rxL1UblNOT4HUgEHfyj3FaN0eWE9F23VsVXIlOK5nSB1u nOLVnAacOhI1dRhFV5NZ3pcmSbzq9jfZC5+GRK9XUMwzE07Ue5tj+NSkswD5+GkoBG+1 PiHXBXfnHoZSsRPTAECx5D1NtTRcxEoI6djpJniKjzpNLrXqzQsa/Mm/F14Oc5YR0LeV Q9p9KS/6OS/G+AGTCkYdzolYY2lPBl/ii7xdYWqHjtfe+RnU3+PPhu2MC31PIWMPwWVX 88rvKM//192mot5JMU+rZo+nZwP891K/WNYyiSX0sUjff95C0p3dhWX/otvrnhkTHEJz vN5w== X-Gm-Message-State: AOAM532CtxZzm5Rt/qwqYbhSPtpafHpgiWg5wTcgnoR5G11Bb1N1lt8m tqKFtejR9mIjxErvYWD1ow0Zpe+sGRXhug== X-Google-Smtp-Source: ABdhPJyYth7oz0ELZxTAtKOHa9SWIagp+pTVrka12xz1gUmiRsZ4PlvtAONbs9mHzVCg3i3RGGCEmQ== X-Received: by 2002:a05:6830:8e:: with SMTP id a14mr6602299oto.280.1637353481548; Fri, 19 Nov 2021 12:24:41 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id bl33sm197093oib.47.2021.11.19.12.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 12:24:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Tom Rini , Simon Glass , Bin Meng , Patrick Delaunay , Rick Chen , Sean Anderson , Stefan Reinauer , Tero Kristo , Vadim Bendebury Subject: [PATCH 22/23] x86: coreboot: Support getting a logo from virtio Date: Fri, 19 Nov 2021 13:24:06 -0700 Message-Id: <20211119202408.1815506-23-sjg@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211119202408.1815506-1-sjg@chromium.org> References: <20211119202408.1815506-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.103.2 at phobos.denx.de X-Virus-Status: Clean Enable this feature so that a splash screen can be provided. Signed-off-by: Simon Glass --- board/coreboot/coreboot/coreboot.c | 20 ++++++++++++++++++-- include/configs/coreboot.h | 3 +++ include/configs/x86-common.h | 6 +++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c index 11294d6e870..3b90ae75386 100644 --- a/board/coreboot/coreboot/coreboot.c +++ b/board/coreboot/coreboot/coreboot.c @@ -4,10 +4,11 @@ */ #include -#include -#include +#include #include #include +#include +#include int board_early_init_r(void) { @@ -65,3 +66,18 @@ fallback: return checkboard(); } #endif + +static struct splash_location coreboot_splash_locations[] = { + { + .name = "virtio_fs", + .storage = SPLASH_STORAGE_VIRTIO, + .flags = SPLASH_STORAGE_RAW, + .devpart = "0", + }, +}; + +int splash_screen_prepare(void) +{ + return splash_source_load(coreboot_splash_locations, + ARRAY_SIZE(coreboot_splash_locations)); +} diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index 1cf5c037e85..d6d679fd7dd 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -10,6 +10,9 @@ #ifndef __CONFIG_H #define __CONFIG_H +#define SPLASH_SETTINGS "splashsource=virtio_fs\0" \ + "splashimage=0x1000000\0" + #include #define CONFIG_SYS_MONITOR_LEN (1 << 20) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 486b5ca7765..2d280d5df60 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -88,9 +88,14 @@ #define DISTRO_BOOTENV #endif +#ifndef SPLASH_SETTINGS +#define SPLASH_SETTINGS +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ DISTRO_BOOTENV \ CONFIG_STD_DEVICES_SETTINGS \ + SPLASH_SETTINGS \ "pciconfighost=1\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ @@ -100,7 +105,6 @@ "ramdisk_addr_r=0x4000000\0" \ "ramdiskfile=initramfs.gz\0" - #define RAMBOOTCOMMAND \ "setenv bootargs root=/dev/ram rw " \ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \ -- 2.34.0.rc2.393.gf8c9666880-goog