From patchwork Mon Feb 1 01:10:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 576271 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3FD13140C07 for ; Mon, 1 Feb 2016 12:12:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=V5NI4hOA; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A3CAA75AA; Mon, 1 Feb 2016 02:11:42 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pLC-vrBT-4O7; Mon, 1 Feb 2016 02:11:42 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1252CA756B; Mon, 1 Feb 2016 02:11:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EFA78A7529 for ; Mon, 1 Feb 2016 02:11:08 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H_L-4mTngJBM for ; Mon, 1 Feb 2016 02:11:08 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f170.google.com (mail-ob0-f170.google.com [209.85.214.170]) by theia.denx.de (Postfix) with ESMTPS id 2354DA753A for ; Mon, 1 Feb 2016 02:11:03 +0100 (CET) Received: by mail-ob0-f170.google.com with SMTP id xk3so6445410obc.2 for ; Sun, 31 Jan 2016 17:11:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=XbOZLbldBIQpdwUmy/o/RPshrVnYYvGnsYl51mbhFaw=; b=V5NI4hOAiVUogvxfQTddM6qs/KENr8RWgfiAdQJVSRZ82E3qPeM8F1cmEIrG2f/9Zn xrlRREdaDZpEm0cMVi4J3u+7YmAps17kgzVRQmpDFmr+zE/YgxWyaRunrqMGt8jb0F5E 5TvolQzgEmjZs+ymS/3r/2VDha+2qw72tQ7GapQYmYmW5d1HRcB4ru9RD2WfYxX+zRgD YjCytodWNWG8hM+61tAaLfg1NykzHIyllU60EoAbN9zou/9gKPE+Dm+SdFR8JDoVxFP6 iM+eHnrLPIBexSxJefbdGyzfHNh0PUGSjlBnYZ31FIVES0rx5wfm8QVsynnmwlaI4yAX duvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=XbOZLbldBIQpdwUmy/o/RPshrVnYYvGnsYl51mbhFaw=; b=H32OpOCHAV1fz3snHloOPu0o+G+h2I+aP+TrhpknSgQVV61B/V0pGOAlVajRfcqePO 1nM/34ntpOXi62wcX1i/cg2wOiZoK02OX/VFR9g67wkXLrC4fuZITaXW/p5p+j+mBEbS luiNCPJCXLZybbkZCotpDczKTHak2HLXWOaBLUQfCzLRmTSCb7bvyR4JIWZopMLtAPE8 on6asaTFQuUJD8JnBmfAAXYeaEJoZ3ptexbZv96Gu+RvQxl27l6yBlAiUpspd+x3LyXN NNrFPX1GPdUXpLtJZyHzV9F1WdMZQI4g2IFC72Ein04KPvoXpdYWNAFC852Gd7oPmFWh dvqw== X-Gm-Message-State: AG10YOQNdUV+2m0bSyOrep+zY+AUgRI1hJKOeJnpNM3X1kYpNt/W4JNhWGPGo5TYA9C/U5wI X-Received: by 10.60.81.103 with SMTP id z7mr16096864oex.59.1454289062347; Sun, 31 Jan 2016 17:11:02 -0800 (PST) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:5567:9246:497b:9030]) by smtp.gmail.com with ESMTPSA id v197sm5963872oia.9.2016.01.31.17.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Jan 2016 17:11:00 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 5343C2215DD; Sun, 31 Jan 2016 18:10:57 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 31 Jan 2016 18:10:53 -0700 Message-Id: <1454289055-17054-6-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1454289055-17054-1-git-send-email-sjg@chromium.org> References: <1454289055-17054-1-git-send-email-sjg@chromium.org> Cc: Marek Vasut , Tom Rini , Stephen Warren , Tom Warren Subject: [U-Boot] [PATCH v3 5/7] socfpga: Simplify Makefile filenames X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We don't need the -dtb suffix anymore, so drop it. Signed-off-by: Simon Glass --- Changes in v3: None Changes in v2: - Fix the update_filename in MCV Makefile | 10 +++++----- include/configs/socfpga_mcvevk.h | 2 +- scripts/Makefile.spl | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 74c13f0..b4e75a5 100644 --- a/Makefile +++ b/Makefile @@ -1010,10 +1010,10 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE ifneq ($(CONFIG_ARCH_SOCFPGA),) quiet_cmd_socboot = SOCBOOT $@ -cmd_socboot = cat spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \ - spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \ - u-boot-dtb.img > $@ || rm -f $@ -u-boot-with-spl-dtb.sfp: spl/u-boot-spl-dtb.sfp u-boot-dtb.img FORCE +cmd_socboot = cat spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ + spl/u-boot-spl.sfp spl/u-boot-spl.sfp \ + u-boot.img > $@ || rm -f $@ +u-boot-with-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE $(call if_changed,socboot) endif @@ -1322,7 +1322,7 @@ spl/u-boot-spl: tools prepare $(if $(CONFIG_OF_SEPARATE),dts/dt.dtb) spl/sunxi-spl.bin: spl/u-boot-spl @: -spl/u-boot-spl-dtb.sfp: spl/u-boot-spl +spl/u-boot-spl.sfp: spl/u-boot-spl @: spl/boot.bin: spl/u-boot-spl diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index e7b5675..f260a64 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -56,7 +56,7 @@ "netdev=eth0\0" \ "hostname=mcvevk\0" \ "kernel_addr_r=0x10000000\0" \ - "update_filename=u-boot-with-spl-dtb.sfp\0" \ + "update_filename=u-boot-with-spl.sfp\0" \ "update_sd_offset=0x800\0" \ "update_sd=" /* Update the SD firmware partition */ \ "if mmc rescan ; then " \ diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index bc6a330..f486feb 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -142,7 +142,7 @@ ALL-y += $(obj)/$(BOARD)-spl.bin endif ifdef CONFIG_ARCH_SOCFPGA -ALL-y += $(obj)/$(SPL_BIN)-dtb.sfp +ALL-y += $(obj)/$(SPL_BIN).sfp endif ifdef CONFIG_SUNXI @@ -229,8 +229,8 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) endif ifdef CONFIG_ARCH_SOCFPGA -MKIMAGEFLAGS_$(SPL_BIN)-dtb.sfp = -T socfpgaimage -$(obj)/$(SPL_BIN)-dtb.sfp: $(obj)/$(SPL_BIN)-dtb.bin FORCE +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage +$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE $(call if_changed,mkimage) endif