Skip to contentSkip to conversation

eukrea_cpuimx35: fix flash header

PATCH In review Eric Bénard 2 participants 3 messages Nov 3, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eukrea_cpuimx35: fix flash header

commit f0e62e69a58e249e11fc33f993e4cdb95eac6ea3 broke the header.

---
 arch/arm/boards/eukrea_cpuimx35/flash_header.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/boards/eukrea_cpuimx35/flash_header.c +3 -2
index 5a77c3a..93c8348 100644
@@ -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),
Signature · 7 lines
1.7.0.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer
#1 lore raw

Hi Eric,

Quoted 6 lines · Eric Bénard

commit f0e62e69a58e249e11fc33f993e4cdb95eac6ea3 broke the header.

---
 arch/arm/boards/eukrea_cpuimx35/flash_header.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

I guess This one is for -master?

Sascha

Quoted 26 lines
arch/arm/boards/eukrea_cpuimx35/flash_header.c +3 -2
index 5a77c3a..93c8348 100644
@@ -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),
Signature · 1 line
1.7.0.4
Signature · 9 lines
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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw

Hi Sascha,

Quoted 10 lines · Sascha Hauer
Quoted 6 lines · Eric Bénard

commit f0e62e69a58e249e11fc33f993e4cdb95eac6ea3 broke the header.

---
  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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox