Merge commit 'upstream/master'

[oweals/u-boot.git] / board / atmel / atstk1000 / flash.c

diff --git a/board/atmel/atstk1000/flash.c b/board/atmel/atstk1000/flash.c
index 3aebf66ee24015a01d5f5f4c0ff68e2dc4bb86c0..958f4dc330c82fb0c245c3fafcf2deae7306632e 100644 (file)
--- a/board/atmel/atstk1000/flash.c
+++ b/board/atmel/atstk1000/flash.c
@@ -57,7 +57,7 @@ unsigned long flash_init(void)
 
        gd->bd->bi_flashstart = CFG_FLASH_BASE;
        gd->bd->bi_flashsize = CFG_FLASH_SIZE;
-       gd->bd->bi_flashoffset = __edata_lma - _text;
+       gd->bd->bi_flashoffset = _edata - _text;
 
        flash_info[0].size = CFG_FLASH_SIZE;
        flash_info[0].sector_count = 135;