From patchwork Thu Apr 18 19:00:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau via B4 Relay X-Patchwork-Id: 1925197 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 (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=ZkuZpxmg; 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 4VL6Z93zggz1yPv for ; Fri, 19 Apr 2024 05:01:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7E79F886AC; Thu, 18 Apr 2024 21:00:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="ZkuZpxmg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14D37886A7; Thu, 18 Apr 2024 21:00:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8F5238869A for ; Thu, 18 Apr 2024 21:00:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=devnull+j.jannau.net@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 93B60CE17C1; Thu, 18 Apr 2024 19:00:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id CC038C3277B; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713466829; bh=FBJF8TwEarYMbU18f17+c423zfMKKM3xK1+QDqFe5Po=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ZkuZpxmg9B05LAIJ3MxoYfk4QaeC6rGemy+jBgLfd+tOqTEvkHxYQfLI3Us4ZGLBj 7srfLwlMYdtZpoU8+vRvoWiGAavXA4T6r1Sy3wU2nhDXR3v2EWQwn8V/RLrihcRwHh Kjowpon51hSEanXY6g6E1M9+f20gaguKbIlUvK1IWYYHRCCHyaJL8rvLYktgiAdcGu xfovTLEI+rcnCZqSI9UOdZiBV4883XxJ+Ps/QdW4noNn81JJhWTav8NiRdgkk6qQyX 7JzQj8T6N4308/3grvV4REvnhtBut/M6+M2gslLQZrfFe/++WJv0rRom1r4s8vKJCH YbdD7LYums4zw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4D96C04FFE; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Thu, 18 Apr 2024 21:00:25 +0200 Subject: [PATCH v2 1/5] apple_m1_defconfig: Turn on CONFIG_SYS_64BIT_LBA MIME-Version: 1.0 Message-Id: <20240418-apple_config-v2-1-7e5c6b9a9db3@jannau.net> References: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> In-Reply-To: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> To: Mark Kettenis , Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, asahi@lists.linux.dev, Janne Grunau , Hector Martin , Neal Gompa X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=911; i=j@jannau.net; h=from:subject:message-id; bh=iW3npaSaVV3BNoLkHi1Fz7M4xWDJIwJ9UUkZXz6uLiw=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhjTF3NNXd722eRf0L+uN9dHzE+wWdz+KZXmQutVUfNnEO 7aGS4/Zd5SwMIhxMciKKbIkab/sYFhdoxhT+yAMZg4rE8gQBi5OAZhI2FNGhguXF709x/5k8b/Q C+lrmLetrv/l5P60t+n24oo59jnv9rcx/JhhO7uyYq7ElGPc7sZ9KRW6r529Xh35OoUto/wvx4Z YdgA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 X-Endpoint-Received: by B4 Relay for j@jannau.net/default with auth_id=62 X-Original-From: Janne Grunau 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: , Reply-To: j@jannau.net 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 From: Hector Martin This makes USB HDDs >2TiB work. The only reason this hasn't bitten us for the internal NVMe yet is the 4K sector size, because the largest SSD Apple sells is 8TB and we can handle up to 16TiB with that sector size. Close call. Signed-off-by: Hector Martin Reviewed-by: Mark Kettenis Reviewed-by: Neal Gompa Signed-off-by: Janne Grunau --- configs/apple_m1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig index e00d72e8be..31d966f0ab 100644 --- a/configs/apple_m1_defconfig +++ b/configs/apple_m1_defconfig @@ -10,6 +10,7 @@ CONFIG_SYS_PBSIZE=276 CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_LATE_INIT=y # CONFIG_NET is not set +CONFIG_SYS_64BIT_LBA=y CONFIG_APPLE_SPI_KEYB=y # CONFIG_MMC is not set CONFIG_NVME_APPLE=y From patchwork Thu Apr 18 19:00:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau via B4 Relay X-Patchwork-Id: 1925194 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 (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=jYC9hxnD; 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 4VL6YY4ft1z1yPv for ; Fri, 19 Apr 2024 05:00:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CCF988693; Thu, 18 Apr 2024 21:00:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="jYC9hxnD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 384E58863A; Thu, 18 Apr 2024 21:00:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3270E88693 for ; Thu, 18 Apr 2024 21:00:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=devnull+j.jannau.net@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 332CF618B9; Thu, 18 Apr 2024 19:00:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id D1F15C116B1; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713466829; bh=RIMrzIgyJNsKDdkG30ykeJxK7kmqXZzvJXb9obb7yIc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=jYC9hxnDWZaTpAzTSi18lBfVPhWwN7h7umZv/zdwWf0558KGgV/+sU73fT+DI4dKW Eodng640LyfDJxABxxJ6WDFcAxHM6mju0MlEbkIHd95hc96pv8kLKbsL7lsduq4hKa 4KKAjXvV5rtovcvcg31A44m1CAAvuT9pijR170JnJaMtejXJ3ZC3zFguKrB/BBP383 6eP8fMOiCHR2muaoxoXxnhvNi7Eowtv6lQy/jKe+kTY5UQGtobecmkiU/+qDZZjD1x qeowGT8yevrxu+Eoe4cv38bzg23sJlhQNtBKqk9e0NUiBdy+V7jOmTJjMNL+aLZMJG Gt3f19KXAinFQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C02B0C05023; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Thu, 18 Apr 2024 21:00:26 +0200 Subject: [PATCH v2 2/5] configs: apple: Use "vidconsole,serial" as stdout/stderr MIME-Version: 1.0 Message-Id: <20240418-apple_config-v2-2-7e5c6b9a9db3@jannau.net> References: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> In-Reply-To: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> To: Mark Kettenis , Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, asahi@lists.linux.dev, Janne Grunau , Neal Gompa X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=904; i=j@jannau.net; h=from:subject:message-id; bh=pYGw3Rvsr83Yc8ZaQ99xyUt7JbaiOW2b/6U7j6EjC9k=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhjTF3NN9cRuTa14bdceZaN24ns2/uiDgYl3kvf/l1bt/S Su1mWzuKGVhEONikBVTZEnSftnBsLpGMab2QRjMHFYmkCEMXJwCMBHTZoZ/Wl/vbTHY+N97ktKW A49nJcXWXhU3inaeXSO1OWfnxnlM/Az/HVcyff0xST79Y8lHowUrmWoc9RaJ1zPJPJ2n1Vrxw1G EBwA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 X-Endpoint-Received: by B4 Relay for j@jannau.net/default with auth_id=62 X-Original-From: Janne Grunau 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: , Reply-To: j@jannau.net 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 From: Janne Grunau The display size querying in efi_console relies on this order. The display should be the primary output device and should be used to display more than 80x25 chars. Reviewed-by: Mark Kettenis Reviewed-by: Neal Gompa Signed-off-by: Janne Grunau --- include/configs/apple.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/apple.h b/include/configs/apple.h index 0576bc04c9..a70440b3ad 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -6,8 +6,8 @@ /* Environment */ #define ENV_DEVICE_SETTINGS \ "stdin=serial,usbkbd,spikbd\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" + "stdout=vidconsole,serial\0" \ + "stderr=vidconsole,serial\0" #if IS_ENABLED(CONFIG_CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) From patchwork Thu Apr 18 19:00:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau via B4 Relay X-Patchwork-Id: 1925196 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 (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=stNIljnv; 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 4VL6Yy1rHnz1yPv for ; Fri, 19 Apr 2024 05:01:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 144B5886A5; Thu, 18 Apr 2024 21:00:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="stNIljnv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9CD268863A; Thu, 18 Apr 2024 21:00:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9341C8869C for ; Thu, 18 Apr 2024 21:00:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=devnull+j.jannau.net@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id B219BCE18FF; Thu, 18 Apr 2024 19:00:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id E2207C32781; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713466829; bh=Gj0k0JywpqBVVyJNgyoLrUStEU15HpkIEpLz94Eallw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=stNIljnvFgwnho9WPkvzvrZE6NwiB7XJw9b8SMN6q/7Z2T0bg5HsxVCfUOVeYk+cZ WZzju8YaukOKlHnSqSB7tq7obGIiITRG5DOIzzLbHh6UhLCkYrjvA2o2ysJ/YmOI2N H4CSD+fGlhxuCAiAg7L5mRmwdFwmqixVRdW96nu0XCsb7wbucWDwQkxwLjmZ1n1+tO hEXt2eVW92EqYsPY/muxthz9kwr2TTWOnzeWbtWPo8dPXpBWgrcM9toAld7h79Jfuv w13EsjuE3tgOEKPl0vMq/sQbhQO9iY3Usj55XS6c+eObzwqJDyI8y/NrO3D6ZHA+3n fgEsoHpUOQnoQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D10E3C4345F; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Thu, 18 Apr 2024 21:00:27 +0200 Subject: [PATCH v2 3/5] configs: apple: Enable CMD_SELECT_FONT and FONT_16X32 MIME-Version: 1.0 Message-Id: <20240418-apple_config-v2-3-7e5c6b9a9db3@jannau.net> References: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> In-Reply-To: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> To: Mark Kettenis , Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, asahi@lists.linux.dev, Janne Grunau , Neal Gompa X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1093; i=j@jannau.net; h=from:subject:message-id; bh=awJWiiYi0FEsQZBJtjQjML0mQJ6lEXedBk0qLMAtjDs=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhjTF3NMrFm359vPJ7aVBhwSEe54zS5uduCxY9PPnnPuuc 2YpFrkpd5SyMIhxMciKKbIkab/sYFhdoxhT+yAMZg4rE8gQBi5OAZjI9G6G/7EyW5TPzDad39Z4 /UrIDs/uqBmRGoJHjl74es6wTkAy+BrDf7fr0z4EHhL/9nPDTgth6TmCv6cXMyg6sjLk7d4QkpV +iA0A X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 X-Endpoint-Received: by B4 Relay for j@jannau.net/default with auth_id=62 X-Original-From: Janne Grunau 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: , Reply-To: j@jannau.net 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 From: Janne Grunau Apple devices have high DPI displays so the larger fonts are preferable for improved readability. This does not yet change the used font based on the display's pixel density so the standard 8x16 font is still used by default. Reviewed-by: Mark Kettenis Reviewed-by: Neal Gompa Signed-off-by: Janne Grunau --- configs/apple_m1_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig index 31d966f0ab..c30aec7c55 100644 --- a/configs/apple_m1_defconfig +++ b/configs/apple_m1_defconfig @@ -9,6 +9,7 @@ CONFIG_SYS_PBSIZE=276 # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_LATE_INIT=y +CONFIG_CMD_SELECT_FONT=y # CONFIG_NET is not set CONFIG_SYS_64BIT_LBA=y CONFIG_APPLE_SPI_KEYB=y @@ -19,6 +20,7 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_PCI=y CONFIG_USB_DWC3=y CONFIG_USB_KEYBOARD=y +CONFIG_VIDEO_FONT_16X32=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_NO_FB_CLEAR=y CONFIG_VIDEO_SIMPLE=y From patchwork Thu Apr 18 19:00:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau via B4 Relay X-Patchwork-Id: 1925193 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 (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=S0H7MkkD; 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 4VL6YM5cNRz1yPv for ; Fri, 19 Apr 2024 05:00:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BE6578863A; Thu, 18 Apr 2024 21:00:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="S0H7MkkD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C12E68863A; Thu, 18 Apr 2024 21:00:33 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C10E68868E for ; Thu, 18 Apr 2024 21:00:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=devnull+j.jannau.net@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 582C96182A; Thu, 18 Apr 2024 19:00:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id EDBCCC32782; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713466830; bh=du5Et+n6Vf2y/C0pkFuNPvpCr9o/O28otVps93AuTLk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=S0H7MkkDUXyGMk4nrTXfm136L1vSBeQnh92nnrGIsGUFAjsD07jQSHvVVAvQQFMFZ Dzkw8HkBJKgItZl5Aj7bOC1MCBuvUbSDZ/EYufyCuMVxAhWq3i4E/5qsvv6bm2oElC qwp9/NjhtG5HL4c6TFkkDvttkFOt24PwhAg7Ds5dTgRZZtJZO5z1DrK09W4KzIJpOD G21XFG4DO0PpBx69cmBvdOtJGkCbMwf44sozmxlMMeWYIMfoj0RgyNWXGECWnPXLLe yZ+fFNyg/aRE7yTc0oche1KOYFHr+/Qt6wibkxKG3y5OQWdrntPYxZh2HPwgKzyzdp RcchUVLogUzLw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1E85C04FFE; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Thu, 18 Apr 2024 21:00:28 +0200 Subject: [PATCH v2 4/5] arm: apple: Switch to standard boot MIME-Version: 1.0 Message-Id: <20240418-apple_config-v2-4-7e5c6b9a9db3@jannau.net> References: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> In-Reply-To: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> To: Mark Kettenis , Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, asahi@lists.linux.dev, Janne Grunau X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1472; i=j@jannau.net; h=from:subject:message-id; bh=bpZhuGl0+MTgE6TV+2Z005nzV5o0C5mfHTMqAQmaZOs=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhjTF3NObHu5eFxfXontTcIfmA73dhqJvlnRzFQZVP/Oxv ML+PDGvo5SFQYyLQVZMkSVJ+2UHw+oaxZjaB2Ewc1iZQIYwcHEKwEReb2FkODrDcsXX/euUTdps J3PZOD+NmzWtd6WCTODZCdrHq6bM2c7I0Ph+6pft02O7G7xDZ7Kn/dpXsVTotZ205Nd63QOfHX8 u5QUA X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 X-Endpoint-Received: by B4 Relay for j@jannau.net/default with auth_id=62 X-Original-From: Janne Grunau 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: , Reply-To: j@jannau.net 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 From: Janne Grunau Use standard boot instead of the distro boot scripts. Use BOOTSTD_FULL instead of BOOTSTD_DEFAULTS for easier interactive use. Signed-off-by: Janne Grunau Reviewed-by: Neal Gompa Reviewed-by: Mark Kettenis --- arch/arm/Kconfig | 2 +- include/configs/apple.h | 20 ++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 01d6556c42..9b83b2e6f8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1034,7 +1034,7 @@ config ARCH_APPLE select USB imply CMD_DM imply CMD_GPT - imply DISTRO_DEFAULTS + imply BOOTSTD_FULL imply OF_HAS_PRIOR_STAGE config ARCH_OWL diff --git a/include/configs/apple.h b/include/configs/apple.h index a70440b3ad..1e08b11448 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -9,26 +9,10 @@ "stdout=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" -#if IS_ENABLED(CONFIG_CMD_NVME) - #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) -#else - #define BOOT_TARGET_NVME(func) -#endif - -#if IS_ENABLED(CONFIG_CMD_USB) - #define BOOT_TARGET_USB(func) func(USB, usb, 0) -#else - #define BOOT_TARGET_USB(func) -#endif - -#define BOOT_TARGET_DEVICES(func) \ - BOOT_TARGET_NVME(func) \ - BOOT_TARGET_USB(func) - -#include +#define BOOT_TARGETS "nvme usb" #define CFG_EXTRA_ENV_SETTINGS \ ENV_DEVICE_SETTINGS \ - BOOTENV + "boot_targets=" BOOT_TARGETS "\0" #endif From patchwork Thu Apr 18 19:00:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau via B4 Relay X-Patchwork-Id: 1925198 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 (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=rsgb02T9; 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 4VL6ZM4r9sz1yPv for ; Fri, 19 Apr 2024 05:01:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0966E886AA; Thu, 18 Apr 2024 21:00:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="rsgb02T9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3C370886A7; Thu, 18 Apr 2024 21:00:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C02D18869D for ; Thu, 18 Apr 2024 21:00:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=devnull+j.jannau.net@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id D67EDCE1905; Thu, 18 Apr 2024 19:00:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 017F7C32783; Thu, 18 Apr 2024 19:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713466830; bh=I/gWLJ/54Jrj+2I7OCqF3ATdRHZ5ajf3sCx+so4scNg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=rsgb02T9TaB0FdCaCuEuY3UIUuLREHGB2yOJ23pCiIc9FXGcEoiNFvYXQjnCle8yS 6gmQL8bvMXIml5FS5mk7FH1VDnMADDo068AtNP2skZvr7nYiksLdLLv6o6PBUMQ8vn iZm3eyPY8veKKMQy3qBT8bCVt+9GVW1fJKOzxNMIylZfadd59c2GfismyzgbHPMBUj Ji5LX5wZTZvsf/N+UWESdMfF+QA6mMxQ9Q6MXvkoe6HTJadS6UyM56M8pVFelmQneU ahNHEV/04g4jb0AEDtmrNiX4sCAe2xfDLJxX4pjdPfooDoL7OhqMFn5ytgMk27PtkV pvAEDEJGrV0UA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED1C6C04FF8; Thu, 18 Apr 2024 19:00:29 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Thu, 18 Apr 2024 21:00:29 +0200 Subject: [PATCH v2 5/5] arm: apple: Do not list bootflows on boot MIME-Version: 1.0 Message-Id: <20240418-apple_config-v2-5-7e5c6b9a9db3@jannau.net> References: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> In-Reply-To: <20240418-apple_config-v2-0-7e5c6b9a9db3@jannau.net> To: Mark Kettenis , Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, asahi@lists.linux.dev, Janne Grunau X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=652; i=j@jannau.net; h=from:subject:message-id; bh=aKmGZalIZA4d3jN5L9yo43E4OSWpBFF1+lCA1zAzZAU=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhjTF3NNdt+0OSJ1iF1Cav3DTObVAQVcOQ7V5RSo55pWtH 2YVn3HtKGVhEONikBVTZEnSftnBsLpGMab2QRjMHFYmkCEMXJwCMBGeKYwMXTf227KazXKKWiRr k+ZnkFEc9u73dRMF1Xs7/Ey3rTsiyvA/eZYF75yw8xxmRg7uGVEN8yRniFR+U//0Y7dX//2C/i8 cAA== X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 X-Endpoint-Received: by B4 Relay for j@jannau.net/default with auth_id=62 X-Original-From: Janne Grunau 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: , Reply-To: j@jannau.net 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 From: Janne Grunau The bootflow list is only seen briefly and is probably more confusing than helpful. Signed-off-by: Janne Grunau Reviewed-by: Neal Gompa Reviewed-by: Mark Kettenis --- configs/apple_m1_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig index c30aec7c55..4eac1a9e2d 100644 --- a/configs/apple_m1_defconfig +++ b/configs/apple_m1_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_CBSIZE=256 CONFIG_SYS_PBSIZE=276 # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_BOOTCOMMAND="bootflow scan -b" CONFIG_BOARD_LATE_INIT=y CONFIG_CMD_SELECT_FONT=y # CONFIG_NET is not set