diff options
| author | Marek Vasut <marex@denx.de> | 2012-09-23 17:41:24 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:53:47 -0700 |
| commit | 5368c55d4ca463405225dd184ecabf370b715c05 (patch) | |
| tree | e1ba15d3d2ca7a971dcdea2569c7335c97a72067 /include/configs/MPC8260ADS.h | |
| parent | 93ea89f0d979a000e4c47dd8a8991328b2ac8cf7 (diff) | |
| download | talos-obmc-uboot-5368c55d4ca463405225dd184ecabf370b715c05.tar.gz talos-obmc-uboot-5368c55d4ca463405225dd184ecabf370b715c05.zip | |
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/MPC8260ADS.h')
| -rw-r--r-- | include/configs/MPC8260ADS.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index bb72b35849..c4c41c77de 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -531,17 +531,18 @@ #define CONFIG_NETDEV eth0 #define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ -#define XMK_STR(x) #x -#define MK_STR(x) XMK_STR(x) - #define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=" MK_STR(CONFIG_NETDEV) "\0" \ + "netdev=" __stringify(CONFIG_NETDEV) "\0" \ "tftpflash=tftpboot $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=400000\0" \ "console=ttyCPM0\0" \ "setbootargs=setenv bootargs " \ @@ -565,7 +566,4 @@ "tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr" -#undef MK_STR -#undef XMK_STR - #endif /* __CONFIG_H */ |
