diff options
| author | Tom Rini <trini@ti.com> | 2013-10-09 10:06:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-09 10:06:40 -0400 |
| commit | 3be2bdf5dc69b3142c1162a59bc67191c9077567 (patch) | |
| tree | ece764111ded1f96162f074d3c3736d6e2d5c251 /board/keymile | |
| parent | df166cc9f400d00c80367823d95bc3485bf02dba (diff) | |
| parent | 283857dac752d4253cd211eb94d3201d2248e173 (diff) | |
| download | u-boot-imx-3be2bdf5dc69b3142c1162a59bc67191c9077567.zip u-boot-imx-3be2bdf5dc69b3142c1162a59bc67191c9077567.tar.gz u-boot-imx-3be2bdf5dc69b3142c1162a59bc67191c9077567.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'board/keymile')
| -rw-r--r-- | board/keymile/common/common.c | 4 | ||||
| -rw-r--r-- | board/keymile/common/ivm.c | 4 | ||||
| -rw-r--r-- | board/keymile/km83xx/km83xx.c | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 86b8110..136b2de 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -226,7 +226,7 @@ U_BOOT_CMD(km_setboardid, 1, 0, do_setboardid, "setboardid", "read out bid and " * application and in the init scripts (?) * return 0 in case of match, 1 if not match or error */ -int do_checkboardidhwk(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_checkboardidhwk(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { unsigned long ivmbid = 0, ivmhwkey = 0; @@ -367,7 +367,7 @@ U_BOOT_CMD(km_checkbidhwk, 2, 0, do_checkboardidhwk, * if the testpin of the board is asserted, return 1 * * else return 0 */ -int do_checktestboot(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_checktestboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { int testpin = 0; diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index aabd3a8..f0e91bb 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -10,7 +10,7 @@ #include <i2c.h> #include "common.h" -int ivm_calc_crc(unsigned char *buf, int len) +static int ivm_calc_crc(unsigned char *buf, int len) { const unsigned short crc_tab[16] = { 0x0000, 0xCC01, 0xD801, 0x1400, @@ -236,7 +236,7 @@ static int ivm_analyze_block2(unsigned char *buf, int len) return 0; } -int ivm_analyze_eeprom(unsigned char *buf, int len) +static int ivm_analyze_eeprom(unsigned char *buf, int len) { unsigned short val; unsigned char valbuf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN]; diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index cd861c9..76291a7 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -28,7 +28,7 @@ #include "../common/common.h" -const qe_iop_conf_t qe_iop_conf_tab[] = { +static const qe_iop_conf_t qe_iop_conf_tab[] = { /* port pin dir open_drain assign */ #if defined(CONFIG_MPC8360) /* MDIO */ @@ -225,6 +225,11 @@ static struct mv88e_sw_reg extsw_conf[] = { { PORT(5), 0x1A, 0xADB1 }, /* port 6, unused, this port has no phy */ { PORT(6), PORT_CTRL, PORT_DIS }, + /* + * Errata Fix: 1.9V Output from Internal 1.8V Regulator, + * acc . MV-S300889-00D.pdf , clause 4.5 + */ + { PORT(5), 0x1A, 0xADB1 }, }; #endif @@ -277,7 +282,7 @@ int last_stage_init(void) return 0; } -int fixed_sdram(void) +static int fixed_sdram(void) { immap_t *im = (immap_t *)CONFIG_SYS_IMMR; u32 msize = 0; |