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/cpu/mpc8xx/spr.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.xz olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip | |
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/cpu/mpc8xx/spr.c')
| -rw-r--r-- | post/cpu/mpc8xx/spr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/post/cpu/mpc8xx/spr.c b/post/cpu/mpc8xx/spr.c index 83f04da55..db84dbe50 100644 --- a/post/cpu/mpc8xx/spr.c +++ b/post/cpu/mpc8xx/spr.c @@ -35,7 +35,7 @@ #include <post.h> -#if CONFIG_POST & CFG_POST_SPR +#if CONFIG_POST & CONFIG_SYS_POST_SPR static struct { @@ -80,7 +80,7 @@ static struct {159, "BAR", 0x00000000, 0x00000000}, {630, "DPDR", 0x00000000, 0x00000000}, {631, "DPIR", 0x00000000, 0x00000000}, - {638, "IMMR", 0xFFFF0000, CFG_IMMR }, + {638, "IMMR", 0xFFFF0000, CONFIG_SYS_IMMR }, {560, "IC_CST", 0x8E380000, 0x00000000}, {561, "IC_ADR", 0x00000000, 0x00000000}, {562, "IC_DAT", 0x00000000, 0x00000000}, @@ -146,4 +146,4 @@ int spr_post_test (int flags) return ret; } -#endif /* CONFIG_POST & CFG_POST_SPR */ +#endif /* CONFIG_POST & CONFIG_SYS_POST_SPR */ |