V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Anatolij Gustschin 2014-10-24 20:13:51 +02:00 committed by Tom Rini
parent f39c5d1e6a
commit 4a8c3f693e
10 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/configs/mcx.h
View File

@ -172,9 +172,6 @@
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define xstr(s) str(s)
#define str(s) #s
/* Setup MTD for NAND on the SOM */ /* Setup MTD for NAND on the SOM */
#define MTDIDS_DEFAULT "nand0=omap2-nand.0" #define MTDIDS_DEFAULT "nand0=omap2-nand.0"
#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \ #define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \
@ -201,13 +198,13 @@
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
"baudrate=115200\0" \ "baudrate=115200\0" \
"consoledev=ttyO2\0" \ "consoledev=ttyO2\0" \
"hostname=" xstr(CONFIG_HOSTNAME) "\0" \ "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \
"loadaddr=0x82000000\0" \ "loadaddr=0x82000000\0" \
"load=tftp ${loadaddr} ${u-boot}\0" \ "load=tftp ${loadaddr} ${u-boot}\0" \
"load_k=tftp ${loadaddr} ${bootfile}\0" \ "load_k=tftp ${loadaddr} ${bootfile}\0" \
"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \ "loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
"loadmlo=tftp ${loadaddr} ${mlo}\0" \ "loadmlo=tftp ${loadaddr} ${mlo}\0" \
"mlo=" xstr(CONFIG_HOSTNAME) "/MLO\0" \ "mlo=" __stringify(CONFIG_HOSTNAME) "/MLO\0" \
"mmcargs=root=/dev/mmcblk0p2 rw " \ "mmcargs=root=/dev/mmcblk0p2 rw " \
"rootfstype=ext3 rootwait\0" \ "rootfstype=ext3 rootwait\0" \
"mmcboot=echo Booting from mmc ...; " \ "mmcboot=echo Booting from mmc ...; " \
@ -221,7 +218,7 @@
"bootm ${loadaddr}\0" \ "bootm ${loadaddr}\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \ "nfsroot=${serverip}:${rootpath}\0" \
"u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.img\0" \ "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.img\0" \
"uboot_addr=0x80000\0" \ "uboot_addr=0x80000\0" \
"update=nandecc sw;nand erase ${uboot_addr} 100000;" \ "update=nandecc sw;nand erase ${uboot_addr} 100000;" \
"nand write ${loadaddr} ${uboot_addr} 80000\0" \ "nand write ${loadaddr} ${uboot_addr} 80000\0" \

6
include/configs/o2d.h
View File

@ -43,8 +43,8 @@
#define CONFIG_BOARD_NAME "o2d" #define CONFIG_BOARD_NAME "o2d"
#define CONFIG_BOARD_BOOTCMD "run dhcp_boot" #define CONFIG_BOARD_BOOTCMD "run dhcp_boot"
#define CONFIG_BOARD_MEM_LIMIT xstr(126) #define CONFIG_BOARD_MEM_LIMIT __stringify(126)
#define BOARD_POST_CRC32_END xstr(0x01000000) #define BOARD_POST_CRC32_END __stringify(0x01000000)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_IFM_DEFAULT_ENV_SETTINGS \ CONFIG_IFM_DEFAULT_ENV_SETTINGS \
@ -56,7 +56,7 @@
"ramtop=fc55ffff\0" \ "ramtop=fc55ffff\0" \
"jffbot=fc560000\0" \ "jffbot=fc560000\0" \
"jfftop=fcffffff\0" \ "jfftop=fcffffff\0" \
"ubobot=" xstr(CONFIG_SYS_FLASH_BASE) "\0" \ "ubobot=" __stringify(CONFIG_SYS_FLASH_BASE) "\0" \
"ubotop=fc03ffff\0" \ "ubotop=fc03ffff\0" \
"kernel_addr=0xfc060000\0" \ "kernel_addr=0xfc060000\0" \
"ramdisk_addr=0xfc160000\0" \ "ramdisk_addr=0xfc160000\0" \

