From patchwork Sun Mar 17 14:54:47 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: 1912924 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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=DnPh+Owl; 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 4TyLdT5DGTz1yWy for ; Mon, 18 Mar 2024 01:55:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A089687F0A; Sun, 17 Mar 2024 15:54:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="DnPh+Owl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E993487D06; Sun, 17 Mar 2024 15:54:56 +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=-2.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 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 2A2B487D0A for ; Sun, 17 Mar 2024 15:54:52 +0100 (CET) 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 3C13DCE0104; Sun, 17 Mar 2024 14:54:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 7AC7BC43394; Sun, 17 Mar 2024 14:54:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710687289; bh=AFc7n4mKSavFmzkVpvu2rqiaKI0HeqSMl+SkIaar5+M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=DnPh+OwlRnVJp7L70OH64DRnz7tP7RglxlSzO0RoDoK507/PWOB9nJzMFyE8/DMGn ce61soTGgDyNq9K2/d8L426OQx+8FEG8FcEGFMnNto5mdhzhZus7xOuih775XgV1l5 cXgIcfzX929+hcbDsXsNAxTpqrhbrLymtgDGQhXOG+FFisgDDm4jnGlnKEXBTqgy1q /F6HRF7DtTGCvgLjONm3ssocBJAEFKxDmDY/RZQiCaAOeAqM/OTtlbMVnPbFt42uhi Z92NdGT4ja5rJQbw91BHsoe6JyPrA9Fjqnbks0kQkeNIdfAHnJKmzOb8Pvxvy6cPfT G6r2f5yRBPu2Q== 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 65F2BC54E60; Sun, 17 Mar 2024 14:54:49 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Sun, 17 Mar 2024 15:54:47 +0100 Subject: [PATCH 1/4] apple_m1_defconfig: Turn on CONFIG_SYS_64BIT_LBA MIME-Version: 1.0 Message-Id: <20240317-apple_config-v1-1-1b862bc140a9@jannau.net> References: <20240317-apple_config-v1-0-1b862bc140a9@jannau.net> In-Reply-To: <20240317-apple_config-v1-0-1b862bc140a9@jannau.net> To: Mark Kettenis , Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, asahi@lists.linux.dev, Janne Grunau , Hector Martin X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=818; i=j@jannau.net; h=from:subject:message-id; bh=5YcL4gGQm/14duZ94SDLQIWzeXI+jl0sijBSTVNX2I8=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhtTvLOYr3hyr5dS2M71nfZezNDM5i+2pLcPEAi7TH10eu 1786P7fUcrCIMbFICumyJKk/bKDYXWNYkztgzCYOaxMIEMYuDgFYCI9yxkZTv19w7vjddTsNt8l +moWTz7PuCV8ImdDa8FexQPHnB1mZzL8UxPYxBXLo2clv+Dgy5dzk55uNgrby8gsu+R2UGWFy2k PLgA= 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 Signed-off-by: Janne Grunau 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 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 Sun Mar 17 14:54:48 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: 1912922 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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=raHplJNa; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TyLd62h8lz1yWy for ; Mon, 18 Mar 2024 01:55:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C502087DD5; Sun, 17 Mar 2024 15:54:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="raHplJNa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1203587EDD; Sun, 17 Mar 2024 15:54:55 +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=-2.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 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 13FEA87D06 for ; Sun, 17 Mar 2024 15:54:52 +0100 (CET) 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 406C6CE0920; Sun, 17 Mar 2024 14:54:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 81B75C433C7; Sun, 17 Mar 2024 14:54:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710687289; bh=Z2mfsCTlO8uO44C+Yol6qT6hc2wvX6pkAvLR6EowyWk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=raHplJNahlwtIXKOZ3cO6maMF454fdqWhdGXr9m33h0pvpz6r+WAdmSVTEt7c/1Un ZH0JT3GtoW5MpKXIXTGRiuuElDdDXUv8bZ+mBwcS33v/Ruz7OSAHap6hLwFVfgle3g KTppERwB6q965UDmQ1RjnwF05rcfchbpZdOf4Zgy90sellxnvxSVB1Qel2dcGC4xqT Jpys1yyhdBJJ7KCD1xsYD6ACvD1QMvmxxyPPZkuVlzk6FLLHfkrnzZhcH7ZNy9Mq4d 8mtNYzby0VB1e8beC+Y5vtzzEOnPvEOv5BAgPvu6aghbF88IcKfzXHBv18XQcgqpQ0 TJf1ywq4hKdIg== 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 6ED44C54E71; Sun, 17 Mar 2024 14:54:49 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Sun, 17 Mar 2024 15:54:48 +0100 Subject: [PATCH 2/4] configs: apple: Use "vidconsole,serial" as stdout/stderr MIME-Version: 1.0 Message-Id: <20240317-apple_config-v1-2-1b862bc140a9@jannau.net> References: <20240317-apple_config-v1-0-1b862bc140a9@jannau.net> In-Reply-To: <20240317-apple_config-v1-0-1b862bc140a9@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.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=811; i=j@jannau.net; h=from:subject:message-id; bh=xRd+NgmurhsE0y/QsMQndq65xM1784gn3CH0uS+KJcY=; b=kA0DAAoWoRs8240vZWYByyZiAGX3BDejycIr/yrWDpJuXUDTC/BljVdi36A6LPw2o2iz/Hibq Ih1BAAWCgAdFiEEYivpiACrfCFcfeBWoRs8240vZWYFAmX3BDcACgkQoRs8240vZWbhqAEAuXlN GmRMlrTBtvWerMAtw5s8j5l5JoPezYtNXWRU/QIBAMeW7g+GDDAe42V3LBn2Hl6ioFiofc9Y0IY G6O0dQOUJ 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. Signed-off-by: Janne Grunau Reviewed-by: Mark Kettenis --- 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 Sun Mar 17 14:54:49 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: 1912923 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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=sGPu62gA; 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 4TyLdH56b6z1yWy for ; Mon, 18 Mar 2024 01:55:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 39D8687EDF; Sun, 17 Mar 2024 15:54:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="sGPu62gA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B58887D06; Sun, 17 Mar 2024 15:54:55 +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=-2.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 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 3AEEC87D7C for ; Sun, 17 Mar 2024 15:54:52 +0100 (CET) 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 4EDA5CE0922; Sun, 17 Mar 2024 14:54:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 8B836C43399; Sun, 17 Mar 2024 14:54:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710687289; bh=guYFFkwoi5nrMtCwr4mxXFtCimym0iwxXVwrtBJ9+IA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=sGPu62gAkzpTMZ89dAqFTYMLDn43NfgdSUQZjObkHUCs4VSv4p+p1wiLB93p68RQ5 SJ42/SQ8phciHvyasr4xTW5psfhNrQGEJJI8/6eF0Y6HhYzoc0NDLPr07c2Nj3RM4p RbaWix3yqWwXN10lV3sAIH+XF2F4KobLAX+hqXDD1ohcibF1YGShoTYlSOBLjCvU30 tFmbhfCw3jYuhvW8g4Ypm7O5c7KOW7aCbqsLFYpoWUbNU6+UMfsn4Wa2FUFT5BdgPz YxLoh/axgknYmllERezVKUXSTlEEfWIUEHWaZOUykuOsJ/7z01Mjp5Q/Mj6kJvSRFr K1TqfNOjbqzoA== 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 7B0F8C54E69; Sun, 17 Mar 2024 14:54:49 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Sun, 17 Mar 2024 15:54:49 +0100 Subject: [PATCH 3/4] configs: apple: Enable CMD_SELECT_FONT and FONT_16X32 MIME-Version: 1.0 Message-Id: <20240317-apple_config-v1-3-1b862bc140a9@jannau.net> References: <20240317-apple_config-v1-0-1b862bc140a9@jannau.net> In-Reply-To: <20240317-apple_config-v1-0-1b862bc140a9@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.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1000; i=j@jannau.net; h=from:subject:message-id; bh=efBW9m/mjVxxFme0pO4/bQ8IJkWzsIngZn6mrb/lwgQ=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhtTvLBa9V3Zy/5YRKpim0BLYFKu5dt/mlUa7W09O/PYy1 uirjV13RykLgxgXg6yYIkuS9ssOhtU1ijG1D8Jg5rAygQxh4OIUgIn072NkWPd/T50ry6QpsfP9 2V/1+XGtZ2DkUK6blTe1XG3nIrm+IkaG2b3TFs+/wPRGSjPE2dz0ddCCOLMLnbLTqo7m6twLU1X mAAA= 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. Signed-off-by: Janne Grunau Reviewed-by: Mark Kettenis --- 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 Sun Mar 17 14:54:50 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: 1912921 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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=L09pWTuO; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TyLd24TQMz1yWy for ; Mon, 18 Mar 2024 01:55:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5350387E2E; Sun, 17 Mar 2024 15:54:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="L09pWTuO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 524BC86F67; Sun, 17 Mar 2024 15:54:53 +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=-2.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 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 54C86876BA for ; Sun, 17 Mar 2024 15:54:51 +0100 (CET) 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 0080560AEC; Sun, 17 Mar 2024 14:54:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 9182BC433F1; Sun, 17 Mar 2024 14:54:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710687289; bh=W/VbIpCvZRDplOLXLtFGQiPxIAPwMPHxXMcJ4WlLWFA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=L09pWTuOPVkz8TuQAxOw9yD+e2hRCEWDMEg/pjeYNBGtdpr9ilBG4SruMRUJeGZYT pWft/DL7M6k0CQd9BL0VpJ9YkTav+HQL5JDaUNEarrRKxEesvGhP/XVmtumwx7oKO8 zw3uP8NtmMmD3+FPqINSmd8nB9l4AkSyWDpal5NEjCbAxmslSNRMLmC5zy1CBnTwET Wgzs3lEhrkFRF6zuWF76/BqiVRi91OAxmnVsmmk1e1YfmNWSB5vXzE9789DsOLKsKp zH7oWAkWxAOGZOX8JR74D6911DcBP5i3sKPHeyLdclVL7R7fBN2jEprPGQUZ7epyl0 c13xDDIH+VPeg== 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 84C18C54E72; Sun, 17 Mar 2024 14:54:49 +0000 (UTC) From: Janne Grunau via B4 Relay Date: Sun, 17 Mar 2024 15:54:50 +0100 Subject: [PATCH 4/4] arm: apple: Switch to standard boot MIME-Version: 1.0 Message-Id: <20240317-apple_config-v1-4-1b862bc140a9@jannau.net> References: <20240317-apple_config-v1-0-1b862bc140a9@jannau.net> In-Reply-To: <20240317-apple_config-v1-0-1b862bc140a9@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.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1402; i=j@jannau.net; h=from:subject:message-id; bh=crjeE1IUF+rCa9w41oK3inDEucGXM4uquwiVSADZxhc=; b=owGbwMvMwCW2UNrmdq9+ahrjabUkhtTvLBZ8rklbnTjUW/wP/JPO5/6z+ma4TOHMM09ffwjY+ 1Ws5v/njlIWBjEuBlkxRZYk7ZcdDKtrFGNqH4TBzGFlAhnCwMUpABN5LsjwT/PXdOdjFjrccdYl T64oHb/76I7xg8jeJt4TVq2bllz+ycXI0MiuumGxecDBWxwSVufSmC/n3w6q0VJfJ37S5mmDQKo 6EwA= 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. Signed-off-by: Janne Grunau --- 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..ad89abde41 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_DEFAULTS 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