Merge with rsync://git-user@source.denx.net/git/u-boot.git

[platform/kernel/u-boot.git] / post / tests.c

diff --git a/post/tests.c b/post/tests.c
index 55da927..3bccd1a 100644 (file)
--- a/post/tests.c
+++ b/post/tests.c
@@ -43,6 +43,8 @@ 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 sysmon_init_f (void);
 
@@ -68,7 +70,7 @@ struct post_test post_list[] =
        "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,
@@ -92,7 +94,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 +106,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,
@@ -129,7 +131,7 @@ struct post_test post_list[] =
        "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,
@@ -196,6 +198,30 @@ 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_DSP
+    {
+       "CODEC test",
+       "codec",
+       "This test checks any connected codec(s).",
+       POST_RAM | POST_MANUAL,
+       &codec_post_test,
+       NULL,
+       NULL,
+       CFG_POST_CODEC
+    },
+#endif
 };
 
 unsigned int post_list_size = sizeof (post_list) / sizeof (struct post_test);