From: Arnd Bergmann <arnd@arndb.de>
To: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>, Nishanth Menon <nm@ti.com>,
linux-omap <linux-omap@vger.kernel.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Kevin Hilman <khilman@ti.com>
Subject: [PATCH] ARM: omap2+: stub out omap*_volt_data
Date: Sat, 08 Oct 2011 17:23:24 +0200 [thread overview]
Message-ID: <1397689.kebELtC4N3@wuerfel> (raw)
When CONFIG_PM_OPP is not set, the definitions for these variables
are not available, so we should conditionally define them to
NULL.
arch/arm/mach-omap2/built-in.o: In function `omap3xxx_voltagedomains_init':
voltagedomains3xxx_data.c:100: undefined reference to `omap36xx_vddmpu_volt_data'
voltagedomains3xxx_data.c:100: undefined reference to `omap34xx_vddmpu_volt_data'
voltagedomains3xxx_data.c:100: undefined reference to `omap36xx_vddcore_volt_data'
voltagedomains3xxx_data.c:100: undefined reference to `omap34xx_vddcore_volt_data'
arch/arm/mach-omap2/built-in.o: In function `omap44xx_voltagedomains_init':
voltagedomains44xx_data.c:111: undefined reference to `omap44xx_vdd_mpu_volt_data'
voltagedomains44xx_data.c:111: undefined reference to `omap44xx_vdd_iva_volt_data'
voltagedomains44xx_data.c:111: undefined reference to `omap44xx_vdd_core_volt_data'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I got this build error only now after pulling in the latest omap series, but
I cannot tell what caused it. It's also not clear to me if this is the correct
solution. Please ack or provide a better fix.
arch/arm/mach-omap2/omap_opp_data.h | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_opp_data.h b/arch/arm/mach-omap2/omap_opp_data.h
index c784c12..fdbf96b 100644
--- a/arch/arm/mach-omap2/omap_opp_data.h
+++ b/arch/arm/mach-omap2/omap_opp_data.h
@@ -83,7 +83,7 @@ struct omap_opp_def {
extern int __init omap_init_opp_table(struct omap_opp_def *opp_def,
u32 opp_def_size);
-
+#ifdef CONFIG_PM_OPP
extern struct omap_volt_data omap34xx_vddmpu_volt_data[];
extern struct omap_volt_data omap34xx_vddcore_volt_data[];
extern struct omap_volt_data omap36xx_vddmpu_volt_data[];
@@ -93,4 +93,15 @@ extern struct omap_volt_data omap44xx_vdd_mpu_volt_data[];
extern struct omap_volt_data omap44xx_vdd_iva_volt_data[];
extern struct omap_volt_data omap44xx_vdd_core_volt_data[];
+#else
+#define omap34xx_vddmpu_volt_data NULL
+#define omap34xx_vddcore_volt_data NULL
+#define omap36xx_vddmpu_volt_data NULL
+#define omap36xx_vddcore_volt_data NULL
+
+#define omap44xx_vdd_mpu_volt_data NULL
+#define omap44xx_vdd_iva_volt_data NULL
+#define omap44xx_vdd_core_volt_data NULL
+#endif
+
#endif /* __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H */
--
1.7.5.4
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: omap2+: stub out omap*_volt_data
Date: Sat, 08 Oct 2011 17:23:24 +0200 [thread overview]
Message-ID: <1397689.kebELtC4N3@wuerfel> (raw)
When CONFIG_PM_OPP is not set, the definitions for these variables
are not available, so we should conditionally define them to
NULL.
arch/arm/mach-omap2/built-in.o: In function `omap3xxx_voltagedomains_init':
voltagedomains3xxx_data.c:100: undefined reference to `omap36xx_vddmpu_volt_data'
voltagedomains3xxx_data.c:100: undefined reference to `omap34xx_vddmpu_volt_data'
voltagedomains3xxx_data.c:100: undefined reference to `omap36xx_vddcore_volt_data'
voltagedomains3xxx_data.c:100: undefined reference to `omap34xx_vddcore_volt_data'
arch/arm/mach-omap2/built-in.o: In function `omap44xx_voltagedomains_init':
voltagedomains44xx_data.c:111: undefined reference to `omap44xx_vdd_mpu_volt_data'
voltagedomains44xx_data.c:111: undefined reference to `omap44xx_vdd_iva_volt_data'
voltagedomains44xx_data.c:111: undefined reference to `omap44xx_vdd_core_volt_data'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I got this build error only now after pulling in the latest omap series, but
I cannot tell what caused it. It's also not clear to me if this is the correct
solution. Please ack or provide a better fix.
arch/arm/mach-omap2/omap_opp_data.h | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_opp_data.h b/arch/arm/mach-omap2/omap_opp_data.h
index c784c12..fdbf96b 100644
--- a/arch/arm/mach-omap2/omap_opp_data.h
+++ b/arch/arm/mach-omap2/omap_opp_data.h
@@ -83,7 +83,7 @@ struct omap_opp_def {
extern int __init omap_init_opp_table(struct omap_opp_def *opp_def,
u32 opp_def_size);
-
+#ifdef CONFIG_PM_OPP
extern struct omap_volt_data omap34xx_vddmpu_volt_data[];
extern struct omap_volt_data omap34xx_vddcore_volt_data[];
extern struct omap_volt_data omap36xx_vddmpu_volt_data[];
@@ -93,4 +93,15 @@ extern struct omap_volt_data omap44xx_vdd_mpu_volt_data[];
extern struct omap_volt_data omap44xx_vdd_iva_volt_data[];
extern struct omap_volt_data omap44xx_vdd_core_volt_data[];
+#else
+#define omap34xx_vddmpu_volt_data NULL
+#define omap34xx_vddcore_volt_data NULL
+#define omap36xx_vddmpu_volt_data NULL
+#define omap36xx_vddcore_volt_data NULL
+
+#define omap44xx_vdd_mpu_volt_data NULL
+#define omap44xx_vdd_iva_volt_data NULL
+#define omap44xx_vdd_core_volt_data NULL
+#endif
+
#endif /* __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H */
--
1.7.5.4
next reply other threads:[~2011-10-08 15:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-08 15:23 Arnd Bergmann [this message]
2011-10-08 15:23 ` [PATCH] ARM: omap2+: stub out omap*_volt_data Arnd Bergmann
2011-10-10 18:41 ` Kevin Hilman
2011-10-10 18:41 ` Kevin Hilman
2011-10-11 13:57 ` Arnd Bergmann
2011-10-11 13:57 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397689.kebELtC4N3@wuerfel \
--to=arnd@arndb.de \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
--cc=paul@pwsan.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.