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

[platform/kernel/u-boot.git] / post / cpu / mpc8xx / spr.c

diff --git a/post/cpu/mpc8xx/spr.c b/post/cpu/mpc8xx/spr.c
index 330b977..4c1e2af 100644 (file)
--- a/post/cpu/mpc8xx/spr.c
+++ b/post/cpu/mpc8xx/spr.c
@@ -33,11 +33,9 @@
  * corresponding table value.
  */
 
-#ifdef CONFIG_POST
-
 #include <post.h>
 
-#if CONFIG_POST & CFG_POST_SPR
+#if CONFIG_POST & CONFIG_SYS_POST_SPR
 
 static struct
 {
@@ -82,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},
@@ -110,8 +108,7 @@ static struct
        {826,   "MD_DBRAM1",    0x00000000,     0x00000000},
 };
 
-static int spr_test_list_size =
-               sizeof (spr_test_list) / sizeof (spr_test_list[0]);
+static int spr_test_list_size = ARRAY_SIZE(spr_test_list);
 
 int spr_post_test (int flags)
 {
@@ -148,5 +145,4 @@ int spr_post_test (int flags)
 
        return ret;
 }
-#endif /* CONFIG_POST & CFG_POST_SPR */
-#endif /* CONFIG_POST */
+#endif /* CONFIG_POST & CONFIG_SYS_POST_SPR */