* [PATCH take 2] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
@ 2009-04-08 14:16 Roger Quadros
2009-04-16 8:43 ` Roger Quadros
2009-04-20 21:49 ` Kevin Hilman
0 siblings, 2 replies; 4+ messages in thread
From: Roger Quadros @ 2009-04-08 14:16 UTC (permalink / raw)
To: Kevin Hilman, linux-omap@vger.kernel.org
From: Roger Quadros <ext-roger.quadros@nokia.com>
Date: Wed, 8 Apr 2009 17:12:43 +0300
Subject: [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
Removes undefined symbol link errors when CONFIG_OMAP_PM is set.
The required symbols are defined in common.c and omap-pm.h
Dummy variables mpu_oops, dsp_oops and l3_oops have to be defined
because they are used in a number of places
It fixes the following link errors
arch/arm/mach-omap2/built-in.o: In function `omap3_round_to_table_rate':
arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `mpu_opps'
arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `dsp_opps'
arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `l3_opps'
arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_hw':
arch/arm/mach-omap2/io.c:241: undefined reference to
`omap_pm_if_early_init'
arch/arm/mach-omap2/io.c:246: undefined reference to `omap_pm_if_init'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com>
---
arch/arm/plat-omap/common.c | 6 ++++++
arch/arm/plat-omap/include/mach/omap-pm.h | 8 ++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 2866612..634ca39 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -46,6 +46,12 @@ int omap_bootloader_tag_len;
struct omap_board_config_kernel *omap_board_config;
int omap_board_config_size;
+#ifdef CONFIG_OMAP_PM_NONE
+struct omap_opp *mpu_opps;
+struct omap_opp *dsp_opps;
+struct omap_opp *l3_opps;
+#endif
+
#ifdef CONFIG_OMAP_BOOT_TAG
static int __init parse_tag_omap(const struct tag *tag)
diff --git a/arch/arm/plat-omap/include/mach/omap-pm.h
b/arch/arm/plat-omap/include/mach/omap-pm.h
index f0bbd36..5526e89 100644
--- a/arch/arm/plat-omap/include/mach/omap-pm.h
+++ b/arch/arm/plat-omap/include/mach/omap-pm.h
@@ -58,9 +58,13 @@ extern struct omap_opp *l3_opps;
* framework starts. The "_if_" is to avoid name collisions with the
* PM idle-loop code.
*/
+#ifdef CONFIG_OMAP_PM_NONE
+#define omap_pm_if_early_init(a, b, c) 0
+#else
int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,
struct omap_opp *dsp_opp_table,
struct omap_opp *l3_opp_table);
+#endif
/**
* omap_pm_if_init - OMAP PM init code called after clock fw init
@@ -68,7 +72,11 @@ int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,
* The main initialization code. OPP tables are passed in here. The
* "_if_" is to avoid name collisions with the PM idle-loop code.
*/
+#ifdef CONFIG_OMAP_PM_NONE
+#define omap_pm_if_init() 0
+#else
int __init omap_pm_if_init(void);
+#endif
/**
* omap_pm_if_exit - OMAP PM exit code
--
1.5.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH take 2] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
2009-04-08 14:16 [PATCH take 2] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set Roger Quadros
@ 2009-04-16 8:43 ` Roger Quadros
2009-04-16 12:26 ` Kevin Hilman
2009-04-20 21:49 ` Kevin Hilman
1 sibling, 1 reply; 4+ messages in thread
From: Roger Quadros @ 2009-04-16 8:43 UTC (permalink / raw)
To: ext Roger Quadros; +Cc: Kevin Hilman, linux-omap@vger.kernel.org
ext Roger Quadros wrote:
> From: Roger Quadros <ext-roger.quadros@nokia.com>
> Date: Wed, 8 Apr 2009 17:12:43 +0300
> Subject: [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
>
> Removes undefined symbol link errors when CONFIG_OMAP_PM is set.
> The required symbols are defined in common.c and omap-pm.h
> Dummy variables mpu_oops, dsp_oops and l3_oops have to be defined
> because they are used in a number of places
>
> It fixes the following link errors
>
> arch/arm/mach-omap2/built-in.o: In function `omap3_round_to_table_rate':
> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `mpu_opps'
> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `dsp_opps'
> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `l3_opps'
> arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_hw':
> arch/arm/mach-omap2/io.c:241: undefined reference to
> `omap_pm_if_early_init'
> arch/arm/mach-omap2/io.c:246: undefined reference to `omap_pm_if_init'
> make: *** [.tmp_vmlinux1] Error 1
>
> Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com>
> ---
> arch/arm/plat-omap/common.c | 6 ++++++
> arch/arm/plat-omap/include/mach/omap-pm.h | 8 ++++++++
> 2 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
> index 2866612..634ca39 100644
> --- a/arch/arm/plat-omap/common.c
> +++ b/arch/arm/plat-omap/common.c
> @@ -46,6 +46,12 @@ int omap_bootloader_tag_len;
> struct omap_board_config_kernel *omap_board_config;
> int omap_board_config_size;
>
> +#ifdef CONFIG_OMAP_PM_NONE
> +struct omap_opp *mpu_opps;
> +struct omap_opp *dsp_opps;
> +struct omap_opp *l3_opps;
> +#endif
> +
> #ifdef CONFIG_OMAP_BOOT_TAG
>
> static int __init parse_tag_omap(const struct tag *tag)
> diff --git a/arch/arm/plat-omap/include/mach/omap-pm.h
> b/arch/arm/plat-omap/include/mach/omap-pm.h
> index f0bbd36..5526e89 100644
> --- a/arch/arm/plat-omap/include/mach/omap-pm.h
> +++ b/arch/arm/plat-omap/include/mach/omap-pm.h
> @@ -58,9 +58,13 @@ extern struct omap_opp *l3_opps;
> * framework starts. The "_if_" is to avoid name collisions with the
> * PM idle-loop code.
> */
> +#ifdef CONFIG_OMAP_PM_NONE
> +#define omap_pm_if_early_init(a, b, c) 0
> +#else
> int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,
> struct omap_opp *dsp_opp_table,
> struct omap_opp *l3_opp_table);
> +#endif
>
> /**
> * omap_pm_if_init - OMAP PM init code called after clock fw init
> @@ -68,7 +72,11 @@ int __init omap_pm_if_early_init(struct omap_opp
> *mpu_opp_table,
> * The main initialization code. OPP tables are passed in here. The
> * "_if_" is to avoid name collisions with the PM idle-loop code.
> */
> +#ifdef CONFIG_OMAP_PM_NONE
> +#define omap_pm_if_init() 0
> +#else
> int __init omap_pm_if_init(void);
> +#endif
>
> /**
> * omap_pm_if_exit - OMAP PM exit code
Hi Kevin,
is this patch making into PM?
regards,
-roger
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH take 2] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
2009-04-16 8:43 ` Roger Quadros
@ 2009-04-16 12:26 ` Kevin Hilman
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2009-04-16 12:26 UTC (permalink / raw)
To: Roger Quadros; +Cc: linux-omap@vger.kernel.org
Roger Quadros <ext-roger.quadros@nokia.com> writes:
> ext Roger Quadros wrote:
>> From: Roger Quadros <ext-roger.quadros@nokia.com>
>> Date: Wed, 8 Apr 2009 17:12:43 +0300
>> Subject: [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
>>
>> Removes undefined symbol link errors when CONFIG_OMAP_PM is set.
>> The required symbols are defined in common.c and omap-pm.h
>> Dummy variables mpu_oops, dsp_oops and l3_oops have to be defined
>> because they are used in a number of places
>>
>> It fixes the following link errors
>>
>> arch/arm/mach-omap2/built-in.o: In function `omap3_round_to_table_rate':
>> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `mpu_opps'
>> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `dsp_opps'
>> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `l3_opps'
>> arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_hw':
>> arch/arm/mach-omap2/io.c:241: undefined reference to
>> `omap_pm_if_early_init'
>> arch/arm/mach-omap2/io.c:246: undefined reference to `omap_pm_if_init'
>> make: *** [.tmp_vmlinux1] Error 1
>>
>> Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com>
>> ---
>> arch/arm/plat-omap/common.c | 6 ++++++
>> arch/arm/plat-omap/include/mach/omap-pm.h | 8 ++++++++
>> 2 files changed, 14 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
>> index 2866612..634ca39 100644
>> --- a/arch/arm/plat-omap/common.c
>> +++ b/arch/arm/plat-omap/common.c
>> @@ -46,6 +46,12 @@ int omap_bootloader_tag_len;
>> struct omap_board_config_kernel *omap_board_config;
>> int omap_board_config_size;
>>
>> +#ifdef CONFIG_OMAP_PM_NONE
>> +struct omap_opp *mpu_opps;
>> +struct omap_opp *dsp_opps;
>> +struct omap_opp *l3_opps;
>> +#endif
>> +
>> #ifdef CONFIG_OMAP_BOOT_TAG
>>
>> static int __init parse_tag_omap(const struct tag *tag)
>> diff --git a/arch/arm/plat-omap/include/mach/omap-pm.h
>> b/arch/arm/plat-omap/include/mach/omap-pm.h
>> index f0bbd36..5526e89 100644
>> --- a/arch/arm/plat-omap/include/mach/omap-pm.h
>> +++ b/arch/arm/plat-omap/include/mach/omap-pm.h
>> @@ -58,9 +58,13 @@ extern struct omap_opp *l3_opps;
>> * framework starts. The "_if_" is to avoid name collisions with the
>> * PM idle-loop code.
>> */
>> +#ifdef CONFIG_OMAP_PM_NONE
>> +#define omap_pm_if_early_init(a, b, c) 0
>> +#else
>> int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,
>> struct omap_opp *dsp_opp_table,
>> struct omap_opp *l3_opp_table);
>> +#endif
>>
>> /**
>> * omap_pm_if_init - OMAP PM init code called after clock fw init
>> @@ -68,7 +72,11 @@ int __init omap_pm_if_early_init(struct omap_opp
>> *mpu_opp_table,
>> * The main initialization code. OPP tables are passed in here. The
>> * "_if_" is to avoid name collisions with the PM idle-loop code.
>> */
>> +#ifdef CONFIG_OMAP_PM_NONE
>> +#define omap_pm_if_init() 0
>> +#else
>> int __init omap_pm_if_init(void);
>> +#endif
>>
>> /**
>> * omap_pm_if_exit - OMAP PM exit code
>
> Hi Kevin,
>
> is this patch making into PM?
>
Sorry, a combination of conference travel and vacation has got me a
bit behind on reviewing PM branch submissions. I'll be catching up on
PM branch submissions early next week.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH take 2] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
2009-04-08 14:16 [PATCH take 2] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set Roger Quadros
2009-04-16 8:43 ` Roger Quadros
@ 2009-04-20 21:49 ` Kevin Hilman
1 sibling, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2009-04-20 21:49 UTC (permalink / raw)
To: Roger Quadros; +Cc: linux-omap@vger.kernel.org
Roger Quadros <ext-roger.quadros@nokia.com> writes:
> From: Roger Quadros <ext-roger.quadros@nokia.com>
> Date: Wed, 8 Apr 2009 17:12:43 +0300
> Subject: [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
>
> Removes undefined symbol link errors when CONFIG_OMAP_PM is set.
> The required symbols are defined in common.c and omap-pm.h
> Dummy variables mpu_oops, dsp_oops and l3_oops have to be defined
> because they are used in a number of places
>
> It fixes the following link errors
>
> arch/arm/mach-omap2/built-in.o: In function `omap3_round_to_table_rate':
> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `mpu_opps'
> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `dsp_opps'
> arch/arm/mach-omap2/clock34xx.c:956: undefined reference to `l3_opps'
> arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_hw':
> arch/arm/mach-omap2/io.c:241: undefined reference to
> `omap_pm_if_early_init'
> arch/arm/mach-omap2/io.c:246: undefined reference to `omap_pm_if_init'
> make: *** [.tmp_vmlinux1] Error 1
>
> Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com>
Thanks, pushing to PM branch today.
Kevin
> ---
> arch/arm/plat-omap/common.c | 6 ++++++
> arch/arm/plat-omap/include/mach/omap-pm.h | 8 ++++++++
> 2 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
> index 2866612..634ca39 100644
> --- a/arch/arm/plat-omap/common.c
> +++ b/arch/arm/plat-omap/common.c
> @@ -46,6 +46,12 @@ int omap_bootloader_tag_len;
> struct omap_board_config_kernel *omap_board_config;
> int omap_board_config_size;
>
> +#ifdef CONFIG_OMAP_PM_NONE
> +struct omap_opp *mpu_opps;
> +struct omap_opp *dsp_opps;
> +struct omap_opp *l3_opps;
> +#endif
> +
> #ifdef CONFIG_OMAP_BOOT_TAG
>
> static int __init parse_tag_omap(const struct tag *tag)
> diff --git a/arch/arm/plat-omap/include/mach/omap-pm.h
> b/arch/arm/plat-omap/include/mach/omap-pm.h
> index f0bbd36..5526e89 100644
> --- a/arch/arm/plat-omap/include/mach/omap-pm.h
> +++ b/arch/arm/plat-omap/include/mach/omap-pm.h
> @@ -58,9 +58,13 @@ extern struct omap_opp *l3_opps;
> * framework starts. The "_if_" is to avoid name collisions with the
> * PM idle-loop code.
> */
> +#ifdef CONFIG_OMAP_PM_NONE
> +#define omap_pm_if_early_init(a, b, c) 0
> +#else
> int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,
> struct omap_opp *dsp_opp_table,
> struct omap_opp *l3_opp_table);
> +#endif
>
> /**
> * omap_pm_if_init - OMAP PM init code called after clock fw init
> @@ -68,7 +72,11 @@ int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,
> * The main initialization code. OPP tables are passed in here. The
> * "_if_" is to avoid name collisions with the PM idle-loop code.
> */
> +#ifdef CONFIG_OMAP_PM_NONE
> +#define omap_pm_if_init() 0
> +#else
> int __init omap_pm_if_init(void);
> +#endif
>
> /**
> * omap_pm_if_exit - OMAP PM exit code
> --
> 1.5.6.3
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-04-20 21:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-08 14:16 [PATCH take 2] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set Roger Quadros
2009-04-16 8:43 ` Roger Quadros
2009-04-16 12:26 ` Kevin Hilman
2009-04-20 21:49 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox