firmware: tegra: bpmp: fix build failure for tegra264-only config
PATCH 1/1 firmware: tegra: bpmp: fix build failure for tegra264-only config
From: Arnd Bergmann <[email protected]>
The definition of tegra186_bpmp_ops was not updated in sync with the use in bpmp.c:
drivers/firmware/tegra/bpmp.c:856:17: error: 'tegra186_bpmp_ops' undeclared here (not in a function); did you mean 'tegra_bpmp_ops'?
856 | .ops = &tegra186_bpmp_ops,
aarch64-linux-ld: drivers/firmware/tegra/bpmp.o:(.rodata+0x2f0): undefined reference to `tegra186_bpmp_ops'
Update the Makefile as needed.
There is really no need to hide the declaration based on the configuration, so just expose it unconditionally so it never has to be updated again for the next SoC.
--- drivers/firmware/tegra/Makefile | 1 + drivers/firmware/tegra/bpmp-private.h | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-)
drivers/firmware/tegra/Makefile +1 -0
@@ -4,6 +4,7 @@ tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC) += bpmp-tegra186.o +tegra-bpmp-$(CONFIG_ARCH_TEGRA_264_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o obj-$(CONFIG_TEGRA_IVC) += ivc.o
drivers/firmware/tegra/bpmp-private.h +0 -6
@@ -23,13 +23,7 @@ struct tegra_bpmp_ops { int (*resume)(struct tegra_bpmp *bpmp); }; -#if IS_ENABLED (CONFIG_ARCH_TEGRA_186_SOC ) || \ -IS_ENABLED (CONFIG_ARCH_TEGRA_194_SOC ) || \ -IS_ENABLED (CONFIG_ARCH_TEGRA_234_SOC )extern const struct tegra_bpmp_ops tegra186_bpmp_ops; -#endif -#if IS_ENABLED (CONFIG_ARCH_TEGRA_210_SOC )extern const struct tegra_bpmp_ops tegra210_bpmp_ops; -#endif #endif
Signature · 1 line
2.39.5
Thierry Reding
AppliedFrom: Thierry Reding <[email protected]>
Quoted 8 lines · Arnd Bergmann
The definition of
tegra186_bpmp_opswas not updated in sync with the use inbpmp.c:
drivers/firmware/tegra/bpmp.c:856:17: error: 'tegra186_bpmp_ops' undeclared here (not in a function); did you mean 'tegra_bpmp_ops'?
856 | .ops =&tegra186_bpmp_ops,
aarch64-linux-ld: drivers/firmware/tegra/bpmp.o:(.rodata+0x2f0): undefined reference to `tegra186_bpmp_ops'[...]
Applied, thanks!
[1/1] firmware: tegra: bpmp: fix build failure for tegra264-only config
commit: 83f96a7eaaf0e3ac1b1447f74a8d3b2213187b6e
Best regards,
Signature · 1 line
Thierry Reding <[email protected]>