summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-09-02 00:44:09 +0200
committerWolfgang Denk <wd@denx.de>2012-09-02 00:44:09 +0200
commit6e2fbdea1b26d75314d87c380a36b0015bf824cf (patch)
tree921a60d936848d731eb7b6875788bac2ad98009c /board
parentdf95321ca1b06a6271c3959b371848c10019e165 (diff)
parent72739219a12bf02820d29a89cb2b7fdc4d0e840f (diff)
downloadu-boot-imx-6e2fbdea1b26d75314d87c380a36b0015bf824cf.zip
u-boot-imx-6e2fbdea1b26d75314d87c380a36b0015bf824cf.tar.gz
u-boot-imx-6e2fbdea1b26d75314d87c380a36b0015bf824cf.tar.bz2
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging: tx25: Use generic gpio_* calls config: Always use GNU ld tools: add kwboot binary to .gitignore file fdt: Include arch specific gpio.h instead of asm-generic/gpio.h serial: CONSOLE macro is not used Conflicts: board/karo/tx25/tx25.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board')
-rw-r--r--board/karo/tx25/tx25.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c
index 0fd41c7..362f00a 100644
--- a/board/karo/tx25/tx25.c
+++ b/board/karo/tx25/tx25.c
@@ -36,6 +36,7 @@ DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_FEC_MXC
#define GPIO_FEC_RESET_B IMX_GPIO_NR(4, 7)
#define GPIO_FEC_ENABLE_B IMX_GPIO_NR(4, 9)
+
void tx25_fec_init(void)
{
struct iomuxc_mux_ctl *muxctl;