Skip to contentSkip to conversation

west bridge, Kconfig fix

PATCH In review David Cross 2 participants 4 messages Sep 10, 2010 – Sep 11, 2010 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 west bridge, Kconfig fix

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

---

drivers/staging/westbridge/Kconfig +24 -5
diff -uprN -X linux-next-vanilla/Documentation/dontdiff linux-next-vanilla/drivers/staging/westbridge/Kconfig linux-next-incremen/drivers/staging/westbridge/Kconfig
@@ -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.
---------------------------------------------------------------

#1 lore raw
Quoted 4 lines · 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.

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

#2 lore raw

-----Original Message-----
From: Greg KH [mailto:[email protected]]

Quoted 8 lines · David Cross
Quoted 4 lines

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

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.
---------------------------------------------------------------

#3 lore raw
Quoted 7 lines · David Cross

-----Original Message-----
From: Greg KH [mailto:[email protected]]

Quoted 3 lines · David Cross
Quoted 3 lines

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

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

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.

Quoted 5 lines

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