diff options
| author | Marek Vasut <marex@denx.de> | 2012-09-23 17:41:23 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:53:47 -0700 |
| commit | 93ea89f0d979a000e4c47dd8a8991328b2ac8cf7 (patch) | |
| tree | e30e63258ab9208f0bf382dcc8403a0d9c3ef808 /include/configs/km | |
| parent | 9aed5080834a4e848a88b972738f28dce466b420 (diff) | |
| download | u-boot-imx-93ea89f0d979a000e4c47dd8a8991328b2ac8cf7.zip u-boot-imx-93ea89f0d979a000e4c47dd8a8991328b2ac8cf7.tar.gz u-boot-imx-93ea89f0d979a000e4c47dd8a8991328b2ac8cf7.tar.bz2 | |
COMMON: Use __stringify() instead of xstr()
Kill multiple occurances and redeclaration of xstr in favor of __stringify().
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/km')
| -rw-r--r-- | include/configs/km/keymile-common.h | 13 | ||||
| -rw-r--r-- | include/configs/km/km-powerpc.h | 12 | ||||
| -rw-r--r-- | include/configs/km/km_arm.h | 14 |
3 files changed, 18 insertions, 21 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 9983104..05480d4 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -148,9 +148,6 @@ "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" #endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */ -#define xstr(s) str(s) -#define str(s) #s - /* * boottargets * - set 'subbootcmds' @@ -187,7 +184,7 @@ ":${hostname}:${netdev}:off3" \ " console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}" \ " mem=${kernelmem} init=${init}" \ - " phram.phram=phvar,${varaddr}," xstr(CONFIG_KM_PHRAM) \ + " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\ " " CONFIG_KM_UBI_LINUX_MTD " " \ CONFIG_KM_DEF_BOOT_ARGS_CPU \ "\0" \ @@ -212,9 +209,9 @@ * - 'cramfsloadfdt': copy fdt from a cramfs to ram */ #define CONFIG_KM_DEF_ENV_FLASH_BOOT \ - "cramfsaddr=" xstr(CONFIG_KM_CRAMFS_ADDR) "\0" \ + "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \ "cramfsloadkernel=cramfsload ${load_addr_r} uImage\0" \ - "ubicopy=ubi read "xstr(CONFIG_KM_CRAMFS_ADDR) \ + "ubicopy=ubi read "__stringify(CONFIG_KM_CRAMFS_ADDR) \ " bootfs${boot_bank}\0" \ CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI @@ -227,7 +224,7 @@ #define CONFIG_KM_DEF_ENV_CONSTANTS \ "backup_bank=0\0" \ "release=run newenv; reset\0" \ - "pnvramsize=" xstr(CONFIG_KM_PNVRAM) "\0" \ + "pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0" \ "testbootcmd=setenv boot_bank ${test_bank}; " \ "run ${subbootcmds}; reset\0" \ "" @@ -252,7 +249,7 @@ "saveenv && saveenv && boot\0" \ "bootlimit=3\0" \ "init=/sbin/init-overlay.sh\0" \ - "load_addr_r="xstr(CONFIG_KM_KERNEL_ADDR) "\0" \ + "load_addr_r="__stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ "load=tftpboot ${load_addr_r} ${u-boot}\0" \ "mtdids=" MTDIDS_DEFAULT "\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 506755b..bd5bdbc 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -80,14 +80,14 @@ "cramfsloadfdt=" \ "cramfsload ${fdt_addr_r} " \ "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "fdt_addr_r=" xstr(CONFIG_KM_FDT_ADDR) "\0" \ - "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.bin\0" \ + "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \ + "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ "update=" \ - "protect off " xstr(BOOTFLASH_START) " +${filesize} && "\ - "erase " xstr(BOOTFLASH_START) " +${filesize} && " \ - "cp.b ${load_addr_r} " xstr(BOOTFLASH_START) \ + "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\ + "erase " __stringify(BOOTFLASH_START) " +${filesize} && "\ + "cp.b ${load_addr_r} " __stringify(BOOTFLASH_START) \ " ${filesize} && " \ - "protect on " xstr(BOOTFLASH_START) " +${filesize}\0" \ + "protect on " __stringify(BOOTFLASH_START) " +${filesize}\0"\ "" #endif /* __CONFIG_KEYMILE_POWERPC_H */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 44d5373..549278d 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -91,7 +91,7 @@ #define CONFIG_KM_DEF_ENV_CPU \ "boot=bootm ${load_addr_r} - -\0" \ "cramfsloadfdt=true\0" \ - "u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.kwb\0" \ + "u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0" \ CONFIG_KM_UPDATE_UBOOT \ "" @@ -271,16 +271,16 @@ int get_scl(void); #if defined CONFIG_KM_ENV_IS_IN_SPI_NOR #define CONFIG_KM_NEW_ENV \ "newenv=sf probe 0;" \ - "sf erase " xstr(CONFIG_ENV_OFFSET) " " \ - xstr(CONFIG_ENV_TOTAL_SIZE)"\0" + "sf erase " __stringify(CONFIG_ENV_OFFSET) " " \ + __stringify(CONFIG_ENV_TOTAL_SIZE)"\0" #else #define CONFIG_KM_NEW_ENV \ "newenv=setenv addr 0x100000 && " \ "i2c dev 1; mw.b ${addr} 0 4 && " \ - "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR) \ - " ${addr} " xstr(CONFIG_ENV_OFFSET) " 4 && " \ - "eeprom write " xstr(CONFIG_SYS_DEF_EEPROM_ADDR) \ - " ${addr} " xstr(CONFIG_ENV_OFFSET_REDUND) " 4\0" + "eeprom write " __stringify(CONFIG_SYS_DEF_EEPROM_ADDR) \ + " ${addr} " __stringify(CONFIG_ENV_OFFSET) " 4 && " \ + "eeprom write " __stringify(CONFIG_SYS_DEF_EEPROM_ADDR) \ + " ${addr} " __stringify(CONFIG_ENV_OFFSET_REDUND) " 4\0" #endif /* |