[PATCH] west bridge, Kconfig fix

[PATCH] west bridge, Kconfig fix

[David Cross]

This patch fixes the currently broken Kconfig for west bridge by
introducing a dependency on a valid HAL Layer for the driver build.

Signed-off-by: David Cross <david.cross@cypress.com>
---
diff -uprN -X linux-next-vanilla/Documentation/dontdiff linux-next-vanilla/drivers/staging/westbridge/Kconfig linux-next-incremen/drivers/staging/westbridge/Kconfig
--- linux-next-vanilla/drivers/staging/westbridge/Kconfig	2010-08-31 19:32:51.000000000 -0700
+++ linux-next-incremen/drivers/staging/westbridge/Kconfig	2010-09-09 19:12:18.000000000 -0700
@@ -4,7 +4,7 @@
 
 menuconfig WESTBRIDGE
 	tristate "West Bridge support"
-	depends on HAS_IOMEM && BROKEN
+	depends on WESTBRIDGE_HAL_SELECTED
 	help
 	  This selects West Bridge Peripheral controller support.
 
@@ -12,7 +12,7 @@ menuconfig WESTBRIDGE
 
 menuconfig WESTBRIDGE_ASTORIA
 	bool "West Bridge Astoria support"
-	depends on WESTBRIDGE != n
+	depends on WESTBRIDGE != n && WESTBRIDGE_HAL_SELECTED
 	help
 		This option enables support for West Bridge Astoria
 
@@ -20,11 +20,30 @@ if WESTBRIDGE_ASTORIA
 source "drivers/staging/westbridge/astoria/Kconfig"
 endif #WESTBRIDGE_ASTORIA
 
-menuconfig MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL
+config	WESTBRIDGE_HAL_SELECTED
+	boolean
+
+choice
+	prompt "West Bridge HAL"
+	help
+	   West Bridge HAL/processor interface to be used
+
+#
+# HAL Layers
+#
+
+config MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL
 	bool "WESTBRIDGE OMAP3430 Astoria PNAND HAL"
-	depends on ARCH_OMAP3 && WESTBRIDGE_ASTORIA
+	depends on ARCH_OMAP3
+	select WESTBRIDGE_HAL_SELECTED
+	help
+	   Include the OMAP3430 HAL for PNAND interface
+
+config MACH_NO_WESTBRIDGE
+	bool "no West Bridge HAL selected"
 	help
-		Include the OMAP3430 Linux Based HAL
+	   Do not include any HAL layer(de-activates West Bridge option)
+endchoice
 
 config WESTBRIDGE_DEBUG
 	bool "West Bridge debugging"


---------------------------------------------------------------
This message and any attachments may contain Cypress (or its
subsidiaries) confidential information. If it has been received
in error, please advise the sender and immediately delete this
message.
---------------------------------------------------------------

Re: [PATCH] west bridge, Kconfig fix

[Greg KH]

On Fri, Sep 10, 2010 at 04:51:05PM -0700, David Cross wrote:
> This patch fixes the currently broken Kconfig for west bridge by
> introducing a dependency on a valid HAL Layer for the driver build.
> 
> Signed-off-by: David Cross <david.cross@cypress.com>

Which order do these 4 patches need to be applied in?  Please read
section 15 in Documentation/SubmittingPatches for details as to how to
properly format things.

thanks,

greg k-h

RE: [PATCH] west bridge, Kconfig fix

[David Cross]

-----Original Message-----
From: Greg KH [mailto:greg@kroah.com] 

On Fri, Sep 10, 2010 at 04:51:05PM -0700, David Cross wrote:
> > This patch fixes the currently broken Kconfig for west bridge by
> > introducing a dependency on a valid HAL Layer for the driver build.
> > 
> > Signed-off-by: David Cross <david.cross@cypress.com>

> Which order do these 4 patches need to be applied in?  Please read
> section 15 in Documentation/SubmittingPatches for details as to how to
> properly format things.

No ordering is necessary for these specific patches, they are all
independent. 
Re-reading SubmittingPatches document, I am not totally sure if you are
referring to ordering (which is not needed in this case), or the actual
format in section 15. Would you like me to re-submit with a "from", empty
line, and a ":" in the subject?
Please let me know.

Thanks,
david


---------------------------------------------------------------
This message and any attachments may contain Cypress (or its
subsidiaries) confidential information. If it has been received
in error, please advise the sender and immediately delete this
message.
---------------------------------------------------------------

Re: [PATCH] west bridge, Kconfig fix

[Greg KH]

On Fri, Sep 10, 2010 at 05:20:49PM -0700, David Cross wrote:
> -----Original Message-----
> From: Greg KH [mailto:greg@kroah.com] 
> 
> On Fri, Sep 10, 2010 at 04:51:05PM -0700, David Cross wrote:
> > > This patch fixes the currently broken Kconfig for west bridge by
> > > introducing a dependency on a valid HAL Layer for the driver build.
> > > 
> > > Signed-off-by: David Cross <david.cross@cypress.com>
> 
> > Which order do these 4 patches need to be applied in?  Please read
> > section 15 in Documentation/SubmittingPatches for details as to how to
> > properly format things.
> 
> No ordering is necessary for these specific patches, they are all
> independent. 

Ok.

> Re-reading SubmittingPatches document, I am not totally sure if you are
> referring to ordering (which is not needed in this case), or the actual
> format in section 15. Would you like me to re-submit with a "from", empty
> line, and a ":" in the subject?
> Please let me know.

No, that's fine, I was referring to the typical [01/04] numbering that
people use to ensure both the order, and the fact that all patches go
through.

thanks,

greg k-h