| Message ID | 1383639820-25339-1-git-send-email-grinberg@compulab.co.il |
|---|---|
| State | Superseded |
| Headers | show |
Hi Tom, Please, disregard this patch in favor to the new one I've just sent. Thanks and sorry for the noise! On 11/05/13 10:23, Igor Grinberg wrote: > Compulab boards can use the same leds code, so move the leds related > code to live under board/compulab/common directory. > > Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> > Tested-by: Nikita Kiryanov <nikita@compulab.co.il> > --- > Tom, > > AFAIU the merge window closes on Thursday. > Can we please have this patch in for 2014.01? > > Thanks! > > Sorry, if anyone gets this message twice... > I had a problem with my mailer... > > > board/compulab/cm_t35/Makefile | 2 +- > board/compulab/common/Makefile | 1 + > board/compulab/{cm_t35 => common}/leds.c | 0 > 3 files changed, 2 insertions(+), 1 deletion(-) > rename board/compulab/{cm_t35 => common}/leds.c (100%) > > diff --git a/board/compulab/cm_t35/Makefile b/board/compulab/cm_t35/Makefile > index 213423e..4b1d591 100644 > --- a/board/compulab/cm_t35/Makefile > +++ b/board/compulab/cm_t35/Makefile > @@ -11,7 +11,7 @@ include $(TOPDIR)/config.mk > > LIB = $(obj)lib$(BOARD).o > > -COBJS := cm_t35.o leds.o $(COBJS-y) > +COBJS := cm_t35.o $(COBJS-y) > > SRCS := $(COBJS:.o=.c) > OBJS := $(addprefix $(obj),$(COBJS)) > diff --git a/board/compulab/common/Makefile b/board/compulab/common/Makefile > index b399c8f..312d955 100644 > --- a/board/compulab/common/Makefile > +++ b/board/compulab/common/Makefile > @@ -16,6 +16,7 @@ LIB = $(obj)lib$(VENDOR).o > > COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o > COBJS-$(CONFIG_LCD) += omap3_display.o > +COBJS-$(CONFIG_STATUS_LED) += leds.o > > COBJS := $(COBJS-y) > SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) > diff --git a/board/compulab/cm_t35/leds.c b/board/compulab/common/leds.c > similarity index 100% > rename from board/compulab/cm_t35/leds.c > rename to board/compulab/common/leds.c >
diff --git a/board/compulab/cm_t35/Makefile b/board/compulab/cm_t35/Makefile index 213423e..4b1d591 100644 --- a/board/compulab/cm_t35/Makefile +++ b/board/compulab/cm_t35/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := cm_t35.o leds.o $(COBJS-y) +COBJS := cm_t35.o $(COBJS-y) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/compulab/common/Makefile b/board/compulab/common/Makefile index b399c8f..312d955 100644 --- a/board/compulab/common/Makefile +++ b/board/compulab/common/Makefile @@ -16,6 +16,7 @@ LIB = $(obj)lib$(VENDOR).o COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o COBJS-$(CONFIG_LCD) += omap3_display.o +COBJS-$(CONFIG_STATUS_LED) += leds.o COBJS := $(COBJS-y) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/compulab/cm_t35/leds.c b/board/compulab/common/leds.c similarity index 100% rename from board/compulab/cm_t35/leds.c rename to board/compulab/common/leds.c