| Message ID | 1452958753-12307-1-git-send-email-aspriel@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
Arend van Spriel <aspriel@gmail.com> writes: > With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro > BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance > for the nvram file. This file is not in linux-firmware repo so it may > not be needed anyway. Otherwise consider this as a temporary fix. > > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> > Signed-off-by: Arend van Spriel <aspriel@gmail.com> Thanks. Geert, it would be great if you could test this. Dave, if Geert says the patch is ok do you mind taking this directly? I would like to fix this build breakage quickly. https://patchwork.kernel.org/patch/8049181/ Acked-by: Kalle Valo <kvalo@codeaurora.org>
On Mon, Jan 18, 2016 at 9:14 AM, Kalle Valo <kvalo@codeaurora.org> wrote: > Arend van Spriel <aspriel@gmail.com> writes: > >> With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro >> BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance >> for the nvram file. This file is not in linux-firmware repo so it may >> not be needed anyway. Otherwise consider this as a temporary fix. >> >> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> >> Signed-off-by: Arend van Spriel <aspriel@gmail.com> > > Thanks. Geert, it would be great if you could test this. Thanks, this fixes this build failure, so Tested-by: Geert Uytterhoeven <geert@linux-m68k.org> (unfortunately) now up to the next one... > Dave, if Geert says the patch is ok do you mind taking this directly? I > would like to fix this build breakage quickly. > > https://patchwork.kernel.org/patch/8049181/ > > Acked-by: Kalle Valo <kvalo@codeaurora.org> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jan 18, 2016 at 10:08 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> (unfortunately) now up to the next one...
Please ignore. I used
"make drivers/net/wireless/broadcom/brcm80211/brcmfmac/", which didn't pick up
subdir-ccflags-$(CONFIG_BRCMDBG) += -DDEBUG
in drivers/net/wireless/broadcom/brcm80211/Makefile
It builds fine with doing a normal build.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On 18-1-2016 10:27, Geert Uytterhoeven wrote: > On Mon, Jan 18, 2016 at 10:08 AM, Geert Uytterhoeven > <geert@linux-m68k.org> wrote: >> (unfortunately) now up to the next one... > > Please ignore. I used > "make drivers/net/wireless/broadcom/brcm80211/brcmfmac/", which didn't pick up > > subdir-ccflags-$(CONFIG_BRCMDBG) += -DDEBUG > > in drivers/net/wireless/broadcom/brcm80211/Makefile > > It builds fine with doing a normal build. I see. Was not sure whether "next one" meant "brcmfmac" or not. Regards, Arend > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Kalle Valo <kvalo@codeaurora.org> Date: Mon, 18 Jan 2016 10:14:27 +0200 > Arend van Spriel <aspriel@gmail.com> writes: > >> With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro >> BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance >> for the nvram file. This file is not in linux-firmware repo so it may >> not be needed anyway. Otherwise consider this as a temporary fix. >> >> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> >> Signed-off-by: Arend van Spriel <aspriel@gmail.com> > > Thanks. Geert, it would be great if you could test this. > > Dave, if Geert says the patch is ok do you mind taking this directly? I > would like to fix this build breakage quickly. > > https://patchwork.kernel.org/patch/8049181/ > > Acked-by: Kalle Valo <kvalo@codeaurora.org> Ok, applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h index ef06f57..d3c9f0d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h @@ -47,8 +47,7 @@ static const char BRCM_ ## fw_nvram_name ## _FIRMWARE_NAME[] = \ BRCMF_FW_DEFAULT_PATH fw; \ static const char BRCM_ ## fw_nvram_name ## _NVRAM_NAME[] = \ BRCMF_FW_DEFAULT_PATH nvram; \ -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw); \ -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH nvram) +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw); #define BRCMF_FW_DEF(fw_name, fw) \ static const char BRCM_ ## fw_name ## _FIRMWARE_NAME[] = \
With gcc < 4.3 __UNIQUE_ID does not create unique ids with the macro BRCMF_FW_NVRAM_DEF. Fix this by removing the MODULE_FIRMWARE instance for the nvram file. This file is not in linux-firmware repo so it may not be needed anyway. Otherwise consider this as a temporary fix. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Arend van Spriel <aspriel@gmail.com> --- Hi Kalle, Here a quick fix for the __UNIQUE_ID issue. Looking at the other issue right now, which seems a bit more complicated. Regards, Arend --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)