Am 19.12.18 um 13:42 schrieb Lars Povlsen:
As we are moving to multi-dtb and board detection, remove static board config options.
Signed-off-by: Lars Povlsen lars.povlsen@microchip.com
arch/mips/mach-mscc/Kconfig | 38 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 28 deletions(-)
This patch should be squashed into the last commit to not break bisectability. After only applying this patch you can't build any Ocelot/Luton baords anymore until the last patch is applied. Otherwise the series looks good.
diff --git a/arch/mips/mach-mscc/Kconfig b/arch/mips/mach-mscc/Kconfig index 0e35b77c9d..37ef432e48 100644 --- a/arch/mips/mach-mscc/Kconfig +++ b/arch/mips/mach-mscc/Kconfig @@ -15,47 +15,29 @@ config SOC_VCOREIII config SYS_SOC default "mscc"
+choice
- prompt "SOC Family Variant"
config SOC_OCELOT
- bool
- bool "Ocelot SOC Family" select SOC_VCOREIII
- select DESIGNWARE_SPI help This supports MSCC Ocelot family of SOCs.
config SOC_LUTON
- bool
- bool "Luton SOC Family" select SOC_VCOREIII
- select MSCC_BITBANG_SPI_GPIO help This supports MSCC Luton family of SOCs.
+endchoice
config SYS_CONFIG_NAME default "vcoreiii"
-choice
- prompt "Board select"
-config TARGET_OCELOT_PCB120
- bool "MSCC PCB120 Reference Board (aka VSC5635EV)"
- select SOC_OCELOT
- help
When selected, CONFIG_DEFAULT_DEVICE_TREE should be set toocelot_pcb120-config TARGET_OCELOT_PCB123
- bool "MSCC PCB123 Reference Board (aka VSC7514EV))"
- select SOC_OCELOT
- help
When selected, CONFIG_DEFAULT_DEVICE_TREE should be set toocelot_pcb123-config TARGET_LUTON_PCB091
- bool "MSCC PCB091 Reference Board"
- select SOC_LUTON
- select MSCC_BITBANG_SPI_GPIO
- help
When selected, CONFIG_DEFAULT_DEVICE_TREE should be set toluton_pcb091-endchoice
choice prompt "DDR type"