From patchwork Mon Oct 25 08:10:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1545605 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=QT9Hm0xM; 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 4Hd72D1sJVz9sXN for ; Mon, 25 Oct 2021 19:11:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6FA5983311; Mon, 25 Oct 2021 10:11:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com 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=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="QT9Hm0xM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D7718311B; Mon, 25 Oct 2021 10:11:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (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 D4C2E83406 for ; Mon, 25 Oct 2021 10:11:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ed1-x533.google.com with SMTP id l13so18920237edi.8 for ; Mon, 25 Oct 2021 01:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CLxfOAcZXsia2vzUwPi6osjJRq9c59hMxyA2a/TvVPA=; b=QT9Hm0xMEs3mnkd3vRSZ82QuZS8DvRlyXQz7NQ1p2y1MOjGeYBM4kOlrd2/YMSBuw5 hdcEhtamFOsqVU1PBh3xbOPOmlUoyKwOo7op9Uk4ewCAYYvg1aMg1FMiMTUpsptR5hVm jDtq5qpF4RBnuwNWepLEIY6piHrKaQH6NPX0mfdWWO5rCZbaHbg8nItu7TcyJBrVaD42 8UmxI+PjMsGwFc7tcysn3IZecOQN95Qvnw5BkvnH8lAaxro1S/EdfVI/vvqgPuGfrUNY K6ueOj/7L0vtsFSHMNXakCe4DlyzdRGK17pR9oXa95oKaeKVvBIyx9mPydZemuwu3mb6 GtXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=CLxfOAcZXsia2vzUwPi6osjJRq9c59hMxyA2a/TvVPA=; b=oowaoIaBu+vB578VQ4+gfUF2mUq6zS5tmpf6TQOcvV7s1iJX3ABx67t8HdE9josXbT Y1HUtHji/Is6u8e4Y+luQBZh8BOR1x43V/452vTd7szEO3giiTyomFOp+lF6owchcIXP GcAaoGzdh0cV7bFzkW9FhANKSMMvioRag2bOK9v8BW2ZiWaR3uIkUciyAsfl2gsLPWsz ArYHzxN5hwR0jxS56HfksKgyiVMk+jChHOE/O0KT9pCGSguT1kRwD41qYZk0+QROiv0u 5OeoI3aDCG4FGukEjhJrZEp1d8UeEXLdBUB8KdxobFZJ86BHLu0mUiH+Ql3V/Wy7Vwx+ TRZg== X-Gm-Message-State: AOAM530/Xg9y6Q+flEfd2y2e81kRn58DzzT4ITz2eepv48uXXQhh1wnv um1owq/Tl6RYecQ2vnZ7oatVMEHpMIKfbQ== X-Google-Smtp-Source: ABdhPJyLEGWTy/mw5pi6zxGSlppjZ5l6k6YYQoiaDrLmfXSRsUhypYDGsEOrWf4v9CBMwQA8XQXCCA== X-Received: by 2002:a17:907:774d:: with SMTP id kx13mr20518060ejc.239.1635149460981; Mon, 25 Oct 2021 01:11:00 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::e05]) by smtp.gmail.com with ESMTPSA id h20sm191930ede.19.2021.10.25.01.11.00 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Oct 2021 01:11:00 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Jorge Ramirez-Ortiz , Michal Simek , Mike Looijmans , Simon Glass , T Karthik Reddy Subject: [PATCH v2] xilinx: zynqmp: Save multiboot as variable Date: Mon, 25 Oct 2021 10:10:52 +0200 Message-Id: <96556221443489c952717bcb340b4707901c9bdd.1635149450.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.33.1 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.103.2 at phobos.denx.de X-Virus-Status: Clean Save multiboot register as u-boot variable. And use it as primary source for composing dfu_alt_info for capsule update. If variable is not defined Signed-off-by: Michal Simek Reviewed-by: Oleksandr Suvorov --- Changes in v2: - Handle also error values from mult_boot() - Reported by Oleksandr Suvorov board/xilinx/zynqmp/zynqmp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 5a1f8153409c..dfb5dab7afa3 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -640,7 +640,7 @@ int board_late_init(void) const char *mode; char *new_targets; char *env_targets; - int ret; + int ret, multiboot; #if defined(CONFIG_USB_ETHER) && !defined(CONFIG_USB_GADGET_DOWNLOAD) usb_ether_init(); @@ -658,6 +658,10 @@ int board_late_init(void) if (ret) return ret; + multiboot = multi_boot(); + if (multiboot >= 0) + env_set_hex("multiboot", multiboot); + bootmode = zynqmp_get_bootmode(); puts("Bootmode: "); @@ -864,6 +868,10 @@ void set_dfu_alt_info(char *interface, char *devstr) memset(buf, 0, sizeof(buf)); multiboot = multi_boot(); + if (multiboot < 0) + multiboot = 0; + + multiboot = env_get_hex("multiboot", multiboot); debug("Multiboot: %d\n", multiboot); switch (zynqmp_get_bootmode()) {