summaryrefslogtreecommitdiffstats
path: root/include/configs/tam3517-common.h
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-23 17:41:23 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:47 -0700
commit93ea89f0d979a000e4c47dd8a8991328b2ac8cf7 (patch)
treee30e63258ab9208f0bf382dcc8403a0d9c3ef808 /include/configs/tam3517-common.h
parent9aed5080834a4e848a88b972738f28dce466b420 (diff)
downloadblackbird-obmc-uboot-93ea89f0d979a000e4c47dd8a8991328b2ac8cf7.tar.gz
blackbird-obmc-uboot-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/tam3517-common.h')
-rw-r--r--include/configs/tam3517-common.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index cbb6c7ec39..dd7757cb97 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -299,9 +299,6 @@
"1m(u-boot),256k(env1)," \
"256k(env2),6m(kernel),-(rootfs)"
-#define xstr(s) str(s)
-#define str(s) #s
-
#define CONFIG_TAM3517_SETTINGS \
"netdev=eth0\0" \
"nandargs=setenv bootargs root=${nandroot} " \
@@ -321,8 +318,8 @@
"addmisc=setenv bootargs ${bootargs} ${misc}\0" \
"loadaddr=82000000\0" \
"kernel_addr_r=82000000\0" \
- "hostname=" xstr(CONFIG_HOSTNAME) "\0" \
- "bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0" \
+ "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \
+ "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \
"flash_self=run ramargs addip addtty addmtd addmisc;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
"flash_nfs=run nfsargs addip addtty addmtd addmisc;" \
@@ -337,10 +334,10 @@
"run ramargs addip addtty addmtd addmisc;" \
"bootm ${kernel_addr_r} ${ramdisk_addr_r};" \
"else echo Images not loades;fi\0" \
- "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.img\0" \
+ "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.img\0" \
"load=tftp ${loadaddr} ${u-boot}\0" \
"loadmlo=tftp ${loadaddr} ${mlo}\0" \
- "mlo=" xstr(CONFIG_HOSTNAME) "/MLO\0" \
+ "mlo=" __stringify(CONFIG_HOSTNAME) "/MLO\0" \
"uboot_addr=0x80000\0" \
"update=nandecc sw;nand erase ${uboot_addr} 100000;" \
"nand write ${loadaddr} ${uboot_addr} 80000\0" \
OpenPOWER on IntegriCloud