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

[oweals/u-boot.git] / post / tests.c

diff --git a/post/tests.c b/post/tests.c
index 53d01e355e6681ad4f9819b37d91565f7b335419..e88d92ed7450f28aad950e2a40fb110652b297f5 100644 (file)
--- a/post/tests.c
+++ b/post/tests.c
@@ -27,10 +27,9 @@
 
 #include <common.h>
 
-#ifdef CONFIG_POST
-
 #include <post.h>
 
+extern int ocm_post_test (int flags);
 extern int cache_post_test (int flags);
 extern int watchdog_post_test (int flags);
 extern int i2c_post_test (int flags);
@@ -62,6 +61,18 @@ extern void sysmon_reloc (void);
 
 struct post_test post_list[] =
 {
+#if CONFIG_POST & CFG_POST_OCM
+    {
+       "OCM test",
+       "ocm",
+       "This test checks on chip memory (OCM).",
+       POST_ROM | POST_ALWAYS | POST_PREREL | POST_CRITICAL | POST_STOP,
+       &ocm_post_test,
+       NULL,
+       NULL,
+       CFG_POST_OCM
+    },
+#endif
 #if CONFIG_POST & CFG_POST_CACHE
     {
        "Cache test",
@@ -229,7 +240,7 @@ struct post_test post_list[] =
        "DSP test",
        "dsp",
        "This test checks any connected DSP(s).",
-       POST_RAM | POST_MANUAL,
+       POST_RAM | POST_ALWAYS | POST_MANUAL,
        &dsp_post_test,
        NULL,
        NULL,
@@ -272,11 +283,9 @@ struct post_test post_list[] =
 #if CONFIG_POST & CFG_POST_BSPEC4
        CONFIG_POST_BSPEC4,
 #endif
-#if CONFIG_POST & CFG_POST_BSPEC4
+#if CONFIG_POST & CFG_POST_BSPEC5
        CONFIG_POST_BSPEC5,
 #endif
 };
 
 unsigned int post_list_size = sizeof (post_list) / sizeof (struct post_test);
-
-#endif /* CONFIG_POST */