From patchwork Tue Jan 13 15:56:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 428490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 84744140151 for ; Wed, 14 Jan 2015 03:01:25 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2708A2846A8; Tue, 13 Jan 2015 16:58:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A3EE8281241 for ; Tue, 13 Jan 2015 16:57:51 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -4.2 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by arrakis.dune.hu (Postfix) with ESMTP for ; Tue, 13 Jan 2015 16:57:50 +0100 (CET) Received: by mail.free-electrons.com (Postfix, from userid 106) id 46057BC3; Tue, 13 Jan 2015 17:00:03 +0100 (CET) Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id E1EB5BBF; Tue, 13 Jan 2015 17:00:02 +0100 (CET) From: Maxime Ripard To: Florian Fainelli , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Luka Perkov , Imre Kaloz Date: Tue, 13 Jan 2015 16:56:39 +0100 Message-Id: <1421164606-3222-3-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1421164606-3222-1-git-send-email-maxime.ripard@free-electrons.com> References: <1421164606-3222-1-git-send-email-maxime.ripard@free-electrons.com> Cc: Thomas Petazzoni , openwrt-devel@lists.openwrt.org, Sudhakar Gundubogula Subject: [OpenWrt-Devel] [PATCH 2/9] mvebu: Switch to the generic mkuimage macro X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" The mvebu image makefile define something almost identical to the generic implementation found in include/image.mk. Switch to this implementation. Signed-off-by: Maxime Ripard --- target/linux/mvebu/image/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index f265dc43d25d..6e00346fe29a 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -24,15 +24,12 @@ KDIR_TMP:=$(KDIR)/tmp UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage -define Image/Build/MkuImage - mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \ - -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2); -endef - define Image/Build/DTB cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1); cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1); - $(call Image/Build/MkuImage,$(KDIR)/zImage$(2)-$(1),$(KDIR)/uImage$(2)-$(1)) + $(call Image/BuildKernel/MkuImage, \ + none, $(LOADADDR), $(LOADADDR), \ + $(KDIR)/zImage$(2)-$(1), $(KDIR)/uImage$(2)-$(1)) cp $(KDIR)/uImage$(2)-$(1) $(UIMAGE)$(2)-$(1); endef