X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=post%2Ftests.c;h=71437b628d2c6f48a1e61be6839680f935d144ce;hb=d2397817f12d246cfd88caefd6f12dfd3e2d2c17;hp=0c49e324471036e9d2d2ac6dc20c0b6c4eeafa2d;hpb=b2e2142c500c48a57f18f9dd30e66c13caea0971;p=u-boot diff --git a/post/tests.c b/post/tests.c index 0c49e32447..71437b628d 100644 --- a/post/tests.c +++ b/post/tests.c @@ -21,16 +21,15 @@ * MA 02111-1307 USA * * Be sure to mark tests to be run before relocation as such with the - * CFG_POST_PREREL flag so that logging is done correctly if the + * CONFIG_SYS_POST_PREREL flag so that logging is done correctly if the * logbuffer support is enabled. */ #include -#ifdef CONFIG_POST - #include +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); @@ -48,6 +47,14 @@ 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 coprocessor_post_test(int flags); + extern int sysmon_init_f (void); extern void sysmon_reloc (void); @@ -55,7 +62,19 @@ extern void sysmon_reloc (void); struct post_test post_list[] = { -#if CONFIG_POST & CFG_POST_CACHE +#if CONFIG_POST & CONFIG_SYS_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, + CONFIG_SYS_POST_OCM + }, +#endif +#if CONFIG_POST & CONFIG_SYS_POST_CACHE { "Cache test", "cache", @@ -64,10 +83,13 @@ struct post_test post_list[] = &cache_post_test, NULL, NULL, - CFG_POST_CACHE + CONFIG_SYS_POST_CACHE }, #endif -#if CONFIG_POST & CFG_POST_WATCHDOG +#if CONFIG_POST & CONFIG_SYS_POST_WATCHDOG +#if defined(CONFIG_POST_WATCHDOG) + CONFIG_POST_WATCHDOG, +#else { "Watchdog timer test", "watchdog", @@ -76,10 +98,11 @@ struct post_test post_list[] = &watchdog_post_test, NULL, NULL, - CFG_POST_WATCHDOG + CONFIG_SYS_POST_WATCHDOG }, #endif -#if CONFIG_POST & CFG_POST_I2C +#endif +#if CONFIG_POST & CONFIG_SYS_POST_I2C { "I2C test", "i2c", @@ -88,10 +111,10 @@ struct post_test post_list[] = &i2c_post_test, NULL, NULL, - CFG_POST_I2C + CONFIG_SYS_POST_I2C }, #endif -#if CONFIG_POST & CFG_POST_RTC +#if CONFIG_POST & CONFIG_SYS_POST_RTC { "RTC test", "rtc", @@ -100,10 +123,10 @@ struct post_test post_list[] = &rtc_post_test, NULL, NULL, - CFG_POST_RTC + CONFIG_SYS_POST_RTC }, #endif -#if CONFIG_POST & CFG_POST_MEMORY +#if CONFIG_POST & CONFIG_SYS_POST_MEMORY { "Memory test", "memory", @@ -112,10 +135,10 @@ struct post_test post_list[] = &memory_post_test, NULL, NULL, - CFG_POST_MEMORY + CONFIG_SYS_POST_MEMORY }, #endif -#if CONFIG_POST & CFG_POST_CPU +#if CONFIG_POST & CONFIG_SYS_POST_CPU { "CPU test", "cpu", @@ -125,10 +148,10 @@ struct post_test post_list[] = &cpu_post_test, NULL, NULL, - CFG_POST_CPU + CONFIG_SYS_POST_CPU }, #endif -#if CONFIG_POST & CFG_POST_FPU +#if CONFIG_POST & CONFIG_SYS_POST_FPU { "FPU test", "fpu", @@ -138,10 +161,13 @@ struct post_test post_list[] = &fpu_post_test, NULL, NULL, - CFG_POST_FPU + CONFIG_SYS_POST_FPU }, #endif -#if CONFIG_POST & CFG_POST_UART +#if CONFIG_POST & CONFIG_SYS_POST_UART +#if defined(CONFIG_POST_UART) + CONFIG_POST_UART, +#else { "UART test", "uart", @@ -150,10 +176,11 @@ struct post_test post_list[] = &uart_post_test, NULL, NULL, - CFG_POST_UART + CONFIG_SYS_POST_UART }, +#endif /* CONFIG_POST_UART */ #endif -#if CONFIG_POST & CFG_POST_ETHER +#if CONFIG_POST & CONFIG_SYS_POST_ETHER { "ETHERNET test", "ethernet", @@ -162,10 +189,10 @@ struct post_test post_list[] = ðer_post_test, NULL, NULL, - CFG_POST_ETHER + CONFIG_SYS_POST_ETHER }, #endif -#if CONFIG_POST & CFG_POST_SPI +#if CONFIG_POST & CONFIG_SYS_POST_SPI { "SPI test", "spi", @@ -174,10 +201,10 @@ struct post_test post_list[] = &spi_post_test, NULL, NULL, - CFG_POST_SPI + CONFIG_SYS_POST_SPI }, #endif -#if CONFIG_POST & CFG_POST_USB +#if CONFIG_POST & CONFIG_SYS_POST_USB { "USB test", "usb", @@ -186,10 +213,10 @@ struct post_test post_list[] = &usb_post_test, NULL, NULL, - CFG_POST_USB + CONFIG_SYS_POST_USB }, #endif -#if CONFIG_POST & CFG_POST_SPR +#if CONFIG_POST & CONFIG_SYS_POST_SPR { "SPR test", "spr", @@ -198,10 +225,10 @@ struct post_test post_list[] = &spr_post_test, NULL, NULL, - CFG_POST_SPR + CONFIG_SYS_POST_SPR }, #endif -#if CONFIG_POST & CFG_POST_SYSMON +#if CONFIG_POST & CONFIG_SYS_POST_SYSMON { "SYSMON test", "sysmon", @@ -210,22 +237,22 @@ struct post_test post_list[] = &sysmon_post_test, &sysmon_init_f, &sysmon_reloc, - CFG_POST_SYSMON + CONFIG_SYS_POST_SYSMON }, #endif -#if CONFIG_POST & CFG_POST_DSP +#if CONFIG_POST & CONFIG_SYS_POST_DSP { "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, - CFG_POST_DSP + CONFIG_SYS_POST_DSP }, #endif -#if CONFIG_POST & CFG_POST_DSP +#if CONFIG_POST & CONFIG_SYS_POST_CODEC { "CODEC test", "codec", @@ -234,23 +261,48 @@ struct post_test post_list[] = &codec_post_test, NULL, NULL, - CFG_POST_CODEC + CONFIG_SYS_POST_CODEC }, #endif -#if CONFIG_POST & CFG_POST_ECC +#if CONFIG_POST & CONFIG_SYS_POST_ECC { "ECC test", "ecc", - "This test checks ECC facility of memory.", - POST_ROM | POST_ALWAYS, + "This test checks the ECC facility of memory.", + POST_ROM | POST_ALWAYS | POST_PREREL, &ecc_post_test, NULL, NULL, - CFG_POST_ECC + CONFIG_SYS_POST_ECC }, #endif +#if CONFIG_POST & CONFIG_SYS_POST_BSPEC1 + CONFIG_POST_BSPEC1, +#endif +#if CONFIG_POST & CONFIG_SYS_POST_BSPEC2 + CONFIG_POST_BSPEC2, +#endif +#if CONFIG_POST & CONFIG_SYS_POST_BSPEC3 + CONFIG_POST_BSPEC3, +#endif +#if CONFIG_POST & CONFIG_SYS_POST_BSPEC4 + CONFIG_POST_BSPEC4, +#endif +#if CONFIG_POST & CONFIG_SYS_POST_BSPEC5 + CONFIG_POST_BSPEC5, +#endif +#if CONFIG_POST & CONFIG_SYS_POST_COPROC + { + "Coprocessors communication test", + "coproc_com", + "This test checks communication with coprocessors.", + POST_RAM | POST_ALWAYS | POST_CRITICAL, + &coprocessor_post_test, + NULL, + NULL, + CONFIG_SYS_POST_COPROC + } +#endif }; -unsigned int post_list_size = sizeof (post_list) / sizeof (struct post_test); - -#endif /* CONFIG_POST */ +unsigned int post_list_size = ARRAY_SIZE(post_list);