From patchwork Thu Jan 26 20:31:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 720369 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 3v8YXf2tdpz9sD6 for ; Fri, 27 Jan 2017 07:33:38 +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="R4r6J87g"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 36ED7B387E; Thu, 26 Jan 2017 21:33:36 +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 KA6bmMN5RKaE; Thu, 26 Jan 2017 21:33:35 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 25102B38AA; Thu, 26 Jan 2017 21:32:37 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3FEDDA75C9 for ; Thu, 26 Jan 2017 21:32:00 +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 XhIRUC7z6Hvs for ; Thu, 26 Jan 2017 21:32:00 +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-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by theia.denx.de (Postfix) with ESMTPS id 857B84A07B for ; Thu, 26 Jan 2017 21:31:37 +0100 (CET) Received: by mail-pg0-f67.google.com with SMTP id 75so23145442pgf.3 for ; Thu, 26 Jan 2017 12:31:37 -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=ihaEeGP/WE0rm6kIZ9BegttO1j0hNBtOxWNgk0yKbl0=; b=R4r6J87ggcW4YH8hD46+T/YQg3Qq8yNCmDdrvnPOOYsMjU99LFpT60H2MMZaB0Ol7Q glaF/2feLo7aDUX20Af8LUQj58SBj4uNJruhWh8kBJcrz672v0SxuLEDMc1E/ToGe8Tz OvoD25KJqC0FckXGB5zN4h2+CyoDnKi8k4iMdIfC0kF2YlCsBdaUBNtr4rV70qndNsqz rA2K3iv4lNSXk9rMyYwnGZSOYsp444Ra+WTb3R4f5AnJd3K8J19Qz7cliHm5szwwtRQL kngNppqthYpWhcU33/zoRxweQadZ6lvLJCE/gXoMHdI7vnzv5SNiawuetYF0DtNeQyq6 o/hg== 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=ihaEeGP/WE0rm6kIZ9BegttO1j0hNBtOxWNgk0yKbl0=; b=dhGodl0UjVLtjgZQz0usiB3+1OfVYDp59rIufeHQRLWqKwjPlD2bYijxJrC9BeQCxR dfYH8JBXCyxFzvh4eCiLfha7dIVUfpj4gwGmhR/XetkUqn1PhoKNL7yaHkapQf9X99Qj o0DqkqHqBoB8lnC4Be8Q9fwo9PYKzoZOAr3CR4EY5F45PN2NYw5PRLfvzJP00EdpPsPf ehOFf9TG8ZzBUZmkdoM0ByU1VvYhZyA0Zh7cz3reWoS9iiZcQyDw2fPfQom569D+W1UR Qq/e5a4N0VVOMwg3mjWOAtoiEk8nnoLucdWfbkjPiLFjAkSu9fsyxNQqa7PNnPNALk+k y/+g== X-Gm-Message-State: AIkVDXJra6RgMNlVFkCs0ym18rNQ/rtha9dukOr8RmGJBQBx+61HQxLjQ6pVJHJ42W5bpw== X-Received: by 10.98.212.23 with SMTP id a23mr5243518pfh.18.1485462695862; Thu, 26 Jan 2017 12:31:35 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 12:31:35 -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:11 -0800 Message-Id: <1485462671-27830-8-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 7/7] arm: socfpga: Update sr1500 environment 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 Remove the default environment as it is now in a common header. Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig to set the linux devicetree name. Signed-off-by: Dalon Westergreen Acked-by: Marek Vasut Acked-by: Dinh Nguyen --- configs/socfpga_sr1500_defconfig | 1 + include/configs/socfpga_sr1500.h | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 6fd7bc0..4c63b02 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_SR1500=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_sr1500.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 0407f03..3c63e80 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -32,31 +32,6 @@ #define CONFIG_PHY_MARVELL #define PHY_ANEG_TIMEOUT 8000 -#define CONFIG_EXTRA_ENV_SETTINGS \ - "verify=n\0" \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=zImage\0" \ - "fdt_addr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "fsloadcmd=ext2load\0" \ - "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" - /* Environment */ #define CONFIG_ENV_IS_IN_SPI_FLASH