projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Drop linux/delay.h from common header
[oweals/u-boot.git]
/
board
/
freescale
/
mpc8568mds
/
mpc8568mds.c
diff --git
a/board/freescale/mpc8568mds/mpc8568mds.c
b/board/freescale/mpc8568mds/mpc8568mds.c
index 2f9417fc77a1cae2869a6cf7026bb2a03c56d365..2871636165ebbeebfb47cfb462c35c018f21f7c4 100644
(file)
--- a/
board/freescale/mpc8568mds/mpc8568mds.c
+++ b/
board/freescale/mpc8568mds/mpc8568mds.c
@@
-1,23
+1,26
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
/*
* Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <flash.h>
+#include <init.h>
+#include <log.h>
#include <pci.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_pci.h>
#include <pci.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/immap_85xx.h>
#include <asm/fsl_pci.h>
-#include <
asm/
fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
#include <asm/fsl_serdes.h>
#include <spd_sdram.h>
#include <i2c.h>
#include <ioports.h>
#include <asm/fsl_serdes.h>
#include <spd_sdram.h>
#include <i2c.h>
#include <ioports.h>
-#include <libfdt.h>
+#include <linux/delay.h>
+#include <linux/libfdt.h>
#include <fdt_support.h>
#include "bcsr.h"
#include <fdt_support.h>
#include "bcsr.h"
@@
-302,7
+305,7
@@
void pci_init_board(void)
porpllsr = in_be32(&gur->porpllsr);
io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19;
porpllsr = in_be32(&gur->porpllsr);
io_sel = (pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19;
- debug
(" pci_init_board: devdisr=%x, io_sel=%x\n"
, devdisr, io_sel);
+ debug
(" %s: devdisr=%x, io_sel=%x\n", __func__
, devdisr, io_sel);
pci_speed = 66666000;
pci_32 = 1;
pci_speed = 66666000;
pci_32 = 1;
@@
-345,10
+348,12
@@
void pci_init_board(void)
#endif /* CONFIG_PCI */
#if defined(CONFIG_OF_BOARD_SETUP)
#endif /* CONFIG_PCI */
#if defined(CONFIG_OF_BOARD_SETUP)
-
void
ft_board_setup(void *blob, bd_t *bd)
+
int
ft_board_setup(void *blob, bd_t *bd)
{
ft_cpu_setup(blob, bd);
FT_FSL_PCI_SETUP;
{
ft_cpu_setup(blob, bd);
FT_FSL_PCI_SETUP;
+
+ return 0;
}
#endif
}
#endif