From 4a8c3f693ef2b50b5db5a95a2c32531b35d31dc0 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Fri, 24 Oct 2014 20:13:51 +0200 Subject: Use __stringify() instead of xstr() Some boards still use xstr(). Replace remaining occurrences of xstr() by commonly used __stringify(). Signed-off-by: Anatolij Gustschin --- include/configs/woodburn_common.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'include/configs/woodburn_common.h') diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 259205e881..d3d3e694cd 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -242,8 +242,6 @@ * Default environment and default scripts * to update uboot and load kernel */ -#define xstr(s) str(s) -#define str(s) #s #define CONFIG_HOSTNAME woodburn #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -263,9 +261,9 @@ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "loadaddr=80800000\0" \ "kernel_addr_r=80800000\0" \ - "hostname=" xstr(CONFIG_HOSTNAME) "\0" \ - "bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0" \ - "ramdisk_file=" xstr(CONFIG_HOSTNAME) "/uRamdisk\0" \ + "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \ + "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \ + "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ @@ -279,9 +277,9 @@ "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.bin\0" \ + "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \ - "uboot_addr=" xstr(CONFIG_SYS_MONITOR_BASE) "\0" \ + "uboot_addr=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \ "update=protect off ${uboot_addr} +80000;" \ "erase ${uboot_addr} +80000;" \ "cp.b ${loadaddr} ${uboot_addr} ${filesize}\0" \ -- cgit v1.2.1