From patchwork Thu Jan 4 15:10:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1882484 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=DndJZP/B; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T5VR42zYxz1ydd for ; Fri, 5 Jan 2024 02:11:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7E6AF8799D; Thu, 4 Jan 2024 16:10:58 +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="DndJZP/B"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A9EE78798C; Thu, 4 Jan 2024 16:10:51 +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=-4.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 7C2B18798D for ; Thu, 4 Jan 2024 16:10: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=sjg@chromium.org Received: by mail-il1-x136.google.com with SMTP id e9e14a558f8ab-35fd5a13285so1685625ab.3 for ; Thu, 04 Jan 2024 07:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704381047; x=1704985847; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8IaGA6AvloKPwvMT5+83EeXKKUMvAVdPHvlUKKiFDok=; b=DndJZP/ByJyd80FoV7mhqB0ECcvlVCx+UnN1EUuiEHd8K7OWPBcvFdlZ/iqL/3HOqr Bgc7lB26GJ87uJAKE9/LmMre1P3+/KkB5AjdJ9McK4tc61bB74lkiHvfXRBx1Ut1PToo bVEYsrqFO4GBWBHum9yDpxj4v0jgup7p8qhzc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381047; x=1704985847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8IaGA6AvloKPwvMT5+83EeXKKUMvAVdPHvlUKKiFDok=; b=F/W79+1//s2GOQCpCHmOWygEGHaVAIpN/aUhfnuJG8L4HpbgO4sqkoLJadSMQApMVK Y2GGjSmBaAnDhnt0vjXjS2ZnrScmlkoJWcZUpIbrL6q935szPeOYVm42Y0Usv+cMV95D /6Xjfrwp9EouNrc81maWFkjWlOD41939qS+wJDKm0xze00+IR8k3RSlO/ztApO4jtLvZ ERa99H7+8mTyhfQvKpZEzvOatP5pUK48JVx8fC0c42M1bi+MQ+sn5qFI3yypJAMaUou7 zstKGsNijme6qbdeIe8kZjpgTByOOuzJqO5fhLzLnkGfTTnULEn/h/IvfbGRXcj9OkMN IFOg== X-Gm-Message-State: AOJu0Yzy6CEAIoViOiLwQav+HhaeisYaji/4KF637fvSFJNZ8PEdMHO8 wQ55kluw3o18eaYdvVrYZQgbOkVUuXEPYFJA7kYUMkAWq52H X-Google-Smtp-Source: AGHT+IFHEC3ZisonGCdCGLWuOva4lLwp14H4WygUpWh06ZO300oz5jpHbeM5sC7xyn1LzQoejakIpA== X-Received: by 2002:a05:6e02:1a45:b0:35f:eb9f:cf93 with SMTP id u5-20020a056e021a4500b0035feb9fcf93mr640752ilv.22.1704381046903; Thu, 04 Jan 2024 07:10:46 -0800 (PST) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z14-20020a02938e000000b0046d710cef38sm4937310jah.159.2024.01.04.07.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:10:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Bin Meng , Ilias Apalodimas , Peter Robinson Subject: [PATCH v6 1/7] x86: coreboot: Add a boot script Date: Thu, 4 Jan 2024 08:10:36 -0700 Message-Id: <20240104081037.v6.1.I134d949e881ebcd532e927119703b28747fe4c53@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104151042.695717-1-sjg@chromium.org> References: <20240104151042.695717-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Provide the user with a list of available boot options. Selecting one causes it to be booted. Pressing causes U-Boot to return to the command-line prompt. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v6: - Rebase to -next Changes in v3: - Clear the screen before booting Changes in v2: - Add new patch to add a coreboot boot script configs/coreboot64_defconfig | 1 + configs/coreboot_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig index dec9b40a2b3..ace3b63dfd4 100644 --- a/configs/coreboot64_defconfig +++ b/configs/coreboot64_defconfig @@ -17,6 +17,7 @@ CONFIG_BOOTSTD_DEFAULTS=y CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" +CONFIG_BOOTCOMMAND="bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi" CONFIG_SYS_PBSIZE=532 CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig index 8356bc12659..3762cde6f3a 100644 --- a/configs/coreboot_defconfig +++ b/configs/coreboot_defconfig @@ -15,6 +15,7 @@ CONFIG_BOOTSTD_DEFAULTS=y CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" +CONFIG_BOOTCOMMAND="bootflow scan -l; if bootflow menu; then cls; bootflow boot; fi" CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_LOG=y From patchwork Thu Jan 4 15:10:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1882485 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=aRaRZK9n; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T5VRH4JJHz1ydd for ; Fri, 5 Jan 2024 02:11:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 949388799E; Thu, 4 Jan 2024 16:11:07 +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="aRaRZK9n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C87EA879B0; Thu, 4 Jan 2024 16:10:51 +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=-4.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 32C6F87994 for ; Thu, 4 Jan 2024 16:10:49 +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-il1-x12c.google.com with SMTP id e9e14a558f8ab-3606ad581a5so918285ab.1 for ; Thu, 04 Jan 2024 07:10:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704381047; x=1704985847; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=adceXGFHmnmuz954gBoxGe3m1Jb9++mO62kVOT4lwho=; b=aRaRZK9n+VTES6JbIZrtLy4/+Kjg5ErqlNagTV4adEy4fM+Hcg7LyHYKFSsT3n7Uqx xW+j1ePxxa2lDGP2Jdr9IdLkDLp+wNBbUNtc9nB8SSjy8qQsjYMkcuhUApclVYZju/RF ksp/7r8xV1CirhZCBsSctMVW4zCQSDP6dXGh4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381047; x=1704985847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=adceXGFHmnmuz954gBoxGe3m1Jb9++mO62kVOT4lwho=; b=BRCA6pDAkkuTbb9O+JrfF+fxghstzJQpr+OhDjM/ItZIdwknCZNptwlqSp4nfrA65C vEqOFk+SZSstsXbaucDm6wEjCOeZMC88B6twi3j5wsynTlVnhkDF7ErR0TvteB1JdrDe YkUcDbOB1c6w4hkuZj1QsMh+hg9hMmSHc+ZB7jG7sWw2Uc5Vfr6nrAoISm/zTynaPmBO WvYSXImFWRGnKxOKijREuIDYlD5HWRz//nW4pzXW09iaPYZ9LfpyiF9/ByJ+dqQeoqXg 1KYUvfiEfwc0JnENky1nMDhmqzmCb5UOgWwVu/KxiIVF+tDMp3LKrZ9Ncl0sq+99oTAN 96SQ== X-Gm-Message-State: AOJu0YxoBNfoIWfDDOUa8m55BMHb4qvWh7ylCc7xEJXHa16PmHg3rcJ/ nXGRNurlSHeLfbIdsrB3v9yRJlLW5A7a95WyEkG2hr5NV+90 X-Google-Smtp-Source: AGHT+IE9K0/t82z0Gcmtqq9wcuoJYRpbjmv9hvdt+ugqSs9ThWRs7a/Ddx7Ql9m0Sbuxt03eJrtwdw== X-Received: by 2002:a5e:de0a:0:b0:7b7:fe53:ebdb with SMTP id e10-20020a5ede0a000000b007b7fe53ebdbmr749145iok.32.1704381047738; Thu, 04 Jan 2024 07:10:47 -0800 (PST) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z14-20020a02938e000000b0046d710cef38sm4937310jah.159.2024.01.04.07.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:10:47 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Anatolij Gustschin , Bin Meng , Devarsh Thakkar , Dzmitry Sankouski , Nikhil M Jain Subject: [PATCH v6 2/7] video: Correct setting of cursor position Date: Thu, 4 Jan 2024 08:10:37 -0700 Message-Id: <20240104151042.695717-2-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104151042.695717-1-sjg@chromium.org> References: <20240104151042.695717-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean The ANSI codes are not correctly handled at present, in that the requested X position is added to the current one. Correct this and also call vidconsole_entry_start() to start a new text line. Signed-off-by: Simon Glass Reviewed-by: Anatolij Gustschin --- (no changes since v1) drivers/video/vidconsole-uclass.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index 22d55df71f6..a312a198524 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -125,6 +125,7 @@ void vidconsole_set_cursor_pos(struct udevice *dev, int x, int y) priv->xcur_frac = VID_TO_POS(x); priv->xstart_frac = priv->xcur_frac; priv->ycur = y; + vidconsole_entry_start(dev); } /** @@ -134,8 +135,10 @@ void vidconsole_set_cursor_pos(struct udevice *dev, int x, int y) * @row: new row * @col: new column */ -static void set_cursor_position(struct vidconsole_priv *priv, int row, int col) +static void set_cursor_position(struct udevice *dev, int row, int col) { + struct vidconsole_priv *priv = dev_get_uclass_priv(dev); + /* * Ensure we stay in the bounds of the screen. */ @@ -144,9 +147,7 @@ static void set_cursor_position(struct vidconsole_priv *priv, int row, int col) if (col >= priv->cols) col = priv->cols - 1; - priv->ycur = row * priv->y_charsize; - priv->xcur_frac = priv->xstart_frac + - VID_TO_POS(col * priv->x_charsize); + vidconsole_position_cursor(dev, col, row); } /** @@ -193,7 +194,7 @@ static void vidconsole_escape_char(struct udevice *dev, char ch) int row = priv->row_saved; int col = priv->col_saved; - set_cursor_position(priv, row, col); + set_cursor_position(dev, row, col); priv->escape = 0; return; } @@ -255,7 +256,7 @@ static void vidconsole_escape_char(struct udevice *dev, char ch) if (row < 0) row = 0; /* Right and bottom overflows are handled in the callee. */ - set_cursor_position(priv, row, col); + set_cursor_position(dev, row, col); break; } case 'H': @@ -279,7 +280,7 @@ static void vidconsole_escape_char(struct udevice *dev, char ch) if (col) --col; - set_cursor_position(priv, row, col); + set_cursor_position(dev, row, col); break; } From patchwork Thu Jan 4 15:10:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1882491 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=i1NwI1Ex; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T5VSH5CWTz1ydd for ; Fri, 5 Jan 2024 02:12:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F3046879A3; Thu, 4 Jan 2024 16:11:11 +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="i1NwI1Ex"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3625887977; Thu, 4 Jan 2024 16:11:06 +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=-4.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 19DEF8799E for ; Thu, 4 Jan 2024 16:10:50 +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-il1-x12b.google.com with SMTP id e9e14a558f8ab-3606ad5f1ffso842695ab.1 for ; Thu, 04 Jan 2024 07:10:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704381048; x=1704985848; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+IhfFkdtwmc+x40dlRQ9yQLO2Il+xbK0ZEs/XXDGabc=; b=i1NwI1Ex9MEGIxdrWvdiJXqw9jo6ib6xMa+QQTUd5vbQTWRyZ/MQLX0jxW+MVXcKWo Igcxyxabe6Sq4qItaBpWK8dCzucN4U9ALGvmG8dWCAakRHj1hq8Zk8fNVWQPYuMp7mJQ w++0V+OHLHZGjmYTYYXuC/RZ1/xkBG6sOpzzI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381048; x=1704985848; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+IhfFkdtwmc+x40dlRQ9yQLO2Il+xbK0ZEs/XXDGabc=; b=WmaAX4GYAhM4ALwlf0to3qoS5tRbztr9KkEBSyjm3JiNd5KXN/+lg4okzY2J8U5VDs OPxAgXkyvuc9oNhUdAbZ2ZJ8EssCt6lE+OfLjsIr33wa9AnIsD5/3Eco8elUbRAR7Ikw 6hsg2K43xYoDd4jQIKVFuy1cQOOkgBLfeywPewvb3acUbRZPiucFYPK7B+iFb8is6mKE mJ7NW/2hzy6k6D4OiMAQ4FY7cn1KhKgMrjj0SwFcI0r+tdEeg4Thr3ibNNI39/nLFzyV yGSYpTMeHDwn0IEimSZ5rO/+g96OJ5h8lWuQiatrTCkzaEW22uI2nUHnAD5X6QxEyL/I VHEg== X-Gm-Message-State: AOJu0Yxt8f6TC7BTneXzAZgxcGeaK1pQR1LwA/YMbWyRjAFCsIPSzsIb LeTXmif4d+aF7sv+wcCj5UsMdIaDnnvnkDtu0oQiSrdxEk1H X-Google-Smtp-Source: AGHT+IGGPWoJMpaQ0gGyx58wOJxbZ/AWMs5Qrtk+sHNGs2xaEX0rSeLVUrAZ8o8diHn63N+eM7K9cw== X-Received: by 2002:a05:6e02:1bc5:b0:360:1914:49b with SMTP id x5-20020a056e021bc500b003601914049bmr788892ilv.47.1704381048597; Thu, 04 Jan 2024 07:10:48 -0800 (PST) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z14-20020a02938e000000b0046d710cef38sm4937310jah.159.2024.01.04.07.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:10:48 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Bin Meng , Anatolij Gustschin , Dzmitry Sankouski Subject: [PATCH v6 3/7] video: Drop unnecessary truetype operations from SPL Date: Thu, 4 Jan 2024 08:10:38 -0700 Message-Id: <20240104151042.695717-3-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104151042.695717-1-sjg@chromium.org> References: <20240104151042.695717-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Saving and restoring entries is used for expo and for the command line, which we don't use in SPL. Drop these methods. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Reviewed-by: Anatolij Gustschin --- (no changes since v3) Changes in v3: - Add new patch to drop unnecessary truetype operations from SPL drivers/video/console_truetype.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index 14fb81e9563..602133575f8 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -799,6 +800,9 @@ static int truetype_entry_save(struct udevice *dev, struct abuf *buf) struct console_tt_store store; const uint size = sizeof(store); + if (spl_phase() <= PHASE_SPL) + return -ENOSYS; + /* * store the whole priv structure as it is simpler that picking out * what we need @@ -820,6 +824,9 @@ static int truetype_entry_restore(struct udevice *dev, struct abuf *buf) struct console_tt_priv *priv = dev_get_priv(dev); struct console_tt_store store; + if (spl_phase() <= PHASE_SPL) + return -ENOSYS; + memcpy(&store, abuf_data(buf), sizeof(store)); vc_priv->xcur_frac = store.cur.xpos_frac; @@ -844,6 +851,9 @@ static int truetype_set_cursor_visible(struct udevice *dev, bool visible, uint out, val; int ret; + if (spl_phase() <= PHASE_SPL) + return -ENOSYS; + if (!visible) return 0; From patchwork Thu Jan 4 15:10:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1882489 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=H75rPUk3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T5VRX4fRyz1ydd for ; Fri, 5 Jan 2024 02:11:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 717D48798C; Thu, 4 Jan 2024 16:11:09 +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="H75rPUk3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AEB1B8796B; Thu, 4 Jan 2024 16:11: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=-4.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) (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 56A5A879A5 for ; Thu, 4 Jan 2024 16:10:51 +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-xd42.google.com with SMTP id ca18e2360f4ac-7b7fdde8b98so22679239f.1 for ; Thu, 04 Jan 2024 07:10:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704381050; x=1704985850; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=37EbUCUpA2uiD8JW7BW15+qfeqzZ+3vxmFHC7zbTRMY=; b=H75rPUk3zGFQMXlVSwZfWlRl4+3y9uvw0z0+V6V2CcjFpEf1mm8TPiwHiMEhDpZGYA HHSv+A7OpGMcqUUzYC+Q7C3ylmHDCOOU2CGeRIR+eZSRwlNbVtd78uCO3aexRJbaSm0f CLl6iti6PSSg7RL5GQS38lNvr6aVk2+uq0CZM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381050; x=1704985850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=37EbUCUpA2uiD8JW7BW15+qfeqzZ+3vxmFHC7zbTRMY=; b=R83YWncmnZ35vMR4hXDqSCHKjFrH7CJ4Tz/ANFSjp1OpnIBN+g22AuDbq9OlhcOfsR FO8KR5KFEwXh3J5rBNTBOGh9Q7iPkY5mIsRzRuoNiOM8R0CwPygN5KFt/ykGvXq/hoAe CBZP/2H37m0lYf29Tn0XbVeJ3XBmeowyqsK+Tf47ysO8KXRzCUZjdGbyY6RZJtye+Rhj dnY+wJrPWHDJnzCI6e4Bwzubf95QiZviFz8aTzwEskXFdRSnom/o2OEIMaoEMrzt1o2H jV3BgY8JOgzX2Sq0J37/gkDN7e+nW92NJZpJRcJ7KT/420AaiugCpvjsVZziUgFBD/Tb eMmg== X-Gm-Message-State: AOJu0Yx7jil0BDgdWSmG995XXLWQLYaf0rMh5ueh6ByP7oAMtAJeE1wH BrGGmEJT6TUlEu35jluDwkdYykTo4adwMFwOr+ElFiZC7R3wf/g= X-Google-Smtp-Source: AGHT+IGSRVv8p/jBi+L6hDp0HhLIiBefap28dOqYuMi+6JWHWq/4ETaAQaR/Mu3sDheQiKJ6Ppk8sQ== X-Received: by 2002:a6b:912:0:b0:7b7:fb2a:aa29 with SMTP id t18-20020a6b0912000000b007b7fb2aaa29mr789152ioi.25.1704381049836; Thu, 04 Jan 2024 07:10:49 -0800 (PST) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z14-20020a02938e000000b0046d710cef38sm4937310jah.159.2024.01.04.07.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:10:49 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Tom Rini , Bin Meng , Anatolij Gustschin , Dzmitry Sankouski , Fabio Estevam , Nikhil M Jain , Svyatoslav Ryhel , Venkatesh Yadav Abbarapu Subject: [PATCH v6 4/7] x86: Enable SSE in 64-bit mode Date: Thu, 4 Jan 2024 08:10:39 -0700 Message-Id: <20240104151042.695717-4-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104151042.695717-1-sjg@chromium.org> References: <20240104151042.695717-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean This is needed to support Truetype fonts. In any case, the compiler expects SSE to be available in 64-bit mode. Provide an option to enable SSE so that hardware floating-point arithmetic works. Signed-off-by: Simon Glass Reviewed-by: Tom Rini Suggested-by: Bin Meng --- (no changes since v4) Changes in v4: - Use a Kconfig option arch/x86/Kconfig | 8 ++++++++ arch/x86/config.mk | 4 ++++ arch/x86/cpu/x86_64/cpu.c | 12 ++++++++++++ drivers/video/Kconfig | 1 + 4 files changed, 25 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 99e59d94c60..6b532d712ee 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -723,6 +723,14 @@ config ROM_TABLE_SIZE hex default 0x10000 +config X86_HARDFP + bool "Support hardware floating point" + help + U-Boot generally does not make use of floating point. Where this is + needed, it can be enabled using this option. This adjusts the + start-up code for 64-bit mode and changes the compiler options for + 64-bit to enable SSE. + config HAVE_ITSS bool "Enable ITSS" help diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 26ec1af2f0b..2e3a7119e79 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -27,9 +27,13 @@ ifeq ($(IS_32BIT),y) PLATFORM_CPPFLAGS += -march=i386 -m32 else PLATFORM_CPPFLAGS += $(if $(CONFIG_SPL_BUILD),,-fpic) -fno-common -march=core2 -m64 + +ifndef CONFIG_X86_HARDFP PLATFORM_CPPFLAGS += -mno-mmx -mno-sse endif +endif # IS_32BIT + PLATFORM_RELFLAGS += -fdata-sections -ffunction-sections -fvisibility=hidden KBUILD_LDFLAGS += -Bsymbolic -Bsymbolic-functions diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index 2647bff891f..5ea746ecce4 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -10,6 +10,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -39,11 +40,22 @@ int x86_mp_init(void) return 0; } +/* enable SSE features for hardware floating point */ +static void setup_sse_features(void) +{ + asm ("mov %%cr4, %%rax\n" \ + "or %0, %%rax\n" \ + "mov %%rax, %%cr4\n" \ + : : "i" (X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT) : "eax"); +} + int x86_cpu_reinit_f(void) { /* set the vendor to Intel so that native_calibrate_tsc() works */ gd->arch.x86_vendor = X86_VENDOR_INTEL; gd->arch.has_mtrr = true; + if (IS_ENABLED(CONFIG_X86_HARDFP)) + setup_sse_features(); return 0; } diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6f319ba0d54..39c82521be1 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -180,6 +180,7 @@ config CONSOLE_ROTATION config CONSOLE_TRUETYPE bool "Support a console that uses TrueType fonts" + select X86_HARDFP if X86 help TrueTrype fonts can provide outline-drawing capability rather than needing to provide a bitmap for each font and size that is needed. From patchwork Thu Jan 4 15:10:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1882490 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=OAsZBPjM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T5VRt20Nvz1ydd for ; Fri, 5 Jan 2024 02:11:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1874987985; Thu, 4 Jan 2024 16:11:11 +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="OAsZBPjM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 43C66879AA; Thu, 4 Jan 2024 16:11: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=-4.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 05FCE8796B for ; Thu, 4 Jan 2024 16:10:52 +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-xd31.google.com with SMTP id ca18e2360f4ac-7b913830d8eso26543039f.1 for ; Thu, 04 Jan 2024 07:10:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704381050; x=1704985850; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dc2ZrolK1NEttM8KoWKpC2Lw4llvoZ31nUaWghODIh0=; b=OAsZBPjMljfKb5/PttrK7IRac6GTOUbRQcX7MTe8fnTBkY1O7RvvdEJ87RRy3IQreo GmdmWnyRvfshAX+ABEhVGaH7bbHw6wVLnBuMb+a1B73myJ9WChBhu6P7aJLCudA1NqAB qL8SzQzRPopmcPKD9XjbhJrUrjnsVjLfjWG+c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381050; x=1704985850; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dc2ZrolK1NEttM8KoWKpC2Lw4llvoZ31nUaWghODIh0=; b=lKX8+3iy3yoUuH3SRBZ6wzk8LaUvqmm0py7M0NMrEac+5dYadukD91s92SOdDh8+gP eJclkCoul1DKAzIMnYUJlEpn2FyP66WH6AaPBltkPkGSD/i9HdUjxuXMifRYKfHSWjiY ca3OUEunf4BuXSBGVQMLmDXSkq0mQdFhyZQ58TUYGtzBFhvDKz9UWpO40XtzcPV0jn8G CY6YZ0J5K7Tig+EASlgDo7kc7SPa83vR5W/9Vis2FVKy7O+NYd4lDgpPznDQuXnAdxiZ 2q93RWVz2csQZzUna1P6MW8GrGf2pMsgELpAlR6mpyZCU1n4kGctVYhS9lHHZPQ+hwH+ b/6A== X-Gm-Message-State: AOJu0Yw/L9Ki5Z3J4YfKtzuPQlcWnjOPX0+AzpYDnIZJLPv0WwC/IwyQ jHhq8nSplfMCXmnMTIbHnl9xkSMdH9TR5lQm5QzJwBndpVZn X-Google-Smtp-Source: AGHT+IGG7C0biZ0vtwedq9bcny5bf+1BdO8zW6ye2suh+lzMfUw2ZSSjz5vHHyVx1QxSxB6pv5HVVw== X-Received: by 2002:a05:6602:4f91:b0:7b7:fb7f:85cd with SMTP id gr17-20020a0566024f9100b007b7fb7f85cdmr839867iob.24.1704381050596; Thu, 04 Jan 2024 07:10:50 -0800 (PST) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z14-20020a02938e000000b0046d710cef38sm4937310jah.159.2024.01.04.07.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:10:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Bin Meng , Ilias Apalodimas , Peter Robinson Subject: [PATCH v6 5/7] x86: coreboot: Enable truetype fonts Date: Thu, 4 Jan 2024 08:10:40 -0700 Message-Id: <20240104151042.695717-5-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104151042.695717-1-sjg@chromium.org> References: <20240104151042.695717-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Truetype fonts look better in the menu, so enable them. Signed-off-by: Simon Glass --- (no changes since v3) Changes in v3: - Add new patch to enable truetype fonts in coreboot arch/x86/dts/coreboot.dts | 10 ++++++++++ configs/coreboot64_defconfig | 1 + configs/coreboot_defconfig | 1 + 3 files changed, 12 insertions(+) diff --git a/arch/x86/dts/coreboot.dts b/arch/x86/dts/coreboot.dts index dfce7c2d591..b867468e16c 100644 --- a/arch/x86/dts/coreboot.dts +++ b/arch/x86/dts/coreboot.dts @@ -46,6 +46,16 @@ compatible = "coreboot-fb"; }; + bootstd { + compatible = "u-boot,boot-std"; + + theme { + font-size = <30>; + menu-inset = <3>; + menuitem-gap-y = <1>; + }; + }; + sysinfo { compatible = "coreboot,sysinfo"; }; diff --git a/configs/coreboot64_defconfig b/configs/coreboot64_defconfig index ace3b63dfd4..8f80e0271f7 100644 --- a/configs/coreboot64_defconfig +++ b/configs/coreboot64_defconfig @@ -61,6 +61,7 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SOUND=y CONFIG_SOUND_I8254=y CONFIG_VIDEO_COPY=y +CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_SPL_ACPI=y CONFIG_CMD_DHRYSTONE=y diff --git a/configs/coreboot_defconfig b/configs/coreboot_defconfig index 3762cde6f3a..7d744e9962a 100644 --- a/configs/coreboot_defconfig +++ b/configs/coreboot_defconfig @@ -55,6 +55,7 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SOUND=y CONFIG_SOUND_I8254=y CONFIG_VIDEO_COPY=y +CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_SCROLL_LINES=5 CONFIG_CMD_DHRYSTONE=y # CONFIG_GZIP is not set From patchwork Thu Jan 4 15:10:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1882493 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=eKSfzlkf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T5VTb4wqhz1ydd for ; Fri, 5 Jan 2024 02:13:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DFEF8879C8; Thu, 4 Jan 2024 16:11:16 +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="eKSfzlkf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A2874879A5; Thu, 4 Jan 2024 16:11:09 +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=-4.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) (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 BB6DD8798F for ; Thu, 4 Jan 2024 16:10:53 +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-xd36.google.com with SMTP id ca18e2360f4ac-7b7f6caf047so23220539f.3 for ; Thu, 04 Jan 2024 07:10:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704381051; x=1704985851; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FuMMyoINzgyasVsmgJvWqqRoYWhwNtTQTkUs2Hh1jgE=; b=eKSfzlkf/0aKgTSxu+iwNdXyOlZ4KonxOXEjtTfXiI5IwgvA4Jsi1OpF6mGQVHTBbi DNykbRViMgBa5AnHCiKVIsDGJSrRS6633vRodeJQhWuj4RjZeNwed3z1Lubjr7co+ibg NEq9brlzaVBdDybXuaCQHyFFQxUuIm+/Is6x0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381051; x=1704985851; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FuMMyoINzgyasVsmgJvWqqRoYWhwNtTQTkUs2Hh1jgE=; b=qvn2Bt3AHUdz0OOpNqsVTYtgukxjnq5ZLrZD3q1WayMxbhqKhw8Mm2Nz9jQ+4NVo96 kcqgMum18iYYLCJ4wpLwTJhTk0TcZKX6ccK5MWHWWft8RTr4PySs+LvCUQaW99HwdMFR aMxREVjgrjKPR4Lm6oC/VPmU0vcscDzQ8//GZ5Xj5qXVMuK0vfldnJ/UxTdE8MwTvl34 CWKzGbyk4HZCP0re6kwt4kmKQFVEVXaan0fNuNrenYJMb1oRMxPtsKhQEeo05CYiwdxZ tsnJRfOqVuNzsgwpV5iXFHTUNH4wx6r/K0WYxqWRoXWA0jyOPKV+aMgw70FHnVSnvDVa nleg== X-Gm-Message-State: AOJu0YwhgWUh4HuEw4QvxyM2toWSQ+VhmnamxAdhriuGsKwg4+Qz3ekb 7bu4bAYebt/qAs8t126wtDZdG/Bi1SP1N0SICJUR7STjTAdW X-Google-Smtp-Source: AGHT+IFo2r70CszJhQXRkbPSgMxKTc6yfWpbIsalJibBOmJUapJ4euuS1cQY3ScUfCnrwiJ92gtaWQ== X-Received: by 2002:a5d:8704:0:b0:7ba:9c04:2e03 with SMTP id u4-20020a5d8704000000b007ba9c042e03mr739674iom.27.1704381051365; Thu, 04 Jan 2024 07:10:51 -0800 (PST) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z14-20020a02938e000000b0046d710cef38sm4937310jah.159.2024.01.04.07.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:10:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Bin Meng , Heinrich Schuchardt , Ilias Apalodimas , Peter Robinson , qemu-devel@nongnu.org Subject: [PATCH v6 6/7] x86: qemu: Expand ROM size Date: Thu, 4 Jan 2024 08:10:41 -0700 Message-Id: <20240104151042.695717-6-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104151042.695717-1-sjg@chromium.org> References: <20240104151042.695717-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Expand the ROM for x86_64 to 2MB to make space for the font, as it is already on the edge. Signed-off-by: Simon Glass --- (no changes since v1) board/emulation/qemu-x86/Kconfig | 3 ++- configs/qemu-x86_64_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig index 01dc1d497ae..34d665a3e4c 100644 --- a/board/emulation/qemu-x86/Kconfig +++ b/board/emulation/qemu-x86/Kconfig @@ -21,7 +21,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select X86_RESET_VECTOR select QEMU select QFW_PIO if CMD_QFW - select BOARD_ROMSIZE_KB_1024 + select BOARD_ROMSIZE_KB_1024 if TARGET_QEMU_X86 + select BOARD_ROMSIZE_KB_2048 if TARGET_QEMU_X86_64 imply VIRTIO_PCI imply VIRTIO_NET imply VIRTIO_BLK diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 8b4c5aff7f6..79cdb0bddb2 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -6,7 +6,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_MAX_CPUS=2 CONFIG_SPL_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx" -CONFIG_SPL_TEXT_BASE=0xfffd8000 +CONFIG_SPL_TEXT_BASE=0xfffd4000 CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000 CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 @@ -17,7 +17,7 @@ CONFIG_DEBUG_UART=y CONFIG_SMP=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y -CONFIG_X86_OFFSET_U_BOOT=0xfff00000 +CONFIG_X86_OFFSET_U_BOOT=0xffe00000 CONFIG_SYS_MONITOR_BASE=0x01110000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y From patchwork Thu Jan 4 15:10:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1882492 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=E3xNF+Lw; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T5VT03KMYz1ydd for ; Fri, 5 Jan 2024 02:12:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 95C7A879BD; Thu, 4 Jan 2024 16:11:12 +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="E3xNF+Lw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E226879B5; Thu, 4 Jan 2024 16:11:09 +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=-4.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) (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 C8D8A87994 for ; Thu, 4 Jan 2024 16:10:53 +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-xd2b.google.com with SMTP id ca18e2360f4ac-7bb982d0f12so43107539f.0 for ; Thu, 04 Jan 2024 07:10:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1704381052; x=1704985852; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jAQCA2+L8S+5OKFmSgZPF3WL7XCVJOyD3jGB9qjlr1Q=; b=E3xNF+LwqEdJL0/wuthMyQqg98dJlycBfgQIQx3RdMGXloDMlIGaeNHp9dj031I3EY eauiPkK1PmczWAwNKkFAKqCgj4N4zJ+vFEXx/QFEh0pzdhH8EBlquIwKCLh5/7+0v5CO YmezRDovoSdEosvr4QY8xX3yQUllZ9BGXrKu4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704381052; x=1704985852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jAQCA2+L8S+5OKFmSgZPF3WL7XCVJOyD3jGB9qjlr1Q=; b=o2EjVeeSi2A2qTc105utF99BBqDu6qLw04N76VGmojhfVnRqnNAjRNoWoVEGA4dCQV rsSpfkEAo19d0ZoWW/MBE077eqe8Gj3ObyEVE0hhNp1t3JgzjABzXRxJv4JngBFBYtg7 Baz2McsL1B1wLt228oDr79iiP1G7TIBLLr7q+Z6+sRWHgWgxbvnS/gRlFeqvDAcBp46l P8Sw1K73LD/MFxPPt++D5Rs9JTo1YL7T6jdA0LZQMCJgNV7/Dqg81m4eodBtTADYfUGR 9v1mMa2vGSSo5rsTTFevCtrkfEwoZ3ioCtGdyzeBc3st8cvULMnVt/Bqf6Xn59P6kXI6 r0Tw== X-Gm-Message-State: AOJu0Yz6GVnKNGNmgLaRpV30OlQAzuE91go8U13t1gdPsBjLyVVGBXqj XqQTE3kCelj8kcIb99I5rQpphjew24zK8YJqYMZgOb4i2wNz X-Google-Smtp-Source: AGHT+IHKGtjhho94H8XlnF5DxIDBQI5UgRF5OICVleGRtK1i58J6OfSiw9pqYrEh0W7htYlJzoE8Dw== X-Received: by 2002:a05:6e02:20eb:b0:360:142:3fec with SMTP id q11-20020a056e0220eb00b0036001423fecmr359057ilv.6.1704381052163; Thu, 04 Jan 2024 07:10:52 -0800 (PST) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z14-20020a02938e000000b0046d710cef38sm4937310jah.159.2024.01.04.07.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 07:10:51 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Bin Meng , Heinrich Schuchardt , Ilias Apalodimas , Peter Robinson , qemu-devel@nongnu.org Subject: [PATCH v6 7/7] x86: qemu: Enable truetype fonts Date: Thu, 4 Jan 2024 08:10:42 -0700 Message-Id: <20240104151042.695717-7-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104151042.695717-1-sjg@chromium.org> References: <20240104151042.695717-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Enable this feature to provide a larger font choice and more attractive menus. Expand the ROM for x86_64 to 2MB to make space for the font. Signed-off-by: Simon Glass --- Changes in v6: - Move 'Avoid unbinding devices in use by bootflows' to another series Changes in v3: - Add new patch to enable truetype fonts in qemu-x86 and qemu-x86_64 configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 79cdb0bddb2..f084f8e2989 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -81,6 +81,7 @@ CONFIG_SPL_DM_RTC=y CONFIG_SYS_NS16550_PORT_MAPPED=y CONFIG_SPI=y CONFIG_USB_KEYBOARD=y +CONFIG_CONSOLE_TRUETYPE=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144 diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 9bcf06c137f..b0d397bae08 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -58,6 +58,7 @@ CONFIG_NVME_PCI=y CONFIG_SYS_NS16550_PORT_MAPPED=y CONFIG_SPI=y CONFIG_USB_KEYBOARD=y +CONFIG_CONSOLE_TRUETYPE=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_USER=y CONFIG_FRAMEBUFFER_VESA_MODE=0x144