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
/
cpu_init.c
diff --git
a/arch/powerpc/cpu/mpc85xx/cpu_init.c
b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index cac928079042beaabf15ed903af215c4a209cd61..4bca2671d5238c2cc8c50a68f957b47a23819f27 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/
arch/powerpc/cpu/mpc85xx/cpu_init.c
@@
-11,6
+11,8
@@
#include <common.h>
#include <env.h>
#include <common.h>
#include <env.h>
+#include <init.h>
+#include <net.h>
#include <watchdog.h>
#include <asm/processor.h>
#include <ioports.h>
#include <watchdog.h>
#include <asm/processor.h>
#include <ioports.h>
@@
-31,6
+33,7
@@
#include <fsl_usb.h>
#include <hwconfig.h>
#include <linux/compiler.h>
#include <fsl_usb.h>
#include <hwconfig.h>
#include <linux/compiler.h>
+#include <linux/delay.h>
#include "mp.h"
#ifdef CONFIG_CHAIN_OF_TRUST
#include <fsl_validate.h>
#include "mp.h"
#ifdef CONFIG_CHAIN_OF_TRUST
#include <fsl_validate.h>
@@
-38,7
+41,7
@@
#ifdef CONFIG_FSL_CAAM
#include <fsl_sec.h>
#endif
#ifdef CONFIG_FSL_CAAM
#include <fsl_sec.h>
#endif
-#if defined(CONFIG_
SECURE_BOOT
) && defined(CONFIG_FSL_CORENET)
+#if defined(CONFIG_
NXP_ESBC
) && defined(CONFIG_FSL_CORENET)
#include <asm/fsl_pamu.h>
#include <fsl_secboot_err.h>
#endif
#include <asm/fsl_pamu.h>
#include <fsl_secboot_err.h>
#endif
@@
-440,7
+443,7
@@
ulong cpu_init_f(void)
#ifdef CONFIG_SYS_DCSRBAR_PHYS
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
#endif
#ifdef CONFIG_SYS_DCSRBAR_PHYS
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
#endif
-#if defined(CONFIG_
SECURE_BOOT
) && !defined(CONFIG_SYS_RAMBOOT)
+#if defined(CONFIG_
NXP_ESBC
) && !defined(CONFIG_SYS_RAMBOOT)
struct law_entry law;
#endif
#ifdef CONFIG_ARCH_MPC8548
struct law_entry law;
#endif
#ifdef CONFIG_ARCH_MPC8548
@@
-460,7
+463,7
@@
ulong cpu_init_f(void)
disable_tlb(14);
disable_tlb(15);
disable_tlb(14);
disable_tlb(15);
-#if defined(CONFIG_
SECURE_BOOT
) && !defined(CONFIG_SYS_RAMBOOT)
+#if defined(CONFIG_
NXP_ESBC
) && !defined(CONFIG_SYS_RAMBOOT)
/* Disable the LAW created for NOR flash by the PBI commands */
law = find_law(CONFIG_SYS_PBI_FLASH_BASE);
if (law.index != -1)
/* Disable the LAW created for NOR flash by the PBI commands */
law = find_law(CONFIG_SYS_PBI_FLASH_BASE);
if (law.index != -1)
@@
-963,7
+966,7
@@
int cpu_init_r(void)
fman_enet_init();
#endif
fman_enet_init();
#endif
-#if defined(CONFIG_
SECURE_BOOT
) && defined(CONFIG_FSL_CORENET)
+#if defined(CONFIG_
NXP_ESBC
) && defined(CONFIG_FSL_CORENET)
if (pamu_init() < 0)
fsl_secboot_handle_error(ERROR_ESBC_PAMU_INIT);
#endif
if (pamu_init() < 0)
fsl_secboot_handle_error(ERROR_ESBC_PAMU_INIT);
#endif
@@
-1023,16
+1026,6
@@
void arch_preboot_os(void)
mtmsr(msr);
}
mtmsr(msr);
}
-#if defined(CONFIG_SATA) && defined(CONFIG_FSL_SATA)
-int sata_initialize(void)
-{
- if (is_serdes_configured(SATA1) || is_serdes_configured(SATA2))
- return __sata_initialize();
-
- return 1;
-}
-#endif
-
void cpu_secondary_init_r(void)
{
#ifdef CONFIG_U_QE
void cpu_secondary_init_r(void)
{
#ifdef CONFIG_U_QE