From patchwork Thu Jun 27 20:12:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2795791 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 425289F3C3 for ; Thu, 27 Jun 2013 20:19:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93B6E20320 for ; Thu, 27 Jun 2013 20:19:08 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E1022030E for ; Thu, 27 Jun 2013 20:19:07 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsIel-0002UK-Vi; Thu, 27 Jun 2013 20:19:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsIej-0002dr-A7; Thu, 27 Jun 2013 20:19:01 +0000 Received: from mail-pd0-f176.google.com ([209.85.192.176]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsIee-0002dE-Vx for linux-arm-kernel@lists.infradead.org; Thu, 27 Jun 2013 20:18:59 +0000 Received: by mail-pd0-f176.google.com with SMTP id t12so586798pdi.7 for ; Thu, 27 Jun 2013 13:18:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=PD8alnhRmPOuanMWwlKr4oHG0SHh3wJPSP4LJ4cNLiA=; b=UjcpH/TBnGIO0ZfT9zEXp2gyErBfPf5S2aHL8EgCx+nH8+/+N4JkL82Yf35qrFI5TG aZW/yMjL7bbZE4q2ZTQwkzXZetnxhEFE6hlrRM68mCzmOxQ2Rww8DAHd8/75xF/XlDCZ HsJxqag3ttXHvcxvlrPb4/+1Vwk4JDASxCstyY7JZ2xqFrgN0i7lLsi6xVNrK2v3DZ3C SWib0S2nb9xW1xP1fiZ5O1TXcJ6eM5p865Swot3V2pAHdpzljM5WKuCovWw2DAEL21xg TvIxe2e3GrFIiXFsXnUE1fQWqMrHYh8xWy++UP8yKMwIWUiNaEL47rNGFTw3r+xoQ+yH PmVw== X-Received: by 10.66.146.66 with SMTP id ta2mr7928449pab.11.1372363944137; Thu, 27 Jun 2013 13:12:24 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPSA id jv10sm4513251pbc.28.2013.06.27.13.12.22 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Jun 2013 13:12:23 -0700 (PDT) From: Kevin Hilman To: Geert Uytterhoeven Subject: [PATCH] ARM: zImage: fix path to fonts which moved to lib/fonts Date: Thu, 27 Jun 2013 13:12:20 -0700 Message-Id: <1372363940-13023-1-git-send-email-khilman@linaro.org> X-Mailer: git-send-email 1.8.3 X-Gm-Message-State: ALoCoQmNgFnK5UjTAHQV/3G7j0Yd2SNLTXQQumEEwOAeZeMRXdwstDWtnIUd1d0TC/QGGT+Svb8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130627_161857_104460_8A7C8E1A X-CRM114-Status: GOOD ( 11.96 ) X-Spam-Score: -1.9 (-) Cc: Olof Johansson , Arnd Bergmann , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 1affee67 (lib: Move fonts from drivers/video/console/ to lib/fonts/) moved fonts from drivers/video/console/ to lib/fonts, but the ARM zImage build still references the old location. Cc: Geert Uytterhoeven Cc: Arnd Bergmann Cc: Olof Johansson Signed-off-by: Kevin Hilman --- Found due to build failures on ARM in next-20130627. Rather than go through the ARM tree, this should probably be included with the original series from Geert. arch/arm/boot/compressed/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 13499a8..7ac1610 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -27,7 +27,7 @@ OBJS += misc.o decompress.o ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y) OBJS += debug.o endif -FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c +FONTC = $(srctree)/lib/fonts/font_acorn_8x8.c # string library code (-Os is enforced to keep it much smaller) OBJS += string.o