diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-09-02 00:44:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-09-02 00:44:09 +0200 |
| commit | 6e2fbdea1b26d75314d87c380a36b0015bf824cf (patch) | |
| tree | 921a60d936848d731eb7b6875788bac2ad98009c | |
| parent | df95321ca1b06a6271c3959b371848c10019e165 (diff) | |
| parent | 72739219a12bf02820d29a89cb2b7fdc4d0e840f (diff) | |
| download | u-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>
| -rw-r--r-- | board/karo/tx25/tx25.c | 1 | ||||
| -rw-r--r-- | config.mk | 6 | ||||
| -rw-r--r-- | drivers/serial/serial.c | 3 | ||||
| -rw-r--r-- | lib/fdtdec.c | 3 | ||||
| -rw-r--r-- | tools/.gitignore | 1 |
5 files changed, 8 insertions, 6 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; @@ -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 0d6ad62..b10bab7 100644 --- 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 cc09e06..af17ac1 100644 --- 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 3557a75..3088f4d 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -2,6 +2,7 @@ /envcrc /gen_eth_addr /img2srec +/kwboot /mkenvimage /mkimage /mpc86x_clk |