diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-15 16:44:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-15 16:44:18 -0500 |
| commit | 8e9801c283c0e5a7ccd5c04f5ba09003d01f1591 (patch) | |
| tree | ae79033993ae3f06b581a3bd0fcd8dc36a3528eb /board/toradex/colibri_imx6 | |
| parent | a970ee22578dce3d7596280351d3dbade561ed8c (diff) | |
| parent | 9587b0d61133c025d48ebf480aa021fc2fdd53a7 (diff) | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'board/toradex/colibri_imx6')
| -rw-r--r-- | board/toradex/colibri_imx6/pf0100.c | 8 | ||||
| -rw-r--r-- | board/toradex/colibri_imx6/pf0100.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c index 6889287760..62e64ab1d7 100644 --- a/board/toradex/colibri_imx6/pf0100.c +++ b/board/toradex/colibri_imx6/pf0100.c @@ -23,7 +23,7 @@ /*#define DEBUG */ /* use GPIO: EXT_IO1 to switch on VPGM, ON: 1 */ -static iomux_v3_cfg_t const pmic_prog_pads[] = { +static __maybe_unused iomux_v3_cfg_t const pmic_prog_pads[] = { MX6_PAD_NANDF_D3__GPIO2_IO03 | MUX_PAD_CTRL(NO_PAD_CTRL), # define PMIC_PROG_VOLTAGE IMX_GPIO_NR(2, 3) }; @@ -144,7 +144,8 @@ unsigned pmic_init(void) return programmed; } -int pf0100_prog(void) +#ifndef CONFIG_SPL_BUILD +static int pf0100_prog(void) { unsigned char bus = 1; unsigned char val; @@ -191,7 +192,7 @@ int pf0100_prog(void) return CMD_RET_SUCCESS; } -int do_pf0100_prog(cmd_tbl_t *cmdtp, int flag, int argc, +static int do_pf0100_prog(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int ret; @@ -209,3 +210,4 @@ U_BOOT_CMD( "Program the OTP fuses on the PMIC PF0100", "" ); +#endif diff --git a/board/toradex/colibri_imx6/pf0100.h b/board/toradex/colibri_imx6/pf0100.h index c84cab8b15..af1e88fbc9 100644 --- a/board/toradex/colibri_imx6/pf0100.h +++ b/board/toradex/colibri_imx6/pf0100.h @@ -50,7 +50,4 @@ /* i.e. 0: unprogrammed, 3: programmed, other: undefined prog. state */ unsigned pmic_init(void); -/* programmes OTP fuses to values required on a Toradex Apalis iMX6 */ -int pf0100_prog(void); - #endif /* PF0100_H_ */ |