Commit 444c3dbd authored by Conor Dooley's avatar Conor Dooley

RISC-V: introduce ARCH_FOO kconfig aliases for SOC_FOO symbols

To facilitate a transfer from SOC_FOO to ARCH_FOO, over a release cycle,
introduce some aliases so that drivers etc that use the SOC_FOO symbols
can be converted.
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
---
To me, the most straight-forward conversion looks like so:
- this patch is applied in week 2 of the merge window, to avoid
  any conflicts with the Renesas tree
- all users of the SOC_ variants can be converted over a release cycle
  (or more) & no trees need to merge an immutable branch.
- we convert defconfig etc over after all users are converted
- doing it over at least one release cycle means that `make oldconfig`
  will keep people's configs working as they upgrade
- any new SoC families added uses ARCH_FOO
parent 1b929c02
menu "SoC selection" menu "SoC selection"
config ARCH_MICROCHIP_POLARFIRE
def_bool SOC_MICROCHIP_POLARFIRE
config SOC_MICROCHIP_POLARFIRE config SOC_MICROCHIP_POLARFIRE
bool "Microchip PolarFire SoCs" bool "Microchip PolarFire SoCs"
select MCHP_CLK_MPFS select MCHP_CLK_MPFS
...@@ -11,6 +14,9 @@ config ARCH_RENESAS ...@@ -11,6 +14,9 @@ config ARCH_RENESAS
help help
This enables support for the RISC-V based Renesas SoCs. This enables support for the RISC-V based Renesas SoCs.
config ARCH_SIFIVE
def_bool SOC_SIFIVE
config SOC_SIFIVE config SOC_SIFIVE
bool "SiFive SoCs" bool "SiFive SoCs"
select SERIAL_SIFIVE if TTY select SERIAL_SIFIVE if TTY
...@@ -21,6 +27,9 @@ config SOC_SIFIVE ...@@ -21,6 +27,9 @@ config SOC_SIFIVE
help help
This enables support for SiFive SoC platform hardware. This enables support for SiFive SoC platform hardware.
config ARCH_STARFIVE
def_bool SOC_STARFIVE
config SOC_STARFIVE config SOC_STARFIVE
bool "StarFive SoCs" bool "StarFive SoCs"
select PINCTRL select PINCTRL
...@@ -28,6 +37,9 @@ config SOC_STARFIVE ...@@ -28,6 +37,9 @@ config SOC_STARFIVE
help help
This enables support for StarFive SoC platform hardware. This enables support for StarFive SoC platform hardware.
config ARCH_VIRT
def_bool SOC_VIRT
config SOC_VIRT config SOC_VIRT
bool "QEMU Virt Machine" bool "QEMU Virt Machine"
select CLINT_TIMER if RISCV_M_MODE select CLINT_TIMER if RISCV_M_MODE
...@@ -42,6 +54,9 @@ config SOC_VIRT ...@@ -42,6 +54,9 @@ config SOC_VIRT
help help
This enables support for QEMU Virt Machine. This enables support for QEMU Virt Machine.
config ARCH_CANAAN
def_bool SOC_CANAAN
config SOC_CANAAN config SOC_CANAAN
bool "Canaan Kendryte K210 SoC" bool "Canaan Kendryte K210 SoC"
depends on !MMU depends on !MMU
...@@ -57,6 +72,9 @@ config SOC_CANAAN ...@@ -57,6 +72,9 @@ config SOC_CANAAN
if SOC_CANAAN if SOC_CANAAN
config ARCH_CANAAN_K210_DTB_BUILTIN
def_bool SOC_CANAAN_K210_DTB_BUILTIN
config SOC_CANAAN_K210_DTB_BUILTIN config SOC_CANAAN_K210_DTB_BUILTIN
bool "Builtin device tree for the Canaan Kendryte K210" bool "Builtin device tree for the Canaan Kendryte K210"
depends on SOC_CANAAN depends on SOC_CANAAN
...@@ -68,6 +86,9 @@ config SOC_CANAAN_K210_DTB_BUILTIN ...@@ -68,6 +86,9 @@ config SOC_CANAAN_K210_DTB_BUILTIN
This option should be selected if no bootloader is being used. This option should be selected if no bootloader is being used.
If unsure, say Y. If unsure, say Y.
config ARCH_CANAAN_K210_DTB_SOURCE
def_bool SOC_CANAAN_K210_DTB_SOURCE
config SOC_CANAAN_K210_DTB_SOURCE config SOC_CANAAN_K210_DTB_SOURCE
string "Source file for the Canaan Kendryte K210 builtin DTB" string "Source file for the Canaan Kendryte K210 builtin DTB"
depends on SOC_CANAAN depends on SOC_CANAAN
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment