[PATCH] ARM: i.MX25/35: Fix bootsource detection

[PATCH] ARM: i.MX25/35: Fix bootsource detection

[Daniel Krüger]

This fixes commit 0b47f95340d801a26643e5e1f4ee05287e8ae90e for i.MX25/35.
Otherwise it was just "unknown".

Signed-off-by: Daniel Krueger <daniel.krueger@systec-electronic.com>
---
  arch/arm/mach-imx/boot.c |   12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index b66c29d..4893060 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -69,13 +69,13 @@ static const enum bootsource locations[4][4] = {
   * Note also that I suspect that the boot source pins are only sampled at
   * power up.
   */
-static void imx25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
+static enum bootsource imx25_35_boot_source(unsigned int ctrl, unsigned 
int type)
  {
  	enum bootsource src;

  	src = locations[ctrl][type];

-	bootsource_set(src);
+	return src;
  }

  void imx25_get_boot_source(enum bootsource *src, int *instance)
@@ -84,8 +84,8 @@ void imx25_get_boot_source(enum bootsource *src, int 
*instance)
  	uint32_t val;

  	val = readl(ccm_base + MX25_CCM_RCSR);
-	imx25_35_boot_save_loc((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
-			       (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
+	*src = imx25_35_boot_source((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
+				    (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
  }

  void imx25_boot_save_loc(void)
@@ -105,8 +105,8 @@ void imx35_get_boot_source(enum bootsource *src, int 
*instance)
  	uint32_t val;

  	val = readl(ccm_base + MX35_CCM_RCSR);
-	imx25_35_boot_save_loc((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
-			       (val >> MX36_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
+	*src = imx25_35_boot_source((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
+				    (val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
  }

  void imx35_boot_save_loc(void)
-- 
1.7.9.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: i.MX25/35: Fix bootsource detection

[Daniel Krüger]

Hi,

I suspect, that the patch got scrambled by Thunderbird. Sorry for that.
I will try it again. Hopefully, then it will be OK.

Best regards,
  Daniel Krüger

Am 21.11.2016 um 13:41 schrieb Daniel Krüger:
> This fixes commit 0b47f95340d801a26643e5e1f4ee05287e8ae90e for i.MX25/35.
> Otherwise it was just "unknown".
> 
> Signed-off-by: Daniel Krueger <daniel.krueger@systec-electronic.com>
> ---
>  arch/arm/mach-imx/boot.c |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
> index b66c29d..4893060 100644
> --- a/arch/arm/mach-imx/boot.c
> +++ b/arch/arm/mach-imx/boot.c
> @@ -69,13 +69,13 @@ static const enum bootsource locations[4][4] = {
>   * Note also that I suspect that the boot source pins are only sampled at
>   * power up.
>   */
> -static void imx25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
> +static enum bootsource imx25_35_boot_source(unsigned int ctrl, unsigned int type)
>  {
>      enum bootsource src;
> 
>      src = locations[ctrl][type];
> 
> -    bootsource_set(src);
> +    return src;
>  }
> 
>  void imx25_get_boot_source(enum bootsource *src, int *instance)
> @@ -84,8 +84,8 @@ void imx25_get_boot_source(enum bootsource *src, int *instance)
>      uint32_t val;
> 
>      val = readl(ccm_base + MX25_CCM_RCSR);
> -    imx25_35_boot_save_loc((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> -                   (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
> +    *src = imx25_35_boot_source((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> +                    (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
>  }
> 
>  void imx25_boot_save_loc(void)
> @@ -105,8 +105,8 @@ void imx35_get_boot_source(enum bootsource *src, int *instance)
>      uint32_t val;
> 
>      val = readl(ccm_base + MX35_CCM_RCSR);
> -    imx25_35_boot_save_loc((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> -                   (val >> MX36_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
> +    *src = imx25_35_boot_source((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> +                    (val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
>  }
> 
>  void imx35_boot_save_loc(void)

-- 

SYS TEC electronic GmbH
Am Windrad 2
08468 Heinsdorfergrund

Telefon : +49 (0) 3765 38600-0
Fax     : +49 (0) 3765 38600-4100
Email   : daniel.krueger@systec-electronic.com
Website : http://www.systec-electronic.com

Managing Directors  :
  Dipl.-Phys. Siegmar Schmidt, Dipl. Ing. (FH) Armin von Collrepp
Commercial registry : Amtsgericht Chemnitz, HRB 28082
USt.-Id Nr.         : DE150534010


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox