X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fcpu%2Fppc4xx%2Fcmd_ecctest.c;h=958ba6c94d91ea584efcfe99b22911a1adb77dca;hb=ab0a6a5dba740afb490e6e7d417e345284e0dbec;hp=b4eac405740a3611b85277a6ec4ccb58c825196f;hpb=96623171423a94092cde80642328fda58a92c894;p=oweals%2Fu-boot.git

diff --git a/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c b/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c
index b4eac40574..958ba6c94d 100644
--- a/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c
+++ b/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c
@@ -2,28 +2,11 @@
  * (C) Copyright 2010
  * Stefan Roese, DENX Software Engineering, sr@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>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/cache.h>
@@ -113,8 +96,6 @@ static force_inline void set_mcopt1_mchk(u32 bits)
  */
 static void inject_ecc_error(void *ptr, int par)
 {
-	u32 val;
-
 	/*
 	 * Taken from PPC460EX/EXr/GT users manual (Rev 1.21)
 	 * 22.2.17.13 ECC Diagnostics
@@ -124,7 +105,7 @@ static void inject_ecc_error(void *ptr, int par)
 	 */
 
 	out_be32(ptr, 0x00000000);
-	val = in_be32(ptr);
+	in_be32(ptr);
 
 	/* 6. Set memory controller to no error checking */
 	set_mcopt1_mchk(SDRAM_MCOPT1_MCHK_NON);
@@ -136,7 +117,7 @@ static void inject_ecc_error(void *ptr, int par)
 		out_be32(ptr, in_be32(ptr) ^ 0x00000003);
 
 	/* 8. Wait for SDRAM idle */
-	val = in_be32(ptr);
+	in_be32(ptr);
 	set_mcopt1_mchk(SDRAM_MCOPT1_MCHK_CHK_REP);
 
 	/* Wait for SDRAM idle */
@@ -151,7 +132,6 @@ static void rewrite_ecc_parity(void *ptr, int par)
 	u32 end_address;
 	u32 address_increment;
 	u32 mcopt1;
-	u32 val;
 
 	/*
 	 * Fill ECC parity byte again. Otherwise further accesses to
@@ -159,7 +139,7 @@ static void rewrite_ecc_parity(void *ptr, int par)
 	 */
 
 	/* Wait for SDRAM idle */
-	val = in_be32(0x00000000);
+	in_be32(0x00000000);
 	set_mcopt1_mchk(SDRAM_MCOPT1_MCHK_GEN);
 
 	/* ECC bit set method for non-cached memory */
@@ -190,15 +170,13 @@ static int do_ecctest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	int error;
 
 	if (argc < 3) {
-		cmd_usage(cmdtp);
-		return 1;
+		return cmd_usage(cmdtp);
 	}
 
 	ptr = (u32 *)simple_strtoul(argv[1], NULL, 16);
 	error = simple_strtoul(argv[2], NULL, 16);
 	if ((error < 1) || (error > 2)) {
-		cmd_usage(cmdtp);
-		return 1;
+		return cmd_usage(cmdtp);
 	}
 
 	printf("Using address %p for %d bit ECC error injection\n",