From patchwork Mon Sep 10 17:51:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 968172 X-Patchwork-Delegate: marek.vasut@gmail.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="aZO63igl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 428FyC6xSdz9s4s for ; Tue, 11 Sep 2018 03:53:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A0919C21E0F; Mon, 10 Sep 2018 17:52:31 +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, 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 A09DAC21DF8; Mon, 10 Sep 2018 17:52:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 12D1AC21DD4; Mon, 10 Sep 2018 17:52:04 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by lists.denx.de (Postfix) with ESMTPS id AF3C8C21BE5 for ; Mon, 10 Sep 2018 17:52:02 +0000 (UTC) Received: by mail-pg1-f180.google.com with SMTP id i190-v6so10846656pgc.6 for ; Mon, 10 Sep 2018 10:52:02 -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:in-reply-to:references; bh=dldGWf4vSag9bfu2EDcgBN0U//ot46fMdHBTdabZqw0=; b=aZO63iglgzbFgfaBL47VU0GUyVQkkDpNjgyVPb93JbtfsX5oklP1EmeSkyMYp2WAfP sm5RoS1ppU5QNrRUopE9Mn/3VeaCdDNZpkMnEBJGWkQnm8vMNtMlTn1oj/qh0lDdaRHc dO3pfRIovRBsZYqg3HYPjWM01l7I/zuXmEj+3sl/DZb5WCuS3IRBeDosflcLyMH6GfPU R5blTLW3A6g29PFB8NZss1gtgUFeIZVFtQWMNlaaY/Pdaj1UbvRGsG0VJAM3Be13o8ci 9WDAFCtGz2qZv62rTbGKeTERk/Uq9ZjdAu1gZSTHhVkN6eYkJib7xDxiNn74QqlQa+UN ChTA== 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=dldGWf4vSag9bfu2EDcgBN0U//ot46fMdHBTdabZqw0=; b=VwHeTbGeEvJXcLE9McBSQksdPykiAw9/emkJqyoh7f+K1K8EhIHTlH25dzCyD8Dbpq 1N2hfFuZglD4Y1QyK5VovO239vl8ly98JN80TrTlBM3cRhLcIMbIJDAHL8dNRFoq2WGJ rX9oAodequgUno8VB/sIjCRyj2TGTu7cjA9b/KWfwhAbEVNguf2tV1/bcTEIs2dtXpfd xj0X7SdqwIsle7JpELrNmzUxTg0VffqlnyNg828Osdely766kSl+6iU7H9h6OqMmPYcC 1hDLvqAzw3ZCXOl8ckNWmN7jM4PUIO9BE2tgr23htyJY6JaXoODObnRs22rJQ6Imh5UA o5bw== X-Gm-Message-State: APzg51BM9dKI5r2nDSYnHvoAaFDx1TJxw9+T7R4LJ0DL73HE5lwjdAzD 1gE1kfpc23FNz2q+TjLv6355/qQ+ X-Google-Smtp-Source: ANB0VdaOseztKoVteB5H5/eSXdbq8pyScEQpHDD/uwOPrpNwFYJBlRpBiYWg45DXijw84UD+Db5bbQ== X-Received: by 2002:a63:b914:: with SMTP id z20-v6mr23959936pge.396.1536601921067; Mon, 10 Sep 2018 10:52:01 -0700 (PDT) Received: from dwesterg-mobl.sn.intel.com ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id t17-v6sm33676582pfm.138.2018.09.10.10.51.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 10:52:00 -0700 (PDT) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, chin.liang.see@intel.com, tien.fong.chee@intel.com Date: Mon, 10 Sep 2018 10:51:52 -0700 Message-Id: <20180910175154.5489-2-dwesterg@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180910175154.5489-1-dwesterg@gmail.com> References: <20180910175154.5489-1-dwesterg@gmail.com> Subject: [U-Boot] [PATCH 1/3] spl: socfpga: remove sfp generation 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In preparation to move to using CONFIG_SPL_TARGET, remove sfp generation targets. Signed-off-by: Dalon Westergreen --- scripts/Makefile.spl | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 252f13826d..9314365aab 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -187,10 +187,6 @@ ifdef CONFIG_SAMSUNG ALL-y += $(obj)/$(BOARD)-spl.bin endif -ifdef CONFIG_ARCH_SOCFPGA -ALL-y += $(obj)/$(SPL_BIN).sfp -endif - ifdef CONFIG_ARCH_SUNXI ALL-y += $(obj)/sunxi-spl.bin @@ -313,14 +309,6 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) endif endif -ifdef CONFIG_TARGET_SOCFPGA_ARRIA10 -MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage_v1 -else -MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage -endif -$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE - $(call if_changed,mkimage) - quiet_cmd_mksunxiboot = MKSUNXI $@ cmd_mksunxiboot = $(objtree)/tools/mksunxiboot \ --default-dt $(CONFIG_DEFAULT_DEVICE_TREE) $< $@ From patchwork Mon Sep 10 17:51:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 968173 X-Patchwork-Delegate: simon.k.r.goldschmidt@gmail.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="LxEV2xam"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 428Fz42gRTz9s3C for ; Tue, 11 Sep 2018 03:53:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 133A2C21E18; Mon, 10 Sep 2018 17:53:07 +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_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 54FF1C21E0D; Mon, 10 Sep 2018 17:52:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4F1DEC21DEC; Mon, 10 Sep 2018 17:52:09 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by lists.denx.de (Postfix) with ESMTPS id A93ACC21DF3 for ; Mon, 10 Sep 2018 17:52:05 +0000 (UTC) Received: by mail-pf1-f171.google.com with SMTP id j8-v6so10844126pff.6 for ; Mon, 10 Sep 2018 10:52:05 -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:in-reply-to:references; bh=M2/fXHXJvCVWOaNs9Hii8S/cWLNZNZrZovkFG+md804=; b=LxEV2xamBK2kAH53tE57yftmcrNI0bPlnjY4yoOJD06DySPbdZRTx2mzkYz108Xthi zXDmuwVI5bOsDUoNCmPcNJg+63xCYoFdVwpbAOMA2j4uhqToR0FNr1A/X/3K/c/zgFif oPdFmwDY5WbObRepT81F7/sjipsYZaTQlvGMe/4YA/H54y8K6ET9vyHjFDHQaqYtV2cF KRhlQFoI3ILuHW5DlX88rRLLmxjUmusWRHAVJUgDJg4BHPH3PtguJlcCT9JKZ4SQ0ilf mIZ4IjQiNd9/pcGUlevyFwtzPhKfDykkSyy2fa3Kh08VutWAgSy2v8ILigNQfD1iMvaL Walg== 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=M2/fXHXJvCVWOaNs9Hii8S/cWLNZNZrZovkFG+md804=; b=QWkNcr+rafBQmdvduRbWHtEzD8JVbmmPD3QaX0wTVH9OPwT/pXjWf/9eUFEzjPktzj nTYZNJXhlk/wTlG7y2rl2BA0+TTJpzvwghnYYXQKj3M/hXGAtszuI78r9IaBLFrebh/i qONCFF26S13sJubCM+ZhSpOrtNYWsavUMt9etYeGXncihVvZUwhbraq1A42YG4U7E1Kp gJ/wW2Ha8u4O3BAkNOnEWnRvYSt5tQtWZcDlIvMbyy7F2RthDcKPEnpIAC0UxE9IDOOv o671GTq682B42i/Nhm+U8lUyTnpsL/FVH3QUHmgYYzl8DG2kGvFvCVMs8nZf1uCPZacV 3BLg== X-Gm-Message-State: APzg51AgjNQ7UhqD/fhbP0VEN3NwsaYjqrJdMc5LkNpQCUjsMkCHEkwY Bu+7AMh5QGmMdpfu81MDmdWqpom4 X-Google-Smtp-Source: ANB0VdaSDGWltqCXDIaA0GdJ5G7PbzlW8KvCtEF+oINVK+ijtxKe6N7kRgM6Z/rbhEWvAlEbQo9unA== X-Received: by 2002:a63:b705:: with SMTP id t5-v6mr22656784pgf.366.1536601922401; Mon, 10 Sep 2018 10:52:02 -0700 (PDT) Received: from dwesterg-mobl.sn.intel.com ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id t17-v6sm33676582pfm.138.2018.09.10.10.52.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 10:52:01 -0700 (PDT) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, chin.liang.see@intel.com, tien.fong.chee@intel.com Date: Mon, 10 Sep 2018 10:51:53 -0700 Message-Id: <20180910175154.5489-3-dwesterg@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180910175154.5489-1-dwesterg@gmail.com> References: <20180910175154.5489-1-dwesterg@gmail.com> Subject: [U-Boot] [PATCH 2/3] socfpga: Add sfp generation targets 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Some SOCFPGA platforms require a header be added to u-boot-spl and a combined spl / u-boot image. The combined image consists of 4 replicated u-boot-spl images with the afore mentioned header, and a u-boot image cat'ed together. Signed-off-by: Dalon Westergreen --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 133d7ac773..6c93c6c129 100644 --- a/Makefile +++ b/Makefile @@ -1198,14 +1198,12 @@ OBJCOPYFLAGS_u-boot.spr = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE $(call if_changed,pad_cat) -ifneq ($(CONFIG_ARCH_SOCFPGA),) quiet_cmd_socboot = SOCBOOT $@ 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 # x86 uses a large ROM. We fill it with 0xff, put the 16-bit stuff (including # reset vector) at the top, Intel ME descriptor at the bottom, and U-Boot in @@ -1518,8 +1516,13 @@ spl/sunxi-spl.bin: spl/u-boot-spl spl/sunxi-spl-with-ecc.bin: spl/sunxi-spl.bin @: -spl/u-boot-spl.sfp: spl/u-boot-spl - @: +ifdef CONFIG_TARGET_SOCFPGA_ARRIA10 +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage_v1 +else +MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage +endif +spl/u-boot-spl.sfp: spl/u-boot-spl.bin FORCE + $(call if_changed,mkimage) spl/boot.bin: spl/u-boot-spl @: From patchwork Mon Sep 10 17:51:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 968171 X-Patchwork-Delegate: simon.k.r.goldschmidt@gmail.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="ZZtkebcW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 428Fxy095Kz9s3C for ; Tue, 11 Sep 2018 03:52:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AB900C21DD4; Mon, 10 Sep 2018 17:52:48 +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_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 6DF19C21C50; Mon, 10 Sep 2018 17:52:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 631A1C21E12; Mon, 10 Sep 2018 17:52:10 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id A1905C21DEC for ; Mon, 10 Sep 2018 17:52:05 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id d19-v6so10859043pgv.1 for ; Mon, 10 Sep 2018 10:52:05 -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:in-reply-to:references; bh=gIP5X17kDhjHMfw14ni6GVM52eNKwPmjZ2cNfGP+Fo8=; b=ZZtkebcWsJ0SQVFL8k8EsM0eMQxL46h7NsO8TtWisKqje4Zz2UxqNG2IRGDDaNPbpg sfUUnfU4Wo1OE4ddSmHSS/wYRqGfE3l8yh9lZ2uaQS9JoeuFKumH9aV+8ttPLXcxAtPT txyUo6uZkzn8uAGKrlcb7DvZ+L3aF6SIY7cuXZ4uh/s8rzwom/QQRmvD1yq60iuV6yP/ SmbV50jvyC1iSSsazVPjS3sJFpHz6GstNiVFK0iP72W55mpGZMKswuXzTswvZeBix3lK VW7M9pgAP31HhOwMpQQ5pGitXyrH8ojn4bpC4wh1VYg/NClGp8gVdPTcZII1GuLVBr8w vWMg== 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=gIP5X17kDhjHMfw14ni6GVM52eNKwPmjZ2cNfGP+Fo8=; b=b2mueDrnjJvI6cahowWA8+D4B3k5qWygCeu/vmBe/MOcDk+UltPegGmtUKOtksxn41 +NS7JmRg9+CPfQ5ZANeAjw0galZqU4PWf45UeCeD1wB+ffW9QztcFLGm6TBniTLzlG1f DReVCXluSgMg4eo9ZKnV5sOZ32+nqJwFzDpTRdjKlN1FxETQgd/rcYTAXyFDdb/iKK2n eV4XFrouMaTBbxXbe/bozxLOS/T/2ybBzy9fxg+HSjuQP/G7TdxtCgFNvOyaI9FmpSDf bjBqLwf7q005j8bJjC53x2V1cQsmwncbGEMTorL5vbs//NGozI/ruxIY1anZcQ/5BBTu SrdQ== X-Gm-Message-State: APzg51DEb/WtCTA3qHDv4rI4n5OI3Jyyfn1EA45nGCbkooiMB9btyF+q OLq8H2ARK7y2Ei1qf5QNptcWOkL+ X-Google-Smtp-Source: ANB0VdZbyv6xdULcZ491Hug0ki9hgkNHxSgmZXsn8Q7kooJi2XoMITnRnyd39n0L2ZZ+hSYT/j6X3A== X-Received: by 2002:a65:5307:: with SMTP id m7-v6mr23601415pgq.431.1536601923986; Mon, 10 Sep 2018 10:52:03 -0700 (PDT) Received: from dwesterg-mobl.sn.intel.com ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id t17-v6sm33676582pfm.138.2018.09.10.10.52.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 10:52:03 -0700 (PDT) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, chin.liang.see@intel.com, tien.fong.chee@intel.com Date: Mon, 10 Sep 2018 10:51:54 -0700 Message-Id: <20180910175154.5489-4-dwesterg@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180910175154.5489-1-dwesterg@gmail.com> References: <20180910175154.5489-1-dwesterg@gmail.com> Subject: [U-Boot] [PATCH 3/3] socfpga: common: add CONFIG_SPL_TARGET to gen5 and arria10 socfpga header 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add CONFIG_SPL_TARGET "u-boot-with-spl.sfp" to common header to generate the required u-boot-spl and u-boot combined image. Signed-off-by: Dalon Westergreen --- include/configs/socfpga_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 2330143cf1..4777b4522d 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -239,6 +239,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * 0xFFEz_zzzz ...... Malloc area (grows up to top) * 0xFFE3_FFFF ...... End of SRAM (top) */ +#define CONFIG_SPL_TARGET "u-boot-with-spl.sfp" #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE