diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:06:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-15 00:06:18 +0100 |
| commit | 6f99eec3dc2285abfb93631003f7e5cadf2eab0f (patch) | |
| tree | 1eaaa31eb768d8bfa68e9ff41eef53d37b64f21c /common/environment.c | |
| parent | f6921e3dc331293c873ec4d109fd5517a42a90b3 (diff) | |
| parent | 30942b18b66f35f2ceedab39af10e9eccaa943cc (diff) | |
| download | talos-obmc-uboot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.gz talos-obmc-uboot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Conflicts:
Makefile
doc/README.standalone
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common/environment.c')
| -rw-r--r-- | common/environment.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common/environment.c b/common/environment.c index 24257f7c52..3b9914f498 100644 --- a/common/environment.c +++ b/common/environment.c @@ -70,11 +70,16 @@ /* * Macros to generate global absolutes. */ +#if defined(__bfin__) +# define GEN_SET_VALUE(name, value) asm (".set " GEN_SYMNAME(name) ", " GEN_VALUE(value)) +#else +# define GEN_SET_VALUE(name, value) asm (GEN_SYMNAME(name) " = " GEN_VALUE(value)) +#endif #define GEN_SYMNAME(str) SYM_CHAR #str #define GEN_VALUE(str) #str #define GEN_ABS(name, value) \ asm (".globl " GEN_SYMNAME(name)); \ - asm (GEN_SYMNAME(name) " = " GEN_VALUE(value)) + GEN_SET_VALUE(name, value) /* * Macros to transform values |
