[PATCH] fbdev: fix frame buffer devices menu

Subsystems: framebuffer layer, the rest

STALE5980d

6 messages, 5 authors, 2010-06-02 · open the first message on its own page

[PATCH] fbdev: fix frame buffer devices menu

From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date: 2010-05-26 18:03:47

Commit f601441916d1e19291d0b4f044b4a7551e2924d0 has inserted the symbol
HAVE_FB_IMX, which does not depend on FB after the menuconfig FB. This
breaks the menu, presenting most of the drivers outside of it, when
using menuconfig.

Moving the symbol to the start of the file, just like HAVE_FB_ATMEL,
fixes the problem without breaking it for iMX25 configurations (tested
with ARCH=arm, no build).

Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Uwe Kleine-König <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
---
 drivers/video/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 1e6fec4..3d94a14 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -8,6 +8,9 @@ menu "Graphics support"
 config HAVE_FB_ATMEL
 	bool
 
+config HAVE_FB_IMX
+	bool
+
 source "drivers/char/agp/Kconfig"
 
 source "drivers/gpu/vga/Kconfig"
@@ -400,9 +403,6 @@ config FB_SA1100
 	  If you plan to use the LCD display with your SA-1100 system, say
 	  Y here.
 
-config HAVE_FB_IMX
-	bool
-
 config FB_IMX
 	tristate "Motorola i.MX LCD support"
 	depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
-- 
1.7.1

Re: [PATCH] fbdev: fix frame buffer devices menu

From: Uwe Kleine-König <hidden>
Date: 2010-05-26 19:02:19

Hello,

On Wed, May 26, 2010 at 02:54:37PM -0300, Thadeu Lima de Souza Cascardo wrote:
Commit f601441916d1e19291d0b4f044b4a7551e2924d0 has inserted the symbol
HAVE_FB_IMX, which does not depend on FB after the menuconfig FB. This
breaks the menu, presenting most of the drivers outside of it, when
using menuconfig.

Moving the symbol to the start of the file, just like HAVE_FB_ATMEL,
fixes the problem without breaking it for iMX25 configurations (tested
with ARCH=arm, no build).

Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Uwe Kleine-König <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
You're right,

Acked-by: Uwe Kleine-König <redacted>

thanks
Uwe

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

Re: [PATCH] fbdev: fix frame buffer devices menu

From: Baruch Siach <baruch@tkos.co.il>
Date: 2010-05-27 04:03:47

On Wed, May 26, 2010 at 02:54:37PM -0300, Thadeu Lima de Souza Cascardo wrote:
Commit f601441916d1e19291d0b4f044b4a7551e2924d0 has inserted the symbol
HAVE_FB_IMX, which does not depend on FB after the menuconfig FB. This
breaks the menu, presenting most of the drivers outside of it, when
using menuconfig.

