From patchwork Tue Oct 18 08:11:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 120374 X-Patchwork-Delegate: sbabic@denx.de 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 14117B70B2 for ; Tue, 18 Oct 2011 19:11:28 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 87789290F8; Tue, 18 Oct 2011 10:11: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 glYotVe3l8La; Tue, 18 Oct 2011 10:11:25 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 653CD28FF2; Tue, 18 Oct 2011 10:11:22 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 32EA228FF2 for ; Tue, 18 Oct 2011 10:11:20 +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 TBJIYCZ+DisP for ; Tue, 18 Oct 2011 10:11:19 +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 moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.8]) by theia.denx.de (Postfix) with ESMTP id 4DC6728FF0 for ; Tue, 18 Oct 2011 10:11:18 +0200 (CEST) Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0Mhekt-1RTbZw2qln-00MKSL; Tue, 18 Oct 2011 10:11:15 +0200 Received: from azuregos.er.corscience.de (azuregos.2og.er.corscience.de [192.168.102.103]) by corscience.de (Postfix) with ESMTP id 322FC5200E; Tue, 18 Oct 2011 10:11:15 +0200 (CEST) From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= To: u-boot@lists.denx.de Date: Tue, 18 Oct 2011 10:11:12 +0200 Message-Id: <1318925472-7863-1-git-send-email-biessmann@corscience.de> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1314715349-29644-1-git-send-email-biessmann@corscience.de> References: <1314715349-29644-1-git-send-email-biessmann@corscience.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:/Wa+zgNBOdcedZQeH1yiOongGA98GnjwulKcVqjEAZC 1pX3b8y9iI1IU31GwQsCU3oY49ol6BhFlFkgtsf/Ggk8yWXC33 5AOdNfVDCk+oHdc710adDNTuCevR5gCg4DenTjEdMDSXh04axP eYhm7XnuHmsJeO9UpMAH6pFfCrpPxNRX0U2QXNgOBieLBSiq90 lBXzfjYNN5fu1cYjylRy07rIFzGStgiodgenaxEzpYD2rknvVW 724yS0BTp7xPbsazO0IqPLlsVqZUDpsCWHUElh/uYw4UDxywEx 3u70pxvW3mBkrvXJqGW9eSndPGH62LHsXD7dBExVhbFcGsNlW4 C/d/5gJUkatL061pxv6a+VwkiP/DoVUrmHEyjVwr0MvZToYWWv PiRppLCflvQvg== Cc: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= Subject: [U-Boot] [PATCH v2] tools/env: use lib/crc32.c directly 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 Instead of linking the file into $(obj) tree use directly the source file. This also prevents littered source tree if building not out-of-tree. Signed-off-by: Andreas Bießmann Acked-by: Mike Frysinger --- total: 0 errors, 0 warnings, 27 lines checked 0001-tools-env-use-lib-crc32.c-directly.patch has no obvious style problems and is ready for submission. changes since v1: - also remove deletion of $(obj)/tools/crc32.c from Makefile which is not longer necessary Makefile | 2 +- tools/env/Makefile | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e9a153c..081e975 100644 --- a/Makefile +++ b/Makefile @@ -973,7 +973,7 @@ clobber: clean @rm -f $(obj)u-boot.kwb @rm -f $(obj)u-boot.imx @rm -f $(obj)u-boot.ubl - @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes} + @rm -f $(obj)tools/inca-swap-bytes @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm @rm -fr $(obj)include/generated diff --git a/tools/env/Makefile b/tools/env/Makefile index 2f7a59c..28b73da 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk -HOSTSRCS := $(obj)crc32.c fw_env.c fw_env_main.c +HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c HEADERS := fw_env.h # Compile for a hosted environment on the target @@ -43,10 +43,7 @@ $(obj)fw_printenv: $(HOSTSRCS) $(HEADERS) $(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS) clean: - rm -f $(obj)fw_printenv $(obj)crc32.c - -$(obj)crc32.c: - ln -s $(src)../../lib/crc32.c $(obj)crc32.c + rm -f $(obj)fw_printenv #########################################################################