diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-16 22:06:51 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-16 22:06:51 +0100 |
| commit | 4c9e98ace78e7de972adf7da7135a46ec0a4ee7e (patch) | |
| tree | 286b22158fa780deb3fcad84f126e40315af6902 /board/freescale/mpc8610hpcd | |
| parent | 5e918a98c26e8ab9b5d2d48d998a2ced2b5b85b3 (diff) | |
| parent | 16c3cde050e2d243e62b37486f1558570787beb8 (diff) | |
| download | u-boot-imx-4c9e98ace78e7de972adf7da7135a46ec0a4ee7e.zip u-boot-imx-4c9e98ace78e7de972adf7da7135a46ec0a4ee7e.tar.gz u-boot-imx-4c9e98ace78e7de972adf7da7135a46ec0a4ee7e.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
Diffstat (limited to 'board/freescale/mpc8610hpcd')
| -rw-r--r-- | board/freescale/mpc8610hpcd/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/board/freescale/mpc8610hpcd/Makefile b/board/freescale/mpc8610hpcd/Makefile index 76087c1..12a92ae 100644 --- a/board/freescale/mpc8610hpcd/Makefile +++ b/board/freescale/mpc8610hpcd/Makefile @@ -27,14 +27,14 @@ endif LIB = $(obj)lib$(BOARD).a -COBJS := $(BOARD).o \ - ../common/sys_eeprom.o \ - ../common/pixis.o \ - mpc8610hpcd_diu.o \ - ../common/fsl_diu_fb.o - SOBJS := init.o +COBJS := $(BOARD).o + +COBJS-${CONFIG_FSL_DIU_FB} += mpc8610hpcd_diu.o + +COBJS += ${COBJS-y} + SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) |