From patchwork Mon Nov 23 08:08:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1404675 X-Patchwork-Delegate: sjg@chromium.org 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; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=BQI08Nf/; 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 4Cfft72GmMz9sTL for ; Mon, 23 Nov 2020 19:08:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1D7C582318; Mon, 23 Nov 2020 09:08:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (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.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="BQI08Nf/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 62723821F7; Mon, 23 Nov 2020 09:08:24 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) (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 76C53821F7 for ; Mon, 23 Nov 2020 09:08:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ed1-x543.google.com with SMTP id d18so16120725edt.7 for ; Mon, 23 Nov 2020 00:08:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dOMapr9SoFQRxvxi95Wfg+2AjMqYMFvgsbG7jjSF7yg=; b=BQI08Nf/OG2+Jp/tko2b49hcZxRWCLVBiZ0AkuNv4UhdKZBwJK3a8HhUqGq3J9dzer F3USnjxbN+3oDRybWMSuvhk7Pe8x3EWaZYxLPvg4Qb3IkGPV+o7X64pYn9ELVHQimMSa tADplQd2dW58YYihWP+tfI7NnfCIx00Jfgjz9cYtya5ceTDULS//79MNEToaSYH3so3g iUXeWeMEwIMDnrIc7aUD3mIMyxwXEjvWvV5RR8FauPMiE9BBqNGlMm4YmGSKFFHevwl2 thvd/xGnh9SDuht2dKe2VvTvn3sibkchspF5T3yhllJpyyo5O7Xli/7nVygignxqN5Og vBPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=dOMapr9SoFQRxvxi95Wfg+2AjMqYMFvgsbG7jjSF7yg=; b=g7oTQZqOx7XPiNDEFlLr1E2uOqLZFmA0/jjFayO9mGEs49ujIsRDwqhtAqQSbc0gRN WuuuhkAMEnV+G9GcuFOTHA2rOCAkEUdSnwkFZ+rgYdNFo4eMcGrq38CIzzs1eWxv5rAY PHonPdqXypfn029jfssJ6+TU7FcgZlXqFYFr8KqdAneaYj62j0bQ/I7HDQn+tm40QVle KaSAI9l5RHgwXlSWRJ5kXXNwJ3jCT+lLpyTs3PkQI3HGaD0p7Aqht+kJwOrNxI6z2eJP iGXFlETMAFIgWBa2+9Avfydi+TmrLlHdmd1cAmdMcKqoQGNvwPCilVn9va9ht6A48Xex VA8Q== X-Gm-Message-State: AOAM533Z3iXklqOOOwZZXIPz4ZSh0DScts5GPHeDp8VMfcdQ8ZClynl0 caGYN4Ceomkl7qS6EMpLU1BRbQ== X-Google-Smtp-Source: ABdhPJzWdEIE3hplnOcQY/AmxxMEGM3wMdu4i+ka9IezP8BfQ06UfPqRPpiCLE6/M6HWDB4RsRWy4Q== X-Received: by 2002:aa7:d351:: with SMTP id m17mr46907505edr.215.1606118901138; Mon, 23 Nov 2020 00:08:21 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id cw26sm3606967ejb.47.2020.11.23.00.08.20 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Nov 2020 00:08:20 -0800 (PST) From: Michal Simek To: Simon Glass , u-boot@lists.denx.de, git@xilinx.com Cc: Bin Meng Subject: [PATCH] binman: Remove additional backslash Date: Mon, 23 Nov 2020 09:08:19 +0100 Message-Id: X-Mailer: git-send-email 2.29.2 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 The origin patch didn't have this change and it was caused by manual resolution where additional backslash was added. Fixes: 6723b4c6ca7b ("binman: Call helper function binman_set_rom_offset() to fill offset") Signed-off-by: Michal Simek Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- lib/binman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/binman.c b/lib/binman.c index d395b1cf70b2..f027d1b30422 100644 --- a/lib/binman.c +++ b/lib/binman.c @@ -104,6 +104,6 @@ int binman_init(void) binman->image = node; } binman_set_rom_offset(ROM_OFFSET_NONE); -\ + return 0; }