soc: riscv: rv32m1: Create basic RV32M1 SOC config

karstenkoenig · karstenkoenig · commit 2f053f06b70f · 2020-08-11T21:12:09.000+02:00
Add new SOC_OPENISA_RV32M1 kconfig symbol to allow having options
common to both the RISCV and ARM cores.

Signed-off-by: Karsten Koenig &lt;karsten.koenig.030@gmail.com&gt;
diff --git a/arch/common/CMakeLists.txt b/arch/common/CMakeLists.txt
@@ -36,6 +36,6 @@ zephyr_linker_sources_ifdef(CONFIG_NOCACHE_MEMORY
 
 # Only ARM, X86 and OPENISA_RV32M1_RISCV32 use ROM_START_OFFSET.
 if (DEFINED CONFIG_ARM OR DEFINED CONFIG_X86
-    OR DEFINED CONFIG_SOC_OPENISA_RV32M1_RISCV32)
+    OR DEFINED CONFIG_SOC_OPENISA_RV32M1)
   zephyr_linker_sources(ROM_START SORT_KEY 0x0 rom_start_offset.ld)
 endif()
diff --git a/drivers/clock_control/Kconfig.rv32m1 b/drivers/clock_control/Kconfig.rv32m1
@@ -5,6 +5,6 @@
 
 config CLOCK_CONTROL_RV32M1_PCC
 	bool "RV32M1 PCC driver"
-	depends on SOC_OPENISA_RV32M1_RISCV32
+	depends on SOC_OPENISA_RV32M1
 	help
 	  Enable support for RV32M1 PCC driver.
diff --git a/drivers/entropy/Kconfig.rv32m1 b/drivers/entropy/Kconfig.rv32m1
@@ -5,7 +5,7 @@
 
 config ENTROPY_RV32M1_TRNG
 	bool "RV32M1 TRNG driver"
-	depends on SOC_OPENISA_RV32M1_RISCV32
+	depends on SOC_OPENISA_RV32M1
 	select ENTROPY_HAS_DRIVER
 	help
 	  This option enables the true random number generator (TRNG)
diff --git a/drivers/gpio/Kconfig.rv32m1 b/drivers/gpio/Kconfig.rv32m1
@@ -5,6 +5,6 @@
 
 config GPIO_RV32M1
 	bool "RV32M1 GPIO driver"
-	depends on SOC_OPENISA_RV32M1_RISCV32
+	depends on SOC_OPENISA_RV32M1
 	help
 	  Enable the RV32M1 GPIO driver.
diff --git a/drivers/interrupt_controller/Kconfig.rv32m1 b/drivers/interrupt_controller/Kconfig.rv32m1
@@ -5,7 +5,7 @@
 
 config RV32M1_INTMUX
 	bool "OpenISA RV32M1 INTMUX interrupt controller support"
-	depends on SOC_OPENISA_RV32M1_RISCV32 && MULTI_LEVEL_INTERRUPTS
+	depends on SOC_OPENISA_RV32M1 && MULTI_LEVEL_INTERRUPTS
 	help
 	  Select this option to enable support for the RV32M1 INTMUX
 	  driver. This provides a level 2 interrupt controller for the SoC.
diff --git a/drivers/pinmux/Kconfig.rv32m1 b/drivers/pinmux/Kconfig.rv32m1
@@ -5,6 +5,6 @@
 
 config PINMUX_RV32M1
 	bool "RV32M1 pinmux driver"
-	depends on SOC_OPENISA_RV32M1_RISCV32
+	depends on SOC_OPENISA_RV32M1
 	help
 	  Enable the RV32M1 pinmux driver.
diff --git a/drivers/pinmux/pinmux_rv32m1.c b/drivers/pinmux/pinmux_rv32m1.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <device.h>
 #include <drivers/pinmux.h>
+#include <soc.h>
 
 #include <fsl_common.h>
 #include <fsl_clock.h>
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
@@ -161,9 +161,8 @@ config RISCV_MACHINE_TIMER
 config RV32M1_LPTMR_TIMER
 	bool "RV32M1 LPTMR system timer driver"
 	default y
-	depends on SOC_OPENISA_RV32M1_RISCV32
+	depends on SOC_OPENISA_RV32M1
 	depends on !TICKLESS_IDLE
-	depends on RV32M1_INTMUX
 	help
 	  This module implements a kernel device driver for using the LPTMR
 	  peripheral as the system clock. It provides the standard "system clock
diff --git a/modules/Kconfig.vega b/modules/Kconfig.vega
@@ -1,9 +1,14 @@
 # Copyright (c) 2018 Foundries.io
 # SPDX-License-Identifier: Apache-2.0
 
+config SOC_OPENISA_RV32M1
+	bool "OpenISA RV32M1 core"
+	help
+	  Basic OpenISA RV32M1 support.
+
 config VEGA_SDK_HAL
 	bool "RV32M1 VEGA SDK support"
