ARM: i.MX35: freescale-mx35-3stack: Switch to imx-image

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

3 files changed, 34 insertions, 74 deletions

diff --git a/arch/arm/boards/freescale-mx35-3ds/Makefile b/arch/arm/boards/freescale-mx35-3ds/Makefile
index a1110c2e0b..c0de068f2e 100644
--- a/arch/arm/boards/freescale-mx35-3ds/Makefile
+++ b/arch/arm/boards/freescale-mx35-3ds/Makefile
@@ -1,4 +1,2 @@
-
 obj-y					+= 3stack.o
 lwl-y					+= lowlevel_init.o
-lwl-$(CONFIG_ARCH_IMX_INTERNAL_BOOT)	+= flash_header.o
diff --git a/arch/arm/boards/freescale-mx35-3ds/flash-header.imxcfg b/arch/arm/boards/freescale-mx35-3ds/flash-header.imxcfg
new file mode 100644
index 0000000000..6eb8bc242c
--- /dev/null
+++ b/arch/arm/boards/freescale-mx35-3ds/flash-header.imxcfg
@@ -0,0 +1,34 @@
+soc imx35
+loadaddr 0x80000000
+dcdofs 0x400
+
+wm 32 0xb8002050 0x0000d843
+wm 32 0xb8002054 0x22252521
+wm 32 0xb8002058 0x22220a00
+wm 32 0xb8001010 0x00000304
+wm 32 0xb8001010 0x0000030c
+wm 32 0xb8001004 0x007ffc3f
+wm 32 0xb800100c 0x007ffc3f
+wm 32 0xb8001000 0x92220000
+wm 32 0xb8001008 0x92220000
+wm 32 0x80000400 0x12345678
+wm 32 0x90000400 0x12345678
+wm 32 0xb8001000 0xa2220000
+wm 32 0xb8001008 0xa2220000
+wm 32 0x80000000 0x87654321
+wm 32 0x90000000 0x87654321
+wm 32 0x80000000 0x87654321
+wm 32 0x90000000 0x87654321
+wm 32 0xb8001000 0xb2220000
+wm 32 0xb8001008 0xb2220000
+wm 8 0x80000233 0xda
+wm 8 0x90000233 0xda
+wm 8 0x82000780 0xda
+wm 8 0x92000780 0xda
+wm 8 0x82000400 0xda
+wm 8 0x92000400 0xda
+wm 32 0xb8001000 0x82226080
+wm 32 0xb8001008 0x82226080
+wm 32 0xb8001004 0x007ffc3f
+wm 32 0xb800100c 0x007ffc3f
+wm 32 0xb8001010 0x00000304
diff --git a/arch/arm/boards/freescale-mx35-3ds/flash_header.c b/arch/arm/boards/freescale-mx35-3ds/flash_header.c
deleted file mode 100644
index 076b816491..0000000000
--- a/arch/arm/boards/freescale-mx35-3ds/flash_header.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <common.h>
-#include <mach/imx-flash-header.h>
-#include <mach/imx35-regs.h>
-#include <asm/barebox-arm-head.h>
-
-void __naked __flash_header_start go(void)
-{
-	barebox_arm_head();
-}
-
-struct imx_dcd_entry __dcd_entry_section dcd_entry[] = {
-	{ .ptr_type = 4, .addr = 0xb8002050, .val = 0x0000d843, },
-	{ .ptr_type = 4, .addr = 0xB8002054, .val = 0x22252521, },
-	{ .ptr_type = 4, .addr = 0xB8002058, .val = 0x22220a00, },
-
-	{ .ptr_type = 4, .addr = 0xB8001010, .val = 0x00000304, },
-	{ .ptr_type = 4, .addr = 0xB8001010, .val = 0x0000030C, },
-
-	{ .ptr_type = 4, .addr = 0xB8001004, .val = 0x007ffc3f, },
-	{ .ptr_type = 4, .addr = 0xB800100C, .val = 0x007ffc3f, },
-
-	{ .ptr_type = 4, .addr = 0xB8001000, .val = 0x92220000, },
-	{ .ptr_type = 4, .addr = 0xB8001008, .val = 0x92220000, },
-
-	{ .ptr_type = 4, .addr = 0x80000400, .val = 0x12345678, },
-	{ .ptr_type = 4, .addr = 0x90000400, .val = 0x12345678, },
-
-	{ .ptr_type = 4, .addr = 0xB8001000, .val = 0xA2220000, },
-	{ .ptr_type = 4, .addr = 0xB8001008, .val = 0xA2220000, },
-
-	{ .ptr_type = 4, .addr = 0x80000000, .val = 0x87654321, },
-	{ .ptr_type = 4, .addr = 0x90000000, .val = 0x87654321, },
-
-	{ .ptr_type = 4, .addr = 0x80000000, .val = 0x87654321, },
-	{ .ptr_type = 4, .addr = 0x90000000, .val = 0x87654321, },
-
-	{ .ptr_type = 4, .addr = 0xB8001000, .val = 0xB2220000, },
-	{ .ptr_type = 4, .addr = 0xB8001008, .val = 0xB2220000, },
-
-	{ .ptr_type = 1, .addr = 0x80000233, .val = 0xda, },
-	{ .ptr_type = 1, .addr = 0x90000233, .val = 0xda, },
-
-	{ .ptr_type = 1, .addr = 0x82000780, .val = 0xda, },
-	{ .ptr_type = 1, .addr = 0x92000780, .val = 0xda, },
-
-	{ .ptr_type = 1, .addr = 0x82000400, .val = 0xda, },
-	{ .ptr_type = 1, .addr = 0x92000400, .val = 0xda, },
-
-	{ .ptr_type = 4, .addr = 0xB8001000, .val = 0x82226080, },
-	{ .ptr_type = 4, .addr = 0xB8001008, .val = 0x82226080, },
-
-	{ .ptr_type = 4, .addr = 0xB8001004, .val = 0x007ffc3f, },
-	{ .ptr_type = 4, .addr = 0xB800100C, .val = 0x007ffc3f, },
-
-	{ .ptr_type = 4, .addr = 0xB8001010, .val = 0x00000304, },
-};
-
-
-struct imx_flash_header __flash_header_section flash_header = {
-	.app_code_jump_vector	= 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),
-	.super_root_key		= 0,
-	.dcd			= FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd_barker),
-	.app_dest		= DEST_BASE,
-	.dcd_barker		= DCD_BARKER,
-	.dcd_block_len		= sizeof(dcd_entry),
-};
-
-unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE;
-