Nokia RX-51: Do not overwrite standard $loadaddr variable

Instead of overwriting $loadaddr variable, use custom temporary
$fileloadaddr variable. So scripts can access default/original address
stored in $loadaddr at build time.

Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a88cfe77d50c2d759eed986e9a69ab6290ed30e0..99a020c3c71d84b855c52a8f1fb4d98024af9b70 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -78,15 +78,16 @@
        "kernaddr=0x82008000\0" \
        "initrdaddr=0x84008000\0" \
        "scriptaddr=0x86008000\0" \
+       "fileloadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fileload=${mmctype}load mmc ${mmcnum}:${mmcpart} " \
-               "${loadaddr} ${mmcfile}\0" \
-       "kernload=setenv loadaddr ${kernaddr};" \
+               "${fileloadaddr} ${mmcfile}\0" \
+       "kernload=setenv fileloadaddr ${kernaddr};" \
                "setenv mmcfile ${mmckernfile};" \
                "run fileload\0" \
-       "initrdload=setenv loadaddr ${initrdaddr};" \
+       "initrdload=setenv fileloadaddr ${initrdaddr};" \
                "setenv mmcfile ${mmcinitrdfile};" \
                "run fileload\0" \
-       "scriptload=setenv loadaddr ${scriptaddr};" \
+       "scriptload=setenv fileloadaddr ${scriptaddr};" \
                "setenv mmcfile ${mmcscriptfile};" \
                "run fileload\0" \
        "scriptboot=echo Running ${mmcscriptfile} from mmc " \