Merge branch 'master' of git://git.denx.de/u-boot-net

[platform/kernel/u-boot.git] / board / bf537-stamp / post-memory.c

diff --git a/board/bf537-stamp/post-memory.c b/board/bf537-stamp/post-memory.c
index 7c36c81..9626f4c 100644 (file)
--- a/board/bf537-stamp/post-memory.c
+++ b/board/bf537-stamp/post-memory.c
@@ -21,24 +21,24 @@ int post_init_sdram(int sclk);
 void post_init_uart(int sclk);
 
 const int pll[CCLK_NUM][SCLK_NUM][2] = {
-       {{20, 4}, {20, 5}, {20, 10}},   /* CCLK = 500M */
-       {{16, 4}, {16, 5}, {16, 8}},    /* CCLK = 400M */
-       {{8, 2}, {8, 4}, {8, 5}},       /* CCLK = 200M */
-       {{4, 1}, {4, 2}, {4, 4}}        /* CCLK = 100M */
+       { {20, 4}, {20, 5}, {20, 10} }, /* CCLK = 500M */
+       { {16, 4}, {16, 5}, {16, 8} },  /* CCLK = 400M */
+       { {8, 2}, {8, 4}, {8, 5} },     /* CCLK = 200M */
+       { {4, 1}, {4, 2}, {4, 4} }      /* CCLK = 100M */
 };
 const char *const log[CCLK_NUM][SCLK_NUM] = {
-       {"CCLK-500Mhz SCLK-125Mhz:    Writing...\0",
-        "CCLK-500Mhz SCLK-100Mhz:    Writing...\0",
-        "CCLK-500Mhz SCLK- 50Mhz:    Writing...\0",},
-       {"CCLK-400Mhz SCLK-100Mhz:    Writing...\0",
-        "CCLK-400Mhz SCLK- 80Mhz:    Writing...\0",
-        "CCLK-400Mhz SCLK- 50Mhz:    Writing...\0",},
-       {"CCLK-200Mhz SCLK-100Mhz:    Writing...\0",
-        "CCLK-200Mhz SCLK- 50Mhz:    Writing...\0",
-        "CCLK-200Mhz SCLK- 40Mhz:    Writing...\0",},
-       {"CCLK-100Mhz SCLK-100Mhz:    Writing...\0",
-        "CCLK-100Mhz SCLK- 50Mhz:    Writing...\0",
-        "CCLK-100Mhz SCLK- 25Mhz:    Writing...\0",},
+       {"CCLK-500MHz SCLK-125MHz:    Writing...\0",
+        "CCLK-500MHz SCLK-100MHz:    Writing...\0",
+        "CCLK-500MHz SCLK- 50MHz:    Writing...\0",},
+       {"CCLK-400MHz SCLK-100MHz:    Writing...\0",
+        "CCLK-400MHz SCLK- 80MHz:    Writing...\0",
+        "CCLK-400MHz SCLK- 50MHz:    Writing...\0",},
+       {"CCLK-200MHz SCLK-100MHz:    Writing...\0",
+        "CCLK-200MHz SCLK- 50MHz:    Writing...\0",
+        "CCLK-200MHz SCLK- 40MHz:    Writing...\0",},
+       {"CCLK-100MHz SCLK-100MHz:    Writing...\0",
+        "CCLK-100MHz SCLK- 50MHz:    Writing...\0",
+        "CCLK-100MHz SCLK- 25MHz:    Writing...\0",},
 };
 
 int memory_post_test(int flags)
@@ -119,7 +119,8 @@ void post_out_buff(char *buff)
 {
 
        int i = 0;
-       for (i = 0; i < 0x80000; i++) ;
+       for (i = 0; i < 0x80000; i++)
+               ;
        i = 0;
        while ((buff[i] != '\0') && (i != 100)) {
                while (!(*pUART_LSR & 0x20)) ;
@@ -127,7 +128,8 @@ void post_out_buff(char *buff)
                SSYNC();
                i++;
        }
-       for (i = 0; i < 0x80000; i++) ;
+       for (i = 0; i < 0x80000; i++)
+               ;
 }
 
 /* Using sw10-PF5 as the hotkey */
@@ -150,9 +152,8 @@ int post_key_pressed(void)
                        value = 0;
                        goto key_pressed;
                }
-               if (value != 0) {
+               if (value != 0)
                        goto key_pressed;
-               }
                for (n = 0; n < KEY_DELAY; n++)
                        asm("nop");
        }
@@ -164,9 +165,8 @@ int post_key_pressed(void)
                        value = 0;
                        goto key_pressed;
                }
-               if (value != 0) {
+               if (value != 0)
                        goto key_pressed;
-               }
                for (n = 0; n < KEY_DELAY; n++)
                        asm("nop");
        }
@@ -178,9 +178,8 @@ int post_key_pressed(void)
                        value = 0;
                        goto key_pressed;
                }
-               if (value != 0) {
+               if (value != 0)
                        goto key_pressed;
-               }
                for (n = 0; n < KEY_DELAY; n++)
                        asm("nop");
        }