6
include/configs/o2d300.h
View File

@ -44,8 +44,8 @@
#define CONFIG_BOARD_NAME "o2d300" #define CONFIG_BOARD_NAME "o2d300"
#define CONFIG_BOARD_BOOTCMD "run dhcp_boot" #define CONFIG_BOARD_BOOTCMD "run dhcp_boot"
#define CONFIG_BOARD_MEM_LIMIT xstr(126) #define CONFIG_BOARD_MEM_LIMIT __stringify(126)
#define BOARD_POST_CRC32_END xstr(0x02000000) #define BOARD_POST_CRC32_END __stringify(0x02000000)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_IFM_DEFAULT_ENV_SETTINGS \ CONFIG_IFM_DEFAULT_ENV_SETTINGS \
@ -63,7 +63,7 @@
"ramtop=fc57ffff\0" \ "ramtop=fc57ffff\0" \
"jffbot=fc580000\0" \ "jffbot=fc580000\0" \
"jfftop=fd39ffff\0" \ "jfftop=fd39ffff\0" \
"ubobot=" xstr(CONFIG_SYS_FLASH_BASE) "\0" \ "ubobot=" __stringify(CONFIG_SYS_FLASH_BASE) "\0" \
"ubotop=fc03ffff\0" \ "ubotop=fc03ffff\0" \
"halname="CONFIG_BOARD_NAME"/"CONFIG_BOARD_NAME"_halcon\0" \ "halname="CONFIG_BOARD_NAME"/"CONFIG_BOARD_NAME"_halcon\0" \
"halbot=fd3a0000\0" \ "halbot=fd3a0000\0" \

7
include/configs/o2dnt-common.h
View File

@ -114,9 +114,6 @@
#undef CONFIG_BOOTARGS #undef CONFIG_BOOTARGS
#define xstr(s) str(s)
#define str(s) #s
#if !defined(CONFIG_CONSOLE_DEV) #if !defined(CONFIG_CONSOLE_DEV)
#define CONFIG_CONSOLE_DEV "ttyPSC1" #define CONFIG_CONSOLE_DEV "ttyPSC1"
#endif #endif
@ -158,7 +155,7 @@
"kernel_addr_r=600000\0" \ "kernel_addr_r=600000\0" \
"initrd_high=0x03e00000\0" \ "initrd_high=0x03e00000\0" \
"memlimit=mem="CONFIG_BOARD_MEM_LIMIT"M\0" \ "memlimit=mem="CONFIG_BOARD_MEM_LIMIT"M\0" \
"memtest=mtest 0x00100000 "xstr(CONFIG_SYS_MEMTEST_END)" 0 1\0" \ "memtest=mtest 0x00100000 "__stringify(CONFIG_SYS_MEMTEST_END)" 0 1\0" \
"netdev=eth0\0" \ "netdev=eth0\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \ "nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \ "nfsroot=${serverip}:${rootpath}\0" \
@ -182,7 +179,7 @@
"unlock=yes\0" \ "unlock=yes\0" \
"post=echo !!! "CONFIG_BOARD_NAME" POWER ON SELF TEST !!!;" \ "post=echo !!! "CONFIG_BOARD_NAME" POWER ON SELF TEST !!!;" \
"setenv bootdelay 1;" \ "setenv bootdelay 1;" \
"crc32 "xstr(CONFIG_SYS_TEXT_BASE)" " \ "crc32 "__stringify(CONFIG_SYS_TEXT_BASE)" " \
BOARD_POST_CRC32_END";" \ BOARD_POST_CRC32_END";" \
"setenv bootcmd "CONFIG_BOARD_BOOTCMD";saveenv;reset\0" "setenv bootcmd "CONFIG_BOARD_BOOTCMD";saveenv;reset\0"

6
include/configs/o2dnt2.h
View File

