projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Convert all of our single license tags to Linux Kernel style
[platform/kernel/u-boot.git]
/
board
/
freescale
/
mpc8610hpcd
/
mpc8610hpcd.c
diff --git
a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index
1f09429
..
5c8538f
100644
(file)
--- a/
board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/
board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@
-1,7
+1,6
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
/*
* Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-10,15
+9,17
@@
#include <asm/processor.h>
#include <asm/immap_86xx.h>
#include <asm/fsl_pci.h>
#include <asm/processor.h>
#include <asm/immap_86xx.h>
#include <asm/fsl_pci.h>
-#include <
asm/
fsl_ddr_sdram.h>
+#include <fsl_ddr_sdram.h>
#include <asm/fsl_serdes.h>
#include <i2c.h>
#include <asm/io.h>
#include <asm/fsl_serdes.h>
#include <i2c.h>
#include <asm/io.h>
-#include <libfdt.h>
+#include <li
nux/li
bfdt.h>
#include <fdt_support.h>
#include <spd_sdram.h>
#include <netdev.h>
#include <fdt_support.h>
#include <spd_sdram.h>
#include <netdev.h>
+DECLARE_GLOBAL_DATA_PTR;
+
void sdram_init(void);
phys_size_t fixed_sdram(void);
int mpc8610hpcd_diu_init(void);
void sdram_init(void);
phys_size_t fixed_sdram(void);
int mpc8610hpcd_diu_init(void);
@@
-116,8
+117,7
@@
int checkboard(void)
}
}
-phys_size_t
-initdram(int board_type)
+int dram_init(void)
{
phys_size_t dram_size = 0;
{
phys_size_t dram_size = 0;
@@
-130,7
+130,9
@@
initdram(int board_type)
setup_ddr_bat(dram_size);
debug(" DDR: ");
setup_ddr_bat(dram_size);
debug(" DDR: ");
- return dram_size;
+ gd->ram_size = dram_size;
+
+ return 0;
}
}
@@
-143,7
+145,7
@@
phys_size_t fixed_sdram(void)
{
#if !defined(CONFIG_SYS_RAMBOOT)
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
{
#if !defined(CONFIG_SYS_RAMBOOT)
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
-
volatile ccsr_ddr_t
*ddr = &immap->im_ddr1;
+
struct ccsr_ddr __iomem
*ddr = &immap->im_ddr1;
uint d_init;
ddr->cs0_bnds = 0x0000001f;
uint d_init;
ddr->cs0_bnds = 0x0000001f;
@@
-258,12
+260,13
@@
void pci_init_board(void)
}
#if defined(CONFIG_OF_BOARD_SETUP)
}
#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