common: Drop asm/global_data.h from common header

[u-boot.git] / board / sbc8641d / sbc8641d.c

diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c
index 08ced102b67d50dbe1446cbd0018964b0320361e..a67092daf47ff43b09d4362f7bcaae308994c912 100644 (file)
--- a/board/sbc8641d/sbc8641d.c
+++ b/board/sbc8641d/sbc8641d.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2007 Wind River Systemes, Inc. <www.windriver.com>
  * Copyright 2007 Embedded Specialties, Inc.
@@ -8,19 +9,21 @@
  * Srikanth Srinivasan ([email protected])
  *
  * (C) Copyright 2002 Scott McNutt <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
+#include <log.h>
 #include <pci.h>
+#include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_86xx.h>
 #include <asm/fsl_pci.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/fsl_serdes.h>
-#include <libfdt.h>
+#include <linux/delay.h>
+#include <linux/libfdt.h>
 #include <fdt_support.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -49,14 +52,14 @@ int dram_init(void)
        dram_size = fixed_sdram ();
 #endif
 
-       debug ("    DDR: ");
+       debug("    DDR: ");
        gd->ram_size = dram_size;
 
        return 0;
 }
 
 #if defined(CONFIG_SYS_DRAM_TEST)
-int testdram (void)
+int testdram(void)
 {
        uint *pstart = (uint *) CONFIG_SYS_MEMTEST_START;
        uint *pend = (uint *) CONFIG_SYS_MEMTEST_END;
@@ -122,12 +125,12 @@ long int fixed_sdram (void)
 
        asm ("sync;isync");
 
-       udelay (500);
+       udelay(500);
 
        ddr->sdram_cfg = CONFIG_SYS_DDR_CFG_1B;
        asm ("sync; isync");
 
-       udelay (500);
+       udelay(500);
        ddr = &immap->im_ddr2;
 
        ddr->cs0_bnds = CONFIG_SYS_DDR2_CS0_BNDS;
@@ -153,12 +156,12 @@ long int fixed_sdram (void)
 
        asm ("sync;isync");
 
-       udelay (500);
+       udelay(500);
 
        ddr->sdram_cfg = CONFIG_SYS_DDR2_CFG_1B;
        asm ("sync; isync");
 
-       udelay (500);
+       udelay(500);
 #endif
        return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
 }
@@ -177,7 +180,7 @@ void pci_init_board(void)
 
 
 #if defined(CONFIG_OF_BOARD_SETUP)
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
        ft_cpu_setup(blob, bd);