From patchwork Wed Apr 13 20:03:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 610245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3qlZXL6RFXz9s9W for ; Thu, 14 Apr 2016 06:04:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=vanguardiasur-com-ar.20150623.gappssmtp.com header.i=@vanguardiasur-com-ar.20150623.gappssmtp.com header.b=SfgaSLsb; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A9FD7879AC; Wed, 13 Apr 2016 20:04:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QNt8TGYF01_f; Wed, 13 Apr 2016 20:04:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C07C6896FF; Wed, 13 Apr 2016 20:04:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 82E6A1C2647 for ; Wed, 13 Apr 2016 20:04:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F705897E3 for ; Wed, 13 Apr 2016 20:04:40 +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 ZhPsM9fzc1L7 for ; Wed, 13 Apr 2016 20:04:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qg0-f53.google.com (mail-qg0-f53.google.com [209.85.192.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 935BC888DD for ; Wed, 13 Apr 2016 20:04:39 +0000 (UTC) Received: by mail-qg0-f53.google.com with SMTP id f105so51534668qge.2 for ; Wed, 13 Apr 2016 13:04:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3BJcSlfkm1NljJhpNzry1XG73VaMsfleBb4G/OWv30s=; b=SfgaSLsbUiYwKDehJItxAzMxqHlZPrBneiGWFipC5/9BZiPDgxdq/poGs39nAQYrZz zKxvHtF5la/NIgxA2qhgz922xT0xoD8DnNgJ5scAjIGZNlH0brBuoBDMVyAV0BCDNFoA OnFsHtyf/9Dz8l2Fy8CTjavzuYB0rlVy1E8qD9FwIcSG3VZLdGbN6PPHzCr65WwJ1kdX KV0VCg+nDksCQ1txudSSLm3u5EdDXRQf0AbzxwePDiEjQ+1KR81rlYQLbHSSzcD1fgN+ tmhd20fzXYlyh8SarIzCxKJqgp6ZQ8u6xGWw/iolXupgEhUq/0Ldk3BLuZpf9z1LuHhb 2w2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3BJcSlfkm1NljJhpNzry1XG73VaMsfleBb4G/OWv30s=; b=YstiiekJciBapby7SJIUJ5btXXJ62r+M7NojtReXY/FTk+l6hsNxYXNUBCqobtfpGg gCmJ8yCXjoHiKwltP8EieQZ4P8ojLMwRFIrrFwu2jByR9bYmiqVBnGzkbV6iBcKr2m8U m4prnewelfrwyRUGzIPlqqFGv1NQJUsUOtz7aWR610VIXaB89t1ekCmWm1Nae4iZT+OO 5ClGX3qmIoMnYAa60I6m0XUtB5fRDWdVJvY/6MmpE9CbSgEZi7zv3WBtRgY0Ctbbec6A TNbl/6KNKiGE29ZNfjEjxgEb3WpVRehXaFYeIksAWZhYWnR8cQBs/zW7l+6sMrtZB2lu Jxfg== X-Gm-Message-State: AOPr4FWTU+sm7lQYrV+2HDO4EdBWlOno7G2OYsMMEoG1FzTlXdjNamMJ5mX63Of9dklryQ== X-Received: by 10.140.102.193 with SMTP id w59mr13496124qge.58.1460577878779; Wed, 13 Apr 2016 13:04:38 -0700 (PDT) Received: from localhost.localdomain ([190.2.108.156]) by smtp.gmail.com with ESMTPSA id 76sm16453856qhs.21.2016.04.13.13.04.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Apr 2016 13:04:37 -0700 (PDT) From: Ezequiel Garcia To: Date: Wed, 13 Apr 2016 17:03:36 -0300 Message-Id: <1460577820-32164-12-git-send-email-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1460577820-32164-1-git-send-email-ezequiel@vanguardiasur.com.ar> References: <1460577820-32164-1-git-send-email-ezequiel@vanguardiasur.com.ar> Cc: Thomas Petazzoni , "Yann E . MORIN" Subject: [Buildroot] [PATCH 11/15] board/boundarydevices: Leverage the new genimage infra X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Let's rework the board and config files to use the recently added genimage infra, which generates the SD card image directly. Signed-off-by: Ezequiel Garcia --- board/boundarydevices/common/post-image.sh | 16 ---------------- configs/nitrogen6sx_defconfig | 4 ++-- configs/nitrogen6x_defconfig | 4 ++-- configs/nitrogen7_defconfig | 4 ++-- 4 files changed, 6 insertions(+), 22 deletions(-) delete mode 100755 board/boundarydevices/common/post-image.sh diff --git a/board/boundarydevices/common/post-image.sh b/board/boundarydevices/common/post-image.sh deleted file mode 100755 index 9cca1b1789ec..000000000000 --- a/board/boundarydevices/common/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index 9d2531769050..29a4ffdc27c6 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -6,13 +6,13 @@ BR2_cortex_a9=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y # filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_GENIMAGE=y +BR2_TARGET_ROOTFS_GENIMAGE_CFG="board/boundarydevices/common/genimage.cfg" # Linux headers same as kernel, a 3.14 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 866b1f8ffc3a..1307d713bb68 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -6,13 +6,13 @@ BR2_cortex_a9=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y # filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_GENIMAGE=y +BR2_TARGET_ROOTFS_GENIMAGE_CFG="board/boundarydevices/common/genimage.cfg" # Linux headers same as kernel, a 3.14 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index 9d54d789fa11..0b1cd558ba48 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -6,14 +6,14 @@ BR2_cortex_a7=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/boundarydevices/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/boundarydevices/common/post-image.sh" -BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y # filesystem # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_GENIMAGE=y +BR2_TARGET_ROOTFS_GENIMAGE_CFG="board/boundarydevices/common/genimage.cfg" # Linux headers same as kernel, a 3.14 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y