Skip to contentSkip to conversation

ARM: bcm: Restrict ARCH_BCM selection to ARCH_MULTI_V6_V7

PATCH New Alexander Shiyan 3 participants 4 messages Apr 1, 2014 – Apr 25, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture
lore
Share & tools
lore

Alexander Shiyan

author
#0 lore raw

PATCH 1/1 ARM: bcm: Restrict ARCH_BCM selection to ARCH_MULTI_V6_V7

Signed-off-by Alexander Shiyan <[email protected]>
---
 arch/arm/mach-bcm/Kconfig | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/arm/mach-bcm/Kconfig +3 -8
index 21f97f7..1048ba1 100644
@@ -1,13 +1,10 @@
 config ARCH_BCM
-	bool "Broadcom SoC Support"
-	depends on ARCH_MULTIPLATFORM
+	bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7
 	help
-	  This enables support for Broadcom ARM based SoC
-          chips
-
-if ARCH_BCM
+	  This enables support for Broadcom ARM based SoC chips
 
 menu "Broadcom SoC Selection"
+	depends on ARCH_BCM
 
 config ARCH_BCM_MOBILE
 	bool "Broadcom Mobile SoC" if ARCH_MULTI_V7

@@ -71,5 +68,3 @@ config ARCH_BCM_5301X
 	  network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
 
 endmenu
-
-endif
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 ARM: bcm: Restrict ARCH_BCM selection to ARCH_MULTI_V6_V7

Quoted 15 lines · Alexander Shiyan
arch/arm/mach-bcm/Kconfig +2 -4
-if ARCH_BCM
+         This enables support for Broadcom ARM based SoC chips
 
 menu "Broadcom SoC Selection"
+       depends on ARCH_BCM
 
 config ARCH_BCM_MOBILE
        bool "Broadcom Mobile SoC" if ARCH_MULTI_V7

@@ -71,5 +68,3 @@ config ARCH_BCM_5301X
          network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
 
 endmenu
-
-endif
--
Quoted 1 line

1.8.3.2

If applied on top of for-next of arm-soc, this won't do the right thing.

The if ARCH_BCM block will soon include config ARCH_BCM2835 and config ARCH_BCM_5301X.

-Tim

#2 lore raw

PATCH 1/1 ARM: bcm: Restrict ARCH_BCM selection to ARCH_MULTI_V6_V7

Quoted 1 line · Tim Kryger

If applied on top of for-next of arm-soc, this won't do the right thing.

Oops, I think I misspoke. Sorry.

-Tim

Applied
#3 lore raw

PATCH 1/1 ARM: bcm: Restrict ARCH_BCM selection to ARCH_MULTI_V6_V7

In reply to Alexander Shiyan
Quoted 1 line · Alexander Shiyan
Signed-off-by Alexander Shiyan <[email protected]>

Applied to mach-bcm for-3.16/soc but I added a proper commit message. Please always have some description so we know why a patch is needed even when it seems trivial.

Thanks,
Matt

Quoted 33 lines
 arch/arm/mach-bcm/Kconfig | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/arm/mach-bcm/Kconfig +3 -8
index 21f97f7..1048ba1 100644
@@ -1,13 +1,10 @@
 config ARCH_BCM
-	bool "Broadcom SoC Support"
-	depends on ARCH_MULTIPLATFORM
+	bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7
 	help
-	  This enables support for Broadcom ARM based SoC
-          chips
-
-if ARCH_BCM
+	  This enables support for Broadcom ARM based SoC chips
 
 menu "Broadcom SoC Selection"
+	depends on ARCH_BCM
 
 config ARCH_BCM_MOBILE
 	bool "Broadcom Mobile SoC" if ARCH_MULTI_V7

@@ -71,5 +68,3 @@ config ARCH_BCM_5301X
 	  network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
 
 endmenu
-
-endif
Signature · 1 line
1.8.3.2