summaryrefslogtreecommitdiff
path: root/include/configs/mcx.h
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2014-10-24 20:13:51 +0200
committerTom Rini <trini@ti.com>2014-10-27 17:54:13 -0400
commit4a8c3f693ef2b50b5db5a95a2c32531b35d31dc0 (patch)
treee8af75d48f723e6b4d79571e40b237917d2d15ae /include/configs/mcx.h
parentf39c5d1e6a2080c6913e11fb30899c8b2adfb0f3 (diff)
Use __stringify() instead of xstr()
Some boards still use xstr(). Replace remaining occurrences of xstr() by commonly used __stringify(). Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include/configs/mcx.h')
-rw-r--r--include/configs/mcx.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index adaf44f68f..b775ebd0ed 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -172,9 +172,6 @@
#define CONFIG_BOOTFILE "uImage"
-#define xstr(s) str(s)
-#define str(s) #s
-
/* Setup MTD for NAND on the SOM */
#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \
@@ -201,13 +198,13 @@
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
"baudrate=115200\0" \
"consoledev=ttyO2\0" \
- "hostname=" xstr(CONFIG_HOSTNAME) "\0" \
+ "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \
"loadaddr=0x82000000\0" \
"load=tftp ${loadaddr} ${u-boot}\0" \
"load_k=tftp ${loadaddr} ${bootfile}\0" \
"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
"loadmlo=tftp ${loadaddr} ${mlo}\0" \
- "mlo=" xstr(CONFIG_HOSTNAME) "/MLO\0" \
+ "mlo=" __stringify(CONFIG_HOSTNAME) "/MLO\0" \
"mmcargs=root=/dev/mmcblk0p2 rw " \
"rootfstype=ext3 rootwait\0" \
"mmcboot=echo Booting from mmc ...; " \
@@ -221,7 +218,7 @@
"bootm ${loadaddr}\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
- "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.img\0" \
+ "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.img\0" \
"uboot_addr=0x80000\0" \
"update=nandecc sw;nand erase ${uboot_addr} 100000;" \
"nand write ${loadaddr} ${uboot_addr} 80000\0" \