X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Flinkstation.h;h=eec79619c10a2ba2ee68711974995e8652fa9900;hb=b7e3129e550957f046c29a917c63f4b503fbfcb9;hp=cdf68273f9161e567ee8988dd492bc29260b4b4f;hpb=31a4f1e5b6ee9b6335f0313dce7637cef887f84f;p=u-boot diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index cdf68273f9..eec79619c1 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -135,9 +135,6 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define XMK_STR(x) #x -#define MK_STR(x) XMK_STR(x) - #if defined(CONFIG_HLAN) || defined(CONFIG_LAN) #define UBFILE "share/u-boot/u-boot-hd.flash.bin" #elif defined(CONFIG_HGLAN) @@ -153,10 +150,10 @@ "stdin=nc\0" \ "stdout=nc\0" \ "stderr=nc\0" \ - "ipaddr="MK_STR(CONFIG_IPADDR_LS)"\0" \ + "ipaddr="__stringify(CONFIG_IPADDR_LS)"\0" \ "netmask=255.255.255.0\0" \ - "serverip="MK_STR(CONFIG_SERVERIP_LS)"\0" \ - "ncip="MK_STR(CONFIG_NCIP_LS)"\0" \ + "serverip="__stringify(CONFIG_SERVERIP_LS)"\0" \ + "ncip="__stringify(CONFIG_NCIP_LS)"\0" \ "netretry=no\0" \ "nc=setenv stdin nc;setenv stdout nc;setenv stderr nc\0" \ "ser=setenv stdin serial;setenv stdout serial;setenv stderr serial\0" \ @@ -282,7 +279,6 @@ */ #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 57600 -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL