summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/u-boot-arm.h
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2010-11-02 14:09:18 +0900
committerMinkyu Kang <mk7.kang@samsung.com>2010-11-02 14:09:18 +0900
commit37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626 (patch)
tree93439a245bc837bec3ec9e812b775ebed730c2fa /arch/arm/include/asm/u-boot-arm.h
parentd9abba8254c3e6b9a1d5c2e52c2d8088bbeb520f (diff)
parent66fca016057b1c6b697552cc7220ebada9d4f82d (diff)
downloadu-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.zip
u-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.tar.gz
u-boot-imx-37a3bda0c9c8a2ffbf7e2a9e121177a3385a0626.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/u-boot-arm.h')
-rw-r--r--arch/arm/include/asm/u-boot-arm.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index faf800a..4ac4f61 100644
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -30,18 +30,18 @@
#define _U_BOOT_ARM_H_ 1
/* for the following variables, see start.S */
-extern ulong _bss_start; /* code + data end == BSS start */
-extern ulong _bss_end; /* BSS end */
+extern ulong _bss_start_ofs; /* BSS start relative to _start */
+extern ulong _bss_end_ofs; /* BSS end relative to _start */
extern ulong IRQ_STACK_START; /* top of IRQ stack */
extern ulong FIQ_STACK_START; /* top of FIQ stack */
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
-extern ulong _armboot_start; /* code start */
+extern ulong _armboot_start_ofs; /* code start */
#else
extern ulong _TEXT_BASE; /* code start */
-extern ulong _datarel_start;
-extern ulong _datarelrolocal_start;
-extern ulong _datarellocal_start;
-extern ulong _datarelro_start;
+extern ulong _datarel_start_ofs;
+extern ulong _datarelrolocal_start_ofs;
+extern ulong _datarellocal_start_ofs;
+extern ulong _datarelro_start_ofs;
extern ulong IRQ_STACK_START_IN; /* 8 bytes in IRQ stack */
#endif