From patchwork Sun Feb 19 20:21:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 729812 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 3vRcpF59fyz9s8G for ; Mon, 20 Feb 2017 19:52:37 +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="GH9XaINM"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7B7E0B3C80; Mon, 20 Feb 2017 09:32: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 Od3JSYKKOxGg; Mon, 20 Feb 2017 09:32:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4E31E3B79; Mon, 20 Feb 2017 09:22:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8C7244A068 for ; Sun, 19 Feb 2017 21:21:23 +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 6APVAq8m1hfW for ; Sun, 19 Feb 2017 21:21:23 +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 186134A01E for ; Sun, 19 Feb 2017 21:21:21 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id v184so10167284pgv.1 for ; Sun, 19 Feb 2017 12:21:21 -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=8lB+NVTUoj5wVJLr423S6+aCglgBRGme50ArKPPHCao=; b=GH9XaINMQghxkpRIOgsBgTYlXbDncI2j3H3BMkqnC/ygBOVOuBgCdU6sTWCN1GBcje pp9TagI1E+7kXkF621dvSkaN5Hfz+HPR6QGQjqq3oqiM+SjZHd59DpYWa1zj5DDGIH/A iYEnMm/BTuQKGYXKGQNOL95rK5e+QbAzjH2u/6PbrhLCD1MtyHgomCeGjDDX0T7VI60b nnB1n0CpYhQUaI14iv0f1tAbPZ8K5MBb620Erl5zYDOhGuKw1GfYbKIkSlOedFh8SQ/e VJc/3jX+9BQja92uNyqYeeNQMtC++4aot5z0TARWRAgzKsNWwl0nwJcgLtagx9hipSy4 2dRw== 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=8lB+NVTUoj5wVJLr423S6+aCglgBRGme50ArKPPHCao=; b=FnpBHrysWpij7aQevigXYqDpSMAzD1wok+Ab1vVH4gcxYNhCSVqB5Fk5XiQomk32Mn CVSjd/yzqa2xhjT1bER25GkIc7D5kZKHDnPf/PRRhWNuP43qjl3sRxjfWOkbQlzlUEoV GWErjM9yvAdwPY44wjeAhQiEjL/gBZ9fimMrIouUOarMd+bvdqX1RQfIqaAIYyLXpNh0 PHxrSMaBZxh1jGUEFV83Lsa/e0b7/3QVtf0Z/IgSHSj+DhfgqaEQNGLuDkyP3tyjHK77 I07dauSLGbDLwVeREFsGXOayi9ZEuCgCzbL7uAHs6Bus7Fl3BSKLzHMK/CFwCnpjf+dz RYqw== X-Gm-Message-State: AMke39k8x6uoCCy87PAsVfBc7BCEKNnLiOU2i6Lkmnud2jFwClR7IO7PjN+tfLwtDEje9g== X-Received: by 10.99.160.17 with SMTP id r17mr18457032pge.50.1487535680448; Sun, 19 Feb 2017 12:21:20 -0800 (PST) Received: from dwesterg-mobl1.amr.corp.intel.com (jfdmzpr03-ext.jf.intel.com. [134.134.139.72]) by smtp.gmail.com with ESMTPSA id l13sm9169783pfk.69.2017.02.19.12.21.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 12:21:19 -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: Sun, 19 Feb 2017 12:21:01 -0800 Message-Id: <1487535664-9314-6-git-send-email-dwesterg@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487535664-9314-1-git-send-email-dwesterg@gmail.com> References: <1487535664-9314-1-git-send-email-dwesterg@gmail.com> Subject: [U-Boot] [PATCH v4 5/8] arm: socfpga: DE1 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 de1 headers and instead uses the common environment provided in socfpga_common.h which now uses distro boot. This board does not have a devicetree in the upstream kernel source so set devicetree to socfpga_cyclone5_de1_soc.dtb. Signed-off-by: Dalon Westergreen Acked-by: Marek Vasut --- Changes in V2: - Remove unneeded CONFIG_BOOTFILE - set devicetree name to match socfpga_{fpga model}_{board model}.dts pattern --- configs/socfpga_de1_soc_defconfig | 1 + include/configs/socfpga_de1_soc.h | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index 032deef..d78e8a1 100644 --- a/configs/socfpga_de1_soc_defconfig +++ b/configs/socfpga_de1_soc_defconfig @@ -6,6 +6,7 @@ CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc" +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de1_soc.dtb" CONFIG_FIT=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 2278357..a7ab1fe 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -16,9 +16,6 @@ #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */ /* Booting Linux */ -#define CONFIG_BOOTFILE "fitImage" -#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 @@ -30,23 +27,6 @@ #define CONFIG_ENV_IS_IN_MMC -/* Extra Environment */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "bootimage=zImage\0" \ - "fdtaddr=100\0" \ - "fdtimage=socfpga.dtb\0" \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "mmcroot=/dev/mmcblk0p2\0" \ - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ - " root=${mmcroot} rw rootwait;" \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ - "mmcload=mmc rescan;" \ - "load mmc 0:1 ${loadaddr} ${bootimage};" \ - "load mmc 0:1 ${fdtaddr} ${fdtimage}\0" \ - /* The rest of the configuration is shared */ #include