diff options
author | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:39:26 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:39:26 +0100 |
commit | 40dcd6aa75ef95b490f342695f970910b82e392e (patch) | |
tree | c262385e57aa5ae54f4fc41023c5d22c2571e64f /cpu/ixp/npe/Makefile | |
parent | f58934551e052db5a1f33f53dcc9cbf6fcb72910 (diff) | |
parent | 799891ef7b1b3432032ec23466df6b665a797fa4 (diff) | |
download | u-boot-imx-40dcd6aa75ef95b490f342695f970910b82e392e.zip u-boot-imx-40dcd6aa75ef95b490f342695f970910b82e392e.tar.gz u-boot-imx-40dcd6aa75ef95b490f342695f970910b82e392e.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-ixp
Diffstat (limited to 'cpu/ixp/npe/Makefile')
-rw-r--r-- | cpu/ixp/npe/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/ixp/npe/Makefile b/cpu/ixp/npe/Makefile index 7f020b5..25117d7 100644 --- a/cpu/ixp/npe/Makefile +++ b/cpu/ixp/npe/Makefile @@ -72,7 +72,6 @@ COBJS := npe.o \ IxNpeDlImageMgr.o \ IxNpeDlNpeMgr.o \ IxNpeDlNpeMgrUtils.o \ - IxNpeMicrocode.o \ IxNpeMh.o \ IxNpeMhConfig.o \ IxNpeMhReceive.o \ @@ -80,6 +79,9 @@ COBJS := npe.o \ IxNpeMhSolicitedCbMgr.o \ IxNpeMhUnsolicitedCbMgr.o +ifndef CONFIG_IXP4XX_NPE_EXT_UCODE_BASE +COBJS += IxNpeMicrocode.o +endif SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) |