From patchwork Sat Dec 8 19:49:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 1009885 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; 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="JPFAHUAp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43C0Kc6y1xz9s4s for ; Sun, 9 Dec 2018 06:49:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7B951C22481; Sat, 8 Dec 2018 19:49:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 13610C220E1; Sat, 8 Dec 2018 19:49:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AEE0FC222E8; Sat, 8 Dec 2018 19:49:26 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id EE0FBC220E1 for ; Sat, 8 Dec 2018 19:49:25 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id v10so5877080ios.13 for ; Sat, 08 Dec 2018 11:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=81dsNhvmuOoED92D9ax1pe6U02jsq/+8XnchOY1MPjc=; b=JPFAHUApTeRCRHKS40ZXh6vLA3zSg/DnzyMq1n02VxyRpAMadndjaUmp08TUY23vgv cf0O751n7f+ijq4hM+IwXq/62odvT+MvkmxzRFodyhkB0S6/GT5Gc/0oLbJIVsTDVcKw DXNJBbO1ilR1BoEBzYkz8v1dOHHL3dvo7YCfEQVSMkKzIdBFqufqYtjfTY56tIqskYGS vjzJIee2WrY/WvzTE9ayfR9BjvNoxQuTxoQYspYk7b6t3U5FOYjoTvqff4GVxc7PY6cb NX91zqiPmj1v41V4qtCBq1TzQaIvV6uiHNgy6M9k5/fX9bjXJekf5sImST/G3Dj7MH7y 4xLA== 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:mime-version:content-transfer-encoding; bh=81dsNhvmuOoED92D9ax1pe6U02jsq/+8XnchOY1MPjc=; b=dRBOHlR+Y48yisqOTn0sXfsumpsJ32x0XmttBdEVqfj7OYDT5LFSgzGmuIfxOxmahB ny7y4CCwmrW1AU3a+2H0qFO5BHG6K0Va5hYB8iEFYYpsDbUKIvwBsey3zfK7Y9sSezde tIE/eH7wx60O9GA4VaBp/rbp3oIrfRtxgSA85FoPhG3/Q9j1XX909RTeowkc4mGPKDLk 8IoPnFF8XVE9W5Z2f2gR8Uht/sdI7sULl/wVjWwBMIjiLbIzRxdGq0uZlkIsadu8mYFj Wp+l3p7q8dLm66APVt1i9vKW5n/bxxMJuF0IfBXZRijfr6GbHX2NKPXscTd0WcbjO0u/ Svbg== X-Gm-Message-State: AA+aEWb6ppjukwdaaLfiCUPV/G7Shy7jQyI6Xn2JTsEG9oGYyoHXy6R3 8rS+6ExrzXewbiUzKza9DDtXN0heZqLOtw== X-Google-Smtp-Source: AFSGD/VL4jPsh08DjrcXYmZV/P3Fsg3Kbrwkxotd8By097cy+Ihv7w80h70Fk4rGzLbJ/ibi68B3uQ== X-Received: by 2002:a6b:8f91:: with SMTP id r139mr5466543iod.128.1544298559590; Sat, 08 Dec 2018 11:49:19 -0800 (PST) Received: from ethiopia.woodsts.org (c-73-176-50-185.hsd1.il.comcast.net. [73.176.50.185]) by smtp.gmail.com with ESMTPSA id m20sm3953007itm.29.2018.12.08.11.49.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Dec 2018 11:49:18 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Sat, 8 Dec 2018 13:49:05 -0600 Message-Id: <20181208194905.21014-1-woods.technical@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: References: MIME-Version: 1.0 Cc: trini@konsulko.com, wenyou.yang@microchip.com, photonthunder@gmail.com Subject: [U-Boot] [PATCH] ARM: at91: Fix 'boot.bin' generation when CONFIG_SD_BOOT is enabled X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" On AT91 platforms configured for SD_BOOT, this commit avoids the generation of the PMECC header used for booting from NAND flash. This issue was found by attempting to boot the SAMA5D3-XPLD board with the 'sama5d3_xplained_mmc_defconfig'. [PMECC Reference] http://www.at91.com/linux4sam/bin/view/Linux4SAM/AT91Bootstrap [Mailing List Thread] https://lists.denx.de/pipermail/u-boot/2018-December/350666.html Fixes: 5541543f ("configs: at91: Remove CONFIG_SYS_EXTRA_OPTIONS assignment") Reported-by: Daniel Evans Cc: Robert Nelson Cc: Eugen Hristev Cc: Wenyou Yang Signed-off-by: Derald D. Woods --- scripts/Makefile.spl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 22bd8f7c27..e727cb610f 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -166,10 +166,12 @@ ifeq ($(CONFIG_SYS_SOC),"at91") MKIMAGEFLAGS_boot.bin = -T atmelimage ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y) +ifneq ($(CONFIG_SD_BOOT),y) MKIMAGEFLAGS_boot.bin += -n $(shell $(obj)/../tools/atmel_pmecc_params) boot.bin: $(obj)/../tools/atmel_pmecc_params endif +endif boot.bin: $(obj)/u-boot-spl.bin FORCE $(call if_changed,mkimage)