diff mbox series

[1/7] board: ti: Add dependency from TARGET selection to SOC

Message ID 20231101203530.80359-1-afd@ti.com
State Accepted
Commit 5936351be1db17ccc7589b678cd7a89578609620
Delegated to: Tom Rini
Headers show
Series [1/7] board: ti: Add dependency from TARGET selection to SOC | expand

Commit Message

Andrew Davis Nov. 1, 2023, 8:35 p.m. UTC
Currently the K3 selection for TARGET boards does not depend on the SoC
for which it is based. This leds to the odd ability to select for instance
both SOC_K3_AM625 and TARGET_J721E_A72_EVM.

To fix this the target choice should depend on the matching SOC config.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 board/siemens/iot2050/Kconfig     | 2 +-
 board/ti/am62ax/Kconfig           | 1 +
 board/ti/am62x/Kconfig            | 1 +
 board/ti/am64x/Kconfig            | 1 +
 board/ti/am65x/Kconfig            | 1 +
 board/ti/j721e/Kconfig            | 1 +
 board/ti/j721s2/Kconfig           | 1 +
 board/toradex/verdin-am62/Kconfig | 1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

Comments

Neha Malcom Francis Nov. 2, 2023, 6:25 a.m. UTC | #1
Hi Andrew,

On 02/11/23 02:05, Andrew Davis wrote:
> Currently the K3 selection for TARGET boards does not depend on the SoC
> for which it is based. This leds to the odd ability to select for instance
> both SOC_K3_AM625 and TARGET_J721E_A72_EVM.
> 
> To fix this the target choice should depend on the matching SOC config.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>   board/siemens/iot2050/Kconfig     | 2 +-
>   board/ti/am62ax/Kconfig           | 1 +
>   board/ti/am62x/Kconfig            | 1 +
>   board/ti/am64x/Kconfig            | 1 +
>   board/ti/am65x/Kconfig            | 1 +
>   board/ti/j721e/Kconfig            | 1 +
>   board/ti/j721s2/Kconfig           | 1 +
>   board/toradex/verdin-am62/Kconfig | 1 +
>   8 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/board/siemens/iot2050/Kconfig b/board/siemens/iot2050/Kconfig
> index a6170aae807..737cda64744 100644
> --- a/board/siemens/iot2050/Kconfig
> +++ b/board/siemens/iot2050/Kconfig
> @@ -8,8 +8,8 @@
>   
>   config TARGET_IOT2050_A53
>   	bool "IOT2050 running on A53"
> +	depends on SOC_K3_AM654
>   	select ARM64
> -	select SOC_K3_AM654
>   	select BOARD_LATE_INIT
>   	select SYS_DISABLE_DCACHE_OPS
>   	select BINMAN
> diff --git a/board/ti/am62ax/Kconfig b/board/ti/am62ax/Kconfig
> index 61f289faccd..30e1a068660 100644
> --- a/board/ti/am62ax/Kconfig
> +++ b/board/ti/am62ax/Kconfig
> @@ -5,6 +5,7 @@
>   
>   choice
>   	prompt "TI K3 AM62Ax based boards"
> +	depends on SOC_K3_AM62A7
>   	optional
>   
>   config TARGET_AM62A7_A53_EVM
> diff --git a/board/ti/am62x/Kconfig b/board/ti/am62x/Kconfig
> index cd17e939e5a..b4b70337d18 100644
> --- a/board/ti/am62x/Kconfig
> +++ b/board/ti/am62x/Kconfig
> @@ -5,6 +5,7 @@
>   
>   choice
>   	prompt "TI K3 AM62x based boards"
> +	depends on SOC_K3_AM625
>   	optional
>   
>   config TARGET_AM625_A53_EVM
> diff --git a/board/ti/am64x/Kconfig b/board/ti/am64x/Kconfig
> index fb596e4adfc..2dbc6197b75 100644
> --- a/board/ti/am64x/Kconfig
> +++ b/board/ti/am64x/Kconfig
> @@ -4,6 +4,7 @@
>   
>   choice
>   	prompt "K3 AM64 based boards"
> +	depends on SOC_K3_AM642
>   	optional
>   
>   config TARGET_AM642_A53_EVM
> diff --git a/board/ti/am65x/Kconfig b/board/ti/am65x/Kconfig
> index 5fd19d652a6..7c1bcfc899c 100644
> --- a/board/ti/am65x/Kconfig
> +++ b/board/ti/am65x/Kconfig
> @@ -5,6 +5,7 @@
>   
>   choice
>   	prompt "K3 AM65 based boards"
> +	depends on SOC_K3_AM654
>   	optional
>   
>   config TARGET_AM654_A53_EVM
> diff --git a/board/ti/j721e/Kconfig b/board/ti/j721e/Kconfig
> index e6cb21f77bd..23867ad8e04 100644
> --- a/board/ti/j721e/Kconfig
> +++ b/board/ti/j721e/Kconfig
> @@ -5,6 +5,7 @@
>   
>   choice
>   	prompt "K3 J721E based boards"
> +	depends on SOC_K3_J721E
>   	optional
>   
>   config TARGET_J721E_A72_EVM
> diff --git a/board/ti/j721s2/Kconfig b/board/ti/j721s2/Kconfig
> index f6d1cb57653..a4a5d16ba21 100644
> --- a/board/ti/j721s2/Kconfig
> +++ b/board/ti/j721s2/Kconfig
> @@ -5,6 +5,7 @@
>   
>   choice
>   	prompt "K3 J721S2 board"
> +	depends on SOC_K3_J721S2
>   	optional
>   
>   config TARGET_J721S2_A72_EVM
> diff --git a/board/toradex/verdin-am62/Kconfig b/board/toradex/verdin-am62/Kconfig
> index e7522244070..abc2984f250 100644
> --- a/board/toradex/verdin-am62/Kconfig
> +++ b/board/toradex/verdin-am62/Kconfig
> @@ -5,6 +5,7 @@
>   
>   choice
>   	prompt "Toradex Verdin AM62 based boards"
> +	depends on SOC_K3_AM625
>   	optional
>   
>   config TARGET_VERDIN_AM62_A53

Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
Tom Rini Nov. 22, 2023, 8:49 p.m. UTC | #2
On Wed, Nov 01, 2023 at 03:35:24PM -0500, Andrew Davis wrote:

