diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-10-10 17:21:42 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-10-10 17:21:42 -0500 |
| commit | daaba9859b0b94571dc3e45ad0c26e136426b351 (patch) | |
| tree | 688c9068794d45f78f9347cb47b7fba55a4b10be /drivers | |
| parent | 1fd5699a4a24f5c1dab1b32f480bace1ebb9fc3e (diff) | |
| parent | a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f (diff) | |
| download | u-boot-midas-daaba9859b0b94571dc3e45ad0c26e136426b351.tar.gz u-boot-midas-daaba9859b0b94571dc3e45ad0c26e136426b351.tar.bz2 u-boot-midas-daaba9859b0b94571dc3e45ad0c26e136426b351.zip | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/nand/Makefile | 2 | ||||
| -rw-r--r-- | drivers/nand_legacy/Makefile | 2 | ||||
| -rw-r--r-- | drivers/serial.c | 6 | ||||
| -rw-r--r-- | drivers/sk98lin/Makefile | 3 |
5 files changed, 7 insertions, 8 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 960da424cc..0f84969a99 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -58,7 +58,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) all: $(LIB) $(LIB): $(obj).depend $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### diff --git a/drivers/nand/Makefile b/drivers/nand/Makefile index d707658612..b03604dc4e 100644 --- a/drivers/nand/Makefile +++ b/drivers/nand/Makefile @@ -33,7 +33,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) all: $(LIB) $(LIB): $(obj).depend $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### diff --git a/drivers/nand_legacy/Makefile b/drivers/nand_legacy/Makefile index 23df5b752b..95314d80ba 100644 --- a/drivers/nand_legacy/Makefile +++ b/drivers/nand_legacy/Makefile @@ -33,7 +33,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) all: $(LIB) $(LIB): $(obj).depend $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### diff --git a/drivers/serial.c b/drivers/serial.c index 8d1ae96bf8..76425d8790 100644 --- a/drivers/serial.c +++ b/drivers/serial.c @@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !defined(CONFIG_CONS_INDEX) #if defined (CONFIG_SERIAL_MULTI) /* with CONFIG_SERIAL_MULTI we might have no console - * on these devices + * on these devices */ #else #error "No console index specified." @@ -238,7 +238,7 @@ serial_putc(const char c) #endif #if defined(CONFIG_SERIAL_MULTI) -static inline void +static inline void serial_putc_raw_dev(unsigned int dev_index,const char c) { _serial_putc_raw(c,dev_index); @@ -310,7 +310,7 @@ serial_setbrg(void) #if defined(CONFIG_SERIAL_MULTI) DECLARE_ESERIAL_FUNCTIONS(1); -struct serial_device eserial1_device = +struct serial_device eserial1_device = INIT_ESERIAL_STRUCTURE(1,"eserial0","EUART1"); DECLARE_ESERIAL_FUNCTIONS(2); struct serial_device eserial2_device = diff --git a/drivers/sk98lin/Makefile b/drivers/sk98lin/Makefile index ac21e02133..7e50b1df98 100644 --- a/drivers/sk98lin/Makefile +++ b/drivers/sk98lin/Makefile @@ -94,7 +94,7 @@ HOST_CFLAGS += $(EXTRA_CFLAGS) all: $(LIB) $(LIB): $(obj).depend $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### @@ -104,4 +104,3 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend ######################################################################### - |