Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751288AbXBZPsx (ORCPT ); Mon, 26 Feb 2007 10:48:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965257AbXBZPsw (ORCPT ); Mon, 26 Feb 2007 10:48:52 -0500 Received: from vervifontaine.sonytel.be ([80.88.33.193]:58947 "EHLO vervifontaine.sonycom.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751288AbXBZPsw (ORCPT ); Mon, 26 Feb 2007 10:48:52 -0500 Date: Mon, 26 Feb 2007 16:48:49 +0100 (CET) From: Geert Uytterhoeven To: Linus Torvalds , Andrew Morton cc: Geoff Levand , Paul Mackerras , Roman Zippel , Linux Frame Buffer Device Development , Linux/PPC Development , Linux Kernel Development , =?UTF-8?Q?Toralf_F=F6rster?= Subject: [PATCH] ps3: Introduce CONFIG_PS3_ADVANCED In-Reply-To: Message-ID: References: <200702210946.27758.toralf.foerster@gmx.de> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3335 Lines: 102 ps3: Introduce CONFIG_PS3_ADVANCED, as suggested by Roman Zippel, and use it to control questions about PS3 subsystems that may not be obvious for the casual user. This gets rid of the following warning on non-powerpc platforms: | drivers/video/Kconfig:1604:warning: 'select' used by config symbol 'FB_PS3' refer to undefined symbol 'PS3_PS3AV' Signed-off-by: Geert Uytterhoeven Cc: Geoff Levand Cc: Paul Mackerras Cc: Roman Zippel --- arch/powerpc/platforms/ps3/Kconfig | 28 +++++++++++++++++++++------- drivers/video/Kconfig | 3 +-- 2 files changed, 22 insertions(+), 9 deletions(-) --- ps3-linux-2.6.21-rc1.orig/arch/powerpc/platforms/ps3/Kconfig +++ ps3-linux-2.6.21-rc1/arch/powerpc/platforms/ps3/Kconfig @@ -1,9 +1,24 @@ menu "PS3 Platform Options" depends on PPC_PS3 +config PS3_ADVANCED + depends on PPC_PS3 + bool "PS3 Advanced configuration options" + help + This gives you access to some advanced options for the PS3. The + defaults should be fine for most users, but these options may make + it possible to better control the kernel configuration if you know + what you are doing. + + Note that the answer to this question won't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about these options. + + Most users should say N to this question. + config PS3_HTAB_SIZE depends on PPC_PS3 - int "PS3 Platform pagetable size" + int "PS3 Platform pagetable size" if PS3_ADVANCED range 18 20 default 20 help @@ -42,7 +57,7 @@ config PS3_USE_LPAR_ADDR config PS3_VUART depends on PPC_PS3 - bool "PS3 Virtual UART support" + bool "PS3 Virtual UART support" if PS3_ADVANCED default y help Include support for the PS3 Virtual UART. @@ -52,9 +67,8 @@ config PS3_VUART general, all users will say Y. config PS3_PS3AV - tristate "PS3 AV settings driver" - depends on PPC_PS3 - select PS3_VUART + tristate "PS3 AV settings driver" if PS3_ADVANCED + depends on PS3_VUART default y help Include support for the PS3 AV Settings driver. @@ -63,8 +77,8 @@ config PS3_PS3AV general, all users will say Y or M. config PS3_SYS_MANAGER - bool "PS3 System Manager driver" - select PS3_VUART + bool "PS3 System Manager driver" if PS3_ADVANCED + depends on PS3_VUART default y help Include support for the PS3 System Manager. --- ps3-linux-2.6.21-rc1.orig/drivers/video/Kconfig +++ ps3-linux-2.6.21-rc1/drivers/video/Kconfig @@ -1618,8 +1618,7 @@ config FB_IBM_GXT4500 config FB_PS3 bool "PS3 GPU framebuffer driver" - depends on FB && PPC_PS3 - select PS3_PS3AV + depends on FB && PS3_PS3AV select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE) Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1 Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/