minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-08-19 03:36:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

Browse Source 
* '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>
This commit is contained in:
Wolfgang Denk 2012-09-02 00:44:09 +02:00
commit 6e2fbdea1b
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
board/karo/tx25/tx25.c
View File

@ -36,6 +36,7 @@ DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_FEC_MXC #ifdef CONFIG_FEC_MXC
#define GPIO_FEC_RESET_B IMX_GPIO_NR(4, 7) #define GPIO_FEC_RESET_B IMX_GPIO_NR(4, 7)
#define GPIO_FEC_ENABLE_B IMX_GPIO_NR(4, 9) #define GPIO_FEC_ENABLE_B IMX_GPIO_NR(4, 9)
void tx25_fec_init(void) void tx25_fec_init(void)
{ {
struct iomuxc_mux_ctl *muxctl; struct iomuxc_mux_ctl *muxctl;

6
config.mk
View File

@ -133,7 +133,11 @@ cc-version = $(shell $(SHELL) $(SRCTREE)/tools/gcc-version.sh $(CC))
# Include the make variables (CC, etc...) # Include the make variables (CC, etc...)
# #
AS = $(CROSS_COMPILE)as 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 CC = $(CROSS_COMPILE)gcc
CPP = $(CC) -E CPP = $(CC) -E
AR = $(CROSS_COMPILE)ar AR = $(CROSS_COMPILE)ar

3
drivers/serial/serial.c
View File

@ -84,9 +84,6 @@ static NS16550_t serial_ports[4] = {
}; };
#define PORT serial_ports[port-1] #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) #if defined(CONFIG_SERIAL_MULTI)

3
lib/fdtdec.c
View File

@ -24,8 +24,7 @@
#include <libfdt.h> #include <libfdt.h>
#include <fdtdec.h> #include <fdtdec.h>
/* we need the generic GPIO interface here */ #include <asm/gpio.h>
#include <asm-generic/gpio.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

1
tools/.gitignore vendored
View File

@ -2,6 +2,7 @@
/envcrc /envcrc
/gen_eth_addr /gen_eth_addr
/img2srec /img2srec
/kwboot
/mkenvimage /mkenvimage
/mkimage /mkimage
/mpc86x_clk /mpc86x_clk