From patchwork Sat Jan 28 23:05:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 721111 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 3v9rqV6Vyvz9sDg for ; Sun, 29 Jan 2017 10:05:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Fc9zshZ3"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C0275B38B8; Sun, 29 Jan 2017 00:05:56 +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 lSvUH8j35GYM; Sun, 29 Jan 2017 00:05:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CE62EB38B0; Sun, 29 Jan 2017 00:05:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1BADAB387F for ; Sun, 29 Jan 2017 00:05:38 +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 HlXhOieUMYG3 for ; Sun, 29 Jan 2017 00:05:38 +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-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by theia.denx.de (Postfix) with ESMTPS id 24832A75D7 for ; Sun, 29 Jan 2017 00:05:30 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id e4so20784408pfg.0 for ; Sat, 28 Jan 2017 15:05:30 -0800 (PST) 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=SEUJpMYSQD67tY/SP2byl8zjCpplzhuekQ3h0wqX0fI=; b=Fc9zshZ33GBNZ0J8FIm3XpqsIqXyurlsKwEttnU1TMc+L1OdDtm48BNiQtijo6jtEQ Hh/GGX21neWcd/mUphvF4w89fkWp3awwinUNOY2rIwrDFdnshquSbw1Rcal2GDLgkQH3 4jrKtpD6CbkHq92yb4FZCna5lIzorF6Srp9b5vhAqfOkn/3iHq6eT69Ht4TIVZk+shXy mJ67jWUhO8X2AmTuxX+tzbJERxqPnu8Y7FyJG0kZ3KJtoXGVgL15cZ7eONr5zr6A+fc1 C+/rSYUNSKPRqZsRZHf99TwkNhJAfH3p+2FXdlwDYZYN/ABWPvh06ljkR920Bwpv726s IKOw== 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=SEUJpMYSQD67tY/SP2byl8zjCpplzhuekQ3h0wqX0fI=; b=OXeNVpk3X+ljeIeQydPw+pMgVgubxtmKo9hvSBuTf9+PtupsBqqIz61W/GxGgjehnF qzBnuASfheVczlCL+1KeRPr5oDVn+6vVBLN6nNhvzKQRYp1WGH+poyA0rd5yVpZn54Q5 iCE50+mEwmJ1v4eLfoBoZkHMCT+7yeOfyYXV1SJvWKDPcadbqgXJwdwMxa6aM6VSWxKl thr1OBbb0OQeoD6AIG8kGyjXhEZsDNbdcKKzEtGR8TXynopdExSfQRxgbCxJwDjq/VN0 zuKgIknqgatluglFry6gBpL2WOvGwUKwzD4gEJSPE6rijvcYZTPYFP5f4Q2ylrZVxz5W pGkw== X-Gm-Message-State: AIkVDXJSiRSzrnF8Hqa9MUPLHwImH+Qxv9yKHysH74tzd9AsalAmYLFt73dYYv7ezl3RQA== X-Received: by 10.84.149.102 with SMTP id b35mr21917011plh.3.1485644728840; Sat, 28 Jan 2017 15:05:28 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com (fmdmzpr01-ext.fm.intel.com. [192.55.54.36]) by smtp.gmail.com with ESMTPSA id j28sm21219188pfj.2.2017.01.28.15.05.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Jan 2017 15:05:28 -0800 (PST) From: Dalon Westergreen To: u-boot@lists.denx.de, dinguyen@kernel.org, chin.liang.see@intel.com, sr@denx.de, agraf@suse.de, agust@denx.de, mailinglists@kunz-im-inter.net Date: Sat, 28 Jan 2017 15:05:12 -0800 Message-Id: <1485644718-20435-2-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485644718-20435-1-git-send-email-dwesterg@gmail.com> References: <1485644718-20435-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v8 1/7] arm: socfpga: add env settings to common header 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" From: Dalon Westergreen Move repeated environment settings for socfpga boards to a common header. The default values for the boot partition and the OS filesystem partition have changed and as as result the default uboot environment for socfpga boards needs updating. Move to using CONFIG_DEFAULT_DEVICE_TREE for setting the default linux devicetree used during linux boot. Signed-off-by: Dalon Westergreen --- include/configs/socfpga_common.h | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6285266..744aee9 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -312,10 +312,14 @@ unsigned int cm_get_qspi_controller_clk_hz(void); /* SPL SDMMC boot support */ #ifdef CONFIG_SPL_MMC_SUPPORT #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 2 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +#ifdef CONFIG_SPL_FAT_SUPPORT +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 +#else +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 2 +#endif #else -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 1 +#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION 3 #endif #endif @@ -336,5 +340,32 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * Stack setup */ #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR + +/* Extra Environment */ +#ifndef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=n\0" \ + "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "bootimage=" CONFIG_BOOTFILE "\0" \ + "fdt_addr=100\0" \ + "fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "mmcroot=/dev/mmcblk0p2\0" \ + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ + " root=${mmcroot} rw rootwait;" \ + "bootz ${loadaddr} - ${fdt_addr}\0" \ + "mmcload=mmc rescan;" \ + "load mmc 0:1 ${loadaddr} ${bootimage};" \ + "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ + "qspiload=sf probe && mtdparts default && run ubiload\0" \ + "qspiboot=setenv bootargs " CONFIG_BOOTARGS \ + " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\ + "bootz ${loadaddr} - ${fdt_addr}\0" \ + "ubiload=ubi part UBI && ubifsmount ubi0 && " \ + "ubifsload ${loadaddr} /boot/${bootimage} && " \ + "ubifsload ${fdt_addr} /boot/${fdtimage}\0" + +#endif #endif /* __CONFIG_SOCFPGA_COMMON_H__ */