From patchwork Wed Apr 13 21:52:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 65766 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp252881qge; Wed, 13 Apr 2016 14:53:01 -0700 (PDT) X-Received: by 10.194.78.235 with SMTP id e11mr11776024wjx.54.1460584381596; Wed, 13 Apr 2016 14:53:01 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id ci16si41909507wjb.126.2016.04.13.14.53.01; Wed, 13 Apr 2016 14:53:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6D716A75F1; Wed, 13 Apr 2016 23:53:00 +0200 (CEST) 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 igw8CMNJKhYL; Wed, 13 Apr 2016 23:52:59 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2A52CA752D; Wed, 13 Apr 2016 23:52:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6A5F6A752D for ; Wed, 13 Apr 2016 23:52:55 +0200 (CEST) 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 JyhlGo4F_ub4 for ; Wed, 13 Apr 2016 23:52:55 +0200 (CEST) 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 conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by theia.denx.de (Postfix) with ESMTPS id 986F2A74BA for ; Wed, 13 Apr 2016 23:52:50 +0200 (CEST) Received: from grover.sesame (FL1-203-136-65-164.osk.mesh.ad.jp [203.136.65.164]) (authenticated) by conuserg-11.nifty.com with ESMTP id u3DLqRbI005820; Thu, 14 Apr 2016 06:52:32 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com u3DLqRbI005820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1460584352; bh=xeCYg0eHVPBOKmXRB5kKwtm0KI9/fokCAWPe03QfKHs=; h=From:To:Cc:Subject:Date:From; b=sZL3pVm14qSt5s/a2kRzTaW5+f2O/ej2HbW55Wu3tJFqS5UI0goYYAk+Wk7r47TSn pTdJImiQsGoitffFpSKXqTKliSQ2bjJGcL6Zeoet2w2vGETurE01JU+x1IcBFXuo2f wXmu93VHKkSZQhR0pa6M8EySWvURqL47Rsml6wnrsqfxbbsk3tnsu2yf1seFNbjOAZ SGW/Bp37QScWeq7HVgR5wEhRHDSgLAUzy+VKq8b8i4jDKKVTCzWyJJwM6N9dzjaHGG R4zqpqBQHXdwZSVvgjiL3r+hC2ZzxVpLZJ29vGplDL+wDX7kQLeKkwlO06py+94gyq htDEzYl8hRlTw== X-Nifty-SrcIP: [203.136.65.164] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 14 Apr 2016 06:52:26 +0900 Message-Id: <1460584346-5200-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] ARM: zynq: load u-boot.img whether CONFIG_OF_SEPARATE is defined or not 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" Since commit ad1ecd2063da ("fdt: Build a U-Boot binary without device tree"), u-boot-dtb.img is identical to u-boot.img, so SPL can always load u-boot.img whether CONFIG_OF_SEPARATE is defined or not. Signed-off-by: Masahiro Yamada --- include/configs/zynq-common.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 49d9fd0..3b5cd5b 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -339,11 +339,7 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#ifdef CONFIG_OF_SEPARATE -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" -#else -# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#endif +#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif /* Disable dcache for SPL just for sure */