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
global: Migrate CONFIG_SYS_MPC8* symbols to the CFG_SYS namespace
[platform/kernel/u-boot.git]
/
board
/
freescale
/
p1010rdb
/
spl_minimal.c
diff --git
a/board/freescale/p1010rdb/spl_minimal.c
b/board/freescale/p1010rdb/spl_minimal.c
index
6079570
..
a262d5c
100644
(file)
--- a/
board/freescale/p1010rdb/spl_minimal.c
+++ b/
board/freescale/p1010rdb/spl_minimal.c
@@
-1,9
+1,10
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2011 Freescale Semiconductor, Inc.
/*
* Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
+#include <clock_legacy.h>
+#include <init.h>
#include <mpc85xx.h>
#include <asm/io.h>
#include <ns16550.h>
#include <mpc85xx.h>
#include <asm/io.h>
#include <ns16550.h>
@@
-19,7
+20,7
@@
DECLARE_GLOBAL_DATA_PTR;
void board_init_f(ulong bootflag)
{
u32 plat_ratio;
void board_init_f(ulong bootflag)
{
u32 plat_ratio;
- ccsr_gur_t *gur = (void *)C
ONFI
G_SYS_MPC85xx_GUTS_ADDR;
+ ccsr_gur_t *gur = (void *)C
F
G_SYS_MPC85xx_GUTS_ADDR;
#if defined(CONFIG_SYS_NAND_BR_PRELIM) && defined(CONFIG_SYS_NAND_OR_PRELIM)
set_lbc_br(0, CONFIG_SYS_NAND_BR_PRELIM);
#if defined(CONFIG_SYS_NAND_BR_PRELIM) && defined(CONFIG_SYS_NAND_OR_PRELIM)
set_lbc_br(0, CONFIG_SYS_NAND_BR_PRELIM);
@@
-29,10
+30,10
@@
void board_init_f(ulong bootflag)
/* initialize selected port with appropriate baud rate */
plat_ratio = in_be32(&gur->porpllsr) & MPC85xx_PORPLLSR_PLAT_RATIO;
plat_ratio >>= 1;
/* initialize selected port with appropriate baud rate */
plat_ratio = in_be32(&gur->porpllsr) & MPC85xx_PORPLLSR_PLAT_RATIO;
plat_ratio >>= 1;
- gd->bus_clk =
CONFIG_SYS_CLK_FREQ
* plat_ratio;
+ gd->bus_clk =
get_board_sys_clk()
* plat_ratio;
-
NS16550_init((NS16550_t
)CONFIG_SYS_NS16550_COM1,
-
gd->bus_clk / 16 / CONFIG_BAUDRATE);
+
ns16550_init((struct ns16550 *
)CONFIG_SYS_NS16550_COM1,
+ gd->bus_clk / 16 / CONFIG_BAUDRATE);
puts("\nNAND boot... ");
puts("\nNAND boot... ");
@@
-53,9
+54,9
@@
void board_init_r(gd_t *gd, ulong dest_addr)
void putc(char c)
{
if (c == '\n')
void putc(char c)
{
if (c == '\n')
-
NS16550_putc((NS16550_t
)CONFIG_SYS_NS16550_COM1, '\r');
+
ns16550_putc((struct ns16550 *
)CONFIG_SYS_NS16550_COM1, '\r');
-
NS16550_putc((NS16550_t
)CONFIG_SYS_NS16550_COM1, c);
+
ns16550_putc((struct ns16550 *
)CONFIG_SYS_NS16550_COM1, c);
}
void puts(const char *str)
}
void puts(const char *str)