public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [PATCH u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code
@ 2023-03-04 10:41 Pali Rohár
  2023-03-24 10:24 ` Stefan Roese
  2023-03-27 21:11 ` [PATCH v2 " Pali Rohár
  0 siblings, 2 replies; 7+ messages in thread
From: Pali Rohár @ 2023-03-04 10:41 UTC (permalink / raw)
  To: Tony Dinh; +Cc: u-boot

Show correct information in debug() output and use correct names for variables.

No functional change.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 arch/arm/mach-mvebu/cpu.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 97154aaa2a7e..018a3614d4dd 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -67,6 +67,8 @@ u32 get_boot_device(void)
 {
 	u32 val;
 	u32 boot_device;
+	u32 boot_err_mode;
+	u32 boot_err_code;
 
 	/*
 	 * First check, if UART boot-mode is active. This can only
@@ -74,9 +76,9 @@ u32 get_boot_device(void)
 	 * MSB marks if the UART mode is active.
 	 */
 	val = readl(BOOTROM_ERR_REG);
-	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
-	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
-	if (boot_device == BOOTROM_ERR_MODE_UART)
+	boot_err_mode = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
+	debug("BOOTROM_ERR_REG=0x%08x boot_err_mode=0x%x\n", val, boot_err_mode);
+	if (boot_err_mode == BOOTROM_ERR_MODE_UART)
 		return BOOT_DEVICE_UART;
 
 #ifdef CONFIG_ARMADA_38X
@@ -84,8 +86,9 @@ u32 get_boot_device(void)
 	 * If the bootrom error code contains any other than zeros it's an
 	 * error condition and the bootROM has fallen back to UART boot
 	 */
-	boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
-	if (boot_device)
+	boot_err_code = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
+	debug("boot_err_code=0x%x\n", boot_err_code);
+	if (boot_err_code)
 		return BOOT_DEVICE_UART;
 #endif
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code
  2023-03-04 10:41 [PATCH u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code Pali Rohár
@ 2023-03-24 10:24 ` Stefan Roese
  2023-03-25 12:27   ` Pali Rohár
  2023-03-27 21:11 ` [PATCH v2 " Pali Rohár
  1 sibling, 1 reply; 7+ messages in thread
From: Stefan Roese @ 2023-03-24 10:24 UTC (permalink / raw)
  To: Pali Rohár, Tony Dinh; +Cc: u-boot

Hi Pali,

On 3/4/23 11:41, Pali Rohár wrote:
> Show correct information in debug() output and use correct names for variables.
> 
> No functional change.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> ---
>   arch/arm/mach-mvebu/cpu.c | 13 ++++++++-----
>   1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> index 97154aaa2a7e..018a3614d4dd 100644
> --- a/arch/arm/mach-mvebu/cpu.c
> +++ b/arch/arm/mach-mvebu/cpu.c
> @@ -67,6 +67,8 @@ u32 get_boot_device(void)
>   {
>   	u32 val;
>   	u32 boot_device;
> +	u32 boot_err_mode;
> +	u32 boot_err_code;
>   
>   	/*
>   	 * First check, if UART boot-mode is active. This can only
> @@ -74,9 +76,9 @@ u32 get_boot_device(void)
>   	 * MSB marks if the UART mode is active.
>   	 */
>   	val = readl(BOOTROM_ERR_REG);
> -	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> -	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
> -	if (boot_device == BOOTROM_ERR_MODE_UART)
> +	boot_err_mode = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> +	debug("BOOTROM_ERR_REG=0x%08x boot_err_mode=0x%x\n", val, boot_err_mode);
> +	if (boot_err_mode == BOOTROM_ERR_MODE_UART)
>   		return BOOT_DEVICE_UART;
>   
>   #ifdef CONFIG_ARMADA_38X
> @@ -84,8 +86,9 @@ u32 get_boot_device(void)
>   	 * If the bootrom error code contains any other than zeros it's an
>   	 * error condition and the bootROM has fallen back to UART boot
>   	 */
> -	boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> -	if (boot_device)
> +	boot_err_code = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> +	debug("boot_err_code=0x%x\n", boot_err_code);
> +	if (boot_err_code)
>   		return BOOT_DEVICE_UART;
>   #endif
>   

This leads to the following compile warnings, e.g. for maxbcm_defconfig:

[stefan@zen4 u-boot-marvell (next)]$ make -sj
arch/arm/mach-mvebu/cpu.c: In function 'get_boot_device':
arch/arm/mach-mvebu/cpu.c:71:13: warning: unused variable 
'boot_err_code' [-Wunused-variable]
    71 |         u32 boot_err_code;
       |             ^~~~~~~~~~~~~
arch/arm/mach-mvebu/cpu.c: In function 'get_boot_device':
arch/arm/mach-mvebu/cpu.c:71:13: warning: unused variable 
'boot_err_code' [-Wunused-variable]
    71 |         u32 boot_err_code;
       |             ^~~~~~~~~~~~~

Could you please take a look?

Thanks,
Stefan

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code
  2023-03-24 10:24 ` Stefan Roese
@ 2023-03-25 12:27   ` Pali Rohár
  2023-03-27  6:59     ` Stefan Roese
  0 siblings, 1 reply; 7+ messages in thread
From: Pali Rohár @ 2023-03-25 12:27 UTC (permalink / raw)
  To: Stefan Roese; +Cc: Tony Dinh, u-boot

On Friday 24 March 2023 11:24:07 Stefan Roese wrote:
> Hi Pali,
> 
> On 3/4/23 11:41, Pali Rohár wrote:
> > Show correct information in debug() output and use correct names for variables.
> > 
> > No functional change.
> > 
> > Signed-off-by: Pali Rohár <pali@kernel.org>
> > ---
> >   arch/arm/mach-mvebu/cpu.c | 13 ++++++++-----
> >   1 file changed, 8 insertions(+), 5 deletions(-)
> > 
> > diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> > index 97154aaa2a7e..018a3614d4dd 100644
> > --- a/arch/arm/mach-mvebu/cpu.c
> > +++ b/arch/arm/mach-mvebu/cpu.c
> > @@ -67,6 +67,8 @@ u32 get_boot_device(void)
> >   {
> >   	u32 val;
> >   	u32 boot_device;
> > +	u32 boot_err_mode;
> > +	u32 boot_err_code;
> >   	/*
> >   	 * First check, if UART boot-mode is active. This can only
> > @@ -74,9 +76,9 @@ u32 get_boot_device(void)
> >   	 * MSB marks if the UART mode is active.
> >   	 */
> >   	val = readl(BOOTROM_ERR_REG);
> > -	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> > -	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
> > -	if (boot_device == BOOTROM_ERR_MODE_UART)
> > +	boot_err_mode = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> > +	debug("BOOTROM_ERR_REG=0x%08x boot_err_mode=0x%x\n", val, boot_err_mode);
> > +	if (boot_err_mode == BOOTROM_ERR_MODE_UART)
> >   		return BOOT_DEVICE_UART;
> >   #ifdef CONFIG_ARMADA_38X
> > @@ -84,8 +86,9 @@ u32 get_boot_device(void)
> >   	 * If the bootrom error code contains any other than zeros it's an
> >   	 * error condition and the bootROM has fallen back to UART boot
> >   	 */
> > -	boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> > -	if (boot_device)
> > +	boot_err_code = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> > +	debug("boot_err_code=0x%x\n", boot_err_code);
> > +	if (boot_err_code)
> >   		return BOOT_DEVICE_UART;
> >   #endif
> 
> This leads to the following compile warnings, e.g. for maxbcm_defconfig:
> 
> [stefan@zen4 u-boot-marvell (next)]$ make -sj
> arch/arm/mach-mvebu/cpu.c: In function 'get_boot_device':
> arch/arm/mach-mvebu/cpu.c:71:13: warning: unused variable 'boot_err_code'
> [-Wunused-variable]
>    71 |         u32 boot_err_code;
>       |             ^~~~~~~~~~~~~
> arch/arm/mach-mvebu/cpu.c: In function 'get_boot_device':
> arch/arm/mach-mvebu/cpu.c:71:13: warning: unused variable 'boot_err_code'
> [-Wunused-variable]
>    71 |         u32 boot_err_code;
>       |             ^~~~~~~~~~~~~
> 
> Could you please take a look?
> 
> Thanks,
> Stefan

It looks like you need to add #ifdef CONFIG_ARMADA_38X guard around
declaration of boot_err_code variable (at the beginning the function)
because this variable is unused on non-a38x platforms.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code
  2023-03-25 12:27   ` Pali Rohár
@ 2023-03-27  6:59     ` Stefan Roese
  0 siblings, 0 replies; 7+ messages in thread
From: Stefan Roese @ 2023-03-27  6:59 UTC (permalink / raw)
  To: Pali Rohár; +Cc: Tony Dinh, u-boot

Hi Pali,

On 3/25/23 13:27, Pali Rohár wrote:
> On Friday 24 March 2023 11:24:07 Stefan Roese wrote:
>> Hi Pali,
>>
>> On 3/4/23 11:41, Pali Rohár wrote:
>>> Show correct information in debug() output and use correct names for variables.
>>>
>>> No functional change.
>>>
>>> Signed-off-by: Pali Rohár <pali@kernel.org>
>>> ---
>>>    arch/arm/mach-mvebu/cpu.c | 13 ++++++++-----
>>>    1 file changed, 8 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
>>> index 97154aaa2a7e..018a3614d4dd 100644
>>> --- a/arch/arm/mach-mvebu/cpu.c
>>> +++ b/arch/arm/mach-mvebu/cpu.c
>>> @@ -67,6 +67,8 @@ u32 get_boot_device(void)
>>>    {
>>>    	u32 val;
>>>    	u32 boot_device;
>>> +	u32 boot_err_mode;
>>> +	u32 boot_err_code;
>>>    	/*
>>>    	 * First check, if UART boot-mode is active. This can only
>>> @@ -74,9 +76,9 @@ u32 get_boot_device(void)
>>>    	 * MSB marks if the UART mode is active.
>>>    	 */
>>>    	val = readl(BOOTROM_ERR_REG);
>>> -	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
>>> -	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
>>> -	if (boot_device == BOOTROM_ERR_MODE_UART)
>>> +	boot_err_mode = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
>>> +	debug("BOOTROM_ERR_REG=0x%08x boot_err_mode=0x%x\n", val, boot_err_mode);
>>> +	if (boot_err_mode == BOOTROM_ERR_MODE_UART)
>>>    		return BOOT_DEVICE_UART;
>>>    #ifdef CONFIG_ARMADA_38X
>>> @@ -84,8 +86,9 @@ u32 get_boot_device(void)
>>>    	 * If the bootrom error code contains any other than zeros it's an
>>>    	 * error condition and the bootROM has fallen back to UART boot
>>>    	 */
>>> -	boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
>>> -	if (boot_device)
>>> +	boot_err_code = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
>>> +	debug("boot_err_code=0x%x\n", boot_err_code);
>>> +	if (boot_err_code)
>>>    		return BOOT_DEVICE_UART;
>>>    #endif
>>
>> This leads to the following compile warnings, e.g. for maxbcm_defconfig:
>>
>> [stefan@zen4 u-boot-marvell (next)]$ make -sj
>> arch/arm/mach-mvebu/cpu.c: In function 'get_boot_device':
>> arch/arm/mach-mvebu/cpu.c:71:13: warning: unused variable 'boot_err_code'
>> [-Wunused-variable]
>>     71 |         u32 boot_err_code;
>>        |             ^~~~~~~~~~~~~
>> arch/arm/mach-mvebu/cpu.c: In function 'get_boot_device':
>> arch/arm/mach-mvebu/cpu.c:71:13: warning: unused variable 'boot_err_code'
>> [-Wunused-variable]
>>     71 |         u32 boot_err_code;
>>        |             ^~~~~~~~~~~~~
>>
>> Could you please take a look?
>>
>> Thanks,
>> Stefan
> 
> It looks like you need to add #ifdef CONFIG_ARMADA_38X guard around
> declaration of boot_err_code variable (at the beginning the function)
> because this variable is unused on non-a38x platforms.

Yes, I'm sure I could fix this myself. But could you please send a
v2 (based on latest next) so that I can apply it easier?

Thanks,
Stefan

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code
  2023-03-04 10:41 [PATCH u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code Pali Rohár
  2023-03-24 10:24 ` Stefan Roese
@ 2023-03-27 21:11 ` Pali Rohár
  2023-03-30  4:59   ` Stefan Roese
  2023-03-30  8:26   ` Stefan Roese
  1 sibling, 2 replies; 7+ messages in thread
From: Pali Rohár @ 2023-03-27 21:11 UTC (permalink / raw)
  To: Stefan Roese; +Cc: u-boot

Show correct information in debug() output and use correct names for variables.

No functional change.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 arch/arm/mach-mvebu/cpu.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 56999f608a38..8b91e174c4c1 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -67,6 +67,10 @@ u32 get_boot_device(void)
 {
 	u32 val;
 	u32 boot_device;
+	u32 boot_err_mode;
+#ifdef CONFIG_ARMADA_38X
+	u32 boot_err_code;
+#endif
 
 	/*
 	 * First check, if UART boot-mode is active. This can only
@@ -74,9 +78,9 @@ u32 get_boot_device(void)
 	 * MSB marks if the UART mode is active.
 	 */
 	val = readl(BOOTROM_ERR_REG);
-	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
-	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
-	if (boot_device == BOOTROM_ERR_MODE_UART)
+	boot_err_mode = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
+	debug("BOOTROM_ERR_REG=0x%08x boot_err_mode=0x%x\n", val, boot_err_mode);
+	if (boot_err_mode == BOOTROM_ERR_MODE_UART)
 		return BOOT_DEVICE_UART;
 
 #ifdef CONFIG_ARMADA_38X
@@ -84,8 +88,9 @@ u32 get_boot_device(void)
 	 * If the bootrom error code contains any other than zeros it's an
 	 * error condition and the bootROM has fallen back to UART boot
 	 */
-	boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
-	if (boot_device)
+	boot_err_code = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
+	debug("boot_err_code=0x%x\n", boot_err_code);
+	if (boot_err_code)
 		return BOOT_DEVICE_UART;
 #endif
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code
  2023-03-27 21:11 ` [PATCH v2 " Pali Rohár
@ 2023-03-30  4:59   ` Stefan Roese
  2023-03-30  8:26   ` Stefan Roese
  1 sibling, 0 replies; 7+ messages in thread
From: Stefan Roese @ 2023-03-30  4:59 UTC (permalink / raw)
  To: Pali Rohár; +Cc: u-boot

On 3/27/23 23:11, Pali Rohár wrote:
> Show correct information in debug() output and use correct names for variables.
> 
> No functional change.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   arch/arm/mach-mvebu/cpu.c | 15 ++++++++++-----
>   1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> index 56999f608a38..8b91e174c4c1 100644
> --- a/arch/arm/mach-mvebu/cpu.c
> +++ b/arch/arm/mach-mvebu/cpu.c
> @@ -67,6 +67,10 @@ u32 get_boot_device(void)
>   {
>   	u32 val;
>   	u32 boot_device;
> +	u32 boot_err_mode;
> +#ifdef CONFIG_ARMADA_38X
> +	u32 boot_err_code;
> +#endif
>   
>   	/*
>   	 * First check, if UART boot-mode is active. This can only
> @@ -74,9 +78,9 @@ u32 get_boot_device(void)
>   	 * MSB marks if the UART mode is active.
>   	 */
>   	val = readl(BOOTROM_ERR_REG);
> -	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> -	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
> -	if (boot_device == BOOTROM_ERR_MODE_UART)
> +	boot_err_mode = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> +	debug("BOOTROM_ERR_REG=0x%08x boot_err_mode=0x%x\n", val, boot_err_mode);
> +	if (boot_err_mode == BOOTROM_ERR_MODE_UART)
>   		return BOOT_DEVICE_UART;
>   
>   #ifdef CONFIG_ARMADA_38X
> @@ -84,8 +88,9 @@ u32 get_boot_device(void)
>   	 * If the bootrom error code contains any other than zeros it's an
>   	 * error condition and the bootROM has fallen back to UART boot
>   	 */
> -	boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> -	if (boot_device)
> +	boot_err_code = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> +	debug("boot_err_code=0x%x\n", boot_err_code);
> +	if (boot_err_code)
>   		return BOOT_DEVICE_UART;
>   #endif
>   

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code
  2023-03-27 21:11 ` [PATCH v2 " Pali Rohár
  2023-03-30  4:59   ` Stefan Roese
@ 2023-03-30  8:26   ` Stefan Roese
  1 sibling, 0 replies; 7+ messages in thread
From: Stefan Roese @ 2023-03-30  8:26 UTC (permalink / raw)
  To: Pali Rohár; +Cc: u-boot

On 3/27/23 23:11, Pali Rohár wrote:
> Show correct information in debug() output and use correct names for variables.
> 
> No functional change.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Applied to u-boot-marvell/next

Thanks,
Stefan

> ---
>   arch/arm/mach-mvebu/cpu.c | 15 ++++++++++-----
>   1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> index 56999f608a38..8b91e174c4c1 100644
> --- a/arch/arm/mach-mvebu/cpu.c
> +++ b/arch/arm/mach-mvebu/cpu.c
> @@ -67,6 +67,10 @@ u32 get_boot_device(void)
>   {
>   	u32 val;
>   	u32 boot_device;
> +	u32 boot_err_mode;
> +#ifdef CONFIG_ARMADA_38X
> +	u32 boot_err_code;
> +#endif
>   
>   	/*
>   	 * First check, if UART boot-mode is active. This can only
> @@ -74,9 +78,9 @@ u32 get_boot_device(void)
>   	 * MSB marks if the UART mode is active.
>   	 */
>   	val = readl(BOOTROM_ERR_REG);
> -	boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> -	debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
> -	if (boot_device == BOOTROM_ERR_MODE_UART)
> +	boot_err_mode = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
> +	debug("BOOTROM_ERR_REG=0x%08x boot_err_mode=0x%x\n", val, boot_err_mode);
> +	if (boot_err_mode == BOOTROM_ERR_MODE_UART)
>   		return BOOT_DEVICE_UART;
>   
>   #ifdef CONFIG_ARMADA_38X
> @@ -84,8 +88,9 @@ u32 get_boot_device(void)
>   	 * If the bootrom error code contains any other than zeros it's an
>   	 * error condition and the bootROM has fallen back to UART boot
>   	 */
> -	boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> -	if (boot_device)
> +	boot_err_code = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
> +	debug("boot_err_code=0x%x\n", boot_err_code);
> +	if (boot_err_code)
>   		return BOOT_DEVICE_UART;
>   #endif
>   

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-03-30  8:26 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-04 10:41 [PATCH u-boot-mvebu] arm: mvebu: Cleanup get_boot_device() code Pali Rohár
2023-03-24 10:24 ` Stefan Roese
2023-03-25 12:27   ` Pali Rohár
2023-03-27  6:59     ` Stefan Roese
2023-03-27 21:11 ` [PATCH v2 " Pali Rohár
2023-03-30  4:59   ` Stefan Roese
2023-03-30  8:26   ` Stefan Roese

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox