From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A3104C433F5 for ; Tue, 15 Feb 2022 11:53:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1BB338388F; Tue, 15 Feb 2022 12:52:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GVlcqQyl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1BC36836BE; Tue, 15 Feb 2022 12:52:54 +0100 (CET) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 0D12E8388F for ; Tue, 15 Feb 2022 12:52:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alpernebiyasak@gmail.com Received: by mail-ej1-x62e.google.com with SMTP id qk11so23280375ejb.2 for ; Tue, 15 Feb 2022 03:52:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to:cc :references:content-language:in-reply-to:content-transfer-encoding; bh=TZmP4ewPrjq3DhLA44u1uVSu7wsXlyKlDzlL/mw7FIc=; b=GVlcqQyl0J04XU2frgcseoqdGIZeM6CcJEf2bx/KBaCkGsaCBMLOvFL9vlbcKVz/Jy SFlfIC0UTwhGysNfzDF10keGCnpQk2cz2NDAE1cx5t6E0ipACK1zlaX0RGOsPtnGqLXa rPw0HHw2q6R4h0xDfya+8cacCs7PzeSu5E/hV0W0Q6x1QemZ5BjHusUHsalNQzxG8V9i v1EloZD8uOq/yno9nW1vF34HtdvSToZHgUyKv46nPKJ6Gw/sIfw7gnUO028fLAt00GfA FTylqKDs9/zOhkbz+mt6YSBVo3Xld8biF3jn0lmdpV4elSnYK8H1O7DVBWZTcLlsFHUT 1KYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:cc:references:content-language:in-reply-to :content-transfer-encoding; bh=TZmP4ewPrjq3DhLA44u1uVSu7wsXlyKlDzlL/mw7FIc=; b=BCCvHabh+gbnaL6hLJJcXMX6z/vfuk9rDSUSxQMMrMEyl3FPz+YukudMpAIkbKWXOV f5LFlGjTf8Un13teWZv3MqGMRv4TEq2Mn2SFk4tGrO1gXSdUd575dcjBhSWRWTEu+zLR kCzxrhEmuu2zUmr2PF0648NbVoB+g3CorKs3JxPJkesj5pJBipno+VTRJYvRVDCw/nxL S7XJGgBG3OlXu//BY6s/X8F0clu6r9hjEWGW+/1+GgOsHlFIkVwQuNrJM3Q7ZiTikByr dD07SDu0hhOnnEcYMFkRQ6U4KZimTvEK3CvnWHlrK3YCOcwdcoNUhhnb0XsX9iFspobF LmHA== X-Gm-Message-State: AOAM531SUFqu8N0vwjNYPEih1Fu2XcpL0MdJ7jU8wnQqKM8MBIDjWtHN sTjKjz5J53lnTIelu2dyrbo= X-Google-Smtp-Source: ABdhPJyd9jbiubVBftYAn3OA2Da4cMVFAPihj+/+aaHbehJW79H9L8SJF6dtOTeLoAFugALcxfASbg== X-Received: by 2002:a17:906:9752:: with SMTP id o18mr2619238ejy.153.1644925970703; Tue, 15 Feb 2022 03:52:50 -0800 (PST) Received: from [192.168.0.74] ([178.233.26.119]) by smtp.gmail.com with ESMTPSA id l2sm16720084eds.28.2022.02.15.03.52.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Feb 2022 03:52:50 -0800 (PST) Message-ID: <4f285518-51a9-e1f1-ef77-c014dc81679a@gmail.com> Date: Tue, 15 Feb 2022 14:42:12 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 From: Alper Nebi Yasak Subject: Re: [PATCH 03/24] spl: x86: Correct the binman symbols for SPL To: Simon Glass , U-Boot Mailing List Cc: huang lin , Jeffy Chen , Kever Yang , Tom Rini , Philippe Reynes , Ivan Mikhaylov , Alexandru Gagniuc , Bin Meng , Heiko Schocher , Heiko Thiery , Heinrich Schuchardt , =?UTF-8?Q?Marek_Beh=c3=ban?= , Marek Vasut , =?UTF-8?Q?Pali_Roh=c3=a1r?= , Ricardo Salveti , Stefan Roese References: <20220208185008.35843-1-sjg@chromium.org> <20220208185008.35843-2-sjg@chromium.org> Content-Language: en-US In-Reply-To: <20220208185008.35843-2-sjg@chromium.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 On 08/02/2022 21:49, Simon Glass wrote: > These symbols are incorrect, meaning that binman cannot find the > associated entry. This leads to errors like: > > binman: Section '/binman/simple-bin': Symbol '_binman_spl_prop_size' > in entry '/binman/simple-bin/u-boot-spl/u-boot-spl-nodtb': > Entry 'spl' not found in list (mkimage,u-boot-spl-nodtb, > u-boot-spl-bss-pad,u-boot-spl-dtb,u-boot-spl,u-boot-img,main-section) I can't help but feel like this is a bug with entry expansion where the name of the expanded node is ignored (and replaced by its type?) when it comes to the symbols. > > Fix it. > > Signed-off-by: Simon Glass > --- > > arch/x86/dts/u-boot.dtsi | 2 +- > common/spl/spl.c | 8 ++++---- > include/spl.h | 4 ++-- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi > index ca84d18ad9..24e692f988 100644 > --- a/arch/x86/dts/u-boot.dtsi > +++ b/arch/x86/dts/u-boot.dtsi > @@ -37,7 +37,7 @@ > u-boot-tpl-dtb { > }; > #endif > - spl { > + u-boot-spl { > type = "u-boot-spl"; I guess the type can be removed now that it's the same as the node name. > offset = ; > }; > diff --git a/common/spl/spl.c b/common/spl/spl.c > index 884102bdea..444907432c 100644 > --- a/common/spl/spl.c > +++ b/common/spl/spl.c > @@ -54,8 +54,8 @@ binman_sym_declare(ulong, u_boot_any, image_pos); > binman_sym_declare(ulong, u_boot_any, size); > > #ifdef CONFIG_TPL > -binman_sym_declare(ulong, spl, image_pos); > -binman_sym_declare(ulong, spl, size); > +binman_sym_declare(ulong, u_boot_spl, image_pos); > +binman_sym_declare(ulong, u_boot_spl, size); > #endif > > /* Define board data structure */ > @@ -143,14 +143,14 @@ void spl_fixup_fdt(void *fdt_blob) > ulong spl_get_image_pos(void) > { > return spl_phase() == PHASE_TPL ? > - binman_sym(ulong, spl, image_pos) : > + binman_sym(ulong, u_boot_spl, image_pos) : > binman_sym(ulong, u_boot_any, image_pos); > } > > ulong spl_get_image_size(void) > { > return spl_phase() == PHASE_TPL ? > - binman_sym(ulong, spl, size) : > + binman_sym(ulong, u_boot_spl, size) : > binman_sym(ulong, u_boot_any, size); > } > > diff --git a/include/spl.h b/include/spl.h > index bb92bc6ec6..8ceb3c0f09 100644 > --- a/include/spl.h > +++ b/include/spl.h > @@ -269,8 +269,8 @@ struct spl_load_info { > */ > binman_sym_extern(ulong, u_boot_any, image_pos); > binman_sym_extern(ulong, u_boot_any, size); > -binman_sym_extern(ulong, spl, image_pos); > -binman_sym_extern(ulong, spl, size); > +binman_sym_extern(ulong, u_boot_spl, image_pos); > +binman_sym_extern(ulong, u_boot_spl, size); > > /** > * spl_get_image_pos() - get the image position of the next phase