From: Wolfgang Denk Date: Sat, 1 Sep 2012 22:44:09 +0000 (+0200) Subject: Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging X-Git-Tag: v2012.10-rc1~108 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6e2fbdea1b26d75314d87c380a36b0015bf824cf;p=u-boot 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 --- 6e2fbdea1b26d75314d87c380a36b0015bf824cf diff --cc board/karo/tx25/tx25.c index 0fd41c7732,07fd98d604..362f00a173 --- a/board/karo/tx25/tx25.c +++ b/board/karo/tx25/tx25.c @@@ -34,8 -34,8 +34,9 @@@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_FEC_MXC -#define GPIO_FEC_RESET_B MXC_GPIO_PORT_TO_NUM(4, 7) -#define GPIO_FEC_ENABLE_B MXC_GPIO_PORT_TO_NUM(4, 9) +#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;