From patchwork Mon Jan 23 03:51:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 718371 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 3v6HV64BYpz9t0G for ; Mon, 23 Jan 2017 14:53:34 +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="PJDzKtzT"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 926C14B646; Mon, 23 Jan 2017 04:52: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 bZGvmaDW4467; Mon, 23 Jan 2017 04:52:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 31AF24B1D0; Mon, 23 Jan 2017 04:52:42 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C5A824ADB5 for ; Mon, 23 Jan 2017 04:52:27 +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 7XM33LIEeHkE for ; Mon, 23 Jan 2017 04:52:27 +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-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by theia.denx.de (Postfix) with ESMTPS id EAD914AACE for ; Mon, 23 Jan 2017 04:52:19 +0100 (CET) Received: by mail-pf0-f196.google.com with SMTP id f144so9112676pfa.2 for ; Sun, 22 Jan 2017 19:52:19 -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=xoGctcaLsezKbFFcTTocDheYfvUBHD1/AtVsiy3iLHU=; b=PJDzKtzTnr+JX8XC1Th8m4dVEEuCscx1mxKUKnx8ulCUpvrKP9nyoNRjZ/d+Hfzjz1 55nVCVBnk58z5/n01tmFzufZpCUC7zWMyd/gxDWgDCuU3wI90LpzsVM+tlcsSKcioyFF Yzv4RX5KJkhKhqPlulaGNjiZYo/z7/Gtss9K16CbTi/Tis+WSg22aShVBjg3bno8GLN5 fOMBVppyC88joseteB5xdqaW+ttCeKukrhNv4bbp1y4mUNmQRP2xWTin9y651EwPxwsn 78z1Ls3fPeQdK49x54xeJC/ldHUQFAv8Pfdee2+yEb9YaR03rtNfEwlRejPDhrtP/aNa lDww== 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=xoGctcaLsezKbFFcTTocDheYfvUBHD1/AtVsiy3iLHU=; b=AW5UsjBZgcQD2kgacYninkE8v5QRzl+LSAkVovuDeHdi0iMwFbBZTRvv92Oc3cH1yQ mgPROCff86kYG1pWsADXmFOi9G+G2HWzjKIqO+/Qm1va2SOwJInT+oK5DDNAHQ5XVWQl CG8wbSVCyKpru7fe/YaLcQOUanBYdS78oay8qbUrx/h5lQjbgxZ8VXK5e21lN3YZcPAp 1sliSHaQ2Z9LZgWF6w90WXWg7D+qlfikcCXoiLNqtUJWjYGfmU3Daukm97mf1bZsMtmM TLrSoOqMga/spRR8CphCVh0IXwh9DtBEFq/yTsR/W2MdWmtgleSNedAXhkZgHYT0Jsa9 jT/A== X-Gm-Message-State: AIkVDXLOl29JLqsmjodK0umC30j8VJ/ekPm99Byc8afE8EnkG1zfhTA77fzJFY3XCUx1jA== X-Received: by 10.84.218.205 with SMTP id g13mr39411152plm.78.1485143538422; Sun, 22 Jan 2017 19:52:18 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id s8sm32424755pfj.30.2017.01.22.19.52.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jan 2017 19:52:17 -0800 (PST) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, sr@denx.de, dinguyen@kernel.org, chin.liang.see@intel.com Date: Sun, 22 Jan 2017 19:51:54 -0800 Message-Id: <1485143514-27229-8-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485143514-27229-1-git-send-email-dwesterg@gmail.com> References: <1485143514-27229-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v3 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: Stefan Roese --- 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..b0b08da 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.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