From: Luis Chamberlain <mcgrof@kernel.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
Stephan Gerhold <stephan@gerhold.net>
Subject: Re: [PATCH] firmware_loader: Fix labels with comma for builtin firmware
Date: Mon, 18 Nov 2019 20:16:11 +0000 [thread overview]
Message-ID: <20191118201611.GG11244@42.do-not-panic.com> (raw)
In-Reply-To: <20191115225911.3260-1-linus.walleij@linaro.org>
On Fri, Nov 15, 2019 at 11:59:11PM +0100, Linus Walleij wrote:
> Some firmware images contain a comma, such as:
> EXTRA_FIRMWARE "brcm/brcmfmac4334-sdio.samsung,gt-s7710.txt"
> as Broadcom firmware simply tags the device tree compatible
> string at the end of the firmware parameter file. And the
> compatible string contains a comma.
>
> This doesn't play well with gas:
>
> drivers/base/firmware_loader/builtin/brcm/brcmfmac4334-sdio.samsung,gt-s7710.txt.gen.S: Assembler messages:
> drivers/base/firmware_loader/builtin/brcm/brcmfmac4334-sdio.samsung,gt-s7710.txt.gen.S:4: Error: bad instruction `_fw_brcm_brcmfmac4334_sdio_samsung,gt_s7710_txt_bin:'
> drivers/base/firmware_loader/builtin/brcm/brcmfmac4334-sdio.samsung,gt-s7710.txt.gen.S:9: Error: bad instruction `_fw_brcm_brcmfmac4334_sdio_samsung,gt_s7710_txt_name:'
> drivers/base/firmware_loader/builtin/brcm/brcmfmac4334-sdio.samsung,gt-s7710.txt.gen.S:15: Error: can't resolve `.rodata' {.rodata section} - `_fw_brcm_brcmfmac4334_sdio_samsung' {*UND* section}
> make[6]: *** [../scripts/Makefile.build:357: drivers/base/firmware_loader/builtin/brcm/brcmfmac4334-sdio.samsung,gt-s7710.txt.gen.o] Error 1
>
> We need to get rid of the comma from the labels used by the
> assembly stub generator.
>
> Replacing a comma using GNU Make subst requires a helper
> variable.
>
> Cc: Stephan Gerhold <stephan@gerhold.net>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Loading should still work after this patch given that the original
firmware name is kept in a different variable FWNAME, and used as a
variable for the object entry.
Acked-by: Luis Chamberlain <mcgrof@kernel.org>
Luis
prev parent reply other threads:[~2019-11-18 20:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 22:59 [PATCH] firmware_loader: Fix labels with comma for builtin firmware Linus Walleij
2019-11-18 20:16 ` Luis Chamberlain [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191118201611.GG11244@42.do-not-panic.com \
--to=mcgrof@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stephan@gerhold.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox