From patchwork Thu Jul 19 10:31:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 946178 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=boundarydevices.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.b="SyOcKrMZ"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41WVgD1lvGz9s4Z for ; Thu, 19 Jul 2018 20:31:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1689288FCC; Thu, 19 Jul 2018 10:31:34 +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 mkfXhwP0sOrX; Thu, 19 Jul 2018 10:31:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7865B88FC1; Thu, 19 Jul 2018 10:31:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CE00E1CF047 for ; Thu, 19 Jul 2018 10:31:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C614188FC1 for ; Thu, 19 Jul 2018 10:31:28 +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 y36lPD9dMjay for ; Thu, 19 Jul 2018 10:31:27 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0E36C88FD6 for ; Thu, 19 Jul 2018 10:31:25 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id v14-v6so7542488wro.5 for ; Thu, 19 Jul 2018 03:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZJ2+G0c5f8CcZN/Zt/5/Ny33g6oqNuSMk5CxUfyDwUg=; b=SyOcKrMZVNvjWlrZs0r7kHAT94uEYRHLtYJC/6Ms69/NJAsLo5kQEUQxK40EyhHtQG tNGUx2nYIS6HPQpOOhxO9uNM26PYHdss6V+Www0V6a7DbdDKgRylOO+EoXGIYr35tqQB XROAvc1fPglXT89gsGj395d3jNiuxTOIbDE8bvq239tnX/HYerO25mX3dRrKMWgSgulx serhJvRJk2J3gS7sOt95snYX6jxtMJI/VdLIjHtImtcwvLozZdz8Enm8g9AtTxUHGoD8 iv26BjX7i/qDT+QJHGbnxA4T4ntyRls8IZ/67StTkBuLACt9fA7iq1CFfLvG6EC3sslN B1ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZJ2+G0c5f8CcZN/Zt/5/Ny33g6oqNuSMk5CxUfyDwUg=; b=ktJSFsmgbocWBWV2dwf2k0cKhfDTy6S9Qd6FVnl6R0TtpQ4IUroKDwAfY7J/LRKNvO T/GGNnggdsVw0AlDdPYhmXG/YZ5n5tA6wUjdONS4iUNOeAM9btC8NB24/bXedTXYr9Cx NuB8BC0h+L7WnyvdV2jivVFhyTRSOCDySeQ4tEpA+vK5bUUUDe/maryfmFRvcae2OsuP W6sMRKk8XrkC2NiNY+MxBDDerNUMVkg+KYQmSPCi6C85JQHz+YEEp0Pz4HJbbX/3eItd bGH4Vax7yO4AOXZVIJyWH6peNH1aYveX+/SA5T23FOBNxH2m08Y5hbovnAz3BkJRYGTh R+Ew== X-Gm-Message-State: AOUpUlGTkLXgn0G8uOoPd5M11jNJqTLpcp2sgThZiaJwJ/Tg0t0WEAe8 fN1B4ihUMAvqGT156bPuCiro7VYOi3s= X-Google-Smtp-Source: AAOMgpe1Nfo13t5QHwyV1cdP1+uQP8S/QxM6ggrCLBQ2x3aIqI6nGcub4YL2iSxrnO37NybqmdEqgQ== X-Received: by 2002:a5d:438d:: with SMTP id i13-v6mr7279831wrq.156.1531996283541; Thu, 19 Jul 2018 03:31:23 -0700 (PDT) Received: from g751.home (2a01cb040a78e30028cbd66b90cf39f4.ipv6.abo.wanadoo.fr. [2a01:cb04:a78:e300:28cb:d66b:90cf:39f4]) by smtp.googlemail.com with ESMTPSA id u4-v6sm11003723wrt.31.2018.07.19.03.31.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jul 2018 03:31:22 -0700 (PDT) From: Gary Bisson To: buildroot@buildroot.org Date: Thu, 19 Jul 2018 12:31:05 +0200 Message-Id: <20180719103109.19887-4-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180719103109.19887-1-gary.bisson@boundarydevices.com> References: <20180719103109.19887-1-gary.bisson@boundarydevices.com> Subject: [Buildroot] [PATCH v2 3/7] board/boundarydevices/common/post-build.sh: fix U-Boot naming X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@bootlin.com MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The upgrade.cmd script expects the binary to be named u-boot.. Signed-off-by: Gary Bisson --- board/boundarydevices/common/post-build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/board/boundarydevices/common/post-build.sh b/board/boundarydevices/common/post-build.sh index b8abb26540..d97c8d7b6a 100755 --- a/board/boundarydevices/common/post-build.sh +++ b/board/boundarydevices/common/post-build.sh @@ -6,6 +6,7 @@ # BOARD_DIR="$(dirname $0)" +UBOOT_DEFCONFIG="$(grep BR2_TARGET_UBOOT_BOARD_DEFCONFIG ${BR2_CONFIG} | sed 's/.*\"\(.*\)\"/\1/')" # bd u-boot looks for standard bootscript install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/ @@ -14,9 +15,9 @@ $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n "boot script" -d $BOARD_DIR/6x_bootscript.txt $TARGET_DIR/6x_bootscript # u-boot / update script for bd upgradeu command -if [ -e $BINARIES_DIR/u-boot.imx ]; -then - install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx +if [ -e $BINARIES_DIR/u-boot.imx ]; then + install -D -m 0644 $BINARIES_DIR/u-boot.imx \ + $TARGET_DIR/u-boot.$UBOOT_DEFCONFIG $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr # legacy 6x_upgrade script