From patchwork Sat Feb 18 20:51:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 729770 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 3vRcJL5pPsz9s8D for ; Mon, 20 Feb 2017 19:30:10 +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="YvjpVZoN"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CB097B391F; Mon, 20 Feb 2017 09:24:03 +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 GJmLP2udR6Kn; Mon, 20 Feb 2017 09:24:03 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 98AABB3998; Mon, 20 Feb 2017 09:19:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 91C8B4A068 for ; Sat, 18 Feb 2017 21:52:25 +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 H1B9n01IzeAz for ; Sat, 18 Feb 2017 21:52:25 +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 1A20F4A026 for ; Sat, 18 Feb 2017 21:52:23 +0100 (CET) Received: by mail-pg0-f67.google.com with SMTP id v184so7990333pgv.1 for ; Sat, 18 Feb 2017 12:52:23 -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=EisFbWhBlkMktUAGRRNX7Y0D1qIgyBdrDZSCyqOeG5s=; b=YvjpVZoNZc46mC/EW70oxCr9J0gW9p37DSWNrd44VNZYx+2FrFpxTN98t+nSDzgENs ePEcFz1vMD/q6476rQHQnbNIug9lHuezNX/Z0CygHkDIVUUVOr9xb3hnMBEqUKFjAODo zZ3c9z0rX72Z0GQSGZ3SWLRtmRXxgIRo2yZJSsm9bDksbUHCBUGWgNxBCV6uYEEdBz4+ WR35xobFbKw9rAL8gv/yWDyoP6BuiF131ROmJ4pO9EObwcsux6lO3tsigHAZ7FDMp7O3 hgCqc8/mnVNMaS2mKyNd6Ou7U+JvESW9b9NxvOXMspCGpXQ8z93ldKPaeGVW1IpfbeXJ rGTA== 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=EisFbWhBlkMktUAGRRNX7Y0D1qIgyBdrDZSCyqOeG5s=; b=uV5UK55QfqdD7DieZBq7xVnFcRulH5YJMpn06ADoDjdax21f8714xHzcW8X0bRlMDC 0fzg2DG4Ue4wjbias5R4beoGf4h/xyQF7A+xboJwo41mV26YJqdi7Jn0Ig3JNjnR33P8 +4NgVRQ36ihzctlZFhZQXBdgoyfqDu96Cp+RWxnOQGDSd78BmsD+flA+PTSyAnoh/IVx Lz3npjJJs6pSsg8qyVaWwCgjI3Z5hiFYh7b+r2Xgl6ISduJJ2+CFtwgSnX+hP3Uj6wck QJiZglc9gPxGo0hUwp2m492YvUm4CD3VLOxEd2SFr3wb+qkcX6MVYO+jlrjfKqrkneGw NceQ== X-Gm-Message-State: AMke39np0cNYEPRUtv57kTOLg0ssx5kcawoRHk/Vjb2ff94EdorGXp6+278KtiwLFm6hSg== X-Received: by 10.98.26.210 with SMTP id a201mr16941723pfa.57.1487451142572; Sat, 18 Feb 2017 12:52:22 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id h17sm26755791pfh.62.2017.02.18.12.52.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 12:52:22 -0800 (PST) From: Dalon Westergreen To: u-boot@lists.denx.de, marex@denx.de, chin.liang.see@intel.com, dinguyen@kernel.org, sr@denx.de, mailinglists@kunz-im-inter.net, agust@denx.de, tien.fong.chee@intel.com, pavel@denx.de Date: Sat, 18 Feb 2017 12:51:48 -0800 Message-Id: <1487451108-4277-9-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487451108-4277-1-git-send-email-dwesterg@gmail.com> References: <1487451108-4277-1-git-send-email-dwesterg@gmail.com> Subject: [U-Boot] [PATCH 8/8] arm: socfpga: sr1500 use environment in 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" This removes the default environment from the sr1500 header and instead uses the common environment provided in socfpga_common.h which now uses distro boot. This board has no upstream devicetree in the kernel source, so leave the default devicetree name socfpga.dtb. Signed-off-by: Dalon Westergreen --- configs/socfpga_sr1500_defconfig | 1 + include/configs/socfpga_sr1500.h | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 981600b..b0925ab 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 f67fafd..d94771c 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -17,8 +17,6 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE) -#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR @@ -28,31 +26,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