From: Wolfgang Denk Date: Fri, 25 Aug 2006 09:47:06 +0000 (+0200) Subject: Fix typo in MCC200/PRS200 configuration X-Git-Tag: U-Boot-1_1_5~50 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3b0ff842bf70baf1f370c8e76e8f33a0f9904c1b;p=oweals%2Fu-boot.git Fix typo in MCC200/PRS200 configuration --- diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index df3d68e9f7..14a5bae36c 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -115,15 +115,15 @@ #undef CONFIG_BOOTARGS -#define XMK_STR(x) #x -#define MK_STR(x) XMK_STR(x) +#define XMK_STR(x) #x +#define MK_STR(x) XMK_STR(x) #ifdef CONFIG_PRS200 -# define CFG__BOARDNAME "prs200" -# define LINUX_CONSOLE "ttyS0" +# define CFG__BOARDNAME "prs200" +# define CFG__LINUX_CONSOLE "ttyS0" #else -# define CFG__BOARDNAME "mcc200" -# define LINUX_CONSOLE "ttyEU7" +# define CFG__BOARDNAME "mcc200" +# define CFG__LINUX_CONSOLE "ttyEU7" #endif #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -143,7 +143,7 @@ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};" \ "run nfsargs addip addcons;bootm\0" \ - "console=" MK_STR(LINUX_CONSOLE) "\0" \ + "console=" LINUX_CONSOLE "\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \ "bootfile=/tftpboot/" CFG__BOARDNAME "/uImage\0" \ "load=tftp 200000 /tftpboot/" CFG__BOARDNAME "/u-boot.bin\0" \