Skip to contentSkip to conversation

firmware: tegra: bpmp: fix build failure for tegra264-only config

PATCH Applied Arnd Bergmann 2 participants 2 messages Jul 11, 2025 Tegra architecture support

lore
Share & tools
lore
#0 lore raw

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.

Fixes 94bce2cf7cf6 ("firmware: tegra: bpmp: Add support on Tegra264")
---
 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
index 620cf3fdd607..41e2e4dc31d6 100644
@@ -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
index 182bfe396516..07c3d46abb87 100644
@@ -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
#1 lore raw

From: Thierry Reding <[email protected]>

Quoted 8 lines · Arnd Bergmann

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'

[...]

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]>