Prepare v2014.01-rc1

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

diff --git a/board/rbc823/flash.c b/board/rbc823/flash.c
index 149a1b9ccda8450e39255c9334caf55751cf1b1c..8a2265263c8e280a535521f89b1f3375996b6601 100644 (file)
--- a/board/rbc823/flash.c
+++ b/board/rbc823/flash.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000
  * 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>
@@ -35,7 +19,7 @@ static void flash_get_offsets(ulong base, flash_info_t *info);
 
 unsigned long flash_init(void)
 {
-       unsigned long size_b0, size_b1;
+       unsigned long size_b0;
        int i;
 
        /* Init: no FLASHes known */
@@ -57,15 +41,9 @@ unsigned long flash_init(void)
                      &flash_info[0]);
 #endif
 
-       size_b1 = 0 ;
-
-       flash_info[1].flash_id = FLASH_UNKNOWN;
-       flash_info[1].sector_count = -1;
-
        flash_info[0].size = size_b0;
-       flash_info[1].size = size_b1;
 
-       return size_b0 + size_b1;
+       return size_b0;
 }
 
 /*-----------------------------------------------------------------------
@@ -181,7 +159,7 @@ static ulong flash_get_size(vu_long *addr, flash_info_t *info)
 
        /* Write auto select command: read Manufacturer ID */
 
-       debug("Base address is: %08x\n", caddr);
+       debug("Base address is: %8p\n", caddr);
 
        caddr[0x0555] = 0xAA;
        caddr[0x02AA] = 0x55;