summaryrefslogtreecommitdiff
path: root/include/configs/MPC837XERDB.h
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-23 17:41:24 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:47 -0700
commit5368c55d4ca463405225dd184ecabf370b715c05 (patch)
treee1ba15d3d2ca7a971dcdea2569c7335c97a72067 /include/configs/MPC837XERDB.h
parent93ea89f0d979a000e4c47dd8a8991328b2ac8cf7 (diff)
downloadu-boot-imx-5368c55d4ca463405225dd184ecabf370b715c05.zip
u-boot-imx-5368c55d4ca463405225dd184ecabf370b715c05.tar.gz
u-boot-imx-5368c55d4ca463405225dd184ecabf370b715c05.tar.bz2
COMMON: Use __stringify() instead of MK_STR()
Kill multiple occurances and redeclaration of MK_STR in favor of __stringify(). Signed-off-by: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/MPC837XERDB.h')
-rw-r--r--include/configs/MPC837XERDB.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index d821352..9ad7e3a 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -719,18 +719,20 @@
#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
-#define XMK_STR(x) #x
-#define MK_STR(x) XMK_STR(x)
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=" CONFIG_NETDEV "\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \
"tftpflash=tftp $loadaddr $uboot;" \
- "protect off " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
- "erase " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
- "cp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize; " \
- "protect on " MK_STR(CONFIG_SYS_TEXT_BASE) " +$filesize; " \
- "cmp.b $loadaddr " MK_STR(CONFIG_SYS_TEXT_BASE) " $filesize\0" \
+ "protect off " __stringify(CONFIG_SYS_TEXT_BASE) \
+ " +$filesize; " \
+ "erase " __stringify(CONFIG_SYS_TEXT_BASE) \
+ " +$filesize; " \
+ "cp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) \
+ " $filesize; " \
+ "protect on " __stringify(CONFIG_SYS_TEXT_BASE) \
+ " +$filesize; " \
+ "cmp.b $loadaddr " __stringify(CONFIG_SYS_TEXT_BASE) \
+ " $filesize\0" \
"fdtaddr=780000\0" \
"fdtfile=" CONFIG_FDTFILE "\0" \
"ramdiskaddr=1000000\0" \
@@ -759,7 +761,4 @@
"tftp $fdtaddr $fdtfile;" \
"bootm $loadaddr $ramdiskaddr $fdtaddr"
-#undef MK_STR
-#undef XMK_STR
-
#endif /* __CONFIG_H */