diff options
| author | Marek Vasut <marex@denx.de> | 2012-09-23 17:41:23 +0200 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:53:47 -0700 | 
| commit | 93ea89f0d979a000e4c47dd8a8991328b2ac8cf7 (patch) | |
| tree | e30e63258ab9208f0bf382dcc8403a0d9c3ef808 /include/configs/imx27lite-common.h | |
| parent | 9aed5080834a4e848a88b972738f28dce466b420 (diff) | |
| download | olio-uboot-2014.01-93ea89f0d979a000e4c47dd8a8991328b2ac8cf7.tar.xz olio-uboot-2014.01-93ea89f0d979a000e4c47dd8a8991328b2ac8cf7.zip | |
COMMON: Use __stringify() instead of xstr()
Kill multiple occurances and redeclaration of xstr in favor of __stringify().
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/imx27lite-common.h')
| -rw-r--r-- | include/configs/imx27lite-common.h | 15 | 
1 files changed, 6 insertions, 9 deletions
| diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index a2853a7ef..8fb33375e 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"				\ |