diff options
Diffstat (limited to 'include/configs/manroland/common.h')
| -rw-r--r-- | include/configs/manroland/common.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h index 797378b30..2e4340370 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -70,9 +70,6 @@ #undef CONFIG_BOOTARGS -#define xstr(s) str(s) -#define str(s) #s - #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "nfsargs=setenv bootargs root=/dev/nfs rw " \ @@ -85,29 +82,29 @@ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ ":${hostname}:${netdev}:off panic=1\0" \ "kernel_addr=ff810000\0" \ - "fdt_addr="xstr(CONFIG_SYS_FLASH_BASE)"\0" \ + "fdt_addr="__stringify(CONFIG_SYS_FLASH_BASE)"\0" \ "flash_nfs=run nfsargs addip addcon addwdt addlog;" \ "bootm ${kernel_addr} - ${fdt_addr}\0" \ "rootpath=/opt/eldk/ppc_82xx\0" \ "kernel_addr_r=300000\0" \ "fdt_addr_r=200000\0" \ - "fdt_file=" xstr(CONFIG_HOSTNAME) "/" \ - xstr(CONFIG_HOSTNAME) ".dtb\0" \ - "kernel_file=" xstr(CONFIG_HOSTNAME) "/uImage \0" \ + "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" \ + __stringify(CONFIG_HOSTNAME) ".dtb\0" \ + "kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0" \ "load_fdt=tftp ${fdt_addr_r} ${fdt_file};\0" \ "load_kernel=tftp ${kernel_addr_r} ${kernel_file};\0" \ "addcon=setenv bootargs ${bootargs} console=ttyPSC0,${baudrate}\0"\ "net_nfs=run load_fdt load_kernel; " \ "run nfsargs addip addcon addwdt addlog;" \ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin \0" \ + "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin \0" \ "u-boot_addr_r=200000\0" \ "load=tftp ${u-boot_addr_r} ${u-boot}\0" \ - "update=protect off " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize};" \ - "erase " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize};" \ - "cp.b ${u-boot_addr_r} " xstr(CONFIG_SYS_TEXT_BASE) \ + "update=protect off " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize};"\ + "erase " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize};"\ + "cp.b ${u-boot_addr_r} " __stringify(CONFIG_SYS_TEXT_BASE) \ " ${filesize};" \ - "protect on " xstr(CONFIG_SYS_TEXT_BASE) " +${filesize}\0" \ + "protect on " __stringify(CONFIG_SYS_TEXT_BASE) " +${filesize}\0"\ "" #define CONFIG_BOOTCOMMAND "run net_nfs" |