@ -43,8 +43,8 @@
#define CONFIG_BOARD_NAME "o2dnt2" #define CONFIG_BOARD_NAME "o2dnt2"
#define CONFIG_BOARD_BOOTCMD "run flash_self" #define CONFIG_BOARD_BOOTCMD "run flash_self"
#define CONFIG_BOARD_MEM_LIMIT xstr(126) #define CONFIG_BOARD_MEM_LIMIT __stringify(126)
#define BOARD_POST_CRC32_END xstr(0x01000000) #define BOARD_POST_CRC32_END __stringify(0x01000000)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_IFM_DEFAULT_ENV_SETTINGS \ CONFIG_IFM_DEFAULT_ENV_SETTINGS \
@ -56,7 +56,7 @@
"ramtop=fc55ffff\0" \ "ramtop=fc55ffff\0" \
"jffbot=fc560000\0" \ "jffbot=fc560000\0" \
"jfftop=fce5ffff\0" \ "jfftop=fce5ffff\0" \
"ubobot=" xstr(CONFIG_SYS_FLASH_BASE) "\0" \ "ubobot=" __stringify(CONFIG_SYS_FLASH_BASE) "\0" \
"ubotop=fc03ffff\0" \ "ubotop=fc03ffff\0" \
"calname="CONFIG_BOARD_NAME"/uCal_"CONFIG_BOARD_NAME"_act\0" \ "calname="CONFIG_BOARD_NAME"/uCal_"CONFIG_BOARD_NAME"_act\0" \
"calbot=fce60000\0" \ "calbot=fce60000\0" \

6
include/configs/o2i.h
View File

@ -37,8 +37,8 @@
#define CONFIG_BOARD_NAME "o2i" #define CONFIG_BOARD_NAME "o2i"
#define CONFIG_BOARD_BOOTCMD "run dhcp_boot" #define CONFIG_BOARD_BOOTCMD "run dhcp_boot"
#define CONFIG_BOARD_MEM_LIMIT xstr(62) #define CONFIG_BOARD_MEM_LIMIT __stringify(62)
#define BOARD_POST_CRC32_END xstr(0x01000000) #define BOARD_POST_CRC32_END __stringify(0x01000000)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_IFM_DEFAULT_ENV_SETTINGS \ CONFIG_IFM_DEFAULT_ENV_SETTINGS \
@ -52,7 +52,7 @@
"jfftop=ffebffff\0" \ "jfftop=ffebffff\0" \
"kernel_addr=0xff060000\0" \ "kernel_addr=0xff060000\0" \
"ramdisk_addr=0xff160000\0" \ "ramdisk_addr=0xff160000\0" \
"ubobot=" xstr(CONFIG_SYS_FLASH_BASE) "\0" \ "ubobot=" __stringify(CONFIG_SYS_FLASH_BASE) "\0" \
"ubotop=ff03ffff\0" \ "ubotop=ff03ffff\0" \
"autoload=no\0" \ "autoload=no\0" \
"dhcp_boot=run dhcpcmd; run flash_mtd\0" \ "dhcp_boot=run dhcpcmd; run flash_mtd\0" \

6
include/configs/o2mnt.h
View File

@ -39,8 +39,8 @@
#define CONFIG_BOARD_NAME "o2mnt" #define CONFIG_BOARD_NAME "o2mnt"
#define CONFIG_BOARD_BOOTCMD "${newcmd}" #define CONFIG_BOARD_BOOTCMD "${newcmd}"
#define CONFIG_BOARD_MEM_LIMIT xstr(62) #define CONFIG_BOARD_MEM_LIMIT __stringify(62)
#define BOARD_POST_CRC32_END xstr(0x01000000) #define BOARD_POST_CRC32_END __stringify(0x01000000)
#ifndef CONFIG_IFM_SENSOR_TYPE #ifndef CONFIG_IFM_SENSOR_TYPE
#define CONFIG_IFM_SENSOR_TYPE "O2M110" #define CONFIG_IFM_SENSOR_TYPE "O2M110"
@ -56,7 +56,7 @@
"ramtop=ffc5ffff\0" \ "ramtop=ffc5ffff\0" \
"jffbot=ffc60000\0" \ "jffbot=ffc60000\0" \
"jfftop=ffffffff\0" \ "jfftop=ffffffff\0" \
"ubobot=" xstr(CONFIG_SYS_FLASH_BASE) "\0" \ "ubobot=" __stringify(CONFIG_SYS_FLASH_BASE) "\0" \
"ubotop=ff03ffff\0" \ "ubotop=ff03ffff\0" \
"kernel_addr=0xff060000\0" \ "kernel_addr=0xff060000\0" \
"ramdisk_addr=0xff260000\0" \ "ramdisk_addr=0xff260000\0" \

