projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-imx
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
spl_minimal.c
diff --git
a/arch/powerpc/cpu/mpc85xx/spl_minimal.c
b/arch/powerpc/cpu/mpc85xx/spl_minimal.c
index 199b33e3bdb521a8c26037e635219bcfe2afe677..972049b8e95a0b84708e6511945a609a817072a0 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/spl_minimal.c
+++ b/
arch/powerpc/cpu/mpc85xx/spl_minimal.c
@@
-1,18
+1,17
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2009 Freescale Semiconductor, Inc.
/*
* Copyright 2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <asm/processor.h>
#include <asm/global_data.h>
*/
#include <common.h>
#include <asm/processor.h>
#include <asm/global_data.h>
-#include <
asm/
fsl_ifc.h>
+#include <fsl_ifc.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR;
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR;
-
void
cpu_init_f(void)
+
ulong
cpu_init_f(void)
{
#ifdef CONFIG_SYS_INIT_L2_ADDR
ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR;
{
#ifdef CONFIG_SYS_INIT_L2_ADDR
ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR;
@@
-27,6
+26,8
@@
void cpu_init_f(void)
out_be32(&l2cache->l2ctl,
(MPC85xx_L2CTL_L2E | MPC85xx_L2CTL_L2SRAM_ENTIRE));
#endif
out_be32(&l2cache->l2ctl,
(MPC85xx_L2CTL_L2E | MPC85xx_L2CTL_L2SRAM_ENTIRE));
#endif
+
+ return 0;
}
#ifndef CONFIG_SYS_FSL_TBCLK_DIV
}
#ifndef CONFIG_SYS_FSL_TBCLK_DIV