sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'work/imx-dcd-size' into next

This commit is contained in:
Sascha Hauer 2012-03-23 21:21:43 +01:00
parent 184641ac49 04b9b0d537
commit bbcb301fc2
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
View File

@ -49,7 +49,6 @@
#include <mach/devices-imx25.h>
#include <asm/barebox-arm-head.h>
extern unsigned long _stext;
extern void exception_vectors(void);
void __naked __flash_header_start go(void)
@ -84,9 +83,7 @@ struct imx_flash_header __flash_header_section flash_header = {
.dcd_block_len = sizeof(dcd_entry),
};
extern unsigned long __bss_start;
unsigned long __image_len_section barebox_len = 0x40000;
unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE;
static struct fec_platform_data fec_info = {
.xcv_type = RMII,

2
arch/arm/boards/eukrea_cpuimx35/flash_header.c
View File

@ -42,4 +42,4 @@ struct imx_flash_header __flash_header_section flash_header = {
.dcd_block_len = sizeof(dcd_entry),
};
unsigned long __image_len_section barebox_len = 0x40000;
unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE;

4
arch/arm/boards/eukrea_cpuimx51/flash_header.c
View File

@ -2,8 +2,6 @@
#include <mach/imx-flash-header.h>
#include <asm/barebox-arm-head.h>
extern unsigned long _stext;
void __naked __flash_header_start go(void)
{
barebox_arm_head();
@ -82,4 +80,4 @@ struct imx_flash_header __flash_header_section flash_header = {
.dcd_block_len = sizeof (dcd_entry),
};
unsigned long __image_len_section barebox_len = 0x40000;
unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE;

5
arch/arm/boards/freescale-mx25-3-stack/3stack.c
View File

@ -45,7 +45,6 @@
#include <mach/devices-imx25.h>
#include <asm/barebox-arm-head.h>
extern unsigned long _stext;
extern void exception_vectors(void);
void __naked __flash_header_start go(void)
@ -107,9 +106,7 @@ struct imx_flash_header __flash_header_section flash_header = {
.dcd_block_len = sizeof(dcd_entry),
};
extern unsigned long __bss_start;
unsigned long __image_len_section barebox_len = 0x40000;
unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE;
static struct fec_platform_data fec_info = {
.xcv_type = RMII,

2
arch/arm/boards/freescale-mx35-3-stack/flash_header.c
View File

@ -70,5 +70,5 @@ struct imx_flash_header __flash_header_section flash_header = {
.dcd_block_len = sizeof(dcd_entry),
};
unsigned long __image_len_section barebox_len = 0x40000;
unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE;

4
arch/arm/boards/freescale-mx51-pdk/flash_header.c
View File

@ -2,8 +2,6 @@
#include <mach/imx-flash-header.h>
#include <asm/barebox-arm-head.h>
extern unsigned long _stext;
void __naked __flash_header_start go(void)
{
barebox_arm_head();
@ -82,5 +80,5 @@ struct imx_flash_header __flash_header_section flash_header = {
.dcd_block_len = sizeof (dcd_entry),
};
unsigned long __image_len_section barebox_len = 0x40000;
unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE;

2
arch/arm/boards/freescale-mx53-loco/flash_header.c
View File

@ -90,7 +90,7 @@ struct imx_flash_header_v2 __flash_header_section flash_header = {
.self = APP_DEST + 0x400,
.boot_data.start = APP_DEST,
.boot_data.size = 0x40000,
.boot_data.size = DCD_BAREBOX_SIZE,
.dcd.header.tag = DCD_HEADER_TAG,
.dcd.header.length = cpu_to_be16(sizeof(struct imx_dcd) + sizeof(dcd_entry)),

2
arch/arm/boards/freescale-mx53-smd/flash_header.c
View File

@ -90,7 +90,7 @@ struct imx_flash_header_v2 __flash_header_section flash_header = {
.self = APP_DEST + 0x400,
.boot_data.start = APP_DEST,
.boot_data.size = 0x40000,
.boot_data.size = DCD_BAREBOX_SIZE,
.dcd.header.tag = DCD_HEADER_TAG,
.dcd.header.length = cpu_to_be16(sizeof(struct imx_dcd) + sizeof(dcd_entry)),

2
arch/arm/boards/tqma53/flash_header.c
View File

@ -97,7 +97,7 @@ struct imx_flash_header_v2 __flash_header_section flash_header = {
.self = APP_DEST + 0x400,
.boot_data.start = APP_DEST,
.boot_data.size = 0x40000,
.boot_data.size = DCD_BAREBOX_SIZE,
.dcd.header.tag = DCD_HEADER_TAG,
.dcd.header.length = cpu_to_be16(sizeof(struct imx_dcd) + sizeof(dcd_entry)),

2
arch/arm/lib/barebox.lds.S
View File

@ -105,5 +105,5 @@ SECTIONS
.bss : { *(.bss*) }
__bss_stop = .;
_end = .;
_barebox_image_size = __bss_start - _text;
_barebox_image_size = __bss_start - TEXT_BASE;
}

10
arch/arm/mach-imx/include/mach/imx-flash-header.h
View File

@ -1,6 +1,8 @@
#ifndef __MACH_FLASH_HEADER_H
#define __MACH_FLASH_HEADER_H
#include <asm-generic/sections.h>
#define __flash_header_start __section(.flash_header_start)
#if defined(CONFIG_ARCH_IMX_INTERNAL_BOOT_NOR)
@ -87,6 +89,14 @@ struct imx_flash_header {
#define DCD_COMMAND_WRITE_TAG 0xcc
#define DCD_COMMAND_WRITE_PARAM 0x04
/*
* At least on i.MX5 the ROM copies only full blocks. Unfortunately
* it does not round up to the next full block, we have to do it
* ourselves. Use 4095 which should be enough for the largest NAND
* pages.
*/
#define DCD_BAREBOX_SIZE (barebox_image_size + 4095)
struct imx_ivt_header {
uint8_t tag;
__be16 length;