2021-06-11 12:08:12

by YueHaibing

[permalink] [raw]
Subject: [PATCH -next] firmware: tegra: Fix build error while ARCH_TEGRA_234_SOC enabled

drivers/firmware/tegra/bpmp.c:861:51:
error: ‘tegra186_soc’ undeclared here (not in a function); did you mean ‘tegra_ivc’?
{ .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc },
^~~~~~~~~~~~
tegra_ivc

Add missing ifdef block to fix this.

Fixes: 0ebdf11699d0 ("firmware: tegra: Enable BPMP support on Tegra234")
Signed-off-by: YueHaibing <[email protected]>
---
drivers/firmware/tegra/bpmp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c
index 0742a90cb844..5654c5e9862b 100644
--- a/drivers/firmware/tegra/bpmp.c
+++ b/drivers/firmware/tegra/bpmp.c
@@ -809,7 +809,8 @@ static const struct dev_pm_ops tegra_bpmp_pm_ops = {
};

#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \
- IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC)
+ IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \
+ IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC)
static const struct tegra_bpmp_soc tegra186_soc = {
.channels = {
.cpu_tx = {
--
2.17.1


2021-06-11 12:23:32

by YueHaibing

[permalink] [raw]
Subject: Re: [PATCH -next] firmware: tegra: Fix build error while ARCH_TEGRA_234_SOC enabled

Pls ignore this

On 2021/6/11 20:06, YueHaibing wrote:
> drivers/firmware/tegra/bpmp.c:861:51:
> error: ‘tegra186_soc’ undeclared here (not in a function); did you mean ‘tegra_ivc’?
> { .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc },
> ^~~~~~~~~~~~
> tegra_ivc
>
> Add missing ifdef block to fix this.
>
> Fixes: 0ebdf11699d0 ("firmware: tegra: Enable BPMP support on Tegra234")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> drivers/firmware/tegra/bpmp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c
> index 0742a90cb844..5654c5e9862b 100644
> --- a/drivers/firmware/tegra/bpmp.c
> +++ b/drivers/firmware/tegra/bpmp.c
> @@ -809,7 +809,8 @@ static const struct dev_pm_ops tegra_bpmp_pm_ops = {
> };
>
> #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \
> - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC)
> + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \
> + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC)
> static const struct tegra_bpmp_soc tegra186_soc = {
> .channels = {
> .cpu_tx = {
>