diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /post/cpu/mpc8xx/spr.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
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 */ |