Skip to content

Commit 83f96a7

Browse files
arndbthierryreding
authored andcommitted
firmware: tegra: bpmp: Fix build failure for tegra264-only config
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: 94bce2c ("firmware: tegra: bpmp: Add support on Tegra264") Signed-off-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Thierry Reding <[email protected]>
1 parent dbe4efe commit 83f96a7

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

drivers/firmware/tegra/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o
44
tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o
55
tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o
66
tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC) += bpmp-tegra186.o
7+
tegra-bpmp-$(CONFIG_ARCH_TEGRA_264_SOC) += bpmp-tegra186.o
78
tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o
89
obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o
910
obj-$(CONFIG_TEGRA_IVC) += ivc.o

drivers/firmware/tegra/bpmp-private.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@ struct tegra_bpmp_ops {
2323
int (*resume)(struct tegra_bpmp *bpmp);
2424
};
2525

26-
#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \
27-
IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \
28-
IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC)
2926
extern const struct tegra_bpmp_ops tegra186_bpmp_ops;
30-
#endif
31-
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
3227
extern const struct tegra_bpmp_ops tegra210_bpmp_ops;
33-
#endif
3428

3529
#endif

0 commit comments

Comments
 (0)