From patchwork Sat Jan 28 20:47:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Kunz X-Patchwork-Id: 721077 X-Patchwork-Delegate: marek.vasut@gmail.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 3v9nmT0Yfbz9sDg for ; Sun, 29 Jan 2017 07:48:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0550DA75F5; Sat, 28 Jan 2017 21:48:02 +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 AYZHuABKfF0j; Sat, 28 Jan 2017 21:48:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1BCDB3896; Sat, 28 Jan 2017 21:47:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E5918A75DC for ; Sat, 28 Jan 2017 21:47:44 +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 JqwbSeyoy2ue for ; Sat, 28 Jan 2017 21:47:44 +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 server1044-han.de-nserver.de (server1044-han.de-nserver.de [77.75.251.205]) by theia.denx.de (Postfix) with ESMTPS id 65C0C4A07B for ; Sat, 28 Jan 2017 21:47:42 +0100 (CET) Received: (qmail 30853 invoked from network); 28 Jan 2017 21:47:41 +0100 X-Fcrdns: Yes Received: from p4FDE8CD6.dip0.t-ipconnect.de (HELO donald.disney) (79.222.140.214) (smtp-auth username mailinglists@kunz-im-inter.net, mechanism plain) by server1044-han.de-nserver.de (qpsmtpd/0.92) with (ECDHE-RSA-AES256-SHA encrypted) ESMTPSA; Sat, 28 Jan 2017 21:47:41 +0100 From: Frank Kunz To: u-boot@lists.denx.de Date: Sat, 28 Jan 2017 21:47:16 +0100 Message-Id: <20170128204717.20694-3-mailinglists@kunz-im-inter.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170128204717.20694-1-mailinglists@kunz-im-inter.net> References: <20170128204717.20694-1-mailinglists@kunz-im-inter.net> X-User-Auth: Auth by mailinglists@kunz-im-inter.net through 79.222.140.214 Cc: marex@denx.de, dingnuyen@kernel.org Subject: [U-Boot] [PATCH 2/3] socfpga: Add distoboot support for DE0-nano-SoC 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" This enables common distroboot support as fall back when the "mmcboot" command fails to load OS image. In fall back case MMC, PXE and DHCP boot are probed. Signed-off-by: Frank Kunz --- :100644 100644 f7e2068782... d58240e751... M include/configs/socfpga_de0_nano_soc.h include/configs/socfpga_de0_nano_soc.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index f7e2068782..d58240e751 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -22,7 +22,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) -#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot; run distro_bootcmd" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR @@ -35,6 +35,22 @@ #define CONFIG_ENV_IS_IN_MMC /* Extra Environment */ +#ifndef CONFIG_SPL_BUILD +#include + +#ifdef CONFIG_CMD_PXE +#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_DEVICES_PXE(func) +#endif + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + BOOT_TARGET_DEVICES_PXE(func) \ + func(DHCP, dhcp, na) + +#include + #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ @@ -50,6 +66,14 @@ "mmcload=mmc rescan;" \ "load mmc 0:1 ${loadaddr} ${bootimage};" \ "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ + "bootm_size=0xa000000\0" \ + "kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0" \ + "fdt_addr_r=0x02000000\0" \ + "scriptaddr=0x02100000\0" \ + "pxefile_addr_r=0x02200000\0" \ + "ramdisk_addr_r=0x02300000\0" \ + BOOTENV +#endif /* The rest of the configuration is shared */ #include