From patchwork Sun Apr 5 12:01:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Geyer X-Patchwork-Id: 458243 X-Patchwork-Delegate: wigyori@uid0.hu 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 25FF91401EF for ; Sun, 5 Apr 2015 22:02:16 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 63AD628C684; Sun, 5 Apr 2015 14:01:25 +0200 (CEST) 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 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 77A0128C684 for ; Sun, 5 Apr 2015 14:01:18 +0200 (CEST) X-policyd-weight: using cached result; rate: -7.6 Received: from mail.cosmopool.net (h1.radempa.de [176.9.142.194]) by arrakis.dune.hu (Postfix) with ESMTP for ; Sun, 5 Apr 2015 14:01:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.cosmopool.net (Postfix) with ESMTP id 83F5D903BEA; Sun, 5 Apr 2015 14:02:01 +0200 (CEST) Received: from mail.cosmopool.net ([127.0.0.1]) by localhost (mail.your-server.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PQp7zUldT56m; Sun, 5 Apr 2015 14:02:01 +0200 (CEST) Received: from huygens.ccbib.org (unknown [10.0.10.106]) by mail.cosmopool.net (Postfix) with SMTP id 06796903A0D; Sun, 5 Apr 2015 14:02:00 +0200 (CEST) Received: by huygens.ccbib.org (sSMTP sendmail emulation); Sun, 05 Apr 2015 12:02:00 +0000 From: Harald Geyer To: Zoltan HERPAI Date: Sun, 5 Apr 2015 12:01:47 +0000 Message-Id: <1428235308-31968-1-git-send-email-harald@ccbib.org> X-Mailer: git-send-email 1.7.10.4 Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH] mxs: Include the right kernel image in the rootfs 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" Currently we always include the zImage if any image is selected for inclusion in the root filesystem. This patch adds discrimination between zImage and uImage. Signed-off-by: Harald Geyer Acked-by: Michael Heimpold --- target/linux/mxs/image/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile index 55e88c2..9830a7d 100644 --- a/target/linux/mxs/image/Makefile +++ b/target/linux/mxs/image/Makefile @@ -22,10 +22,15 @@ endef define Image/InstallKernel - ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),) + ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE),) mkdir -p $(TARGET_DIR)/boot $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(TARGET_DIR)/boot/ endif + + ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE),) + mkdir -p $(TARGET_DIR)/boot + cp $(KDIR)/uImage $(TARGET_DIR)/boot/ + endif ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),) mkdir -p $(TARGET_DIR)/boot