summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorFred Fan <r01011@freescale.com>2009-02-23 14:50:43 +0800
committerFred Fan <r01011@freescale.com>2009-09-10 14:11:18 +0800
commit765b588dba3e1672d66f6e63727b5f6691424e5e (patch)
tree3fd1d14e3ce11310b77914a6ced3c32a1c6f89b7 /board
parent5f7373e548c7862364511891596a97f18b945978 (diff)
downloadu-boot-imx-765b588dba3e1672d66f6e63727b5f6691424e5e.zip
u-boot-imx-765b588dba3e1672d66f6e63727b5f6691424e5e.tar.gz
u-boot-imx-765b588dba3e1672d66f6e63727b5f6691424e5e.tar.bz2
ENGR00107886 Porting MX31, MX35 3stack to u-boot V2009.01
Modify and Verfiy MX31 & MX35 3stack according to the changes in V2009.01 Signed-off-by: Fred Fan <r01011@freescale.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx31_3stack/mx31_3stack.c2
-rw-r--r--board/freescale/mx31_3stack/u-boot.lds2
-rw-r--r--board/freescale/mx35_3stack/mx35_3stack.c10
3 files changed, 12 insertions, 2 deletions
diff --git a/board/freescale/mx31_3stack/mx31_3stack.c b/board/freescale/mx31_3stack/mx31_3stack.c
index 33adfd3..c8dd7ce 100644
--- a/board/freescale/mx31_3stack/mx31_3stack.c
+++ b/board/freescale/mx31_3stack/mx31_3stack.c
@@ -48,7 +48,7 @@ int board_init(void)
mx31_gpio_mux(MUX_RXD1__UART1_RXD_MUX);
mx31_gpio_mux(MUX_TXD1__UART1_TXD_MUX);
mx31_gpio_mux(MUX_RTS1__UART1_RTS_B);
- mx31_gpio_mux(MUX_RTS1__UART1_CTS_B);
+ mx31_gpio_mux(MUX_CTS1__UART1_CTS_B);
/* SPI2 */
mx31_gpio_mux((MUX_CTL_FUNC << 8) | MUX_CTL_CSPI2_SS2);
diff --git a/board/freescale/mx31_3stack/u-boot.lds b/board/freescale/mx31_3stack/u-boot.lds
index 8b717ff..b26def7 100644
--- a/board/freescale/mx31_3stack/u-boot.lds
+++ b/board/freescale/mx31_3stack/u-boot.lds
@@ -46,7 +46,7 @@ SECTIONS
drivers/mtd/libmtd.a (.text)
. = DEFINED(env_offset) ? env_offset : .;
- common/environment.o(.text)
+ common/env_embedded.o(.text)
*(.text)
}
diff --git a/board/freescale/mx35_3stack/mx35_3stack.c b/board/freescale/mx35_3stack/mx35_3stack.c
index 267e9f1..41163f4 100644
--- a/board/freescale/mx35_3stack/mx35_3stack.c
+++ b/board/freescale/mx35_3stack/mx35_3stack.c
@@ -24,6 +24,7 @@
#include <common.h>
#include <asm/io.h>
+#include <asm/errno.h>
#include <asm/arch/mx35.h>
#include <asm/arch/mx35_pins.h>
#include <asm/arch/iomux.h>
@@ -269,3 +270,12 @@ int checkboard(void)
printf("]\n");
return 0;
}
+
+int board_eth_init(bd_t *bis)
+{
+ int rc = -ENODEV;
+#if defined(CONFIG_DRIVER_SMC911X)
+ rc = smc911x_initialize(bis);
+#endif
+ return rc;
+}