Blackfin: convert old boards to use COBJS-y Makefile style
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
parent
1f75d6f0ff
commit
1f4a3bb503
@ -29,11 +29,11 @@ include $(TOPDIR)/config.mk
|
|||||||
|
|
||||||
LIB = $(obj)lib$(BOARD).a
|
LIB = $(obj)lib$(BOARD).a
|
||||||
|
|
||||||
COBJS := $(BOARD).o flash.o
|
COBJS-y := $(BOARD).o flash.o
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(COBJS))
|
OBJS := $(addprefix $(obj),$(COBJS-y))
|
||||||
SOBJS := $(addprefix $(obj),$(SOBJS))
|
SOBJS := $(addprefix $(obj),$(SOBJS-y))
|
||||||
|
|
||||||
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds
|
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds
|
||||||
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
||||||
|
@ -29,12 +29,13 @@ include $(TOPDIR)/config.mk
|
|||||||
|
|
||||||
LIB = $(obj)lib$(BOARD).a
|
LIB = $(obj)lib$(BOARD).a
|
||||||
|
|
||||||
COBJS-y := $(BOARD).o spi_flash.o
|
COBJS-y := $(BOARD).o
|
||||||
|
COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o
|
||||||
COBJS-$(CONFIG_VIDEO) += video.o
|
COBJS-$(CONFIG_VIDEO) += video.o
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
|
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(COBJS-y))
|
OBJS := $(addprefix $(obj),$(COBJS-y))
|
||||||
SOBJS := $(addprefix $(obj),$(SOBJS))
|
SOBJS := $(addprefix $(obj),$(SOBJS-y))
|
||||||
|
|
||||||
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds
|
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds
|
||||||
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
||||||
|
@ -29,11 +29,13 @@ include $(TOPDIR)/config.mk
|
|||||||
|
|
||||||
LIB = $(obj)lib$(BOARD).a
|
LIB = $(obj)lib$(BOARD).a
|
||||||
|
|
||||||
COBJS := $(BOARD).o post-memory.o spi_flash.o cmd_bf537led.o nand.o
|
COBJS-y := $(BOARD).o post-memory.o cmd_bf537led.o
|
||||||
|
COBJS-$(CONFIG_CMD_EEPROM) += spi_flash.o
|
||||||
|
COBJS-$(CONFIG_CMD_NAND) += nand.o
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(COBJS))
|
OBJS := $(addprefix $(obj),$(COBJS-y))
|
||||||
SOBJS := $(addprefix $(obj),$(SOBJS))
|
SOBJS := $(addprefix $(obj),$(SOBJS-y))
|
||||||
|
|
||||||
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds
|
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds
|
||||||
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
||||||
|
@ -23,8 +23,6 @@
|
|||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
#if defined(CONFIG_CMD_NAND)
|
|
||||||
|
|
||||||
#include <nand.h>
|
#include <nand.h>
|
||||||
|
|
||||||
#define CONCAT(a,b,c,d) a ## b ## c ## d
|
#define CONCAT(a,b,c,d) a ## b ## c ## d
|
||||||
@ -100,4 +98,3 @@ int board_nand_init(struct nand_chip *nand)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
@ -29,11 +29,11 @@ include $(TOPDIR)/config.mk
|
|||||||
|
|
||||||
LIB = $(obj)lib$(BOARD).a
|
LIB = $(obj)lib$(BOARD).a
|
||||||
|
|
||||||
COBJS := $(BOARD).o
|
COBJS-y := $(BOARD).o
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(COBJS))
|
OBJS := $(addprefix $(obj),$(COBJS-y))
|
||||||
SOBJS := $(addprefix $(obj),$(SOBJS))
|
SOBJS := $(addprefix $(obj),$(SOBJS-y))
|
||||||
|
|
||||||
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds
|
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(obj)u-boot.lds
|
||||||
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
|
||||||
|
Loading…
Reference in New Issue
Block a user