From patchwork Sat Jan 19 11:04:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 213822 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 25BE32C0079 for ; Sat, 19 Jan 2013 22:05:00 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 01ACD8B04E; Sat, 19 Jan 2013 11:04:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g+lvkYyJGSMM; Sat, 19 Jan 2013 11:04:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 65DE382809; Sat, 19 Jan 2013 11:04:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D42168F74B for ; Sat, 19 Jan 2013 11:05:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2EE0382809 for ; Sat, 19 Jan 2013 11:04:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Tdg4KdAFUA+E for ; Sat, 19 Jan 2013 11:04:52 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 62308821F5 for ; Sat, 19 Jan 2013 11:04:52 +0000 (UTC) Received: from asgard (host110.190-225-90.telecom.net.ar [190.225.90.110]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id r0JB4iJA016379 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 19 Jan 2013 11:04:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1358593489; bh=aME77K8NQveEdQop/rmZrAmMs3vBDIlmwinSHMQqm6Y=; h=From:To:Cc:Subject:Date; b=vC0V3Pb1o+OMg10UZn2qoL5MyVyuzT1ZUbmPd7+Zh3fEJRBhbYyr7F7NXFKYz7Zi3 HF65dRv9FW6uRapH8Bel56oSlDKOeE8H1YTxIpoOJ9g18gfIdkuUgAs5evrvbp43tJ b9pRTwjPbRQuWyOiq3LeS7ZIpEeDrxhdiC3MVvAc= Received: by asgard (sSMTP sendmail emulation); Sat, 19 Jan 2013 08:04:43 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Sat, 19 Jan 2013 08:04:43 -0300 Message-Id: <1358593483-26071-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.12.4 X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] uboot-tools: fix build failure for the target X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The patch to drop config.h is still required, it just needed a tweak. Fixes: http://autobuild.buildroot.net/results/3653c0e3ec460c710524468987d5192337cf210e/ Signed-off-by: Gustavo Zacarias --- .../uboot-tools-drop-configh-from-tools.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/uboot-tools/uboot-tools-drop-configh-from-tools.patch diff --git a/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch b/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch new file mode 100644 index 0000000..21995ec --- /dev/null +++ b/package/uboot-tools/uboot-tools-drop-configh-from-tools.patch @@ -0,0 +1,37 @@ +We need to build u-boot tools without a board configuration for the target. +fw_env just uses config.h to define the default environment of the created +image, so it really isn't mandatory. + +Signed-off-by: Gustavo Zacarias + +diff -Nura u-boot-2013.01.orig/tools/env/fw_env.h u-boot-2013.01/tools/env/fw_env.h +--- u-boot-2013.01.orig/tools/env/fw_env.h 2013-01-19 07:50:53.879241660 -0300 ++++ u-boot-2013.01/tools/env/fw_env.h 2013-01-19 07:58:11.897903403 -0300 +@@ -21,15 +21,6 @@ + * MA 02111-1307 USA + */ + +-/* Pull in the current config to define the default environment */ +-#ifndef __ASSEMBLY__ +-#define __ASSEMBLY__ /* get only #defines from config.h */ +-#include +-#undef __ASSEMBLY__ +-#else +-#include +-#endif +- + /* + * To build the utility with the static configuration + * comment out the next line. +diff -Nura u-boot-2013.01.orig/tools/env/Makefile u-boot-2013.01/tools/env/Makefile +--- u-boot-2013.01.orig/tools/env/Makefile 2013-01-19 07:50:53.879241660 -0300 ++++ u-boot-2013.01/tools/env/Makefile 2013-01-19 07:59:34.926486346 -0300 +@@ -26,7 +26,7 @@ + HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c + HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c + HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c +-HEADERS := fw_env.h $(OBJTREE)/include/config.h ++HEADERS := fw_env.h + + # Compile for a hosted environment on the target + HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \