From patchwork Thu Jan 26 20:31:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 720363 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 3v8YVY1MfMz9ryk for ; Fri, 27 Jan 2017 07:31:49 +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="GFL2DZZZ"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 81B2EA75E6; Thu, 26 Jan 2017 21:31:46 +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 4jWokUyVusPG; Thu, 26 Jan 2017 21:31:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AA64F4AA12; Thu, 26 Jan 2017 21:31:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 91CF34A08A for ; Thu, 26 Jan 2017 21:31:28 +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 EYwmO-PG4rRN for ; Thu, 26 Jan 2017 21:31:28 +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-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by theia.denx.de (Postfix) with ESMTPS id 249064A07B for ; Thu, 26 Jan 2017 21:31:24 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id 3so5393150pgj.1 for ; Thu, 26 Jan 2017 12:31:24 -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=GFL2DZZZrL1xoZjXcL7qG3BloIWzUjP7XBKeQe3RoeF1Ll+v6SoBU1RAYR4wHA1c4Q 6LOsStzAtVsHnxgEpNbpUyMtd2xbVY6a3yBAk8sR2qdAsGRpeSFmP/loWGHwLpmdy5JS Mip4doR1FhXpHRHuxho8G213BOsBPeiTKKm88pZEK+jCpbEpB1A73xrabihYS64qi70f u8veGp020u7YcCViLle6jy48G55jdnwtvdd9PudnMDAxVe15V5Yao6edvzY+jgf22ZkT dUjkMlVX6KKmn2c+EseU1TbuTj4XGobgt7OZ17TScdq9eEYuQ4xTMQBYgTVJ9ifIbZAc 6mSQ== 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=R0+5InnjK1Zkr4p0mLNbtN8dfjUm12fvDnOKcfJqc3+6XVLsUCOuTnfiRKtg8LWyYo 1jEehIQ1nkPJ+EffOhbN9vtain9oCqeCBP+9DLR2NskAm1qntnrThGDASIfMPKmRIhAY 4SAapQn62V1MLtuINapQqXAfQFUY5pTzzGdFxjPo8DPQDush2DcZznqbPmtDsVYbCe/c giloeQriH8lCJBQees4ZJ3r0SDGH9NIPEIgcQcBzihrS+tzIlKvKZeKITZtMZ1WRx6dI mLXcMAAOjIiJbyCXQWyT0wzkVvMzKZsVKJvJGl0eI24SPpSSPC9axWuuMFM9pt8+cllS jDPw== X-Gm-Message-State: AIkVDXKbUimpfp4V8bKk4N9bH7wKHraiii6kTNg9BgM4YVRTJMbjlNsUAwBoBOYq1OINHA== X-Received: by 10.99.217.85 with SMTP id e21mr5279084pgj.79.1485462683161; Thu, 26 Jan 2017 12:31:23 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id d68sm5445831pfj.92.2017.01.26.12.31.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 12:31:22 -0800 (PST) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, dinguyen@kernel.org, chin.liang.see@intel.com, sr@denx.de, agraf@suse.de, agust@denx.de Date: Thu, 26 Jan 2017 12:31:05 -0800 Message-Id: <1485462671-27830-2-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485462671-27830-1-git-send-email-dwesterg@gmail.com> References: <1485462671-27830-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v7 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__ */