Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

[platform/kernel/u-boot.git] / include / configs / nokia_rx51.h

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a88cfe7..310bdde 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -40,7 +40,6 @@
  */
 #define V_NS16550_CLK          48000000                /* 48MHz (APLL96/2) */
 
-#define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
 
 /*
@@ -78,15 +77,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 " \