Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / r360mpi / flash.c

diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c
index 45cccf712b1c699e47b78686b0f4b2347d4d61da..996a22e5a8d573e36bdd7b086fb9a18cadf8d774 100644 (file)
--- a/board/r360mpi/flash.c
+++ b/board/r360mpi/flash.c
@@ -5,23 +5,7 @@
  * (C) Copyright 2001
  * 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+
  */
 
 /* #define DEBUG */
@@ -219,7 +203,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info)
 
        value = addr[0];
 
-       debug ("Manuf. ID @ 0x%08lx: 0x%08lx\n", (ulong)addr, value);
+       debug("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value);
 
        switch (value) {
        case (FPW) INTEL_MANUFACT:
@@ -235,7 +219,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info)
 
        value = addr[1];                        /* device ID        */
 
-       debug ("Device ID @ 0x%08lx: 0x%08lx\n", (ulong)(&addr[1]), value);
+       debug("Device ID @ 0x%08lx: 0x%08x\n", (ulong)(&addr[1]), value);
 
        switch (value) {
        case (FPW) INTEL_ID_28F320J3A: