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

[Andrew Morton]

On Thu, 27 May 2010 07:03:29 +0300
Baruch Siach <baruch@xxxxxxxxxx> wrote:

> 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@xxxxxxxxxx>
> > Cc: Uwe Kleine-K__nig <u.kleine-koenig@xxxxxxxxxxxxxx>
> > Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>
> 
> Acked-by: Baruch Siach <baruch@xxxxxxxxxx>
> 

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 <krzysztof.h1@xxxxx>

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 <krzysztof.h1@xxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 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
_

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/