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>

diff --cc board/karo/tx25/tx25.c
index 0fd41c77322566d279fc0bd3d9ec2ce11a0f78e0,07fd98d6048cd38212d68a3228c513c7818deb3a..362f00a173f1bf30f020b21e7748df8919701645
--- 1/board/karo/tx25/tx25.c
--- 2/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;