From patchwork Wed Mar 29 14:51:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phelip Etienne X-Patchwork-Id: 744826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vtW235Byxz9s2Q for ; Thu, 30 Mar 2017 01:52:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0EBAB88FDC; Wed, 29 Mar 2017 14:52:04 +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 JoRpE-mqFFCu; Wed, 29 Mar 2017 14:51:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 196A089664; Wed, 29 Mar 2017 14:51:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4C1271C0412 for ; Wed, 29 Mar 2017 14:51:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4C8D189AB3 for ; Wed, 29 Mar 2017 14:51:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VLnj5wZHK91I for ; Wed, 29 Mar 2017 14:51:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0DD7E89B8C for ; Wed, 29 Mar 2017 14:51:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 152D79C1B14; Wed, 29 Mar 2017 10:51:41 -0400 (EDT) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id BmMgzKCOAXRF; Wed, 29 Mar 2017 10:51:39 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 8FD7B9C1B45; Wed, 29 Mar 2017 10:51:39 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id AzA6NSf7JHxj; Wed, 29 Mar 2017 10:51:39 -0400 (EDT) Received: from localhost.mtl.sfl (unknown [192.168.49.129]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 7089E9C1B17; Wed, 29 Mar 2017 10:51:39 -0400 (EDT) From: Etienne Phelip To: buildroot@buildroot.org Date: Wed, 29 Mar 2017 10:51:19 -0400 Message-Id: <20170329145120.11863-4-etienne.phelip@savoirfairelinux.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170329145120.11863-1-etienne.phelip@savoirfairelinux.com> References: <20170329145120.11863-1-etienne.phelip@savoirfairelinux.com> Cc: Etienne Phelip Subject: [Buildroot] [RFC 3/4] configs/raspberrypi3_defconfig: set BR2_GENIMAGE_CFG_FILES 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" Use the new BR2_GENIMAGE_CFG_FILES Kconfig symbol to reduce boilerplate and use the generic genimage wrapper. Signed-off-by: Etienne Phelip --- board/raspberrypi/post-image.sh | 16 ---------------- configs/raspberrypi3_defconfig | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index b2bb070..6d8e62c 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -1,10 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" -BOARD_NAME="$(basename ${BOARD_DIR})" -GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - case "${2}" in --add-pi3-miniuart-bt-overlay) if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then @@ -17,14 +12,3 @@ __EOF__ fi ;; esac - -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/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index de0c42d..a6deff4 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -35,3 +35,4 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" +BR2_GENIMAGE_CFG_FILES="board/raspberrypi3/genimage-raspberrypi3.cfg"