summaryrefslogtreecommitdiff
path: root/include/configs/x600.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/x600.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/x600.h')
-rw-r--r--include/configs/x600.h27
1 files changed, 13 insertions, 14 deletions
diff --git a/include/configs/x600.h b/include/configs/x600.h
index 71373e98f9..6214dc480a 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -181,26 +181,24 @@
#define CONFIG_UBI_PART ubi0
#define CONFIG_UBIFS_VOLUME rootfs
-#define xstr(s) str(s)
-#define str(s) #s
-
#define MTDIDS_DEFAULT "nand0=nand"
#define MTDPARTS_DEFAULT "mtdparts=nand:64M(ubi0),64M(ubi1)"
#define CONFIG_EXTRA_ENV_SETTINGS \
"u-boot_addr=1000000\0" \
- "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.spr\0" \
+ "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.spr\0" \
"load=tftp ${u-boot_addr} ${u-boot}\0" \
- "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) " +${filesize};"\
- "erase " xstr(CONFIG_SYS_MONITOR_BASE) " +${filesize};" \
- "cp.b ${u-boot_addr} " xstr(CONFIG_SYS_MONITOR_BASE) \
+ "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \
+ " +${filesize};" \
+ "erase " __stringify(CONFIG_SYS_MONITOR_BASE) " +${filesize};" \
+ "cp.b ${u-boot_addr} " __stringify(CONFIG_SYS_MONITOR_BASE) \
" ${filesize};" \
- "protect on " xstr(CONFIG_SYS_MONITOR_BASE) \
+ "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \
" +${filesize}\0" \
"upd=run load update\0" \
- "ubifs=" xstr(CONFIG_HOSTNAME) "/ubifs.img\0" \
- "part=" xstr(CONFIG_UBI_PART) "\0" \
- "vol=" xstr(CONFIG_UBIFS_VOLUME) "\0" \
+ "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0" \
+ "part=" __stringify(CONFIG_UBI_PART) "\0" \
+ "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0" \
"load_ubifs=tftp ${kernel_addr} ${ubifs}\0" \
"update_ubifs=ubi part ${part};ubi write ${kernel_addr} ${vol}" \
" ${filesize}\0" \
@@ -223,11 +221,12 @@
"saveenv;boot\0" \
"ubifsargs=set bootargs ubi.mtd=ubi${boot_part} " \
"root=ubi0:rootfs rootfstype=ubifs\0" \
- "kernel=" xstr(CONFIG_HOSTNAME) "/uImage\0" \
+ "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \
"kernel_fs=/boot/uImage \0" \
"kernel_addr=1000000\0" \
- "dtb=" xstr(CONFIG_HOSTNAME) "/" xstr(CONFIG_HOSTNAME) ".dtb\0" \
- "dtb_fs=/boot/" xstr(CONFIG_HOSTNAME) ".dtb\0" \
+ "dtb=" __stringify(CONFIG_HOSTNAME) "/" \
+ __stringify(CONFIG_HOSTNAME) ".dtb\0" \
+ "dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0" \
"dtb_addr=1800000\0" \
"load_kernel=tftp ${kernel_addr} ${kernel}\0" \
"load_dtb=tftp ${dtb_addr} ${dtb}\0" \