-	depends on SOC_OPENISA_RV32M1_RISCV32
+	depends on SOC_OPENISA_RV32M1
 
 config HAS_RV32M1_LPUART
 	bool
diff --git a/soc/riscv/openisa_rv32m1/Kconfig.soc b/soc/riscv/openisa_rv32m1/Kconfig.soc
@@ -7,6 +7,7 @@ config SOC_OPENISA_RV32M1_RISCV32
 	# The following select is due to limitations in the linker script.
 	# (We can't make it a 'depends on' without causing a dependency loop).
 	select XIP
+	select SOC_OPENISA_RV32M1
 	select HAS_RV32M1_LPUART
 	select HAS_RV32M1_LPI2C
 	select HAS_RV32M1_LPSPI
diff --git a/subsys/bluetooth/controller/CMakeLists.txt b/subsys/bluetooth/controller/CMakeLists.txt
@@ -82,7 +82,7 @@ endif()
 
 if(CONFIG_SOC_COMPATIBLE_NRF)
   include(ll_sw/nrf.cmake)
-elseif(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
+elseif(CONFIG_SOC_OPENISA_RV32M1)
   include(ll_sw/openisa.cmake)
 endif()
 
diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig
@@ -282,7 +282,7 @@ config BT_CTLR_RL_SIZE
 	depends on BT_CTLR_PRIVACY
 	default 8
 	range 1 8 if SOC_COMPATIBLE_NRF
-	range 1 8 if SOC_OPENISA_RV32M1_RISCV32
+	range 1 8 if SOC_OPENISA_RV32M1
 	help
 	  Set the size of the Resolving List for LE Controller-based Privacy.
 	  On nRF5x-based controllers, the hardware imposes a limit of 8 devices.
diff --git a/subsys/bluetooth/controller/Kconfig.ll_sw_split b/subsys/bluetooth/controller/Kconfig.ll_sw_split
@@ -37,7 +37,7 @@ config BT_LLL_VENDOR_NORDIC
 
 config BT_LLL_VENDOR_OPENISA
 	bool "Use OpenISA LLL"
-	depends on SOC_OPENISA_RV32M1_RISCV32
+	depends on SOC_OPENISA_RV32M1
 	select BT_CTLR_PHY_UPDATE_SUPPORT
 	select BT_CTLR_EXT_REJ_IND_SUPPORT
 	select BT_HAS_HCI_VS
diff --git a/subsys/bluetooth/controller/ll_sw/openisa.cmake b/subsys/bluetooth/controller/ll_sw/openisa.cmake
@@ -44,15 +44,15 @@ if(CONFIG_BT_LL_SW_SPLIT)
 endif()
 
 zephyr_library_sources_ifdef(
-  CONFIG_SOC_OPENISA_RV32M1_RISCV32
+  CONFIG_SOC_OPENISA_RV32M1
   ll_sw/openisa/hal/RV32M1/cntr.c
   ll_sw/openisa/hal/RV32M1/ecb.c
   ll_sw/openisa/hal/RV32M1/radio/radio.c
   ll_sw/openisa/hal/RV32M1/mayfly.c
   ll_sw/openisa/hal/RV32M1/ticker.c
   )
 
-if(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
+if(CONFIG_SOC_OPENISA_RV32M1)
   zephyr_library_include_directories(
     ll_sw/openisa
     hci/openisa
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c
@@ -555,11 +555,11 @@ void lll_conn_pdu_tx_prep(struct lll_conn *lll, struct pdu_data **pdu_data_tx)
 
 	p->rfu = 0U;
 
-#if !defined(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
+#if !defined(CONFIG_SOC_OPENISA_RV32M1)
 #if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR)
 	p->resv = 0U;
 #endif /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */
-#endif /* !CONFIG_SOC_OPENISA_RV32M1_RISCV32 */
+#endif /* !CONFIG_SOC_OPENISA_RV32M1 */
 
 	*pdu_data_tx = p;
 }
diff --git a/subsys/bluetooth/controller/ll_sw/pdu.h b/subsys/bluetooth/controller/ll_sw/pdu.h
@@ -616,11 +616,11 @@ struct pdu_data {
 
 	uint8_t len;
 
-#if !defined(CONFIG_SOC_OPENISA_RV32M1_RISCV32)
+#if !defined(CONFIG_SOC_OPENISA_RV32M1)
 #if !defined(CONFIG_BT_CTLR_DATA_LENGTH_CLEAR)
 	uint8_t resv:8; /* TODO: remove nRF specific code */
 #endif /* !CONFIG_BT_CTLR_DATA_LENGTH_CLEAR */
-#endif /* !CONFIG_SOC_OPENISA_RV32M1_RISCV32 */
+#endif /* !CONFIG_SOC_OPENISA_RV32M1 */
 
 	union {
 		struct pdu_data_llctrl llctrl;
