Merge branch 'u-boot/master' into u-boot-arm/master

[karo-tx-uboot.git] / post / drivers / memory.c

diff --git a/post/drivers/memory.c b/post/drivers/memory.c
index 69973c0f4427bd7be4a6c5e923967a567c411b33..d94a437440792a94805f50ae05f3d8fccc7ac1d6 100644 (file)
--- a/post/drivers/memory.c
+++ b/post/drivers/memory.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>
@@ -466,10 +450,11 @@ static int memory_post_test_regions(unsigned long start, unsigned long size)
 
        for (i = 0; i < (size >> 20) && (!ret); i++) {
                if (!ret)
-                       ret = memory_post_test_patterns(i << 20, 0x800);
-               if (!ret)
-                       ret = memory_post_test_patterns((i << 20) + 0xff800,
+                       ret = memory_post_test_patterns(start + (i << 20),
                                0x800);
+               if (!ret)
+                       ret = memory_post_test_patterns(start + (i << 20) +
+                               0xff800, 0x800);
        }
 
        return ret;