> Currently the K3 selection for TARGET boards does not depend on the SoC
> for which it is based. This leds to the odd ability to select for instance
> both SOC_K3_AM625 and TARGET_J721E_A72_EVM.
> 
> To fix this the target choice should depend on the matching SOC config.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> Reviewed-by: Neha Malcom Francis <n-francis@ti.com>

For the series, applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/board/siemens/iot2050/Kconfig b/board/siemens/iot2050/Kconfig
index a6170aae807..737cda64744 100644
--- a/board/siemens/iot2050/Kconfig
+++ b/board/siemens/iot2050/Kconfig
@@ -8,8 +8,8 @@ 
 
 config TARGET_IOT2050_A53
 	bool "IOT2050 running on A53"
+	depends on SOC_K3_AM654
 	select ARM64
-	select SOC_K3_AM654
 	select BOARD_LATE_INIT
 	select SYS_DISABLE_DCACHE_OPS
 	select BINMAN
diff --git a/board/ti/am62ax/Kconfig b/board/ti/am62ax/Kconfig
index 61f289faccd..30e1a068660 100644
--- a/board/ti/am62ax/Kconfig
+++ b/board/ti/am62ax/Kconfig
@@ -5,6 +5,7 @@ 
 
 choice
 	prompt "TI K3 AM62Ax based boards"
+	depends on SOC_K3_AM62A7
 	optional
 
 config TARGET_AM62A7_A53_EVM
diff --git a/board/ti/am62x/Kconfig b/board/ti/am62x/Kconfig
index cd17e939e5a..b4b70337d18 100644
--- a/board/ti/am62x/Kconfig
+++ b/board/ti/am62x/Kconfig
@@ -5,6 +5,7 @@ 
 
 choice
 	prompt "TI K3 AM62x based boards"
+	depends on SOC_K3_AM625
 	optional
 
 config TARGET_AM625_A53_EVM
diff --git a/board/ti/am64x/Kconfig b/board/ti/am64x/Kconfig
index fb596e4adfc..2dbc6197b75 100644
--- a/board/ti/am64x/Kconfig
+++ b/board/ti/am64x/Kconfig
@@ -4,6 +4,7 @@ 
 
 choice
 	prompt "K3 AM64 based boards"
+	depends on SOC_K3_AM642
 	optional
 
 config TARGET_AM642_A53_EVM
diff --git a/board/ti/am65x/Kconfig b/board/ti/am65x/Kconfig
index 5fd19d652a6..7c1bcfc899c 100644
--- a/board/ti/am65x/Kconfig
+++ b/board/ti/am65x/Kconfig
@@ -5,6 +5,7 @@ 
 
 choice
 	prompt "K3 AM65 based boards"
+	depends on SOC_K3_AM654
 	optional
 
 config TARGET_AM654_A53_EVM
diff --git a/board/ti/j721e/Kconfig b/board/ti/j721e/Kconfig
index e6cb21f77bd..23867ad8e04 100644
--- a/board/ti/j721e/Kconfig
+++ b/board/ti/j721e/Kconfig
@@ -5,6 +5,7 @@ 
 
 choice
 	prompt "K3 J721E based boards"
+	depends on SOC_K3_J721E
 	optional
 
 config TARGET_J721E_A72_EVM
diff --git a/board/ti/j721s2/Kconfig b/board/ti/j721s2/Kconfig
index f6d1cb57653..a4a5d16ba21 100644
--- a/board/ti/j721s2/Kconfig
+++ b/board/ti/j721s2/Kconfig
@@ -5,6 +5,7 @@ 
 
 choice
 	prompt "K3 J721S2 board"
+	depends on SOC_K3_J721S2
 	optional
 
 config TARGET_J721S2_A72_EVM
diff --git a/board/toradex/verdin-am62/Kconfig b/board/toradex/verdin-am62/Kconfig
index e7522244070..abc2984f250 100644
--- a/board/toradex/verdin-am62/Kconfig
+++ b/board/toradex/verdin-am62/Kconfig
@@ -5,6 +5,7 @@ 
 
 choice
 	prompt "Toradex Verdin AM62 based boards"
+	depends on SOC_K3_AM625
 	optional
 
 config TARGET_VERDIN_AM62_A53