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 --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c
index 0fd41c77322566d279fc0bd3d9ec2ce11a0f78e0..362f00a173f1bf30f020b21e7748df8919701645 100644 (file)
--- 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;

diff --git a/config.mk b/config.mk
index 3dcea6a8f99a8b3bc4e22f6c981a7e43839cf6f8..c3822a25c255100f6730549820fe32dadce8dba7 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -133,7 +133,11 @@ cc-version = $(shell $(SHELL) $(SRCTREE)/tools/gcc-version.sh $(CC))
 # Include the make variables (CC, etc...)
 #
 AS     = $(CROSS_COMPILE)as
-LD     = $(CROSS_COMPILE)ld
+
+# Always use GNU ld
+LD     = $(shell if $(CROSS_COMPILE)ld.bfd -v > /dev/null 2>&1; \
+               then echo "$(CROSS_COMPILE)ld.bfd"; else echo "$(CROSS_COMPILE)ld"; fi;)
+
 CC     = $(CROSS_COMPILE)gcc
 CPP    = $(CC) -E
 AR     = $(CROSS_COMPILE)ar

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 0d6ad6283ace04ff723afafc1bb1908cc9d4d310..b10bab70d02f9806085b8c5e1483b46e0ace855a 100644 (file)
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -84,9 +84,6 @@ static NS16550_t serial_ports[4] = {
 };
 
 #define PORT   serial_ports[port-1]
-#if defined(CONFIG_CONS_INDEX)
-#define CONSOLE        (serial_ports[CONFIG_CONS_INDEX-1])
-#endif
 
 #if defined(CONFIG_SERIAL_MULTI)
 

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index cc09e06c730d993c06f3cc5798ef02077807d979..af17ac1b7a1cdc24bd40f30dd2e1a2b149a42936 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -24,8 +24,7 @@
 #include <libfdt.h>
 #include <fdtdec.h>
 
-/* we need the generic GPIO interface here */
-#include <asm-generic/gpio.h>
+#include <asm/gpio.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/tools/.gitignore b/tools/.gitignore
index 3557a75b9e19110bdb47c0e7eb70bbdf6606e279..3088f4de986022474689250ab3110fef22dbc5bd 100644 (file)
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -2,6 +2,7 @@
 /envcrc
 /gen_eth_addr
 /img2srec
+/kwboot
 /mkenvimage
 /mkimage
 /mpc86x_clk