From patchwork Wed Nov 11 11:46:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nathan Rossi X-Patchwork-Id: 542860 X-Patchwork-Delegate: monstr@monstr.eu 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 355A2140297 for ; Wed, 11 Nov 2015 22:47:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nathanrossi_com.20150623.gappssmtp.com header.i=@nathanrossi_com.20150623.gappssmtp.com header.b=yImHFMJT; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BDFE54B7BC; Wed, 11 Nov 2015 12:47:01 +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 2oGCVZ1oPuZ7; Wed, 11 Nov 2015 12:47:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 63F914B7BE; Wed, 11 Nov 2015 12:46:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8ACDB4B779 for ; Wed, 11 Nov 2015 12:46:53 +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 WdlUE5uQ9kTy for ; Wed, 11 Nov 2015 12:46:53 +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-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by theia.denx.de (Postfix) with ESMTPS id 1A2834B774 for ; Wed, 11 Nov 2015 12:46:48 +0100 (CET) Received: by pabfh17 with SMTP id fh17so29448887pab.0 for ; Wed, 11 Nov 2015 03:46:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nathanrossi_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Hd21bBo4ZEJIfbqal34SPVmcgIM+st2QCOZmMGXegFM=; b=yImHFMJTDJ1B94rsLdA0CVo3PgpklFTTKDAS/amuNS+zBu3qpz2Ttc2tpUu58WtpZf 4igBYiRrrnVoPr+rpFhRQOqoWFOuoJdbm8EhQckNlJY9YzS/SLe1+3OsjTyqY2Lz5V01 P9scyFXwbXSCTIFv8ppvb6XON0IG22pj+bjsYopDleEGD81eeF+arXHhxHGhLm+rBADE ZquaoYUxEPs6gHIINUpUVrqPi4kcv53hqK7kEJ6Bn8sTBxPpIdMNZ3xULLImMPSKPbrV RmlIR8zAJkeO+BxIjA+zkjVrOzRjCTI6xY8Fc6ieySppAfKDvo3ROER9x3CkmIR0hoFn wD/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=Hd21bBo4ZEJIfbqal34SPVmcgIM+st2QCOZmMGXegFM=; b=OSz476yWotyTC/k7J45FNIpVLeouiea3AvrjrtvUGsPxEprCZSUVxluSnRTH0wICoT 8lVRuP9hJXXwnEQ6VjPSZrjplMWkR9c/2NfOJnizuDRpK7l3pMB7yDNilyxC+RwZndZS 3jgfjIO7QJ1VROU10cJkXrgCnwUfqG8+CmVzwSSg1eSNNvVTvHAYyds0jWeg8psAh5Q1 l03ftqzG5wHKB53oB/dx6ZUfG4ic2tohzmmTnbBghvF/jpyK9oW2XRP7CT139hpC0vwi V6ilrX+ToMLjfQKDQqDl0/9Y4Yvpi5FJ0I2ghoRFlZGyHFCqAhjQoRDLGY0EIzln9vrn 9Akw== X-Gm-Message-State: ALoCoQniHmfWCYhwimN2lzyh1ViMzBvpK148obGCWtwYPPQBpj9U1F/at1lodqgxIJWlrA7EyABQ X-Received: by 10.66.160.229 with SMTP id xn5mr13663991pab.0.1447242407173; Wed, 11 Nov 2015 03:46:47 -0800 (PST) Received: from nathanbox.home.gateway ([43.252.111.142]) by smtp.gmail.com with ESMTPSA id ia3sm9124563pbb.5.2015.11.11.03.46.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Nov 2015 03:46:45 -0800 (PST) From: Nathan Rossi To: u-boot@lists.denx.de Date: Wed, 11 Nov 2015 21:46:23 +1000 Message-Id: <1447242383-14927-3-git-send-email-nathan@nathanrossi.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1447242383-14927-1-git-send-email-nathan@nathanrossi.com> References: <1447242383-14927-1-git-send-email-nathan@nathanrossi.com> MIME-Version: 1.0 Cc: Tom Rini , Michal Simek , Nathan Rossi Subject: [U-Boot] [PATCH 2/2] ARM: zynq: Add target for building bootable SPL image for Zynq 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add a build target to generate 'boot.bin' which includes SPL. This is used by the platforms BootROM to load SPL directly. This change also conditionally changes what the 'boot.bin' target generates depending on the SoC. Leaving the behaviour unchanged for the AT91 targets. Signed-off-by: Nathan Rossi Signed-off-by: Michal Simek Cc: Tom Rini Cc: Andreas Bießmann Cc: Heiko Schocher Reviewed-by: Tom Rini --- Makefile | 3 +++ scripts/Makefile.spl | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/Makefile b/Makefile index 61050ad..b7da462 100644 --- a/Makefile +++ b/Makefile @@ -1335,6 +1335,9 @@ spl/sunxi-spl.bin: spl/u-boot-spl spl/u-boot-spl-dtb.sfp: spl/u-boot-spl @: +spl/boot.bin: spl/u-boot-spl + @: + tpl/u-boot-tpl.bin: tools prepare $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index dd235b9..b0d8551 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -116,6 +116,7 @@ MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE) MLO MLO.byteswap: $(obj)/u-boot-spl.bin $(call if_changed,mkimage) +ifeq ($(CONFIG_SYS_SOC),"at91") MKIMAGEFLAGS_boot.bin = -T atmelimage ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y) @@ -126,6 +127,12 @@ endif boot.bin: $(obj)/u-boot-spl.bin $(call if_changed,mkimage) +else +MKIMAGEFLAGS_boot.bin = -T zynqimage + +spl/boot.bin: $(obj)/u-boot-spl-dtb.bin + $(call if_changed,mkimage) +endif ALL-y += $(obj)/$(SPL_BIN).bin $(obj)/$(SPL_BIN).cfg @@ -149,6 +156,10 @@ ifeq ($(CONFIG_SYS_SOC),"at91") ALL-y += boot.bin endif +ifdef CONFIG_ARCH_ZYNQ +ALL-y += $(obj)/boot.bin +endif + all: $(ALL-y) quiet_cmd_cat = CAT $@