[PATCH] MIPS: bcm47xx: Move the BCM47XX board types under a choice symbol

[PATCH] MIPS: bcm47xx: Move the BCM47XX board types under a choice symbol

[Markos Chandras]

Since the build system expects one of the two types to be selected,
it's better if we move these symbols under a new choice symbol.
Moreover, this fixes the following build problem when no board is
selected:

In file included from arch/mips/bcm47xx/irq.c:32:0:
./arch/mips/include/asm/mach-bcm47xx/bcm47xx.h:34:1: error: expected identifier
before '}' token };
                 ^
Cc: "Rafał Miłecki" <zajec5@gmail.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
 arch/mips/bcm47xx/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig
index fc21d3659fa0..39e24407709e 100644
--- a/arch/mips/bcm47xx/Kconfig
+++ b/arch/mips/bcm47xx/Kconfig
@@ -1,5 +1,9 @@
 if BCM47XX
 
+choice
+	prompt "Board type"
+	default BCM47XX_SSB
+
 config BCM47XX_SSB
 	bool "SSB Support for Broadcom BCM47XX"
 	select SYS_HAS_CPU_BMIPS32_3300
@@ -34,4 +38,6 @@ config BCM47XX_BCMA
 
 	 This will generate an image with support for BCMA and MIPS32 R2 instruction set.
 
+endchoice
+
 endif
-- 
2.3.5

[PATCH] MIPS: bcm47xx: Move the BCM47XX board types under a choice symbol

[Markos Chandras]

Since the build system expects one of the two types to be selected,
it's better if we move these symbols under a new choice symbol.
Moreover, this fixes the following build problem when no board is
selected:

In file included from arch/mips/bcm47xx/irq.c:32:0:
./arch/mips/include/asm/mach-bcm47xx/bcm47xx.h:34:1: error: expected identifier
before '}' token };
                 ^
Cc: "Rafał Miłecki" <zajec5@gmail.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
 arch/mips/bcm47xx/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig
index fc21d3659fa0..39e24407709e 100644
--- a/arch/mips/bcm47xx/Kconfig
+++ b/arch/mips/bcm47xx/Kconfig
@@ -1,5 +1,9 @@
 if BCM47XX
 
+choice
+	prompt "Board type"
+	default BCM47XX_SSB
+
 config BCM47XX_SSB
 	bool "SSB Support for Broadcom BCM47XX"
 	select SYS_HAS_CPU_BMIPS32_3300
@@ -34,4 +38,6 @@ config BCM47XX_BCMA
 
 	 This will generate an image with support for BCMA and MIPS32 R2 instruction set.
 
+endchoice
+
 endif
-- 
2.3.5

Re: [PATCH] MIPS: bcm47xx: Move the BCM47XX board types under a choice symbol

[Rafał Miłecki]

On 23 April 2015 at 14:28, Markos Chandras <markos.chandras@imgtec.com> wrote:
> Since the build system expects one of the two types to be selected,
> it's better if we move these symbols under a new choice symbol.

Nack, it doesn't allow building kernel with *both* buses support.

Re: [PATCH] MIPS: bcm47xx: Move the BCM47XX board types under a choice symbol

[Markos Chandras]

On 04/23/2015 01:33 PM, Rafał Miłecki wrote:
> On 23 April 2015 at 14:28, Markos Chandras <markos.chandras@imgtec.com> wrote:
>> Since the build system expects one of the two types to be selected,
>> it's better if we move these symbols under a new choice symbol.
> 
> Nack, it doesn't allow building kernel with *both* buses support.
> 
I see. I didn't know that this was a valid configuration. Perhaps the
choice statement needs some rework to add a third option to select both
buses.

-- 
markos

Re: [PATCH] MIPS: bcm47xx: Move the BCM47XX board types under a choice symbol

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 676 bytes --]

On 23/04/15 13:51, Markos Chandras wrote:
> On 04/23/2015 01:33 PM, Rafał Miłecki wrote:
>> On 23 April 2015 at 14:28, Markos Chandras <markos.chandras@imgtec.com> wrote:
>>> Since the build system expects one of the two types to be selected,
>>> it's better if we move these symbols under a new choice symbol.
>>
>> Nack, it doesn't allow building kernel with *both* buses support.
>>
> I see. I didn't know that this was a valid configuration. Perhaps the
> choice statement needs some rework to add a third option to select both
> buses.
> 

sounds like a workaround for a workaround that'd be better to just fix
at the source level. :)

Cheers
James


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]