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]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
mp.c
diff --git
a/arch/powerpc/cpu/mpc85xx/mp.c
b/arch/powerpc/cpu/mpc85xx/mp.c
index 88c8e65930e6918002fd8495fb4dc9644f704e53..8822cf29fefd081aa07fa4837a14bcf05086285c 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/mp.c
+++ b/
arch/powerpc/cpu/mpc85xx/mp.c
@@
-1,17
+1,21
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2008-2011 Freescale Semiconductor, Inc.
/*
* Copyright 2008-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <cpu_func.h>
+#include <env.h>
+#include <log.h>
#include <asm/processor.h>
#include <asm/processor.h>
+#include <env.h>
#include <ioports.h>
#include <lmb.h>
#include <asm/io.h>
#include <asm/mmu.h>
#include <asm/fsl_law.h>
#include <fsl_ddr_sdram.h>
#include <ioports.h>
#include <lmb.h>
#include <asm/io.h>
#include <asm/mmu.h>
#include <asm/fsl_law.h>
#include <fsl_ddr_sdram.h>
+#include <linux/delay.h>
#include "mp.h"
DECLARE_GLOBAL_DATA_PTR;
#include "mp.h"
DECLARE_GLOBAL_DATA_PTR;
@@
-30,8
+34,8
@@
u32 get_my_id()
*/
int hold_cores_in_reset(int verbose)
{
*/
int hold_cores_in_reset(int verbose)
{
- /* Default to no, overriden by 'y', 'yes', 'Y', 'Yes', or '1' */
- if (
getenv
_yesno("mp_holdoff") == 1) {
+ /* Default to no, overrid
d
en by 'y', 'yes', 'Y', 'Yes', or '1' */
+ if (
env_get
_yesno("mp_holdoff") == 1) {
if (verbose) {
puts("Secondary cores are being held in reset.\n");
puts("See 'mp_holdoff' environment variable\n");
if (verbose) {
puts("Secondary cores are being held in reset.\n");
puts("See 'mp_holdoff' environment variable\n");
@@
-43,7
+47,7
@@
int hold_cores_in_reset(int verbose)
return 0;
}
return 0;
}
-int cpu_reset(
int
nr)
+int cpu_reset(
u32
nr)
{
volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC8xxx_PIC_ADDR);
out_be32(&pic->pir, 1 << nr);
{
volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC8xxx_PIC_ADDR);
out_be32(&pic->pir, 1 << nr);
@@
-54,7
+58,7
@@
int cpu_reset(int nr)
return 0;
}
return 0;
}
-int cpu_status(
int
nr)
+int cpu_status(
u32
nr)
{
u32 *table, id = get_my_id();
{
u32 *table, id = get_my_id();
@@
-80,7
+84,7
@@
int cpu_status(int nr)
}
#ifdef CONFIG_FSL_CORENET
}
#ifdef CONFIG_FSL_CORENET
-int cpu_disable(
int
nr)
+int cpu_disable(
u32
nr)
{
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
{
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
@@
-96,7
+100,7
@@
int is_core_disabled(int nr) {
return (coredisrl & (1 << nr));
}
#else
return (coredisrl & (1 << nr));
}
#else
-int cpu_disable(
int
nr)
+int cpu_disable(
u32
nr)
{
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
{
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
@@
-138,7
+142,7
@@
static u8 boot_entry_map[4] = {
BOOT_ENTRY_R3_LOWER,
};
BOOT_ENTRY_R3_LOWER,
};
-int cpu_release(
int nr, int argc, char *
const argv[])
+int cpu_release(
u32 nr, int argc, char *
const argv[])
{
u32 i, val, *table = (u32 *)&__spin_table + nr * NUM_BOOT_ENTRY;
u64 boot_addr;
{
u32 i, val, *table = (u32 *)&__spin_table + nr * NUM_BOOT_ENTRY;
u64 boot_addr;