[PATCH] ARM: boards: protonic-imx6: Re-introduce generic boot target board string

[PATCH] ARM: boards: protonic-imx6: Re-introduce generic boot target board string

[Robin van der Gracht]

This allows using a single bootable usb drive for multiple boards.

Signed-off-by: Robin van der Gracht <robin@protonic.nl>
---
 arch/arm/boards/protonic-imx6/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
index 19e58627c6..e4debb1c66 100644
--- a/arch/arm/boards/protonic-imx6/board.c
+++ b/arch/arm/boards/protonic-imx6/board.c
@@ -374,7 +374,7 @@ static int prt_imx6_usb_boot(struct bootentry *entry, int verbose, int dryrun)
 
 	*second_word = 0;
 
-	if (strcmp(buf, priv->name)) {
+	if (strcmp(buf, priv->name) && strcmp(buf, "prti6qp")) {
 		dev_err(dev, "Boot target for a different board! (got: %s expected: %s)\n",
 			buf, priv->name);
 		ret = -EINVAL;
-- 
2.43.0

Re: [PATCH] ARM: boards: protonic-imx6: Re-introduce generic boot target board string

[Sascha Hauer]

Hi Robin,

On Thu, Mar 27, 2025 at 11:01:22AM +0100, Robin van der Gracht wrote:
> This allows using a single bootable usb drive for multiple boards.
> 
> Signed-off-by: Robin van der Gracht <robin@protonic.nl>
> ---
>  arch/arm/boards/protonic-imx6/board.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
> index 19e58627c6..e4debb1c66 100644
> --- a/arch/arm/boards/protonic-imx6/board.c
> +++ b/arch/arm/boards/protonic-imx6/board.c
> @@ -374,7 +374,7 @@ static int prt_imx6_usb_boot(struct bootentry *entry, int verbose, int dryrun)
>  
>  	*second_word = 0;
>  
> -	if (strcmp(buf, priv->name)) {
> +	if (strcmp(buf, priv->name) && strcmp(buf, "prti6qp")) {

Where does this "prti6qp" string come from? It sounds like a very
specific machine, but is used as a generic value to short circuit the
compatible check.

Shouldn't it be something like "prt,generic-imx6" or whatever else this
image is supposed to work on?

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH] ARM: boards: protonic-imx6: Re-introduce generic boot target board string

[Robin van der Gracht]

Hi Sascha,

On 31-03-2025 09:44, Sascha Hauer wrote:
> Hi Robin,
>
> On Thu, Mar 27, 2025 at 11:01:22AM +0100, Robin van der Gracht wrote:
>> This allows using a single bootable usb drive for multiple boards.
>>
>> Signed-off-by: Robin van der Gracht <robin@protonic.nl>
>> ---
>>   arch/arm/boards/protonic-imx6/board.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
>> index 19e58627c6..e4debb1c66 100644
>> --- a/arch/arm/boards/protonic-imx6/board.c
>> +++ b/arch/arm/boards/protonic-imx6/board.c
>> @@ -374,7 +374,7 @@ static int prt_imx6_usb_boot(struct bootentry *entry, int verbose, int dryrun)
>>   
>>   	*second_word = 0;
>>   
>> -	if (strcmp(buf, priv->name)) {
>> +	if (strcmp(buf, priv->name) && strcmp(buf, "prti6qp")) {
> Where does this "prti6qp" string come from? It sounds like a very
> specific machine, but is used as a generic value to short circuit the
> compatible check.
>
> Shouldn't it be something like "prt,generic-imx6" or whatever else this
> image is supposed to work on?

Ack. This is something that grew like this historically. But we can 
still change
that to something more sensible. I like your suggestion and will create 
a new patch.

Thank you.

Regards,
Robin