arm: dra7: Set fastboot variables in environment

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

diff --git a/post/cpu/mpc8xx/spr.c b/post/cpu/mpc8xx/spr.c
index 330b977f1a56e4256028cf3bf42423f543175a14..d20da8d1e84aba7da1c9e4a16b13c67a2788fec9 100644 (file)
--- a/post/cpu/mpc8xx/spr.c
+++ b/post/cpu/mpc8xx/spr.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -33,11 +17,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 +64,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 +92,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 +129,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 */