[PATCH 1/5] ARM: rmobile: Enable board detection when FIT is enabled

[Adam Ford]

There are three boards from Beacon, RZ/G2 M/N/H which all
use the same board file, but different device trees.
Add code to automatically select the proper device tree
based on the CPU type.

Signed-off-by: Adam Ford 

diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c 
b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index c12ff77fb2..b3521fcbc1 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -36,3 +36,19 @@ void reset_cpu(void)
 {
writel(RST_CODE, RST_CA57RESCNT);
 }
+
+#if IS_ENABLED(CONFIG_MULTI_DTB_FIT)
+int board_fit_config_name_match(const char *name)
+{
+   if (!strcmp(rzg_get_cpu_name(), "R8A774A1") && !strcmp(name, 
"r8a774a1-beacon-rzg2m-kit"))
+   return 0;
+
+   if (!strcmp(rzg_get_cpu_name(), "R8A774B1") && !strcmp(name, 
"r8a774b1-beacon-rzg2n-kit"))
+   return 0;
+
+   if (!strcmp(rzg_get_cpu_name(), "R8A774E1") && !strcmp(name, 
"r8a774e1-beacon-rzg2h-kit"))
+   return 0;
+
+   return -1;
+}
+#endif
-- 
2.25.1

Re: [PATCH 1/5] ARM: rmobile: Enable board detection when FIT is enabled

[Adam Ford]

On Mon, Aug 30, 2021 at 10:40 AM Adam Ford  wrote:
>
> There are three boards from Beacon, RZ/G2 M/N/H which all
> use the same board file, but different device trees.
> Add code to automatically select the proper device tree
> based on the CPU type.
>
> Signed-off-by: Adam Ford 
>

Marek,

I was wondering if you had any feedback on this series.  You asked if
I could consolidate all three of my RZ/G2 boards to reduce the amount
of duplicated code, so this series attempts to do that.

adam
> diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c 
> b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> index c12ff77fb2..b3521fcbc1 100644
> --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> @@ -36,3 +36,19 @@ void reset_cpu(void)
>  {
> writel(RST_CODE, RST_CA57RESCNT);
>  }
> +
> +#if IS_ENABLED(CONFIG_MULTI_DTB_FIT)
> +int board_fit_config_name_match(const char *name)
> +{
> +   if (!strcmp(rzg_get_cpu_name(), "R8A774A1") && !strcmp(name, 
> "r8a774a1-beacon-rzg2m-kit"))
> +   return 0;
> +
> +   if (!strcmp(rzg_get_cpu_name(), "R8A774B1") && !strcmp(name, 
> "r8a774b1-beacon-rzg2n-kit"))
> +   return 0;
> +
> +   if (!strcmp(rzg_get_cpu_name(), "R8A774E1") && !strcmp(name, 
> "r8a774e1-beacon-rzg2h-kit"))
> +   return 0;
> +
> +   return -1;
> +}
> +#endif
> --
> 2.25.1
>

Re: [PATCH 1/5] ARM: rmobile: Enable board detection when FIT is enabled

[Marek Vasut]

On 9/20/21 2:11 PM, Adam Ford wrote:

On Mon, Aug 30, 2021 at 10:40 AM Adam Ford  wrote:


There are three boards from Beacon, RZ/G2 M/N/H which all
use the same board file, but different device trees.
Add code to automatically select the proper device tree
based on the CPU type.

Signed-off-by: Adam Ford 



Marek,

I was wondering if you had any feedback on this series.  You asked if
I could consolidate all three of my RZ/G2 boards to reduce the amount
of duplicated code, so this series attempts to do that.


Please rebase/resend, it was likely missed, sorry.