From patchwork Sat Jan 16 21:54:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1427633 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=H5gIZ9Af; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DJBkv1626z9s24 for ; Sun, 17 Jan 2021 08:58:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78DC582A58; Sat, 16 Jan 2021 22:54: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=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="H5gIZ9Af"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 556BC82A4F; Sat, 16 Jan 2021 22:54:46 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 F35CE829E1 for ; Sat, 16 Jan 2021 22:54:42 +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-xd34.google.com with SMTP id e22so25380719iom.5 for ; Sat, 16 Jan 2021 13:54:42 -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=sdtqC2JpMYo5rda7OaUgFiVAv02i66kEPFp7V76PLz0=; b=H5gIZ9AfwmGjeSU4Z+s/JNQ9bnQtm5cD+CqSj6U30XzGsOPy6Z3BST4j1ZNDbG5818 HHLLhHkoGE7GIkXmMsdHl6kZ2AXG8ls6uDEumzUZg1pC+VhqmXyNdjVLkLdqaKgjtZPt 2CAuOrc4rqdqqvV40/iOE1VEq5UoTlNHTztGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sdtqC2JpMYo5rda7OaUgFiVAv02i66kEPFp7V76PLz0=; b=WiGd0rmchTebs1GYgftuUj6N4/Cwkl6zAtRbnukUkxwiOAah/xzE6y1vGxw9Xi8Bku FQ7W7Fulac0Z3jqfINOr3/36VsZhNA8ath4HMIHIGXHiTV0KYuUeWy8UhjFc+JWgEaF7 LQa+AjyUzSYOtlQyYdGCZ/u3kjdNkYw55XbxOw1gX32lzA0YNiOy4Q91uJuCU//82ZDJ D7daF1eDJ9jfBSdVaNzxubJnUH7ENLCtH51cJTae3eMC+hmpMBEcQOL+TSAy3VXe2KoQ br/QHyA6HaqJnA/3xpNcx8OeEuk3HiZTgQECAPNlSii4XrcxBFOj1CdKWPyv3UEIk+34 JGqg== X-Gm-Message-State: AOAM530p+giwfwob/UpqX+AHM/h06kVMdXAFLgeoCcAtRYhcXkBhQWFG vNOKYBX4q9e1YnE6HxxlHUFKP/kWRoZk58+9 X-Google-Smtp-Source: ABdhPJynPHMsglzDUpgKvJC0ourZeyiB7ZrsNR3WMckt46fdPfSbRBige1fHLeYQAnvMqu+uLBEAhA== X-Received: by 2002:a5e:d603:: with SMTP id w3mr12814265iom.65.1610834081608; Sat, 16 Jan 2021 13:54:41 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y3sm7557773ilc.2.2021.01.16.13.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 13:54:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Heiko Stuebner , Lokesh Vutla , Masahiro Yamada , Otavio Salvador , Samuel Holland , Stefan Roese Subject: [PATCH 1/7] spl: Drop duplicate 'Jumping to U-Boot' message Date: Sat, 16 Jan 2021 14:54:30 -0700 Message-Id: <20210116215436.1221132-2-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog In-Reply-To: <20210116215436.1221132-1-sjg@chromium.org> References: <20210116215436.1221132-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean This is printed twice but we only need one message, since there is very little processing in between them. Drop the first one. Signed-off-by: Simon Glass --- common/spl/spl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 12b00e2a407..7fe0812799f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -693,7 +693,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2) #endif switch (spl_image.os) { case IH_OS_U_BOOT: - debug("Jumping to U-Boot\n"); break; #if CONFIG_IS_ENABLED(ATF) case IH_OS_ARM_TRUSTED_FIRMWARE: From patchwork Sat Jan 16 21:54:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1427635 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=GMHatGm4; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DJBl46Gj7z9s24 for ; Sun, 17 Jan 2021 08:58:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD24482A47; Sat, 16 Jan 2021 22:54:55 +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="GMHatGm4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E01782A5A; Sat, 16 Jan 2021 22:54:48 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 CCFAA82A48 for ; Sat, 16 Jan 2021 22:54:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2a.google.com with SMTP id e22so1714311iog.6 for ; Sat, 16 Jan 2021 13:54:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dJ2J4XW/inz9ejfLgebqStnvPlTKKUKCdwI4Ps2cYWU=; b=GMHatGm43GXBwaiufb5rM5URVvetowjeuCeb7isDNAM2pV/Q6OZFXMxU27YxliUU7d AqwTtoLn78Bxo3NPwpndwUXbWXC5QHanriK6E1yri82belWwBTAlN5rk5kvMYoEud54/ WPDUbIYo0K6ADqmuFcpyhPztHT+IjOcMwqrow= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dJ2J4XW/inz9ejfLgebqStnvPlTKKUKCdwI4Ps2cYWU=; b=YqsmsFHT/TzmmEfuvGW0KLNKJe0A1Diwl9iTVB3wMuJSJV98VJuuv4EK/suIVUxkUS ry0XiFJHq8cEQzGE5V12JmMW7VApAExwcjdpeWP2GL0NgvEvv+sa0yu8wE1mrdAoczxE HdMJe5QZBAoPKaVMHGMS8QFE2ilCfDtIPapun6KIZ16NyDJKobuJXgkd/UlYUbziVek1 9B6GirxuWBJrusb0/i5qwxPINQO8ELSqcACieJGQbu3Ya9ZXeJ2y5n5GJbWZ/67EelOJ /Oe0zzAKjfiET3GAtiyLBhkzN+IkUxc2j1fizj7xLEuRVf+qFlhtv6er/NlKJ/aQzB0u Ts+A== X-Gm-Message-State: AOAM532ay6ufSA3M7TcGvw7UiXUz8y9Jbxwq1jYTwN5sNCZgYd8UcmmN 54GDoGL9Bs7U9XcM/rJGaCWJ+aFj9BVy/Zyz X-Google-Smtp-Source: ABdhPJwnYk2JBaJr9EhqTwoJy95c9sij2Ax+NIiJpQW525PATpJ/HQ7aZ9us35BchT/P9MWY0I1nyA== X-Received: by 2002:a05:6e02:509:: with SMTP id d9mr1094987ils.150.1610834082519; Sat, 16 Jan 2021 13:54:42 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y3sm7557773ilc.2.2021.01.16.13.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 13:54:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Bin Meng , Jagan Teki , Kever Yang Subject: [PATCH 2/7] binman: Indicate how to make binman verbose Date: Sat, 16 Jan 2021 14:54:31 -0700 Message-Id: <20210116215436.1221132-3-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog In-Reply-To: <20210116215436.1221132-1-sjg@chromium.org> References: <20210116215436.1221132-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Add notes about how to make binman produce verbose logging when building. Add a comment on how to do this. Signed-off-by: Simon Glass --- Makefile | 1 + tools/binman/README | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c2b7046ce3b..66f441f23aa 100644 --- a/Makefile +++ b/Makefile @@ -1326,6 +1326,7 @@ u-boot.ldr: u-boot # binman # --------------------------------------------------------------------------- # Use 'make BINMAN_DEBUG=1' to enable debugging +# Use 'make BINMAN_VERBOSE=3' to set vebosity level default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE)) quiet_cmd_binman = BINMAN $@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ diff --git a/tools/binman/README b/tools/binman/README index a00c9026163..45f0a0c2cd3 100644 --- a/tools/binman/README +++ b/tools/binman/README @@ -637,7 +637,8 @@ Logging Binman normally operates silently unless there is an error, in which case it just displays the error. The -D/--debug option can be used to create a full -backtrace when errors occur. +backtrace when errors occur. You can use BINMAN_DEBUG=1 when building to select +this. Internally binman logs some output while it is running. This can be displayed by increasing the -v/--verbosity from the default of 1: @@ -649,6 +650,7 @@ by increasing the -v/--verbosity from the default of 1: 4: detailed information about each operation 5: debug (all output) +You can use BINMAN_VERBOSE=5 (for example) when building to select this. Hashing Entries --------------- From patchwork Sat Jan 16 21:54:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1427637 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=LvN+lehV; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DJBlF5tTdz9s24 for ; Sun, 17 Jan 2021 08:58:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4DDAB82A4F; Sat, 16 Jan 2021 22:54: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="LvN+lehV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 023F682A55; Sat, 16 Jan 2021 22:54:49 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 ADFA682A4A for ; Sat, 16 Jan 2021 22:54:44 +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-xd33.google.com with SMTP id d81so10251208iof.3 for ; Sat, 16 Jan 2021 13:54:44 -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=JczvENvL8T7ywGDjG/QRZjQK69hMke4lvV5JrxcR95A=; b=LvN+lehVBkJU2m6U4eXik5Gh9r2Qr6A/deQBqSVnhioK1KEDt+67Hrm1K5goyCfcDt epus/b+AJbyniAEMZgubIsSIibr8LJAOHUayjNw8WTX9KK5BMsCLvzu2l/pwKJy+PRMo xpGDC2WGwnzqV8xslgCII4UoZvYJA/mf2kzZw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JczvENvL8T7ywGDjG/QRZjQK69hMke4lvV5JrxcR95A=; b=sk/aRPE8iMYS4zmWjbFRNHbbnHEgDA4Ka07MB2WIY1fwx991cCj520QKoHpfhbye09 4TYpldv5v6ebTyYY/LaanOV/8c6c7abbJLkJQ806nLe43FzemxcWmSH3UWmrnaSkjgCy YI0RaGFy+Jp55ccCSTbL8/rSPgpOjk8SQN+68m4xhz8f9HM9JXN9wpVqtFIhcyvYRiZh 5kKhWdjJVJceFLsXHKmkXI77b9C3PL9u5Bl7mEMjuKpuBPLBRCK8c3j7iSYSBC4Ikb9G CwV20Ogkjg7Z9poEO9k03wyAAPID9JX3NwIJg5BLd436F9pllRq4+qKlBi6icNjpUiIB 7d9Q== X-Gm-Message-State: AOAM531XO8eydErx8JsYOVBEqy/EV4xJx3VvryfKE14oCF5NBAAfzTrW HB17bIn/u/oN/+6ZD92XX+lzwaAWGiqE1JvM X-Google-Smtp-Source: ABdhPJxzIkcxrh2kLpNw2+7g35MTOrvwk48CB0gDJr7nUyU+3lIHSBO1iX673uX27P3H758MQN+LOw== X-Received: by 2002:a02:ccea:: with SMTP id l10mr15046092jaq.101.1610834083382; Sat, 16 Jan 2021 13:54:43 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y3sm7557773ilc.2.2021.01.16.13.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 13:54:42 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Adam Ford , Marek Vasut , Naoki Hayama , Patrick Delaunay Subject: [PATCH 3/7] doc: Add a note about how to produce 'md' output using hexdump Date: Sat, 16 Jan 2021 14:54:32 -0700 Message-Id: <20210116215436.1221132-4-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog In-Reply-To: <20210116215436.1221132-1-sjg@chromium.org> References: <20210116215436.1221132-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Comparing a hex dump on the U-Boot command line with the contents of a file on the host system is fairly easy and convenient to do manually if it is small. But the format used hexdump by default differs from that shown by U-Boot. Add a note about how to make them the same. (For large dumps, writing the data to the network with tftpput, or to a USB stick with ext4save is easiest.) Signed-off-by: Simon Glass --- README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README b/README index afa33dc7f30..582bfb00348 100644 --- a/README +++ b/README @@ -3274,6 +3274,10 @@ TODO. For now: just type "help ". +Note that the format of 'md' can be emulated from linux with: + + hexdump -v -e '"%08.8_ax: " 16/1 "%02x " " "' -e '16/1 "%_p" "\n" ' fname + Environment Variables: ====================== From patchwork Sat Jan 16 21:54:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1427639 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=VNiAWSGc; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DJBlc4FX0z9s24 for ; Sun, 17 Jan 2021 08:59:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E1EB482A64; Sat, 16 Jan 2021 22:55:04 +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="VNiAWSGc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1FA9F82A64; Sat, 16 Jan 2021 22:54:52 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (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 8C70582A49 for ; Sat, 16 Jan 2021 22:54:45 +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-xd2f.google.com with SMTP id p72so634861iod.12 for ; Sat, 16 Jan 2021 13:54:45 -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=Ctz7JY9t0E0icSml49VxaGOvN9nh+biSWJWzhdYaRJc=; b=VNiAWSGc1PQn1py7avYUdaQRkSj/8ugv8oZabBoFvla1BMdBVvPwrjDtNoII8f2NQb hsovOyJKseRIyO8BDKvF8Q+7eSp3Pg3d+ZSm2P9SYOyKOAWvhRZtdxSOEQYwgcEB0Xi+ ibz+6yYyTU9G/cqNedOtfKSoy6KVZI3MStIBE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ctz7JY9t0E0icSml49VxaGOvN9nh+biSWJWzhdYaRJc=; b=DsBlJRet3LHgasbtqtSHkxTFBdeJXtg+S7yNWo9O644LaRaOLlmO5ypAvIzG5Ncpva ZAgtJpWG0P6M6loqZ5i893EyVOlchOZtQuqlz65vRM4ZL0ofHPGbPSpN5OWDdin9q6gb VTdUHKsMtY0sKrRIjeEM6dOf4LdJR4ugRx5aJT17OJfUdK+znwEVanCvMX3xrF3B+L5X PiGBTT7oMHyx5TIF5coVG0nfFI+3Mr5niWTpKvIYnb/gvvT3DqNmtUWONkPUIldKFOgP b/NtAUbIXytYgZpqaeBaXQua21DgkRtTacvPDkptWl6dBFvmOD8TIUbvTQhfwt+XyHRV QKkA== X-Gm-Message-State: AOAM531J+t79PkyogPLi70IKx0w6IEFvMqYegkQl32hGIdAmKFBsPJRt tnPLfdtcQSTo25K6hrrvohG3LWEvN4A24TfH X-Google-Smtp-Source: ABdhPJxts71LJQkikVdq7zA5f3J3Ua03I1S9z/iLfasmT+GmIBsAzauCDOA6MdBp8ul9EqXwuRs/XQ== X-Received: by 2002:a02:5148:: with SMTP id s69mr15549326jaa.8.1610834084215; Sat, 16 Jan 2021 13:54:44 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y3sm7557773ilc.2.2021.01.16.13.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 13:54:43 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Stefan Bosch Subject: [PATCH 4/7] s5p4418_nanopi2: Bring in some dead code Date: Sat, 16 Jan 2021 14:54:33 -0700 Message-Id: <20210116215436.1221132-5-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog In-Reply-To: <20210116215436.1221132-1-sjg@chromium.org> References: <20210116215436.1221132-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean This code is still using the old command typedef. It was not noticed since this file is not currently built. It is using a non-existent option in the Makefile. Fix it up and add it to the build. (This is offered as an act of service in the hope of receiving a free beer at some point.) Signed-off-by: Simon Glass --- arch/arm/mach-nexell/Makefile | 2 +- arch/arm/mach-nexell/cmd_boot_linux.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-nexell/Makefile b/arch/arm/mach-nexell/Makefile index 10b3963ed10..8113624cac3 100644 --- a/arch/arm/mach-nexell/Makefile +++ b/arch/arm/mach-nexell/Makefile @@ -10,4 +10,4 @@ obj-y += nx_gpio.o obj-y += tieoff.o obj-$(CONFIG_ARCH_S5P4418) += reg-call.o obj-$(CONFIG_ARCH_S5P4418) += nx_sec_reg.o -obj-$(CONFIG_CMD_BOOTL) += cmd_boot_linux.o +obj-y += cmd_boot_linux.o diff --git a/arch/arm/mach-nexell/cmd_boot_linux.c b/arch/arm/mach-nexell/cmd_boot_linux.c index f2dedfe1625..730550cd389 100644 --- a/arch/arm/mach-nexell/cmd_boot_linux.c +++ b/arch/arm/mach-nexell/cmd_boot_linux.c @@ -5,11 +5,13 @@ */ #include +#include #include #include -#include +#include #include #include +#include #include #if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_CLI_FRAMEWORK) @@ -18,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR; static bootm_headers_t linux_images; -static void boot_go_set_os(cmd_tbl_t *cmdtp, int flag, int argc, +static void boot_go_set_os(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[], bootm_headers_t *images) { @@ -66,8 +68,8 @@ static void boot_start_lmb(bootm_headers_t *images) lmb_init(&images->lmb); - mem_start = getenv_bootm_low(); - mem_size = getenv_bootm_size(); + mem_start = env_get_bootm_low(); + mem_size = env_get_bootm_size(); lmb_add(&images->lmb, (phys_addr_t)mem_start, mem_size); @@ -79,7 +81,7 @@ static void boot_start_lmb(bootm_headers_t *images) static inline void boot_start_lmb(bootm_headers_t *images) { } #endif -int do_boot_linux(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_boot_linux(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { boot_os_fn *boot_fn; bootm_headers_t *images = &linux_images; @@ -126,7 +128,7 @@ U_BOOT_CMD(bootl, CONFIG_SYS_MAXARGS, 1, do_boot_linux, #endif #if defined(CONFIG_CMD_BOOTD) && !defined(CONFIG_CMD_BOOTM) -int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_bootd(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { return run_command(env_get("bootcmd"), flag); } From patchwork Sat Jan 16 21:54:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1427638 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=eL5LP0FT; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DJBlQ4xmBz9sB4 for ; Sun, 17 Jan 2021 08:58:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9756782A67; Sat, 16 Jan 2021 22:55:00 +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="eL5LP0FT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E2E0982A55; Sat, 16 Jan 2021 22:54:50 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE 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 731D8829E1 for ; Sat, 16 Jan 2021 22:54:46 +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 z5so25341033iob.11 for ; Sat, 16 Jan 2021 13:54:46 -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=bFFH/RHHy3KPBIz5zWuoqq5YiXvk7v6hqYTgAjIX0ms=; b=eL5LP0FTJpPGqj/SU0x3C2ZMmgeeG8WA7mo4pmf/1neL5yp2g2ag70midRziMrOMcl TdZ3cUHXoaKr9xNEKXTpNFdlJ2NfdJkha7XqAgXP0oclpBgmEYPQHtppYZH45EIuT3Ib jxjPCp92HAFdRKRfUw/DCxhj6qV6VafQSrHSw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bFFH/RHHy3KPBIz5zWuoqq5YiXvk7v6hqYTgAjIX0ms=; b=jTM7fhQrW1FLGx00ewmQETb0U0Agz5T1/Bk7N16yncjNVBiDjajt4p8DrcBS44a9+l fkrHZlSgGdpCRhIe/WAWr5Tufqu2dwgaBt0n9dxiQUVUiBmhLwuIRT4WSWcqeLIii3d5 frPmiQepk4JHk4I8klOwFsfEDma6ha4AgY7z9tHPgr3fP7A9jjcjJAO6naOqCkA6FohW jSD7v4TZWjRi9w8U6C5w0Uwq54YQGcoiCKfHuN6GVYAfdQOR1LRBxGUbZ7dMULx8wNpz MJeeBVxtqGEMhyg0WTcvO+Ea/49UpIbkc7g3eOckSsnW+OlMgD8EH/ZXvJ1h31vV4ZTl OaYg== X-Gm-Message-State: AOAM530WLh5/avu+Z/KrHAoHQrpZej+AgLMttLlLC0P1/+Thr3z0GUFH oKD02fiVxFRtFfLHtXzabu6+F+PZeEaDan1p X-Google-Smtp-Source: ABdhPJwA7ohvyxi8DzsoMhk09zxS/izKQ3qKxZttHGQcGApRrDJaSzyH6Vj4dcCn1Xw22KQWpBA/pA== X-Received: by 2002:a02:878d:: with SMTP id t13mr947150jai.105.1610834085144; Sat, 16 Jan 2021 13:54:45 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y3sm7557773ilc.2.2021.01.16.13.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 13:54:44 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Heinrich Schuchardt , Patrick Delaunay Subject: [PATCH 5/7] sandbox: Avoid using malloc() for system state Date: Sat, 16 Jan 2021 14:54:34 -0700 Message-Id: <20210116215436.1221132-6-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog In-Reply-To: <20210116215436.1221132-1-sjg@chromium.org> References: <20210116215436.1221132-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean This state is not accessible to the running U-Boot but at present it is allocated in the emulated SDRAM. This doesn't seem very useful. Adjust it to allocate from the OS instead. Signed-off-by: Simon Glass --- arch/sandbox/cpu/state.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index b2901b7a8ca..f9b4b4c045e 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -29,17 +29,17 @@ static int state_ensure_space(int extra_size) return 0; size = used + extra_size; - buf = malloc(size); + buf = os_malloc(size); if (!buf) return -ENOMEM; ret = fdt_open_into(blob, buf, size); if (ret) { - free(buf); + os_free(buf); return -EIO; } - free(blob); + os_free(blob); state->state_fdt = buf; return 0; } @@ -55,7 +55,7 @@ static int state_read_file(struct sandbox_state *state, const char *fname) printf("Cannot find sandbox state file '%s'\n", fname); return -ENOENT; } - state->state_fdt = malloc(size); + state->state_fdt = os_malloc(size); if (!state->state_fdt) { puts("No memory to read sandbox state\n"); return -ENOMEM; @@ -77,7 +77,7 @@ static int state_read_file(struct sandbox_state *state, const char *fname) err_read: os_close(fd); err_open: - free(state->state_fdt); + os_free(state->state_fdt); state->state_fdt = NULL; return ret; @@ -244,7 +244,7 @@ int sandbox_write_state(struct sandbox_state *state, const char *fname) /* Create a state FDT if we don't have one */ if (!state->state_fdt) { size = 0x4000; - state->state_fdt = malloc(size); + state->state_fdt = os_malloc(size); if (!state->state_fdt) { puts("No memory to create FDT\n"); return -ENOMEM; @@ -302,7 +302,7 @@ int sandbox_write_state(struct sandbox_state *state, const char *fname) err_write: os_close(fd); err_create: - free(state->state_fdt); + os_free(state->state_fdt); return ret; } @@ -420,7 +420,7 @@ int state_uninit(void) os_unlink(state->jumped_fname); if (state->state_fdt) - free(state->state_fdt); + os_free(state->state_fdt); memset(state, '\0', sizeof(*state)); return 0; From patchwork Sat Jan 16 21:54:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1427640 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=JmPXpwCc; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DJBlq0WmCz9s24 for ; Sun, 17 Jan 2021 08:59:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 99BCB82A60; Sat, 16 Jan 2021 22:55:08 +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="JmPXpwCc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 56CE182A4F; Sat, 16 Jan 2021 22:54:52 +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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 571E382A4D for ; Sat, 16 Jan 2021 22:54:47 +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-xd34.google.com with SMTP id p72so634929iod.12 for ; Sat, 16 Jan 2021 13:54:47 -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=IsHB+CfjlScAKojBEYEKooAayT+u7czYMi3xOcoSH5s=; b=JmPXpwCc6KYG6uKOPyoPs5jUHD0nfHAsAa4VRKrdauIWoSPku1Ylc7pn+pf+av1A8n WxgmOFNtQ6/1gEPLq0rVEhnujSTrsOiozA1nktceETfvWO3NG7HpUPN6l9CZP978yHfn 4Vcbu59mg6HNaj02AZ8A6+YRxGkflSt2lxd+8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IsHB+CfjlScAKojBEYEKooAayT+u7czYMi3xOcoSH5s=; b=Sd9e2oRtVSyumPZsgXdsdixkNFNTwIA1YaMN44C7jygWWwiWNX4BEXCUV6SAreeenD 79WITSICylCXt9MCzo//prU/gHtMBb0SHZ6Qs5xJE9QWGpj7nUCDT9xbCHMkLJg1iKkh 284BlKkvwFUGV3J3ayseWQESrNiZzFUmfQGZx3XpsaWvkF2OlrjNbIKYQxU9dwaHa2Q4 KDmAjMUxLIIASAs+kZg7neqwDoveLEzPjRHTl0oezTpBu7WHi9A1p6dn+tgS9+sdulS+ c0dD425lbfIFowrqUReNoE3ks+DloLF15H3PC4AZmHiac+Edo2425OBwGrfBUKvqe0sA RGBA== X-Gm-Message-State: AOAM531pIjhMUamsR5WXU8sG0nxdeceL7vVQq8QFCk3iPAAlev9ZDcGa VKY3FeRjNCLwMj8/HuSATA+UJyei2qAv4Xfv X-Google-Smtp-Source: ABdhPJyfWCgvIcrvFiwJMPvpJTTuZusgBX5AthZbPkgNVhVfvgsYxciELMhcQv0W8ACqYk49+h/VAw== X-Received: by 2002:a05:6e02:16ca:: with SMTP id 10mr16052399ilx.28.1610834085999; Sat, 16 Jan 2021 13:54:45 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y3sm7557773ilc.2.2021.01.16.13.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 13:54:45 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Heinrich Schuchardt , Patrick Delaunay Subject: [PATCH 6/7] sandbox: Write out bloblist when existing Date: Sat, 16 Jan 2021 14:54:35 -0700 Message-Id: <20210116215436.1221132-7-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog In-Reply-To: <20210116215436.1221132-1-sjg@chromium.org> References: <20210116215436.1221132-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Sandbox provides a way to write out its emulated memory on exit. This makes it possible to pass a bloblist from one phase (e.g. SPL) to the next. However the bloblist is not closed off, so the checksum is generally invalid. Fix this by finishing up the bloblist before writing the memory file. Signed-off-by: Simon Glass --- arch/sandbox/cpu/state.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index f9b4b4c045e..f9919149103 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include @@ -398,8 +399,12 @@ int state_uninit(void) { int err; + log_info("Writing sandbox state\n"); state = &main_state; + /* Finish the bloblist, so that it is correct before writing memory */ + bloblist_finish(); + if (state->write_ram_buf) { err = os_write_ram_buf(state->ram_buf_fname); if (err) { From patchwork Sat Jan 16 21:54:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1427641 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=E0sx5aw4; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DJBm14lmRz9s24 for ; Sun, 17 Jan 2021 08:59:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED49D82A6F; Sat, 16 Jan 2021 22:55:10 +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="E0sx5aw4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 487C382A4F; Sat, 16 Jan 2021 22: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.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 2C30F82A53 for ; Sat, 16 Jan 2021 22:54: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-io1-xd32.google.com with SMTP id e22so1714475iog.6 for ; Sat, 16 Jan 2021 13:54:48 -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=/WyIgW/sBoJxFIa0VcxnFDfA0JJpizmG8gFyOIHvEFk=; b=E0sx5aw4zzyjxEKiY8glnnMGSK6WOv+fNzYz8lVqOpY9dXxY6AOpK2FuNMHTOiRTM2 vQK/fxs02NoWrDS8Eju+SEK3/CpAy4nxcSMtwqNlQTMuUCFk8AobGIJ8u7SjVrHF5hLQ 5Uln0fyeNAcpOjSamfZ7ySMpvnb7gJGzo5+uA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/WyIgW/sBoJxFIa0VcxnFDfA0JJpizmG8gFyOIHvEFk=; b=HP9if4NJ6xADgkIc7KBNEESfiStbTbGwSHyqb4m+38YDvC7Pm/4zn9fc3Bd1JVwwyj +LZRsoZ6bLhouQ5rTTmGflrvvVmrYZcTQaXCe+J6hRTJo67oRiC8x3V9Qee0317iwoi/ PoYolAKc6zhm+/RpgU6ChlkDczp3yXPXaaKeT/2eVq73wMuflRJszO+An9sALSr1RZrX 7iAUOtWpZjDKdO04bJq9Gc8OaFYDu4/TphrQ56gyPM5MoKjKnYDgCcrIpSvRlMhQBxMa siWJZSDLTaDjYRrIiwWtSSJkD8ZXLdPidOA6P39NgAAT/r3otXPHBHkeG/l4M9ylEoT9 iKCg== X-Gm-Message-State: AOAM533M5BzbSHuoYtqZ0ketGlsJ3fuhyV9ko7DHVorMpDtstw9xiKIe Nq1ZXhJ/zcAQt16/7Fn+NJ1f0IhcgtSfTxzP X-Google-Smtp-Source: ABdhPJzmoMijoVfMLPrlQffvWoDDfJln3cmYCE9zqn71xNmhvfPxr3B8cxML+AIQ77RBLundwoOUAQ== X-Received: by 2002:a92:da85:: with SMTP id u5mr16071282iln.249.1610834086887; Sat, 16 Jan 2021 13:54:46 -0800 (PST) Received: from localhost.localdomain (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id y3sm7557773ilc.2.2021.01.16.13.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 13:54:46 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass , Heinrich Schuchardt , Jaehoon Chung , Tero Kristo Subject: [PATCH 7/7] bootm: Fix duplicate debugging in bootm_process_cmdline() Date: Sat, 16 Jan 2021 14:54:36 -0700 Message-Id: <20210116215436.1221132-8-sjg@chromium.org> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog In-Reply-To: <20210116215436.1221132-1-sjg@chromium.org> References: <20210116215436.1221132-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean These two returns use the same string so are not distinguishable with LOG_ERROR_RETURN. Fix it. Signed-off-by: Simon Glass --- common/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/bootm.c b/common/bootm.c index 8298693900d..48a5b04cd7a 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -585,7 +585,7 @@ int bootm_process_cmdline(char *buf, int maxlen, int flags) if (IS_ENABLED(CONFIG_BOOTARGS_SUBST) && (flags & BOOTM_CL_SUBST)) { ret = process_subst(buf, maxlen); if (ret) - return log_msg_ret("silent", ret); + return log_msg_ret("subst", ret); } return 0;