diff options
Diffstat (limited to 'arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c')
| -rw-r--r-- | arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c index caeb46e872..7fd1031171 100644 --- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c @@ -33,7 +33,7 @@ #include <asm/mmu.h> #include <partition.h> -#include <asm/mach-types.h> +#include <generated/mach-types.h> #include <mach/imx-nand.h> #include <mach/imxfb.h> #include <fec.h> @@ -42,13 +42,14 @@ #include <mach/iomux-mx25.h> extern unsigned long _stext; +extern void exception_vectors(void); void __naked __flash_header_start go(void) { __asm__ __volatile__("b exception_vectors\n"); } -struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { +struct imx_dcd_entry __dcd_entry_section dcd_entry[] = { { .ptr_type = 4, .addr = 0xb8001010, .val = 0x00000004, }, { .ptr_type = 4, .addr = 0xb8001000, .val = 0x92100000, }, { .ptr_type = 1, .addr = 0x80000400, .val = 0x12344321, }, @@ -63,21 +64,21 @@ struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = { { .ptr_type = 4, .addr = 0x53f80008, .val = 0x20034000, }, }; -struct imx_flash_header __flash_header_0x400 eukrea_cpuimx25_header = { - .app_code_jump_vector = TEXT_BASE + 0x2000, +struct imx_flash_header __flash_header_section flash_header = { + .app_code_jump_vector = DEST_BASE + ((unsigned int)&exception_vectors - TEXT_BASE), .app_code_barker = APP_CODE_BARKER, .app_code_csf = 0, - .dcd_ptr_ptr = TEXT_BASE + 0x400 + offsetof(struct imx_flash_header, dcd), + .dcd_ptr_ptr = FLASH_HEADER_BASE + offsetof(struct imx_flash_header, dcd), .super_root_key = 0, - .dcd = TEXT_BASE + 0x400 + offsetof(struct imx_flash_header, dcd_barker), - .app_dest = TEXT_BASE, + .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), }; extern unsigned long __bss_start; -unsigned long __image_len_0x400 barebox_len = 0x40000; +unsigned long __image_len_section barebox_len = 0x40000; static struct fec_platform_data fec_info = { .xcv_type = RMII, @@ -85,6 +86,7 @@ static struct fec_platform_data fec_info = { }; static struct device_d fec_dev = { + .id = -1, .name = "fec_imx", .map_base = IMX_FEC_BASE, .platform_data = &fec_info, @@ -96,6 +98,7 @@ static struct memory_platform_data sdram_pdata = { }; static struct device_d sdram0_dev = { + .id = -1, .name = "mem", .map_base = IMX_SDRAM_CS0, .size = 64 * 1024 * 1024, @@ -108,6 +111,7 @@ struct imx_nand_platform_data nand_info = { }; static struct device_d nand_dev = { + .id = -1, .name = "imx_nand", .map_base = IMX_NFC_BASE, .platform_data = &nand_info, @@ -140,6 +144,7 @@ static struct imx_fb_platform_data eukrea_cpuimx25_fb_data = { static struct device_d imxfb_dev = { + .id = -1, .name = "imxfb", .map_base = 0x53fbc000, .size = 0x1000, @@ -243,6 +248,7 @@ static int eukrea_cpuimx25_devices_init(void) device_initcall(eukrea_cpuimx25_devices_init); static struct device_d eukrea_cpuimx25_serial_device = { + .id = -1, .name = "imx_serial", .map_base = IMX_UART1_BASE, .size = 16 * 1024, |