Merge branch 'master' of /home/wd/git/u-boot/master/

[u-boot] / post / tests.c

diff --git a/post/tests.c b/post/tests.c
index 55da92706af81a9c71d05a0c3957ee6ffebc10bb..53d01e355e6681ad4f9819b37d91565f7b335419 100644 (file)
--- a/post/tests.c
+++ b/post/tests.c
@@ -37,12 +37,23 @@ extern int i2c_post_test (int flags);
 extern int rtc_post_test (int flags);
 extern int memory_post_test (int flags);
 extern int cpu_post_test (int flags);
+extern int fpu_post_test (int flags);
 extern int uart_post_test (int flags);
 extern int ether_post_test (int flags);
 extern int spi_post_test (int flags);
 extern int usb_post_test (int flags);
 extern int spr_post_test (int flags);
 extern int sysmon_post_test (int flags);
+extern int dsp_post_test (int flags);
+extern int codec_post_test (int flags);
+extern int ecc_post_test (int flags);
+
+extern int dspic_init_post_test (int flags);
+extern int dspic_post_test (int flags);
+extern int gdc_post_test (int flags);
+extern int fpga_post_test (int flags);
+extern int lwmon5_watchdog_post_test(int flags);
+extern int sysmon1_post_test(int flags);
 
 extern int sysmon_init_f (void);
 
@@ -64,17 +75,21 @@ struct post_test post_list[] =
     },
 #endif
 #if CONFIG_POST & CFG_POST_WATCHDOG
+#if defined(CONFIG_POST_WATCHDOG)
+       CONFIG_POST_WATCHDOG,
+#else
     {
        "Watchdog timer test",
        "watchdog",
        "This test checks the watchdog timer.",
-       POST_RAM | POST_POWERON | POST_POWERFAIL | POST_MANUAL | POST_REBOOT,
+       POST_RAM | POST_POWERON | POST_SLOWTEST | POST_MANUAL | POST_REBOOT,
        &watchdog_post_test,
        NULL,
        NULL,
        CFG_POST_WATCHDOG
     },
 #endif
+#endif
 #if CONFIG_POST & CFG_POST_I2C
     {
        "I2C test",
@@ -92,7 +107,7 @@ struct post_test post_list[] =
        "RTC test",
        "rtc",
        "This test verifies the RTC operation.",
-       POST_RAM | POST_POWERFAIL | POST_MANUAL,
+       POST_RAM | POST_SLOWTEST | POST_MANUAL,
        &rtc_post_test,
        NULL,
        NULL,
@@ -104,7 +119,7 @@ struct post_test post_list[] =
        "Memory test",
        "memory",
        "This test checks RAM.",
-       POST_ROM | POST_POWERON | POST_POWERFAIL | POST_PREREL,
+       POST_ROM | POST_POWERON | POST_SLOWTEST | POST_PREREL,
        &memory_post_test,
        NULL,
        NULL,
@@ -124,12 +139,25 @@ struct post_test post_list[] =
        CFG_POST_CPU
     },
 #endif
+#if CONFIG_POST & CFG_POST_FPU
+    {
+       "FPU test",
+       "fpu",
+       "This test verifies the arithmetic logic unit of"
+       " FPU.",
+       POST_RAM | POST_ALWAYS,
+       &fpu_post_test,
+       NULL,
+       NULL,
+       CFG_POST_FPU
+    },
+#endif
 #if CONFIG_POST & CFG_POST_UART
     {
        "UART test",
        "uart",
        "This test verifies the UART operation.",
-       POST_RAM | POST_POWERFAIL | POST_MANUAL,
+       POST_RAM | POST_SLOWTEST | POST_MANUAL,
        &uart_post_test,
        NULL,
        NULL,
@@ -177,7 +205,7 @@ struct post_test post_list[] =
        "SPR test",
        "spr",
        "This test checks SPR contents.",
-       POST_ROM | POST_ALWAYS | POST_PREREL,
+       POST_RAM | POST_ALWAYS,
        &spr_post_test,
        NULL,
        NULL,
@@ -196,6 +224,57 @@ struct post_test post_list[] =
        CFG_POST_SYSMON
     },
 #endif
+#if CONFIG_POST & CFG_POST_DSP
+    {
+       "DSP test",
+       "dsp",
+       "This test checks any connected DSP(s).",
+       POST_RAM | POST_MANUAL,
+       &dsp_post_test,
+       NULL,
+       NULL,
+       CFG_POST_DSP
+    },
+#endif
+#if CONFIG_POST & CFG_POST_CODEC
+    {
+       "CODEC test",
+       "codec",
+       "This test checks any connected codec(s).",
+       POST_RAM | POST_MANUAL,
+       &codec_post_test,
+       NULL,
+       NULL,
+       CFG_POST_CODEC
+    },
+#endif
+#if CONFIG_POST & CFG_POST_ECC
+    {
+       "ECC test",
+       "ecc",
+       "This test checks the ECC facility of memory.",
+       POST_ROM | POST_ALWAYS | POST_PREREL,
+       &ecc_post_test,
+       NULL,
+       NULL,
+       CFG_POST_ECC
+    },
+#endif
+#if CONFIG_POST & CFG_POST_BSPEC1
+       CONFIG_POST_BSPEC1,
+#endif
+#if CONFIG_POST & CFG_POST_BSPEC2
+       CONFIG_POST_BSPEC2,
+#endif
+#if CONFIG_POST & CFG_POST_BSPEC3
+       CONFIG_POST_BSPEC3,
+#endif
+#if CONFIG_POST & CFG_POST_BSPEC4
+       CONFIG_POST_BSPEC4,
+#endif
+#if CONFIG_POST & CFG_POST_BSPEC4
+       CONFIG_POST_BSPEC5,
+#endif
 };
 
 unsigned int post_list_size = sizeof (post_list) / sizeof (struct post_test);