X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fimx27lite-common.h;h=8fb33375e048b0261ccf52dcf687456267f958f1;hb=1c1b7c3739095da7d73fef3adbe9f187791ca9ff;hp=a2853a7ef99e5892db05a643c896b0b1455cbd56;hpb=6e2fbdea1b26d75314d87c380a36b0015bf824cf;p=u-boot diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index a2853a7ef9..8fb33375e0 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -204,9 +204,6 @@ #define CONFIG_LOADADDR 0xa0800000 /* loadaddr env var */ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define xstr(s) str(s) -#define str(s) #s - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ @@ -219,19 +216,19 @@ " console=ttymxc0,${baudrate}\0" \ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ "addmisc=setenv bootargs ${bootargs}\0" \ - "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ "kernel_addr_r=a0800000\0" \ - "bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0" \ + "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ "rootpath=/opt/eldk-4.2-arm/arm\0" \ "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ "run nfsargs addip addtty addmtd addmisc;" \ "bootm\0" \ - "bootcmd=run net_nfs\0" \ + "bootcmd=run net_nfs\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ - "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize};era " xstr(CONFIG_SYS_MONITOR_BASE) \ + "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ + " +${filesize};era " __stringify(CONFIG_SYS_MONITOR_BASE)\ " +${filesize};cp.b ${fileaddr} " \ - xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \ + __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \ "upd=run load update\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \