From patchwork Tue Jan 24 17:06:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 719263 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 3v7F402bmmz9t0p for ; Wed, 25 Jan 2017 04:07:44 +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="ctyATUj7"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 13AC64B811; Tue, 24 Jan 2017 18:07:11 +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 n61d-etX_sDD; Tue, 24 Jan 2017 18:07:10 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 984E64B82C; Tue, 24 Jan 2017 18:06:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 80ACE4AB34 for ; Tue, 24 Jan 2017 18:06: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 K4dy4UeJ0rRx for ; Tue, 24 Jan 2017 18:06: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 mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by theia.denx.de (Postfix) with ESMTPS id 0C65B4B15F for ; Tue, 24 Jan 2017 18:06:29 +0100 (CET) Received: by mail-pg0-f67.google.com with SMTP id 75so17112000pgf.3 for ; Tue, 24 Jan 2017 09:06:29 -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=dqJEvfM4uyCIJGq1sgbiP0zTq+LVFu1q2yLlzsY/jk4=; b=ctyATUj7vc3JTO/3dyBMyhTW+YPMgZ6TwqYkvoNp4RyZ23vJl5F7JXfV+pSrFwYNFk WwWn0dwJZ0Mej7jkS0Y/eupirGKnxTzOczta5GP8+nmNLYrd/e9jB2AvZSuHd6mR0dxY yJE9+odaoCUkbbv6Fscxgh8IFwQ88MLnruhQxpfC9nZtiR0TCyq9xRzTSSmVLTVQ4qOG zbrhNj/mNSMGBZsTs/HUE81x5z8pV8qtCSQXUds33sWJkIrWtPVOHCOgN0DdLpx2LBsX QoParmRKiK+SMPhl9egrGCnPL5JuNE1idrHWFy36IbsPJHq1aCHCJSDb+fRptw5KBHqc FXDw== 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=dqJEvfM4uyCIJGq1sgbiP0zTq+LVFu1q2yLlzsY/jk4=; b=phZn4rT3+6tjIMDy3LhRtqw/wjDbB17NUeHp2RO9+GtEMw2+uj7s4D1dEyHi/ZsNCL rrn9gjYZGjHG9kl+CR936lz8ZHeWRmXeD5XSBVWEEJqDqjjhJHk36ni0H4S8q8LkXVB+ R5KRm3BD8t5EVN20YqKVjpS5cTWA7MN5YM1AXd1GAGXnTEeYwKATOUl4aGYMlyf1Y/jU aD7HF235/y5AWtrrDN+0c0zTTO3oPgmB3hGkNs6+HLDVdWF8tWZFRH7pR0XOtYT9kyKU 3UNr1xFGNWUE2JAIlI9SKTpOgzRVf0/CNLm3u77iyShIbV5NqarM3BGL9L24NLgfGLSg GywQ== X-Gm-Message-State: AIkVDXIH0N/VrpLICFxmJuKzJJNdDcCjcmoA+whCVliLe5hlbYFNRssOMInXpwTPZ4PoLQ== X-Received: by 10.98.160.140 with SMTP id p12mr39599435pfl.97.1485277587648; Tue, 24 Jan 2017 09:06:27 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com ([134.134.139.78]) by smtp.gmail.com with ESMTPSA id k76sm46135412pfg.42.2017.01.24.09.06.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 09:06:27 -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 Date: Tue, 24 Jan 2017 09:06:03 -0800 Message-Id: <1485277563-18514-8-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485277563-18514-1-git-send-email-dwesterg@gmail.com> References: <1485277563-18514-1-git-send-email-dwesterg@gmail.com> Cc: Dalon Westergreen Subject: [U-Boot] [PATCH v4 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