From patchwork Tue Jul 9 09:57:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris OFFOUGA X-Patchwork-Id: 1129673 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e32KjL2X"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45jd675FBPz9sMr for ; Tue, 9 Jul 2019 19:57:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D637386246; Tue, 9 Jul 2019 09:57:29 +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 3NDcGvFR5Vzg; Tue, 9 Jul 2019 09:57:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BBB0F864E0; Tue, 9 Jul 2019 09:57:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 916B41BF29D for ; Tue, 9 Jul 2019 09:57:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8B4952047A for ; Tue, 9 Jul 2019 09:57:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MiUgYvr9Ihzq for ; Tue, 9 Jul 2019 09:57:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by silver.osuosl.org (Postfix) with ESMTPS id A1E432040C for ; Tue, 9 Jul 2019 09:57:26 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id y4so11704938wrm.2 for ; Tue, 09 Jul 2019 02:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Rosk/mNme2vVyU2VCggd5PaEBL1P2r6+qcZiCvNAJlk=; b=e32KjL2XbhiqwfudTTmnKhGE9zrJZw5PtRqHwsLgecHpCaOejzT167neQpVAyy2xRg VjtFRA8NgNOBdOANlS1PPdS5jaAxdFc9VJj7nQw2rhuAHEQ+WJrtlX4JKakfariH2gx0 EktYPMGDcrpZaBdx2D63uQf3asv0nF28KFQ+mu5IfqEK2h/5jVj/bu6EuV5T3BjRRU/R oFX+YS5p3NSB9hBbQtkiudigHxq9BRn21GoOElnKRcuVQN06YIa43rPBZ8hPl8iFygOk 78V9pO3VbiRIRMPz9x7Ju3L7+frQdOaUsG/4tKlz5DZGdWMyrpTrNW9yEsrQlxUbd7/4 qLzQ== 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; bh=Rosk/mNme2vVyU2VCggd5PaEBL1P2r6+qcZiCvNAJlk=; b=eqWloBI6GPF13cO8I/xMgRFwU+0ZA3xFW2R8JwUlr7464yFbhlxRioX8qeeLvfuSwE smOVKIVfKowSQ8dCjgsHluelIm/iBn8iO0Pu0QQe6FGb07XpWumJns4p6k9YexjycRpR Nfa1FJmlwkYRZmX+cNdo6VkxXufJNQKyqU6Ot+eEYKHDGO1NPOfmgo5j9wywVD08a/Yr SJURguDXNQptRX5NTw6TLViF2fUW2UISZD36i1olKGp0yC22J7N6d2zOLtdjFYSgopNh MNZoCCKhQ2Y2cRV0rNdSCsctKMx4PIcE3LjrpD7HKN7gog2Dqxu2xqXmKAemmwzaB61g ZhNQ== X-Gm-Message-State: APjAAAUOCaFwX0C34l8vWFeF9TWfN0HBPvMj31vug3JuRJ+QOYLVCvxY 5Y1c4oQdiGn6cCpN7tQEUd4oFHG9 X-Google-Smtp-Source: APXvYqzwqcQlSHlCJ+BM2DWNDtO+kA0oliTZ3FMgYFXPM3XNxlPBCuT4CUQ3wg20drq2qT5IHzOgsQ== X-Received: by 2002:a05:6000:10c1:: with SMTP id b1mr21296523wrx.126.1562666244813; Tue, 09 Jul 2019 02:57:24 -0700 (PDT) Received: from localhost.localdomain ([37.58.205.20]) by smtp.gmail.com with ESMTPSA id g25sm1846032wmk.39.2019.07.09.02.57.23 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 02:57:24 -0700 (PDT) From: Joris Offouga To: buildroot@buildroot.org Date: Tue, 9 Jul 2019 11:57:02 +0200 Message-Id: <20190709095703.24229-1-offougajoris@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/2] board/freescale: Introduce UBOOTBIN in spl template X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joris Offouga MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" For board like imx7d-pico u-boot.img change to u-boot-dtb.img in U-Boot v2019.07 so replace hard code u-boot.img with variable Signed-off-by: Joris Offouga --- .../common/imx/genimage.cfg.template_no_boot_part_spl | 4 ++-- board/freescale/common/imx/genimage.cfg.template_spl | 4 ++-- board/freescale/common/imx/post-image.sh | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl b/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl index 9cdecc6ce0..c29032572a 100644 --- a/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl +++ b/board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl @@ -17,9 +17,9 @@ image sdcard.img { offset = 1024 } - partition u-boot-img { + partition u-boot { in-partition-table = "no" - image = "u-boot.img" + image = "%UBOOTBIN%" offset = 69K } diff --git a/board/freescale/common/imx/genimage.cfg.template_spl b/board/freescale/common/imx/genimage.cfg.template_spl index 0b6e22864b..d2d810777b 100644 --- a/board/freescale/common/imx/genimage.cfg.template_spl +++ b/board/freescale/common/imx/genimage.cfg.template_spl @@ -26,9 +26,9 @@ image sdcard.img { offset = 1024 } - partition u-boot-img { + partition u-boot { in-partition-table = "no" - image = "u-boot.img" + image = "%UBOOTBIN%" offset = 69K } diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index 12756c63d5..ab51dc2098 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -66,6 +66,10 @@ uboot_image() echo "u-boot-dtb.imx" elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then echo "u-boot.imx" + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then + echo "u-boot-dtb.img" + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then + echo "u-boot.img" fi }