6
include/configs/o3dnt.h
View File

@ -44,8 +44,8 @@
#define CONFIG_BOARD_NAME "o3dnt" #define CONFIG_BOARD_NAME "o3dnt"
#define CONFIG_BOARD_BOOTCMD "run flash_self" #define CONFIG_BOARD_BOOTCMD "run flash_self"
#define CONFIG_BOARD_MEM_LIMIT xstr(62) #define CONFIG_BOARD_MEM_LIMIT __stringify(62)
#define BOARD_POST_CRC32_END xstr(0x01000000) #define BOARD_POST_CRC32_END __stringify(0x01000000)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_IFM_DEFAULT_ENV_SETTINGS \ CONFIG_IFM_DEFAULT_ENV_SETTINGS \
@ -57,7 +57,7 @@
"ramtop=fc55ffff\0" \ "ramtop=fc55ffff\0" \
"jffbot=fc560000\0" \ "jffbot=fc560000\0" \
"jfftop=fce5ffff\0" \ "jfftop=fce5ffff\0" \
"ubobot=" xstr(CONFIG_SYS_FLASH_BASE) "\0" \ "ubobot=" __stringify(CONFIG_SYS_FLASH_BASE) "\0" \
"ubotop=fc03ffff\0" \ "ubotop=fc03ffff\0" \
"calname="CONFIG_BOARD_NAME"/uCal_"CONFIG_BOARD_NAME"_act\0" \ "calname="CONFIG_BOARD_NAME"/uCal_"CONFIG_BOARD_NAME"_act\0" \
"calbot=fce60000\0" \ "calbot=fce60000\0" \

12
include/configs/woodburn_common.h
View File

@ -242,8 +242,6 @@
* Default environment and default scripts * Default environment and default scripts
* to update uboot and load kernel * to update uboot and load kernel
*/ */
#define xstr(s) str(s)
#define str(s) #s
#define CONFIG_HOSTNAME woodburn #define CONFIG_HOSTNAME woodburn
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
@ -263,9 +261,9 @@
"addmisc=setenv bootargs ${bootargs} ${misc}\0" \ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \
"loadaddr=80800000\0" \ "loadaddr=80800000\0" \
"kernel_addr_r=80800000\0" \ "kernel_addr_r=80800000\0" \
"hostname=" xstr(CONFIG_HOSTNAME) "\0" \ "hostname=" __stringify(CONFIG_HOSTNAME) "\0" \
"bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0" \ "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \
"ramdisk_file=" xstr(CONFIG_HOSTNAME) "/uRamdisk\0" \ "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0" \
"flash_self=run ramargs addip addtty addmtd addmisc;" \ "flash_self=run ramargs addip addtty addmtd addmisc;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \
@ -279,9 +277,9 @@
"run ramargs addip addtty addmtd addmisc;" \ "run ramargs addip addtty addmtd addmisc;" \
"bootm ${kernel_addr_r} ${ramdisk_addr_r};" \ "bootm ${kernel_addr_r} ${ramdisk_addr_r};" \
"else echo Images not loades;fi\0" \ "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" \ "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;" \ "update=protect off ${uboot_addr} +80000;" \
"erase ${uboot_addr} +80000;" \ "erase ${uboot_addr} +80000;" \
"cp.b ${loadaddr} ${uboot_addr} ${filesize}\0" \ "cp.b ${loadaddr} ${uboot_addr} ${filesize}\0" \

