From patchwork Fri Mar 11 19:10:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1604520 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=gTd9QeE5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KFbBW5GG8z9s3q for ; Sat, 12 Mar 2022 06:11:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B9EE883108; Fri, 11 Mar 2022 20: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="gTd9QeE5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ACD3C8340A; Fri, 11 Mar 2022 20: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=-2.6 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-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 C52A58390E for ; Fri, 11 Mar 2022 20:11:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-qv1-xf29.google.com with SMTP id kl20so7679760qvb.10 for ; Fri, 11 Mar 2022 11:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5FJRXkLZoRDcQMDs8ayORw1zb1bjNzyTw7z5ev2KgL4=; b=gTd9QeE5GEXXQvmf+dv88hksNpji87rqfc1LTn4Ia5hsXCM1dZLNaWXbfbND2lMewn f2g9jPTXL9zT2JFbMsHtE5vlWymkBh6/CwmDtcbx2bPzd7xU5eZ8bwMBgZNG4miDp5B4 264h6+sBKTq6mG66n8zSXkLcch3IqtSMRR4Pk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5FJRXkLZoRDcQMDs8ayORw1zb1bjNzyTw7z5ev2KgL4=; b=BcOk8XsL9FJhcI7wdWOmaBhGogigkfh2NrEIPDyi5dcwpaPk2wNJW6S2UfFDfLaTvc OGccjvGUqlHXdxTDaNavXOZcJ+Vm7bQo+Tr8AWBfVam8i6XWSh1HXeYSQD1rKjpQD5pv 3YyxVdtDEKYy3dS8Y9mSLGZa5BOa68yj7GiIZFekI1ICPyUrclD/fodF/BoknrdOEqiu fdxHNlzmkiQFf9Wz/G4NfWPeQiY5IBQy9vlnD6nzIgb5OC7KC8FhLeaxojKMgr12jCih 1o43B/EJnW9EUEgZ9J19BBa5280XEH3jRBU1GwDcnj/tsUBnPSG+AseNI0ikK0/+xTz/ Vv6g== X-Gm-Message-State: AOAM532k69SwYeVEKzywhn4h9Wx/fueu+Zbty1ejgc1Mg8oHqFeNP3wo iU4F20nUXS3eiD11Xlid4W4jJYYepWM6ww== X-Google-Smtp-Source: ABdhPJxeNVmB8ugW2fpzWJ/lOxMO8C27bRguQQGMZqKdobr1coz8yX/jtSzk18uZ74MXaO/vJXAHwA== X-Received: by 2002:a05:6214:c22:b0:42c:2887:3b0b with SMTP id a2-20020a0562140c2200b0042c28873b0bmr2105011qvd.99.1647025861432; Fri, 11 Mar 2022 11:11:01 -0800 (PST) Received: from sjg1.unitedwifi.com ([205.220.129.24]) by smtp.gmail.com with ESMTPSA id b21-20020a05620a04f500b0067b4895472esm4335425qkh.5.2022.03.11.11.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Mar 2022 11:11:00 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , AKASHI Takahiro , Simon Glass , Heinrich Schuchardt , Patrick Delaunay , Wolfgang Denk Subject: [PATCH 1/5] disk: Add an option for partitions in SPL Date: Fri, 11 Mar 2022 12:10:01 -0700 Message-Id: <20220311191005.364540-2-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog In-Reply-To: <20220311191005.364540-1-sjg@chromium.org> References: <20220311191005.364540-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.5 at phobos.denx.de X-Virus-Status: Clean In some cases we do not want to enable partition support in SPL. Add an option to allow this. Signed-off-by: Simon Glass --- disk/Kconfig | 24 ++++++++++++++++++++---- disk/Makefile | 6 +++--- drivers/block/blk-uclass.c | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/disk/Kconfig b/disk/Kconfig index cee16a80bc2..13700322e97 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -4,10 +4,6 @@ menu "Partition Types" config PARTITIONS bool "Enable Partition Labels (disklabels) support" default y - select SPL_SPRINTF if SPL - select TPL_SPRINTF if TPL - select SPL_STRTO if SPL - select TPL_STRTO if TPL help Partition Labels (disklabels) Supported: Zero or more of the following: @@ -23,6 +19,26 @@ config PARTITIONS you must configure support for at least one non-MTD partition type as well. +config SPL_PARTITIONS + bool "Enable Partition Labels (disklabels) support in SPL" + default y if PARTITIONS + select SPL_SPRINTF + select SPL_STRTO + help + Enable this for base partition support in SPL. The required + partition table types shold be enabled separately. This add a + small amount of size to SPL, typically 500 bytes. + +config TPL_PARTITIONS + bool "Enable Partition Labels (disklabels) support in TPL" + default y if PARTITIONS + select TPL_SPRINTF + select TPL_STRTO + help + Enable this for base partition support in SPL. The required + partition table types shold be enabled separately. This add a + small amount of size to SPL, typically 500 bytes. + config MAC_PARTITION bool "Enable Apple's MacOS partition table" depends on PARTITIONS diff --git a/disk/Makefile b/disk/Makefile index ec37b74f5f4..ffd7b07f867 100644 --- a/disk/Makefile +++ b/disk/Makefile @@ -5,9 +5,9 @@ #ccflags-y += -DET_DEBUG -DDEBUG -obj-$(CONFIG_PARTITIONS) += part.o -ifdef CONFIG_$(SPL_)BLK -obj-$(CONFIG_PARTITIONS) += disk-uclass.o +obj-$(CONFIG_$(SPL_TPL_)PARTITIONS) += part.o +ifdef CONFIG_$(SPL_TPL_)BLK +obj-$(CONFIG_$(SPL_TPL_)PARTITIONS) += disk-uclass.o endif obj-$(CONFIG_$(SPL_)MAC_PARTITION) += part_mac.o obj-$(CONFIG_$(SPL_)DOS_PARTITION) += part_dos.o diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index 58dc74e71f1..bcd18ed38b2 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -712,7 +712,7 @@ int blk_unbind_all(int if_type) static int blk_post_probe(struct udevice *dev) { - if (IS_ENABLED(CONFIG_PARTITIONS) && + if (CONFIG_IS_ENABLED(PARTITIONS) && IS_ENABLED(CONFIG_HAVE_BLOCK_DEVICE)) { struct blk_desc *desc = dev_get_uclass_plat(dev); From patchwork Fri Mar 11 19:10:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1604521 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=dGdPKS4z; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KFbBp2Dgjz9s3q for ; Sat, 12 Mar 2022 06:11:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D12C383B00; Fri, 11 Mar 2022 20:11:26 +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="dGdPKS4z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F10D083AFF; Fri, 11 Mar 2022 20:11:22 +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.6 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-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 1B0EE8390E for ; Fri, 11 Mar 2022 20: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=sjg@chromium.org Received: by mail-qv1-xf29.google.com with SMTP id im7so7719362qvb.4 for ; Fri, 11 Mar 2022 11:11:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ae/D+BFYTnG1OuinDuw8qAwpBdQC66HUVTm3dCgL+vw=; b=dGdPKS4z/ucqzZ0u6/OFArHlT0t0q/6sLIQqXVd3KJC+DBBvwMVPAx5MgPRgxr7ZzF UBqo4Ba5PLxfwOXy5C1uKPMGsHWJGihscbMaP6EWeNP7gRPTV0Axhego56FNOhCANVtp xVswwpmAhTcyQaezZP2GzDQXjIYxmXrMYY7pI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ae/D+BFYTnG1OuinDuw8qAwpBdQC66HUVTm3dCgL+vw=; b=j6pC2ajBzZrzAbHyxP5GVCGXQzSVUc4jbYyqjD8GpTVYa90Rs4YZbWOXFMFk4Q2/9d 5vaQOPUlEkstzKyOFgY/zmD//jIFp71QSpl0N84MEVi8oGv4nPi5FyDkNKgd9kbiNEbj ZO0JE0yJSY+L1BrENDeCuZPmTh+3HXvNIwy7vnaWN/hoW7z+Jj1A5VnDykGtzpdT52jV bi1Ra4MGfcU8garIgYGPzZmHfIisDkM3qPld9v4d6cqT4/CJYxCslHOd5EAG6ZBbU+2o IQM34p7KI4sZkefOM8hYDz6nl8SRxE3EhQoFJFf8wVZesm4ovTBUGLoJhTO54GDzTBle N/WA== X-Gm-Message-State: AOAM532H9ux1iSLk0N9MctzwduCWNRjzIrqtzBV29ajM4gRBEgsc3Jec QsEfzQYuFe5S61nn/XPHFhpFaqGE3fOOXg== X-Google-Smtp-Source: ABdhPJwExM3L1JMciGu0fUT16t+0IWDpdmUYnU2P+dD8TJxmE20houg7Ku1cEOv0REDdPPH4JdFr0g== X-Received: by 2002:a05:6214:22c:b0:432:6b2b:95d0 with SMTP id j12-20020a056214022c00b004326b2b95d0mr9172988qvt.63.1647025869831; Fri, 11 Mar 2022 11:11:09 -0800 (PST) Received: from sjg1.unitedwifi.com ([205.220.129.24]) by smtp.gmail.com with ESMTPSA id b21-20020a05620a04f500b0067b4895472esm4335425qkh.5.2022.03.11.11.11.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Mar 2022 11:11:09 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , AKASHI Takahiro , Simon Glass , Soeren Moch Subject: [PATCH 2/5] tbs2910: Disable ext4 write Date: Fri, 11 Mar 2022 12:10:02 -0700 Message-Id: <20220311191005.364540-3-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog In-Reply-To: <20220311191005.364540-1-sjg@chromium.org> References: <20220311191005.364540-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.5 at phobos.denx.de X-Virus-Status: Clean This board is right up against the size limit. Drop ext4 writing to give it some more space. Signed-off-by: Simon Glass --- configs/tbs2910_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index e1278f2e70a..9819df55f05 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -50,7 +50,6 @@ CONFIG_CMD_TIME=y CONFIG_CMD_SYSBOOT=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y From patchwork Fri Mar 11 19:10:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1604522 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=e0qD0ZSw; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KFbCC4Dwvz9s3q for ; Sat, 12 Mar 2022 06:11:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FAF083108; Fri, 11 Mar 2022 20:11:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="e0qD0ZSw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4285583AFC; Fri, 11 Mar 2022 20:11:30 +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.6 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-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) (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 339BD83AF7 for ; Fri, 11 Mar 2022 20:11:19 +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-qv1-xf31.google.com with SMTP id kj21so4830687qvb.11 for ; Fri, 11 Mar 2022 11:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FlaF2HIrAzwLmTLKPrL9vGQpbi6jhQRsOQ+OK+NXFmM=; b=e0qD0ZSw+e7QODg1arBmBkeM2ucJ2vOAp8X3CDnAngamdUr4Ejy+5xYP4SP5Smcbdj 90G9V3vV+VqbcUvcLvX23PFeu/OhHpe8KsLtZ+/zmZeiOJdFdudLHXSo8fBax3ojHAjL 8fsfLcNFE+3lv2Nm6iObHuP+dtWve7HymE/GI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FlaF2HIrAzwLmTLKPrL9vGQpbi6jhQRsOQ+OK+NXFmM=; b=JOslTRaQUp/+QpZJ0rS9gVNWKjnGMQuGV4r0Hq3V8yu+n1tSCUg28ncfdOcdkbNddl mr+4lUCBNcdrkOE6oe9eIZOOSmPCmPgLhrkrvXLn1HtR1FPa5/3Kn04ruPWnJmQ9Un0+ m0J68kmtN+7z0PJex8BT3pU8y0yv5WrpvIhpcDzKwUPGJ/pPSXYDf6SfILmsrfaI3npY iVk6i0/lDevC1ChjOgvaRHlhKLgi9MziMFPSjf9C+hu8Y5bBlvHh8+DBagxoV8JEr0Q7 0HM8xCOy+YJiAnO0H7HDcwX7Qzu6ehTS0GcPgw5BudYkYGTOyWdLYcAetLLUauykerNW +GKQ== X-Gm-Message-State: AOAM531+vNiVnnlClO1maiARzGnjq8z+K64EtDaNxmdl2JnY9Jvh++23 jcGJi7hzW3+aRP8c0iPzLErxGSxWKF+nmw== X-Google-Smtp-Source: ABdhPJykRGPbRIRde9JQj/oFRnHYRUTcxE3sgrV8IUWes5+TSsv+XYjBAvz6Kc1Fghg0xSZr2DR5Mw== X-Received: by 2002:a05:6214:23c6:b0:433:8a2:c244 with SMTP id hr6-20020a05621423c600b0043308a2c244mr9343374qvb.88.1647025877699; Fri, 11 Mar 2022 11:11:17 -0800 (PST) Received: from sjg1.unitedwifi.com ([205.220.129.24]) by smtp.gmail.com with ESMTPSA id b21-20020a05620a04f500b0067b4895472esm4335425qkh.5.2022.03.11.11.11.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Mar 2022 11:11:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , AKASHI Takahiro , Simon Glass , Nobuhiro Iwamatsu Subject: [PATCH 3/5] rcar3_salvator-x: Drop EFI_LOADER Date: Fri, 11 Mar 2022 12:10:03 -0700 Message-Id: <20220311191005.364540-4-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog In-Reply-To: <20220311191005.364540-1-sjg@chromium.org> References: <20220311191005.364540-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.5 at phobos.denx.de X-Virus-Status: Clean This board is too close to the limit to enable this feature. Drop it. Signed-off-by: Simon Glass --- configs/rcar3_salvator-x_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig index 5fb27d257af..402d56a1321 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -102,4 +102,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT_OVERLAY=y -# CONFIG_EFI_UNICODE_CAPITALIZATION is not set +# CONFIG_EFI_LOADER is not set From patchwork Fri Mar 11 19:10:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1604523 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=VWq1fvyW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KFbCR3mpdz9s3q for ; Sat, 12 Mar 2022 06:12:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7692283AFC; Fri, 11 Mar 2022 20:11:54 +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="VWq1fvyW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2EC3383AF0; Fri, 11 Mar 2022 20:11:39 +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.6 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-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) (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 A73AF83AFA for ; Fri, 11 Mar 2022 20:11:29 +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-qv1-xf2e.google.com with SMTP id kj21so4831132qvb.11 for ; Fri, 11 Mar 2022 11:11:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r2Rs0AyD4H9cBc6Edaws5aleASNTFiyxX/oXwd7mNx0=; b=VWq1fvyWB9yV/1KH7Auuv1adPFjk1xyd4kI7sjc8PhnVcbLAzk6QZSM6T0N0NiSV0h u0erVhNObBefOpls2ujwmtatnxuE/M0XNgi94b09NMvOoCKqt7K21P5cYLgNxthb4f7B VlgqMymmNtmpmAWYWsKQLCbef6frEi6hBxF3c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r2Rs0AyD4H9cBc6Edaws5aleASNTFiyxX/oXwd7mNx0=; b=VvhmumwQppSAs/2Je6PpDFGb6IbKvgWMBO5ZgjoYbrgchCGOgOa/+6MikxOUW+cBcr grwnC3N+xo/1C8YEnuGRiaGffSrxAWRCBP3HFokODRVc0HTo4fnQjz+BFoxA97ekYAhi o0NVSTRgxLRyWBTJRU8gE+8D3HUTDPqiQ9hp5LiJJe5apmSbqwjAp8nV7AVvUGDuyXoX 1Je2/eAo7EZDcU0vkLYyIOqabhcjSD0VH1G59y1KZbk5msAaJMGk6v80psT/jd+xGCnF EllqimhS+oVe4Z9x9L92+Hf8OMuNm8QnOQpq0bJLOCZJiVKFfRCLeKQBQGIPPkIcluco Cebg== X-Gm-Message-State: AOAM531ify56I1XsUHbY3/uM39v+TB7g7nLQK+8apyjqp+vgWOq+YjWr LLA7y6gAsX5Bu+Ffu8GvK3m6PvjUQNpyCw== X-Google-Smtp-Source: ABdhPJxPiMj3nGARu0nLjUszw/fIddOF7+wGZPydqooPFuQQxxHm23/0xcd6NKElZ1272LoP1uQYeA== X-Received: by 2002:a05:6214:cc4:b0:435:1c56:744a with SMTP id 4-20020a0562140cc400b004351c56744amr9238755qvx.119.1647025888405; Fri, 11 Mar 2022 11:11:28 -0800 (PST) Received: from sjg1.unitedwifi.com ([205.220.129.24]) by smtp.gmail.com with ESMTPSA id b21-20020a05620a04f500b0067b4895472esm4335425qkh.5.2022.03.11.11.11.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Mar 2022 11:11:27 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , AKASHI Takahiro , Simon Glass , Wadim Egorov Subject: [PATCH 4/5] phycore-rk3288: Avoid enabling partition support in SPL Date: Fri, 11 Mar 2022 12:10:04 -0700 Message-Id: <20220311191005.364540-5-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog In-Reply-To: <20220311191005.364540-1-sjg@chromium.org> References: <20220311191005.364540-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.5 at phobos.denx.de X-Virus-Status: Clean This is not needed or used, and adds code size. Drop it. Signed-off-by: Simon Glass Reviewed-by: Kever Yang --- configs/phycore-rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig index 63aabfbe81b..a67be72f366 100644 --- a/configs/phycore-rk3288_defconfig +++ b/configs/phycore-rk3288_defconfig @@ -35,9 +35,9 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y +# CONFIG_SPL_PARTITIONS is not set # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set -CONFIG_SPL_PARTITION_UUIDS=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y From patchwork Fri Mar 11 19:10:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1604524 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=Xof6+vIc; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KFbCf6tH9z9s3q for ; Sat, 12 Mar 2022 06:12:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 59D6083B0A; Fri, 11 Mar 2022 20:12:03 +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="Xof6+vIc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 937B981F9A; Fri, 11 Mar 2022 20:11:45 +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.6 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-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) (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 6B93C83B07 for ; Fri, 11 Mar 2022 20:11:38 +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-qv1-xf2d.google.com with SMTP id b12so7736685qvk.1 for ; Fri, 11 Mar 2022 11:11:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MKEfBNNypm/HUPyIGDIxcHqKicj6lLYLbJl56UtUWTU=; b=Xof6+vIckGEIi6CZGwcZ0wQG9kPxd/JVVdDQVZx5zSJYfEsqX2e0zE7Fk8kyqOaEbs 6WdMAoW0mJnFO3koY+ljuQoQzt5nnWcPHj0ha00x6wwp/BG4GSbSkI/jUyei5LIsffFI PjuIVz1LNKOvPxl9bFkEIjFE2raSLMuvCm0cE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MKEfBNNypm/HUPyIGDIxcHqKicj6lLYLbJl56UtUWTU=; b=MMifo/S0ZKSL9MbzsHwVt0Ya656+20xa/N9TM4Li7/Kqeyo7VuoH6ZLQZ6zvI0/4GK 1zSwGbrcUXSKa1I6FJlR/q/paFcytyek4P0xCWwL1Z4EVdRG4G1O/1cSfCKXQARJCOvl 589cYoKNvkBAHCsaRRg1xJHbgP2OfmP7kYIgKqMabMSMyeR7XHr6xzo8tx+rDMXijcgI QjxaCxqsciSrAep55bk5gLvCJuotH8UpvR4R0Bmx2LXfw/clSM52+a6R0DfcbLtuE5Fo OaiIPSeDerwA/ySreZ+vXTVnfH8MBiONych4VkzZZvtmC5Di9Xj2QzFbknWJJS4HQ5jA POeA== X-Gm-Message-State: AOAM533CkOT7d7HJKKTnOLszpnEW4K1TP3dafiUaqRUYCxCms2l97RFB CXVUmTDPQkwtaT/iMLef7o06Cxl72Lal4A== X-Google-Smtp-Source: ABdhPJzzekki54zvy8FG3hJjzre9xe8nWszXKFWXqgEJ5siXslktiQZt4dQFGDTogWi3mZ8ELi0OkA== X-Received: by 2002:a05:6214:5188:b0:435:50a5:24a0 with SMTP id kl8-20020a056214518800b0043550a524a0mr9022688qvb.55.1647025896947; Fri, 11 Mar 2022 11:11:36 -0800 (PST) Received: from sjg1.unitedwifi.com ([205.220.129.24]) by smtp.gmail.com with ESMTPSA id b21-20020a05620a04f500b0067b4895472esm4335425qkh.5.2022.03.11.11.11.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Mar 2022 11:11:35 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , AKASHI Takahiro , Simon Glass Subject: [PATCH 5/5] disk: Use a helper function to reduce duplication Date: Fri, 11 Mar 2022 12:10:05 -0700 Message-Id: <20220311191005.364540-6-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog In-Reply-To: <20220311191005.364540-1-sjg@chromium.org> References: <20220311191005.364540-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.5 at phobos.denx.de X-Virus-Status: Clean Reduce the duplicated code slightly by using a helper function to handle the common code. This reduces the code size very slightly. Signed-off-by: Simon Glass --- disk/disk-uclass.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index 72ff62ebf58..7adfe6b2545 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -65,26 +65,38 @@ int part_create_block_devices(struct udevice *blk_dev) return 0; } +static int blk_part_setup(struct udevice *dev, lbaint_t *startp, + lbaint_t blkcnt) +{ + struct disk_part *part; + + part = dev_get_uclass_plat(dev); + if (*startp >= part->gpt_part_info.size) + return -E2BIG; + + if (*startp + blkcnt > part->gpt_part_info.size) + blkcnt = part->gpt_part_info.size - *startp; + *startp += part->gpt_part_info.start; + + return 0; +} + static ulong blk_part_read(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *buffer) { struct udevice *parent; - struct disk_part *part; const struct blk_ops *ops; + int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->read) return -ENOSYS; - part = dev_get_uclass_plat(dev); - if (start >= part->gpt_part_info.size) + ret = blk_part_setup(dev, &start, blkcnt); + if (ret) return 0; - if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; - return ops->read(parent, start, blkcnt, buffer); } @@ -92,22 +104,18 @@ static ulong blk_part_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, const void *buffer) { struct udevice *parent; - struct disk_part *part; const struct blk_ops *ops; + int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->write) return -ENOSYS; - part = dev_get_uclass_plat(dev); - if (start >= part->gpt_part_info.size) + ret = blk_part_setup(dev, &start, blkcnt); + if (ret) return 0; - if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; - return ops->write(parent, start, blkcnt, buffer); } @@ -115,22 +123,18 @@ static ulong blk_part_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) { struct udevice *parent; - struct disk_part *part; const struct blk_ops *ops; + int ret; parent = dev_get_parent(dev); ops = blk_get_ops(parent); if (!ops->erase) return -ENOSYS; - part = dev_get_uclass_plat(dev); - if (start >= part->gpt_part_info.size) + ret = blk_part_setup(dev, &start, blkcnt); + if (ret) return 0; - if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; - return ops->erase(parent, start, blkcnt); }