[PATCH] ARM: pxa: fix the building failue on saar

[PATCH] ARM: pxa: fix the building failue on saar

[Haojian Zhuang]

Since CONFIG_FB_PXA_SMARTPANEL is introduced and it's depend on CONFIG_FB_PXA.
We can't compile CONFIG_FB_PXA as module.

arch/arm/mach-pxa/built-in.o: In function `ltm020d550_update':
saar.c:(.text+0xdc8): undefined reference to `pxafb_smart_queue'
saar.c:(.text+0xdd4): undefined reference to `pxafb_smart_flush'
arch/arm/mach-pxa/built-in.o: In function `ltm020d550_lcd_power':
saar.c:(.text+0xdf8): undefined reference to `pxafb_smart_queue'
saar.c:(.text+0xe08): undefined reference to `pxafb_smart_queue'
saar.c:(.text+0xe10): undefined reference to `pxafb_smart_flush'
saar.c:(.text+0xe2c): undefined reference to `pxafb_smart_queue'
arch/arm/mach-pxa/built-in.o: In function `ltm022a97a_update':
saar.c:(.text+0xe68): undefined reference to `pxafb_smart_queue'
saar.c:(.text+0xe74): undefined reference to `pxafb_smart_flush'
arch/arm/mach-pxa/built-in.o: In function `ltm022a97a_lcd_power':
saar.c:(.text+0xeb0): undefined reference to `pxafb_smart_queue'
saar.c:(.text+0xec0): undefined reference to `pxafb_smart_queue'
saar.c:(.text+0xec8): undefined reference to `pxafb_smart_flush'
saar.c:(.text+0xf08): undefined reference to `pxafb_smart_queue'
saar.c:(.text+0xf18): undefined reference to `pxafb_smart_queue'
make[1]: *** [.tmp_vmlinux1] Error 1
make: *** [sub-make] Error 2

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
---
 arch/arm/mach-pxa/saar.c     |    2 +-
 arch/arm/mach-pxa/tavorevb.c |    2 +-
 drivers/video/Kconfig        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c
index 115b6f2..f8c3a13 100644
--- a/arch/arm/mach-pxa/saar.c
+++ b/arch/arm/mach-pxa/saar.c
@@ -116,7 +116,7 @@ static struct platform_device smc91x_device = {
 	},
 };
 
-#if defined(CONFIG_FB_PXA) || (CONFIG_FB_PXA_MODULE)
+#if defined(CONFIG_FB_PXA)
 static uint16_t lcd_power_on[] = {
 	/* single frame */
 	SMART_CMD_NOOP,
diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c
index 0f440c9..0b3abac 100644
--- a/arch/arm/mach-pxa/tavorevb.c
+++ b/arch/arm/mach-pxa/tavorevb.c
@@ -163,7 +163,7 @@ static void __init tavorevb_init_keypad(void)
 static inline void tavorevb_init_keypad(void) {}
 #endif /* CONFIG_KEYBOARD_PXA27x || CONFIG_KEYBOARD_PXA27x_MODULE */
 
-#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
+#if defined(CONFIG_FB_PXA)
 static struct platform_pwm_backlight_data tavorevb_backlight_data[] = {
 	[0] = {
 		/* primary backlight */
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 8b31fdf..003b84e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1805,7 +1805,7 @@ config FB_PXA168
 	  MMP processor.
 
 config FB_PXA
-	tristate "PXA LCD framebuffer support"
+	bool "PXA LCD framebuffer support"
 	depends on FB && ARCH_PXA
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
-- 
1.5.6.5

[PATCH] ARM: pxa: fix the building failue on saar

[Uwe Kleine-König]

Hello,

On Thu, Nov 04, 2010 at 10:53:21PM +0800, Haojian Zhuang wrote:
> Since CONFIG_FB_PXA_SMARTPANEL is introduced and it's depend on CONFIG_FB_PXA.
> We can't compile CONFIG_FB_PXA as module.
I don't know if choosing CONFIG_FB_PXA=m without
CONFIG_FB_PXA_SMARTPANEL makes sense.  If yes, just letting
CONFIG_FB_PXA_SMARTPANEL depend on CONFIG_FB_PXA=y should work.

If this doesn't work (e.g. because arch/arm/mach-pxa/saar.c calls
functions that are only available in the fb_pxa kernel module) there is
no need to talk about CONFIG_FB_PXA_SMARTPANEL in the commit log, this
only confuses the readers.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH] ARM: pxa: fix the building failue on saar

[Eric Miao]

2010/11/4 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>:
> Hello,
>
> On Thu, Nov 04, 2010 at 10:53:21PM +0800, Haojian Zhuang wrote:
>> Since CONFIG_FB_PXA_SMARTPANEL is introduced and it's depend on CONFIG_FB_PXA.
>> We can't compile CONFIG_FB_PXA as module.
> I don't know if choosing CONFIG_FB_PXA=m without
> CONFIG_FB_PXA_SMARTPANEL makes sense. ?If yes, just letting
> CONFIG_FB_PXA_SMARTPANEL depend on CONFIG_FB_PXA=y should work.
>
> If this doesn't work (e.g. because arch/arm/mach-pxa/saar.c calls
> functions that are only available in the fb_pxa kernel module) there is
> no need to talk about CONFIG_FB_PXA_SMARTPANEL in the commit log, this
> only confuses the readers.
>

Haojian,

I don't like the Kconfig change to make FB_PXA non-tristate as well.
Please see if there's better solution.

> Best regards
> Uwe
>
> --
> Pengutronix e.K. ? ? ? ? ? ? ? ? ? ? ? ? ? | Uwe Kleine-K?nig ? ? ? ? ? ?|
> Industrial Linux Solutions ? ? ? ? ? ? ? ? | http://www.pengutronix.de/ ?|
>

[PATCH] ARM: pxa: fix the building failue on saar

[Haojian Zhuang]

>-----Original Message-----
>From: Eric Miao [mailto:eric.y.miao at gmail.com]
>Sent: 2010?11?5? 12:02 AM
>To: Uwe Kleine-K?nig
>Cc: Haojian Zhuang; linux-arm-kernel at lists.infradead.org
>Subject: Re: [PATCH] ARM: pxa: fix the building failue on saar
>
>2010/11/4 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>:
>> Hello,
>>
>> On Thu, Nov 04, 2010 at 10:53:21PM +0800, Haojian Zhuang wrote:
>>> Since CONFIG_FB_PXA_SMARTPANEL is introduced and it's depend on
>CONFIG_FB_PXA.
>>> We can't compile CONFIG_FB_PXA as module.
>> I don't know if choosing CONFIG_FB_PXA=m without
>> CONFIG_FB_PXA_SMARTPANEL makes sense. ?If yes, just letting
>> CONFIG_FB_PXA_SMARTPANEL depend on CONFIG_FB_PXA=y should work.
>>
>> If this doesn't work (e.g. because arch/arm/mach-pxa/saar.c calls
>> functions that are only available in the fb_pxa kernel module) there is
>> no need to talk about CONFIG_FB_PXA_SMARTPANEL in the commit log, this
>> only confuses the readers.
>>
>
>Haojian,
>
>I don't like the Kconfig change to make FB_PXA non-tristate as well.
>Please see if there's better solution.
>
>> Best regards
>> Uwe
>>
>> --
>> Pengutronix e.K. ? ? ? ? ? ? ? ? ? ? ? ? ? | Uwe Kleine-K?nig ? ? ? ? ? ?|
>> Industrial Linux Solutions ? ? ? ? ? ? ? ? | http://www.pengutronix.de/ ?|
>>

OK. Now I let saar and tavorevb depend on FB_PXA.

Thanks
Haojian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ARM-pxa-fix-build-failure-in-saar-and-tavor.patch
Type: application/octet-stream
Size: 1477 bytes
Desc: 0001-ARM-pxa-fix-build-failure-in-saar-and-tavor.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101105/99e1d9e6/attachment.obj>