From patchwork Sat Feb 18 20:51:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dalon Westergreen X-Patchwork-Id: 729767 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 3vRcHf4tfRz9s8D for ; Mon, 20 Feb 2017 19:29: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="tPi7uYeO"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 90DF7B3E4A; Mon, 20 Feb 2017 09:23:37 +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 2selwiVL5kP7; Mon, 20 Feb 2017 09:23:37 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4984FB3A05; Mon, 20 Feb 2017 09:19:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E73094A068 for ; Sat, 18 Feb 2017 21:52:16 +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 2RjRaukmTaSg for ; Sat, 18 Feb 2017 21:52:16 +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 70D7C4A026 for ; Sat, 18 Feb 2017 21:52:14 +0100 (CET) Received: by mail-pg0-f67.google.com with SMTP id 5so7982470pgj.0 for ; Sat, 18 Feb 2017 12:52:14 -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=1M52Eb/f3xkeoKM5TGDEuKR4/iopLariadv1XfVTfhk=; b=tPi7uYeO7zefmImZFSg9L/4Hb/4q4Lqj/1IdThUd8hFEDKY8hB5pKBrlQvcKp9bjCo QuxbnBPCysEWLmmt1dd8D/DL9g9eLtcnG5QiwEZ7XNSCXeX8YHGSW7LX4qVSar1eEAMh axx+751edYNHKfWsBW7jM7Y0vHifJX6S/6PzWA95jTCyhyDa/R8AdP8WA3wRutrbi/yR KTgiXd0i3FEHVFOgarN+4hAX7fOmIH4aJbSRHAt95ofjc1AhCqTQdGvgMfDfSjhgCAdA AhyYG7Z3ejA1JEWGnb5v47NuvCKR6WytMtQVWEFAMGrqCBSPaxaa1QQ2TrGK/3M5wJ8Z /v0w== 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=1M52Eb/f3xkeoKM5TGDEuKR4/iopLariadv1XfVTfhk=; b=j6CUOrDuRobT8gLOXt2czquRkX9TNx96EZUqn52ik/1r1PY7PZEG4vLfRf+WyMuFKQ FohCR0PFGve49P2XRAjaqJmNLjFmWHcMqpVg0H5KEG+VgJ92jcIxNO3DWPXIqxzVwSnv kqtWfqxn4gNrmS2OJPSORUa8Se7shvm/T0QVuqNRtYy4nBJOXPjG/YXH/EzZrJgcV3PM GNrzjHsEl5OOBBLzyIOSaXqqKOxLlIzKHjb5h1EJLkZBXaHAd0GGeNcyFdAH4sx7APIF aLn4yM+kfP4w1+tPQGr6XfuYymGJhejmYNKujc549uSjP+V3QNXhyD2MolrZzyjYO1Sk nMEQ== X-Gm-Message-State: AMke39n7ab82TjRaSxxCKToeglJo/UTSdKtty+x93Gslxh0EBXnHNEHMzDAWepDskuLcyg== X-Received: by 10.84.210.46 with SMTP id z43mr20691620plh.11.1487451133071; Sat, 18 Feb 2017 12:52:13 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 12:52:12 -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:45 -0800 Message-Id: <1487451108-4277-6-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 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 leave the default devicetree name socfpga.dtb. Signed-off-by: Dalon Westergreen --- configs/socfpga_de1_soc_defconfig | 1 + include/configs/socfpga_de1_soc.h | 19 ------------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/configs/socfpga_de1_soc_defconfig b/configs/socfpga_de1_soc_defconfig index 032deef..19ff608 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.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..2f31d45 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -17,8 +17,6 @@ /* 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 +28,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