diff options
| author | Tom Rini <trini@ti.com> | 2013-05-02 16:21:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-02 16:21:20 -0400 |
| commit | e3288e1d152a213e71f99c093a4ef63041fe6997 (patch) | |
| tree | b94203f8c5a07227847ca04ec5f2abeb6dee52a2 /board | |
| parent | 63216de13488e8bc81afb53d0f5177142ee34ceb (diff) | |
| parent | 8aa34499727936ede3f85033380720b4a9522aaa (diff) | |
| download | u-boot-imx-e3288e1d152a213e71f99c093a4ef63041fe6997.zip u-boot-imx-e3288e1d152a213e71f99c093a4ef63041fe6997.tar.gz u-boot-imx-e3288e1d152a213e71f99c093a4ef63041fe6997.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
Diffstat (limited to 'board')
| -rw-r--r-- | board/a3m071/a3m071.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/board/a3m071/a3m071.c b/board/a3m071/a3m071.c index 0f9f883..c62ba62 100644 --- a/board/a3m071/a3m071.c +++ b/board/a3m071/a3m071.c @@ -8,7 +8,7 @@ * (C) Copyright 2006 * MicroSys GmbH * - * Copyright 2012 Stefan Roese <sr@denx.de> + * Copyright 2012-2013 Stefan Roese <sr@denx.de> * * See file CREDITS for list of people who contributed to this * project. @@ -241,12 +241,26 @@ void spl_board_init(void) /* And write new value back to register */ out_be32(&mm->ipbi_ws_ctrl, val); -#endif - /* - * No need to change the pin multiplexing (MPC5XXX_GPS_PORT_CONFIG) - * as all 3 config versions (failsave level) have the same setup. - */ + + /* Setup pin multiplexing */ + if (failsavelevel == 2) { + /* fpga-version ok */ +#if defined(CONFIG_SYS_GPS_PORT_CONFIG_2) + out_be32(&gpio->port_config, CONFIG_SYS_GPS_PORT_CONFIG_2); +#endif + } else if (failsavelevel == 1) { + /* digiboard-version ok - fpga not */ +#if defined(CONFIG_SYS_GPS_PORT_CONFIG_1) + out_be32(&gpio->port_config, CONFIG_SYS_GPS_PORT_CONFIG_1); +#endif + } else { + /* full failsave-mode */ +#if defined(CONFIG_SYS_GPS_PORT_CONFIG) + out_be32(&gpio->port_config, CONFIG_SYS_GPS_PORT_CONFIG); +#endif + } +#endif /* * Setup gpio_wkup_7 as watchdog AS INPUT to disable it - see |