Moving the symbol to the start of the file, just like HAVE_FB_ATMEL,
fixes the problem without breaking it for iMX25 configurations (tested
with ARCH=arm, no build).

Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Uwe Kleine-König <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{   - baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

Re: [PATCH] fbdev: fix frame buffer devices menu

From: Andrew Morton <akpm@linux-foundation.org>
Date: 2010-06-01 21:29:56

On Thu, 27 May 2010 07:03:29 +0300
Baruch Siach [off-list ref] wrote:
On Wed, May 26, 2010 at 02:54:37PM -0300, Thadeu Lima de Souza Cascardo wrote:
quoted
Commit f601441916d1e19291d0b4f044b4a7551e2924d0 has inserted the symbol
HAVE_FB_IMX, which does not depend on FB after the menuconfig FB. This
breaks the menu, presenting most of the drivers outside of it, when
using menuconfig.

Moving the symbol to the start of the file, just like HAVE_FB_ATMEL,
fixes the problem without breaking it for iMX25 configurations (tested
with ARCH=arm, no build).

Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Uwe Kleine-K__nig <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
OK, I've been sitting on the below patch
(fbdev-fix-kconfig-breakage-in-drivers-video.patch) for months, waiting
for Krzysztof to respond to some comment which Baruch made, but
Krzysztof seems to have gone quiet.

Could you guys please compare Thadeu's patch with the below and work
out which is preferable and whether the new patch has the same coverage
as the old one, etc?

Thanks.



From: Krzysztof Helt <redacted>

There are two new options inside the CONFIG_FB section which do not depend
on the CONFIG_FB.  This break Kconfig menu layout.

Fix it and reduce few conditions for sparc frame buffers as the FB_SBUS =
((FB = y) && SPARC).

Signed-off-by: Krzysztof Helt <redacted>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/video/Kconfig |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff -puN drivers/video/Kconfig~fbdev-fix-kconfig-breakage-in-drivers-video drivers/video/Kconfig
--- a/drivers/video/Kconfig~fbdev-fix-kconfig-breakage-in-drivers-video
+++ a/drivers/video/Kconfig
@@ -400,12 +400,9 @@ config FB_SA1100
 	  If you plan to use the LCD display with your SA-1100 system, say
 	  Y here.
 
-config HAVE_FB_IMX
-	bool
-
 config FB_IMX
 	tristate "Motorola i.MX LCD support"
-	depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
+	depends on FB && (ARCH_MX1 || ARCH_MX2)
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -802,7 +799,7 @@ config FB_SBUS
 
 config FB_BW2
 	bool "BWtwo support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -811,7 +808,7 @@ config FB_BW2
 
 config FB_CG3
 	bool "CGthree support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -820,7 +817,7 @@ config FB_CG3
 
 config FB_CG6
 	bool "CGsix (GX,TurboGX) support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
 	help
_

Re: [PATCH] fbdev: fix frame buffer devices menu

From: Randy Dunlap <hidden>
Date: 2010-06-01 21:43:33

Andrew Morton wrote:
On Thu, 27 May 2010 07:03:29 +0300
Baruch Siach [off-list ref] wrote:
quoted
On Wed, May 26, 2010 at 02:54:37PM -0300, Thadeu Lima de Souza Cascardo wrote:
quoted
Commit f601441916d1e19291d0b4f044b4a7551e2924d0 has inserted the symbol
HAVE_FB_IMX, which does not depend on FB after the menuconfig FB. This
breaks the menu, presenting most of the drivers outside of it, when
using menuconfig.

Moving the symbol to the start of the file, just like HAVE_FB_ATMEL,
fixes the problem without breaking it for iMX25 configurations (tested
with ARCH=arm, no build).

Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Uwe Kleine-K__nig <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
OK, I've been sitting on the below patch
(fbdev-fix-kconfig-breakage-in-drivers-video.patch) for months, waiting
for Krzysztof to respond to some comment which Baruch made, but
Krzysztof seems to have gone quiet.

Could you guys please compare Thadeu's patch with the below and work
out which is preferable and whether the new patch has the same coverage
as the old one, etc?

Thanks.



From: Krzysztof Helt <redacted>

There are two new options inside the CONFIG_FB section which do not depend
on the CONFIG_FB.  This break Kconfig menu layout.

Fix it and reduce few conditions for sparc frame buffers as the FB_SBUS =
((FB = y) && SPARC).

Signed-off-by: Krzysztof Helt <redacted>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/video/Kconfig |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
This patch is missing a compatible change to
arch/arm/plat-mxc/Kconfig:

config ARCH_MX25
	bool "MX25-based"
	select CPU_ARM926T
	select ARCH_MXC_IOMUX_V3
	select HAVE_FB_IMX
	help
	  This enables support for systems based on the Freescale i.MX25 family

so the "select HAVE_FB_IMX" does nothing and there is no handling for this config
below AFAICT.

quoted hunk
diff -puN drivers/video/Kconfig~fbdev-fix-kconfig-breakage-in-drivers-video drivers/video/Kconfig
--- a/drivers/video/Kconfig~fbdev-fix-kconfig-breakage-in-drivers-video
+++ a/drivers/video/Kconfig
@@ -400,12 +400,9 @@ config FB_SA1100
 	  If you plan to use the LCD display with your SA-1100 system, say
 	  Y here.
 
-config HAVE_FB_IMX
-	bool
-
 config FB_IMX
 	tristate "Motorola i.MX LCD support"
-	depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
+	depends on FB && (ARCH_MX1 || ARCH_MX2)
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -802,7 +799,7 @@ config FB_SBUS
 
 config FB_BW2
 	bool "BWtwo support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -811,7 +808,7 @@ config FB_BW2
 
 config FB_CG3
 	bool "CGthree support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -820,7 +817,7 @@ config FB_CG3
 
 config FB_CG6
 	bool "CGsix (GX,TurboGX) support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
 	help
_

Re: [PATCH] fbdev: fix frame buffer devices menu

From: Baruch Siach <baruch@tkos.co.il>
Date: 2010-06-02 04:35:18

Hi Andrew,

On Tue, Jun 01, 2010 at 02:28:06PM -0700, Andrew Morton wrote:
On Thu, 27 May 2010 07:03:29 +0300
Baruch Siach [off-list ref] wrote:
quoted
On Wed, May 26, 2010 at 02:54:37PM -0300, Thadeu Lima de Souza Cascardo wrote:
quoted
Commit f601441916d1e19291d0b4f044b4a7551e2924d0 has inserted the symbol
HAVE_FB_IMX, which does not depend on FB after the menuconfig FB. This
breaks the menu, presenting most of the drivers outside of it, when
using menuconfig.

Moving the symbol to the start of the file, just like HAVE_FB_ATMEL,
fixes the problem without breaking it for iMX25 configurations (tested
with ARCH=arm, no build).

Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Uwe Kleine-K__nig <redacted>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
OK, I've been sitting on the below patch
(fbdev-fix-kconfig-breakage-in-drivers-video.patch) for months, waiting
for Krzysztof to respond to some comment which Baruch made, but
Krzysztof seems to have gone quiet.

Could you guys please compare Thadeu's patch with the below and work
out which is preferable and whether the new patch has the same coverage
as the old one, etc?
Krzysztof's patch breaks the fb support for the MX25 platform, so I prefer 
Thadeu's approach. I have no objection to the

s/(FB = y) && (SPARC && FB_SBUS)/FB_SBUS/

thing, though.

baruch
quoted hunk
From: Krzysztof Helt <redacted>

There are two new options inside the CONFIG_FB section which do not depend
on the CONFIG_FB.  This break Kconfig menu layout.

Fix it and reduce few conditions for sparc frame buffers as the FB_SBUS =
((FB = y) && SPARC).

Signed-off-by: Krzysztof Helt <redacted>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/video/Kconfig |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff -puN drivers/video/Kconfig~fbdev-fix-kconfig-breakage-in-drivers-video drivers/video/Kconfig
--- a/drivers/video/Kconfig~fbdev-fix-kconfig-breakage-in-drivers-video
+++ a/drivers/video/Kconfig
@@ -400,12 +400,9 @@ config FB_SA1100
 	  If you plan to use the LCD display with your SA-1100 system, say
 	  Y here.
 
-config HAVE_FB_IMX
-	bool
-
 config FB_IMX
 	tristate "Motorola i.MX LCD support"
-	depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
+	depends on FB && (ARCH_MX1 || ARCH_MX2)
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -802,7 +799,7 @@ config FB_SBUS
 
 config FB_BW2
 	bool "BWtwo support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -811,7 +808,7 @@ config FB_BW2
 
 config FB_CG3
 	bool "CGthree support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
@@ -820,7 +817,7 @@ config FB_CG3
 
 config FB_CG6
 	bool "CGsix (GX,TurboGX) support"
-	depends on (FB = y) && (SPARC && FB_SBUS)
+	depends on FB_SBUS
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
 	help
_
-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{   - baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help