| Message ID | 1361255579-22801-1-git-send-email-rajeshwari.s@samsung.com |
|---|---|
| State | Accepted |
| Commit | c42ffff02a1edd24fc50e5efb33ead1bfa843a26 |
| Headers | show |
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 >
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.
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