Merge git://git.denx.de/u-boot-x86

[u-boot] / board / muas3001 / muas3001.c

diff --git a/board/muas3001/muas3001.c b/board/muas3001/muas3001.c
index e0a7f32fd9def0f1a6cbe47e6221e6a0fbe87c37..e0c4dbaeba583a3cae22f9fdc93296e786c1daed 100644 (file)
--- a/board/muas3001/muas3001.c
+++ b/board/muas3001/muas3001.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2008
  * Heiko Schocher, DENX Software Engineering, hs@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>
@@ -259,14 +243,11 @@ phys_size_t initdram (int board_type)
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
        long psize;
-#ifndef CONFIG_SYS_RAMBOOT
        long sizelittle, sizebig;
-#endif
 
        memctl->memc_psrt = CONFIG_SYS_PSRT;
        memctl->memc_mptpr = CONFIG_SYS_MPTPR;
 
-#ifndef CONFIG_SYS_RAMBOOT
        /* 60x SDRAM setup:
         */
        sizelittle = try_init (memctl, CONFIG_SYS_PSDMR_LITTLE, CONFIG_SYS_OR1_LITTLE,
@@ -279,7 +260,6 @@ phys_size_t initdram (int board_type)
                psize = try_init (memctl, CONFIG_SYS_PSDMR_LITTLE, CONFIG_SYS_OR1_LITTLE,
                                                  (uchar *) CONFIG_SYS_SDRAM_BASE);
        }
-#endif /* CONFIG_SYS_RAMBOOT */
 
        icache_enable ();
 
@@ -302,6 +282,8 @@ int board_early_init_r (void)
 }
 
 #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT)
+DECLARE_GLOBAL_DATA_PTR;
+
 /*
  * update "memory" property in the blob
  */
@@ -330,7 +312,7 @@ void ft_blob_update (void *blob, bd_t *bd)
        /* baudrate */
        nodeoffset = fdt_path_offset (blob, "/soc/cpm/serial");
        if (nodeoffset >= 0) {
-               speed = cpu_to_be32 (bd->bi_baudrate);
+               speed = cpu_to_be32 (gd->baudrate);
                ret = fdt_setprop (blob, nodeoffset, "current-speed", &speed,
                                        sizeof (unsigned long));
        if (ret < 0)
@@ -343,9 +325,11 @@ void ft_blob_update (void *blob, bd_t *bd)
        }
 }
 
-void ft_board_setup (void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup (blob, bd);
        ft_blob_update (blob, bd);
+
+       return 0;
 }
 #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */