diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-01-12 23:30:40 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-01-12 23:30:40 +0100 |
| commit | 02c631e6eec5439daea46f8cbdb1572b0df3c843 (patch) | |
| tree | bdc82731cdc493dfe35c13f39f985199c8bd5ba3 /board/freescale/mpc8315erdb/mpc8315erdb.c | |
| parent | 8b0ab304943b07d13a29db6d3d2ca3edad32cdcb (diff) | |
| parent | a3f5da1bee9a8c343a411080d7d468bdc78794a4 (diff) | |
| download | u-boot-imx-02c631e6eec5439daea46f8cbdb1572b0df3c843.zip u-boot-imx-02c631e6eec5439daea46f8cbdb1572b0df3c843.tar.gz u-boot-imx-02c631e6eec5439daea46f8cbdb1572b0df3c843.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'board/freescale/mpc8315erdb/mpc8315erdb.c')
| -rw-r--r-- | board/freescale/mpc8315erdb/mpc8315erdb.c | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c index dea4d6f..d5e71dc 100644 --- a/board/freescale/mpc8315erdb/mpc8315erdb.c +++ b/board/freescale/mpc8315erdb/mpc8315erdb.c @@ -32,6 +32,8 @@ #include <mpc83xx.h> #include <netdev.h> #include <asm/io.h> +#include <ns16550.h> +#include <nand.h> DECLARE_GLOBAL_DATA_PTR; @@ -45,6 +47,8 @@ int board_early_init_f(void) return 0; } +#ifndef CONFIG_NAND_SPL + static u8 read_board_info(void) { u8 val8; @@ -220,3 +224,41 @@ int board_eth_init(bd_t *bis) cpu_eth_init(bis); /* Initialize TSECs first */ return pci_eth_init(bis); } + +#else /* CONFIG_NAND_SPL */ + +int checkboard(void) +{ + puts("Board: Freescale MPC8315ERDB\n"); + return 0; +} + +void board_init_f(ulong bootflag) +{ + board_early_init_f(); + NS16550_init((NS16550_t)(CONFIG_SYS_IMMR + 0x4500), + CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); + puts("NAND boot... "); + init_timebase(); + initdram(0); + relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000, (gd_t *)gd, + CONFIG_SYS_NAND_U_BOOT_RELOC); +} + +void board_init_r(gd_t *gd, ulong dest_addr) +{ + nand_boot(); +} + +void putc(char c) +{ + if (gd->flags & GD_FLG_SILENT) + return; + + if (c == '\n') + NS16550_putc((NS16550_t)(CONFIG_SYS_IMMR + 0x4500), '\r'); + + NS16550_putc((NS16550_t)(CONFIG_SYS_IMMR + 0x4500), c); +} + +#endif /* CONFIG_NAND_SPL */ |