summaryrefslogtreecommitdiff
path: root/board/a3m071/a3m071.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2013-04-25 23:20:23 +0000
committerWolfgang Denk <wd@denx.de>2013-05-02 20:46:08 +0200
commit8aa34499727936ede3f85033380720b4a9522aaa (patch)
tree7205023513e16840e74356e2f3d2a5f44f45a446 /board/a3m071/a3m071.c
parent704afcc43f5937f1b56d17a08cad7d8dc8b68717 (diff)
downloadu-boot-imx-8aa34499727936ede3f85033380720b4a9522aaa.zip
u-boot-imx-8aa34499727936ede3f85033380720b4a9522aaa.tar.gz
u-boot-imx-8aa34499727936ede3f85033380720b4a9522aaa.tar.bz2
mpc5200: a3m071/a4m2k: Miscellaneous updates and fixes
The changes to a3m071/a4m2k in summary are: - Enable CAN1 on I2C in GPS Port Configuration - Enable SPI on PSC2 - Activate network console - New flash partitioning - Fix some typos - Pass host name to Linux - Change rootfs to squashfs,jffs2 - Enable UBI/UBIFS support - Enable FIT support Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/a3m071/a3m071.c')
-rw-r--r--board/a3m071/a3m071.c26
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