This is an automated email from the ASF dual-hosted git repository.
raiden00pl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 0bc6d62f63f arch/arm/ra8m1: Fix Kconfig conflict with ra4 RA_SCIn_UART
symbols.
0bc6d62f63f is described below
commit 0bc6d62f63f8a5ce86e4694f57225e5226c9e5bf
Author: raiden00pl <[email protected]>
AuthorDate: Thu Oct 15 14:54:32 2026 +0200
arch/arm/ra8m1: Fix Kconfig conflict with ra4 RA_SCIn_UART symbols.
Both chips define RA_SCIn_UART, so the ra8m1 choice breaks olddefconfig.
Assisted-by: Claude:claude-fable-5-1
Signed-off-by: raiden00pl <[email protected]>
---
arch/arm/src/ra8m1/Kconfig | 90 +++++++++++++++++++---------------------------
1 file changed, 36 insertions(+), 54 deletions(-)
diff --git a/arch/arm/src/ra8m1/Kconfig b/arch/arm/src/ra8m1/Kconfig
index a9677eb89b8..613e52366b6 100644
--- a/arch/arm/src/ra8m1/Kconfig
+++ b/arch/arm/src/ra8m1/Kconfig
@@ -371,17 +371,16 @@ config RA_HAVE_IIC1
# RA_HAVE_* above (prompt, depends on RA_HAVE_*, select
# the driver it wires up -- see README "Kconfig draft").
-choice
- prompt "SCI0 mode"
- depends on RA_HAVE_SCI_B0
- optional
-
config RA_SCI0_UART
- bool "UART"
+ bool "UART 0"
+ default n
+ depends on RA_HAVE_SCI_B0
select SCI0_SERIALDRIVER
config RA_SCI0_I2C
- bool "I2C bus interface (Simple IIC mode)"
+ bool "I2C 0 (SCI0 Simple IIC mode)"
+ default n
+ depends on RA_HAVE_SCI_B0 && !RA_SCI0_UART
select I2C
---help---
Uses SCI0's Simple IIC mode (RA8M1 User's Manual section
@@ -389,8 +388,6 @@ config RA_SCI0_I2C
by board bring-up (ra8m1_bringup.c), not fixed by this
driver.
-endchoice
-
config RA_SCI0_DTC
bool "Transfer SCI0 I2C message data through the DTC"
default n
@@ -486,17 +483,16 @@ config RA_SCI0_RXDTC
Mutually exclusive with CONFIG_RA_SCI0_FIFO (see its help).
-choice
- prompt "SCI1 mode"
- depends on RA_HAVE_SCI_B1
- optional
-
config RA_SCI1_UART
- bool "UART"
+ bool "UART 1"
+ default n
+ depends on RA_HAVE_SCI_B1
select SCI1_SERIALDRIVER
config RA_SCI1_I2C
- bool "I2C bus interface (Simple IIC mode)"
+ bool "I2C 1 (SCI1 Simple IIC mode)"
+ default n
+ depends on RA_HAVE_SCI_B1 && !RA_SCI1_UART
select I2C
---help---
Uses SCI1's Simple IIC mode (RA8M1 User's Manual section
@@ -504,8 +500,6 @@ config RA_SCI1_I2C
by board bring-up (ra8m1_bringup.c), not fixed by this
driver.
-endchoice
-
config RA_SCI1_DTC
bool "Transfer SCI1 I2C message data through the DTC"
default n
@@ -601,17 +595,16 @@ config RA_SCI1_RXDTC
Mutually exclusive with CONFIG_RA_SCI1_FIFO (see its help).
-choice
- prompt "SCI2 mode"
- depends on RA_HAVE_SCI_B2
- optional
-
config RA_SCI2_UART
- bool "UART"
+ bool "UART 2"
+ default n
+ depends on RA_HAVE_SCI_B2
select SCI2_SERIALDRIVER
config RA_SCI2_I2C
- bool "I2C bus interface (Simple IIC mode)"
+ bool "I2C 2 (SCI2 Simple IIC mode)"
+ default n
+ depends on RA_HAVE_SCI_B2 && !RA_SCI2_UART
select I2C
---help---
Uses SCI2's Simple IIC mode (RA8M1 User's Manual section
@@ -619,8 +612,6 @@ config RA_SCI2_I2C
by board bring-up (ra8m1_bringup.c), not fixed by this
driver.
-endchoice
-
config RA_SCI2_DTC
bool "Transfer SCI2 I2C message data through the DTC"
default n
@@ -716,17 +707,16 @@ config RA_SCI2_RXDTC
Mutually exclusive with CONFIG_RA_SCI2_FIFO (see its help).
-choice
- prompt "SCI3 mode"
- depends on RA_HAVE_SCI_B3
- optional
-
config RA_SCI3_UART
- bool "UART"
+ bool "UART 3"
+ default n
+ depends on RA_HAVE_SCI_B3
select SCI3_SERIALDRIVER
config RA_SCI3_I2C
- bool "I2C bus interface (Simple IIC mode)"
+ bool "I2C 3 (SCI3 Simple IIC mode)"
+ default n
+ depends on RA_HAVE_SCI_B3 && !RA_SCI3_UART
select I2C
---help---
Uses SCI3's Simple IIC mode (RA8M1 User's Manual section
@@ -734,8 +724,6 @@ config RA_SCI3_I2C
by board bring-up (ra8m1_bringup.c), not fixed by this
driver.
-endchoice
-
config RA_SCI3_DTC
bool "Transfer SCI3 I2C message data through the DTC"
default n
@@ -831,17 +819,16 @@ config RA_SCI3_RXDTC
Mutually exclusive with CONFIG_RA_SCI3_FIFO (see its help).
-choice
- prompt "SCI4 mode"
- depends on RA_HAVE_SCI_B4
- optional
-
config RA_SCI4_UART
- bool "UART"
+ bool "UART 4"
+ default n
+ depends on RA_HAVE_SCI_B4
select SCI4_SERIALDRIVER
config RA_SCI4_I2C
- bool "I2C bus interface (Simple IIC mode)"
+ bool "I2C 4 (SCI4 Simple IIC mode)"
+ default n
+ depends on RA_HAVE_SCI_B4 && !RA_SCI4_UART
select I2C
---help---
Uses SCI4's Simple IIC mode (RA8M1 User's Manual section
@@ -849,8 +836,6 @@ config RA_SCI4_I2C
by board bring-up (ra8m1_bringup.c), not fixed by this
driver.
-endchoice
-
config RA_SCI4_DTC
bool "Transfer SCI4 I2C message data through the DTC"
default n
@@ -946,17 +931,16 @@ config RA_SCI4_RXDTC
Mutually exclusive with CONFIG_RA_SCI4_FIFO (see its help).
-choice
- prompt "SCI9 mode"
- depends on RA_HAVE_SCI_B9
- optional
-
config RA_SCI9_UART
- bool "UART"
+ bool "UART 9"
+ default n
+ depends on RA_HAVE_SCI_B9
select SCI9_SERIALDRIVER
config RA_SCI9_I2C
- bool "I2C bus interface (Simple IIC mode)"
+ bool "I2C 9 (SCI9 Simple IIC mode)"
+ default n
+ depends on RA_HAVE_SCI_B9 && !RA_SCI9_UART
select I2C
---help---
Uses SCI9's Simple IIC mode (RA8M1 User's Manual section
@@ -964,8 +948,6 @@ config RA_SCI9_I2C
by board bring-up (ra8m1_bringup.c), not fixed by this
driver.
-endchoice
-
config RA_SCI9_DTC
bool "Transfer SCI9 I2C message data through the DTC"
default n
