[PATCH] eukrea_cpuimx35: fix flash header

[PATCH] eukrea_cpuimx35: fix flash header

[Eric Bénard]

commit f0e62e69a58e249e11fc33f993e4cdb95eac6ea3 broke the header.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 arch/arm/boards/eukrea_cpuimx35/flash_header.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/eukrea_cpuimx35/flash_header.c b/arch/arm/boards/eukrea_cpuimx35/flash_header.c
index 5a77c3a..93c8348 100644
--- a/arch/arm/boards/eukrea_cpuimx35/flash_header.c
+++ b/arch/arm/boards/eukrea_cpuimx35/flash_header.c
@@ -28,13 +28,14 @@ struct imx_dcd_entry __dcd_entry_section dcd_entry[] = {
 };
 
 #define CPUIMX35_DEST_BASE 0x80000000
+#define CPUIMX35_FLASH_HEADER_BASE (CPUIMX35_DEST_BASE + FLASH_HEADER_OFFSET)
 struct imx_flash_header __flash_header_section flash_header = {
 	.app_code_jump_vector	= CPUIMX35_DEST_BASE + 0x1000,
 	.app_code_barker	= APP_CODE_BARKER,
 	.app_code_csf		= 0,
-	.dcd_ptr_ptr		= FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd),
+	.dcd_ptr_ptr		= CPUIMX35_FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd),
 	.super_root_key		= 0,
-	.dcd			= FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker),
+	.dcd			= CPUIMX35_FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker),
 	.app_dest		= CPUIMX35_DEST_BASE,
 	.dcd_barker		= DCD_BARKER,
 	.dcd_block_len		= sizeof(dcd_entry),
-- 
1.7.0.4


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

Re: [PATCH] eukrea_cpuimx35: fix flash header

[Sascha Hauer]

Hi Eric,

On Wed, Nov 03, 2010 at 05:08:16PM +0100, Eric Bénard wrote:
> commit f0e62e69a58e249e11fc33f993e4cdb95eac6ea3 broke the header.
> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
>  arch/arm/boards/eukrea_cpuimx35/flash_header.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)

I guess This one is for -master?

Sascha


> 
> diff --git a/arch/arm/boards/eukrea_cpuimx35/flash_header.c b/arch/arm/boards/eukrea_cpuimx35/flash_header.c
> index 5a77c3a..93c8348 100644
> --- a/arch/arm/boards/eukrea_cpuimx35/flash_header.c
> +++ b/arch/arm/boards/eukrea_cpuimx35/flash_header.c
> @@ -28,13 +28,14 @@ struct imx_dcd_entry __dcd_entry_section dcd_entry[] = {
>  };
>  
>  #define CPUIMX35_DEST_BASE 0x80000000
> +#define CPUIMX35_FLASH_HEADER_BASE (CPUIMX35_DEST_BASE + FLASH_HEADER_OFFSET)
>  struct imx_flash_header __flash_header_section flash_header = {
>  	.app_code_jump_vector	= CPUIMX35_DEST_BASE + 0x1000,
>  	.app_code_barker	= APP_CODE_BARKER,
>  	.app_code_csf		= 0,
> -	.dcd_ptr_ptr		= FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd),
> +	.dcd_ptr_ptr		= CPUIMX35_FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd),
>  	.super_root_key		= 0,
> -	.dcd			= FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker),
> +	.dcd			= CPUIMX35_FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker),
>  	.app_dest		= CPUIMX35_DEST_BASE,
>  	.dcd_barker		= DCD_BARKER,
>  	.dcd_block_len		= sizeof(dcd_entry),
> -- 
> 1.7.0.4
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

Re: [PATCH] eukrea_cpuimx35: fix flash header

[Eric Bénard]

Hi Sascha,

Le 03/11/2010 19:02, Sascha Hauer a écrit :
> On Wed, Nov 03, 2010 at 05:08:16PM +0100, Eric Bénard wrote:
>> commit f0e62e69a58e249e11fc33f993e4cdb95eac6ea3 broke the header.
>>
>> Signed-off-by: Eric Bénard<eric@eukrea.com>
>> ---
>>   arch/arm/boards/eukrea_cpuimx35/flash_header.c |    5 +++--
>>   1 files changed, 3 insertions(+), 2 deletions(-)
>
> I guess This one is for -master?
>
yes, I broke this on the 1st of november so master is broken for this board.

Thanks
Eric

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