diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /post/board/lwmon5/dspic.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
Diffstat (limited to 'post/board/lwmon5/dspic.c')
| -rw-r--r-- | post/board/lwmon5/dspic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/post/board/lwmon5/dspic.c b/post/board/lwmon5/dspic.c index eb1c31ce3..ff2ed0566 100644 --- a/post/board/lwmon5/dspic.c +++ b/post/board/lwmon5/dspic.c @@ -40,12 +40,12 @@ DECLARE_GLOBAL_DATA_PTR; #define DSPIC_SYS_ERROR_REG 0x802 #define DSPIC_VERSION_REG 0x804 -#if CONFIG_POST & CFG_POST_BSPEC1 +#if CONFIG_POST & CONFIG_SYS_POST_BSPEC1 /* Verify that dsPIC ready test done early at hw init passed ok */ int dspic_init_post_test(int flags) { - if (in_be32((void *)CFG_DSPIC_TEST_ADDR) & CFG_DSPIC_TEST_MASK) { + if (in_be32((void *)CONFIG_SYS_DSPIC_TEST_ADDR) & CONFIG_SYS_DSPIC_TEST_MASK) { post_log("dsPIC init test failed\n"); return 1; } @@ -53,15 +53,15 @@ int dspic_init_post_test(int flags) return 0; } -#endif /* CONFIG_POST & CFG_POST_BSPEC1 */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_BSPEC1 */ -#if CONFIG_POST & CFG_POST_BSPEC2 +#if CONFIG_POST & CONFIG_SYS_POST_BSPEC2 /* Read a register from the dsPIC. */ int dspic_read(ushort reg) { uchar buf[2]; - if (i2c_read(CFG_I2C_DSPIC_IO_ADDR, reg, 2, buf, 2)) + if (i2c_read(CONFIG_SYS_I2C_DSPIC_IO_ADDR, reg, 2, buf, 2)) return -1; return (uint)((buf[0] << 8) | buf[1]); @@ -102,4 +102,4 @@ int dspic_post_test(int flags) return ret; } -#endif /* CONFIG_POST & CFG_POST_BSPEC2 */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_BSPEC2 */ |