diff options
Diffstat (limited to 'board/linkstation')
| -rw-r--r-- | board/linkstation/Makefile | 15 | ||||
| -rw-r--r-- | board/linkstation/avr.c | 4 | ||||
| -rw-r--r-- | board/linkstation/config.mk | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/board/linkstation/Makefile b/board/linkstation/Makefile index 57c84de60..8d92d8a6c 100644 --- a/board/linkstation/Makefile +++ b/board/linkstation/Makefile @@ -23,18 +23,21 @@ include $(TOPDIR)/config.mk -LIB = lib$(BOARD).a +LIB = $(obj)lib$(BOARD).a OBJS = $(BOARD).o ide.o hwctl.o avr.o -$(LIB): .depend $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(OBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) crv $@ $(OBJS) ######################################################################### -.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk -sinclude .depend +sinclude $(obj).depend ######################################################################### diff --git a/board/linkstation/avr.c b/board/linkstation/avr.c index 68bc5450a..a689c6330 100644 --- a/board/linkstation/avr.c +++ b/board/linkstation/avr.c @@ -35,7 +35,7 @@ /* LED commands */ #define PWRBLINKSTRT '[' /* Blink power LED */ #define PWRBLINKSTOP 'Z' /* Solid power LED */ -#define HDDLEDON 'W' /* HDD LED on */ +#define HDDLEDON 'W' /* HDD LED on */ #define HDDLEDOFF 'V' /* HDD LED off */ #define HDDBLINKSTRT 'Y' /* HDD LED start blink */ #define HDDBLINKSTOP 'X' /* HDD LED stop blink */ @@ -57,7 +57,7 @@ static char *consoles[] = { "nc", #endif }; -#define MAX_CONS_CHOICE (sizeof(consoles)/sizeof(char *)) +#define MAX_CONS_CHOICE (sizeof(consoles)/sizeof(char *)) #if !defined(CONFIG_NETCONSOLE) #define DEF_CONS_CHOICE 0 diff --git a/board/linkstation/config.mk b/board/linkstation/config.mk index bdf611dc2..d04829014 100644 --- a/board/linkstation/config.mk +++ b/board/linkstation/config.mk @@ -35,7 +35,7 @@ # 0x07F00000 boot from RAM # -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE # For flash image - all models |