Merge branch 'master' of git://git.denx.de/u-boot-i2c

[karo-tx-uboot.git] / board / scb9328 / scb9328.c

diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index 2e31e8c7b35fd6e6221a69834be4445c1c49f936..3463f52693aaf0ec24ba0b5e60cd86ebe7c3e60f 100644 (file)
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -1,21 +1,7 @@
 /*
  * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
  *
- * 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>
@@ -23,12 +9,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# define SHOW_BOOT_PROGRESS(arg)        show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-
 int board_init (void)
 {
        gd->bd->bi_arch_number = MACH_TYPE_SCB9328;
@@ -40,7 +20,7 @@ int board_init (void)
 int dram_init (void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
-       gd->ram_size = get_ram_size((volatile void *)SCB9328_SDRAM_1,
+       gd->ram_size = get_ram_size((void *)SCB9328_SDRAM_1,
                                    SCB9328_SDRAM_1_SIZE);
 
        return 0;