From patchwork Tue Oct 25 16:29:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 121746 X-Patchwork-Delegate: kim.phillips@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 8D591B6F84 for ; Wed, 26 Oct 2011 03:29:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 410D629460; Tue, 25 Oct 2011 18:29:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NE9gKKs274Ra; Tue, 25 Oct 2011 18:29:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1AECE293E0; Tue, 25 Oct 2011 18:29:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4DF06293DB for ; Tue, 25 Oct 2011 18:29:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y+MQWqS0qpB6 for ; Tue, 25 Oct 2011 18:29:24 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from TX2EHSOBE005.bigfish.com (tx2ehsobe003.messaging.microsoft.com [65.55.88.13]) by theia.denx.de (Postfix) with ESMTPS id 39E88293B8 for ; Tue, 25 Oct 2011 18:29:22 +0200 (CEST) Received: from mail39-tx2-R.bigfish.com (10.9.14.247) by TX2EHSOBE005.bigfish.com (10.9.40.25) with Microsoft SMTP Server id 14.1.225.22; Tue, 25 Oct 2011 16:29:16 +0000 Received: from mail39-tx2 (localhost.localdomain [127.0.0.1]) by mail39-tx2-R.bigfish.com (Postfix) with ESMTP id 9DFDE190335 for ; Tue, 25 Oct 2011 16:29:18 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h64h) X-Spam-TCS-SCL: 3:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail39-tx2 (localhost.localdomain [127.0.0.1]) by mail39-tx2 (MessageSwitch) id 1319560158496296_27636; Tue, 25 Oct 2011 16:29:18 +0000 (UTC) Received: from TX2EHSMHS038.bigfish.com (unknown [10.9.14.252]) by mail39-tx2.bigfish.com (Postfix) with ESMTP id 7194286004F for ; Tue, 25 Oct 2011 16:29:18 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS038.bigfish.com (10.9.99.138) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 25 Oct 2011 16:29:14 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.339.2; Tue, 25 Oct 2011 11:29:19 -0500 Received: from localhost.localdomain ([10.214.87.153]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p9PGTHxN028162; Tue, 25 Oct 2011 11:29:18 -0500 (CDT) From: York Sun To: Date: Tue, 25 Oct 2011 09:29:17 -0700 Message-ID: <1319560157-22904-1-git-send-email-yorksun@freescale.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Cc: York Sun Subject: [U-Boot] [PATCH] powerpc/mpc83xx: cleanup makefile for mpc83xx X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Remove symbolic link generated by compiling. Fix makefile for out-of-tree compiling error. Signed-off-by: York Sun --- Makefile | 1 + arch/powerpc/cpu/mpc83xx/Makefile | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5db2e0e..e3c3738 100644 --- a/Makefile +++ b/Makefile @@ -964,6 +964,7 @@ clobber: clean @rm -f $(obj)u-boot.ubl @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes} @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c + @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm @rm -fr $(obj)include/generated @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f diff --git a/arch/powerpc/cpu/mpc83xx/Makefile b/arch/powerpc/cpu/mpc83xx/Makefile index b353036..b5c499d 100644 --- a/arch/powerpc/cpu/mpc83xx/Makefile +++ b/arch/powerpc/cpu/mpc83xx/Makefile @@ -42,15 +42,15 @@ COBJS-$(CONFIG_PCIE) += pcie.o COBJS-$(CONFIG_OF_LIBFDT) += fdt.o ifdef CONFIG_FSL_DDR2 -COBJS-$(CONFIG_MPC8349) += ddr-gen2.o +COBJS_LN-$(CONFIG_MPC8349) += ddr-gen2.o else COBJS-y += spd_sdram.o endif COBJS-$(CONFIG_FSL_DDR2) += law.o COBJS := $(COBJS-y) -SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) +SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) $(addprefix $(obj),$(COBJS_LN-y:.o=.c)) +OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(COBJS_LN-y)) START := $(addprefix $(obj),$(START)) all: $(obj).depend $(START) $(LIB) @@ -59,15 +59,12 @@ $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) $(obj)ddr-gen1.c: - @rm -f $(obj)ddr-gen1.c ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen1.c $(obj)ddr-gen1.c $(obj)ddr-gen2.c: - @rm -f $(obj)ddr-gen2.c ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen2.c $(obj)ddr-gen2.c $(obj)ddr-gen3.c: - @rm -f $(obj)ddr-gen3.c ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen3.c $(obj)ddr-gen3.c #########################################################################