27
include/configs/x600.h
View File

@ -181,26 +181,24 @@
#define CONFIG_UBI_PART ubi0 #define CONFIG_UBI_PART ubi0
#define CONFIG_UBIFS_VOLUME rootfs #define CONFIG_UBIFS_VOLUME rootfs
#define xstr(s) str(s)
#define str(s) #s
#define MTDIDS_DEFAULT "nand0=nand" #define MTDIDS_DEFAULT "nand0=nand"
#define MTDPARTS_DEFAULT "mtdparts=nand:64M(ubi0),64M(ubi1)" #define MTDPARTS_DEFAULT "mtdparts=nand:64M(ubi0),64M(ubi1)"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"u-boot_addr=1000000\0" \ "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" \ "load=tftp ${u-boot_addr} ${u-boot}\0" \
"update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) " +${filesize};"\ "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \
"erase " xstr(CONFIG_SYS_MONITOR_BASE) " +${filesize};" \ " +${filesize};" \
"cp.b ${u-boot_addr} " xstr(CONFIG_SYS_MONITOR_BASE) \ "erase " __stringify(CONFIG_SYS_MONITOR_BASE) " +${filesize};" \
"cp.b ${u-boot_addr} " __stringify(CONFIG_SYS_MONITOR_BASE) \
" ${filesize};" \ " ${filesize};" \
"protect on " xstr(CONFIG_SYS_MONITOR_BASE) \ "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \
" +${filesize}\0" \ " +${filesize}\0" \
"upd=run load update\0" \ "upd=run load update\0" \
"ubifs=" xstr(CONFIG_HOSTNAME) "/ubifs.img\0" \ "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0" \
"part=" xstr(CONFIG_UBI_PART) "\0" \ "part=" __stringify(CONFIG_UBI_PART) "\0" \
"vol=" xstr(CONFIG_UBIFS_VOLUME) "\0" \ "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0" \
"load_ubifs=tftp ${kernel_addr} ${ubifs}\0" \ "load_ubifs=tftp ${kernel_addr} ${ubifs}\0" \
"update_ubifs=ubi part ${part};ubi write ${kernel_addr} ${vol}" \ "update_ubifs=ubi part ${part};ubi write ${kernel_addr} ${vol}" \
" ${filesize}\0" \ " ${filesize}\0" \
@ -223,11 +221,12 @@
"saveenv;boot\0" \ "saveenv;boot\0" \
"ubifsargs=set bootargs ubi.mtd=ubi${boot_part} " \ "ubifsargs=set bootargs ubi.mtd=ubi${boot_part} " \
"root=ubi0:rootfs rootfstype=ubifs\0" \ "root=ubi0:rootfs rootfstype=ubifs\0" \
"kernel=" xstr(CONFIG_HOSTNAME) "/uImage\0" \ "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0" \
"kernel_fs=/boot/uImage \0" \ "kernel_fs=/boot/uImage \0" \
"kernel_addr=1000000\0" \ "kernel_addr=1000000\0" \
"dtb=" xstr(CONFIG_HOSTNAME) "/" xstr(CONFIG_HOSTNAME) ".dtb\0" \ "dtb=" __stringify(CONFIG_HOSTNAME) "/" \
"dtb_fs=/boot/" xstr(CONFIG_HOSTNAME) ".dtb\0" \ __stringify(CONFIG_HOSTNAME) ".dtb\0" \
"dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0" \
"dtb_addr=1800000\0" \ "dtb_addr=1800000\0" \
"load_kernel=tftp ${kernel_addr} ${kernel}\0" \ "load_kernel=tftp ${kernel_addr} ${kernel}\0" \
"load_dtb=tftp ${dtb_addr} ${dtb}\0" \ "load_dtb=tftp ${dtb_addr} ${dtb}\0" \