Patchwork [U-Boot] EXYNOS: Correct ordering of SPL machine_params

login
register
mail settings
Submitter Rajeshwari Birje
Date Feb. 19, 2013, 6:32 a.m.
Message ID <1361255579-22801-1-git-send-email-rajeshwari.s@samsung.com>
Download mbox | patch
Permalink /patch/221625/
State Accepted
Delegated to: Minkyu Kang
Headers show

Comments

Rajeshwari Birje - Feb. 19, 2013, 6:32 a.m.
From: Simon Glass <sjg@chromium.org>

The mem_manuf is not in the correct order according to the string table.
This causes cros_bundle_firmware to get the BL2 settings in the wrong
order. This patch fixes the same.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
 arch/arm/include/asm/arch-exynos/spl.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Simon Glass - Feb. 28, 2013, 12:40 a.m.
On Mon, Feb 18, 2013 at 10:32 PM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> From: Simon Glass <sjg@chromium.org>
>
> The mem_manuf is not in the correct order according to the string table.
> This causes cros_bundle_firmware to get the BL2 settings in the wrong
> order. This patch fixes the same.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>

Acked-by: Simon Glass <sjg@chromium.org>

> ---
>  arch/arm/include/asm/arch-exynos/spl.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-exynos/spl.h b/arch/arm/include/asm/arch-exynos/spl.h
> index 306b41d..46b25a6 100644
> --- a/arch/arm/include/asm/arch-exynos/spl.h
> +++ b/arch/arm/include/asm/arch-exynos/spl.h
> @@ -78,11 +78,12 @@ struct spl_machine_param {
>          */
>         u32             uboot_size;
>         enum boot_mode  boot_source;    /* Boot device */
> -       enum mem_manuf  mem_manuf;      /* Memory Manufacturer */
>         unsigned        frequency_mhz;  /* Frequency of memory in MHz */
>         unsigned        arm_freq_mhz;   /* ARM Frequency in MHz */
>         u32             serial_base;    /* Serial base address */
>         u32             i2c_base;       /* i2c base address */
> +       u32             board_rev_gpios;        /* Board revision GPIOs */
> +       enum mem_manuf  mem_manuf;      /* Memory Manufacturer */
>  } __attribute__((__packed__));
>  #endif
>
> --
> 1.7.4.4
>
Minkyu Kang - March 12, 2013, 1:46 a.m.
On 19/02/13 15:32, Rajeshwari Shinde wrote:
> From: Simon Glass <sjg@chromium.org>
> 
> The mem_manuf is not in the correct order according to the string table.
> This causes cros_bundle_firmware to get the BL2 settings in the wrong
> order. This patch fixes the same.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> ---
>  arch/arm/include/asm/arch-exynos/spl.h |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-exynos/spl.h b/arch/arm/include/asm/arch-exynos/spl.h
> index 306b41d..46b25a6 100644
> --- a/arch/arm/include/asm/arch-exynos/spl.h
> +++ b/arch/arm/include/asm/arch-exynos/spl.h
> @@ -78,11 +78,12 @@ struct spl_machine_param {
>  	 */
>  	u32		uboot_size;
>  	enum boot_mode	boot_source;	/* Boot device */
> -	enum mem_manuf	mem_manuf;	/* Memory Manufacturer */
>  	unsigned	frequency_mhz;	/* Frequency of memory in MHz */
>  	unsigned	arm_freq_mhz;	/* ARM Frequency in MHz */
>  	u32		serial_base;	/* Serial base address */
>  	u32		i2c_base;	/* i2c base address */
> +	u32		board_rev_gpios;	/* Board revision GPIOs */
> +	enum mem_manuf	mem_manuf;	/* Memory Manufacturer */
>  } __attribute__((__packed__));
>  #endif
>  
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.

Patch

diff --git a/arch/arm/include/asm/arch-exynos/spl.h b/arch/arm/include/asm/arch-exynos/spl.h
index 306b41d..46b25a6 100644
--- a/arch/arm/include/asm/arch-exynos/spl.h
+++ b/arch/arm/include/asm/arch-exynos/spl.h
@@ -78,11 +78,12 @@  struct spl_machine_param {
 	 */
 	u32		uboot_size;
 	enum boot_mode	boot_source;	/* Boot device */
-	enum mem_manuf	mem_manuf;	/* Memory Manufacturer */
 	unsigned	frequency_mhz;	/* Frequency of memory in MHz */
 	unsigned	arm_freq_mhz;	/* ARM Frequency in MHz */
 	u32		serial_base;	/* Serial base address */
 	u32		i2c_base;	/* i2c base address */
+	u32		board_rev_gpios;	/* Board revision GPIOs */
+	enum mem_manuf	mem_manuf;	/* Memory Manufacturer */
 } __attribute__((__packed__));
 #endif