Merge remote-tracking branch 'u-boot-ti/master'

[karo-tx-uboot.git] / include / configs / qong.h

diff --git a/include/configs/qong.h b/include/configs/qong.h
index 485e1b1f043430f071745f16d1e5c5f4bc8118dc..e43a02110ec84337f3d383d7daab20dfa133f91a 100644 (file)
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -28,8 +28,6 @@
 #define CONFIG_ARM1136                 /* This is an arm1136 CPU core */
 #define CONFIG_MX31                    /* in a mx31 */
 #define CONFIG_QONG
-#define CONFIG_MX31_HCLK_FREQ  26000000        /* 26MHz */
-#define CONFIG_MX31_CLK32      32768
 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
@@ -146,9 +144,6 @@
 
 #define CONFIG_LOADADDR                0x80800000      /* loadaddr env var */
 
-#define xstr(s)        str(s)
-#define str(s) #s
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
@@ -178,10 +173,10 @@
                "bootm\0"                                               \
        "bootcmd=run flash_self\0"                                      \
        "load=tftp ${loadaddr} ${u-boot}\0"                             \
-       "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE)             \
-               " +${filesize};era " xstr(CONFIG_SYS_MONITOR_BASE)      \
+       "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE)      \
+               " +${filesize};era " __stringify(CONFIG_SYS_MONITOR_BASE)\
                " +${filesize};cp.b ${fileaddr} "                       \
-               xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0"          \
+               __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0"   \
        "upd=run load update\0"                                         \
        "videomode=video=ctfb:x:640,y:480,depth:16,mode:0,pclk:40000,"  \
                "le:120,ri:40,up:35,lo:10,hs:30,vs:3,sync:100663296,"   \