From patchwork Wed Sep 13 21:42:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 813630 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xswCp6nTnz9s81 for ; Thu, 14 Sep 2017 07:44:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0C348C2245C; Wed, 13 Sep 2017 21:43:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1E207C2256F; Wed, 13 Sep 2017 21:43:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DAC62C22544; Wed, 13 Sep 2017 21:43:10 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id 1FDAFC2250A for ; Wed, 13 Sep 2017 21:43:07 +0000 (UTC) Received: from localhost (unknown [75.164.166.0]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 6D2DC1AB47; Wed, 13 Sep 2017 14:43:06 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Wed, 13 Sep 2017 14:42:53 -0700 Message-Id: <20170913214256.8031-2-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170913214256.8031-1-vagrant@debian.org> References: <20170913214256.8031-1-vagrant@debian.org> Cc: Vagrant Cascadian Subject: [U-Boot] [v2 PATCH 1/4] Fix default console on odroid to only specify the device, as "console=" is redundant with the boot environment. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Signed-off-by: Vagrant Cascadian --- include/configs/odroid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 2afb19f84a..43138e2191 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -44,7 +44,7 @@ /* Console configuration */ #define CONFIG_BOOTCOMMAND "run autoboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" +#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8\0" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - GENERATED_GBL_DATA_SIZE) From patchwork Wed Sep 13 21:42:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 813632 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xswFW62tyz9s81 for ; Thu, 14 Sep 2017 07:45:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A40ECC225D3; Wed, 13 Sep 2017 21:44:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3B0B1C22534; Wed, 13 Sep 2017 21:43:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 393F5C22544; Wed, 13 Sep 2017 21:43:13 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id 3F88DC22530 for ; Wed, 13 Sep 2017 21:43:10 +0000 (UTC) Received: from localhost (unknown [75.164.166.0]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 8BB6D1AB49; Wed, 13 Sep 2017 14:43:09 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Wed, 13 Sep 2017 14:42:54 -0700 Message-Id: <20170913214256.8031-3-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170913214256.8031-1-vagrant@debian.org> References: <20170913214256.8031-1-vagrant@debian.org> Cc: Vagrant Cascadian Subject: [U-Boot] [v2 PATCH 2/4] Increase the default environment size on odroid, as config_distro_bootcmd requires a more space for the environment. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Signed-off-by: Vagrant Cascadian --- include/configs/odroid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 43138e2191..573ccbdd36 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -52,7 +52,7 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_SIZE 4096 +#define CONFIG_ENV_SIZE 8192 #define CONFIG_ENV_OFFSET (SZ_1K * 1280) /* 1.25 MiB offset */ #define CONFIG_ENV_OVERWRITE From patchwork Wed Sep 13 21:42:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 813633 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xswGK75S3z9ryQ for ; Thu, 14 Sep 2017 07:46:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BFA8FC2256A; Wed, 13 Sep 2017 21:44:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 824C9C22548; Wed, 13 Sep 2017 21:43:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 11138C22548; Wed, 13 Sep 2017 21:43:15 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id 5540FC22548 for ; Wed, 13 Sep 2017 21:43:12 +0000 (UTC) Received: from localhost (unknown [75.164.166.0]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id A17301AB4C; Wed, 13 Sep 2017 14:43:11 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Wed, 13 Sep 2017 14:42:55 -0700 Message-Id: <20170913214256.8031-4-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170913214256.8031-1-vagrant@debian.org> References: <20170913214256.8031-1-vagrant@debian.org> Cc: Vagrant Cascadian Subject: [U-Boot] [v2 PATCH 3/4] Switch odroid to use config_distro_bootcmd. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Using distro_bootcmd standardizes board behavior across many platforms. This is particularly useful for distributions supporting multiple boards without requiring custom configuration for each board. Signed-off-by: Vagrant Cascadian --- include/configs/odroid.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 573ccbdd36..731c607e70 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -43,7 +43,6 @@ /* Console configuration */ -#define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8\0" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ @@ -85,6 +84,20 @@ "bl2 raw 0x1f 0x1d;" \ "tzsw raw 0x83f 0x138\0" +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) + +#include + +#define MEM_LAYOUT_ENV_SETTINGS \ + "bootm_size=0x10000000\0" \ + "kernel_addr_r=0x42000000\0" \ + "fdt_addr_r=0x43000000\0" \ + "ramdisk_addr_r=0x43300000\0" \ + "scriptaddr=0x50000000\0" \ + "pxefile_addr_r=0x51000000\0" + /* * Bootable media layout: * dev: SD eMMC(part boot) @@ -171,7 +184,9 @@ "initrdname=uInitrd\0" \ "initrdaddr=42000000\0" \ "scriptaddr=0x42000000\0" \ - "fdtaddr=40800000\0" + "fdtaddr=40800000\0" \ + MEM_LAYOUT_ENV_SETTINGS \ + BOOTENV /* GPT */ #define CONFIG_RANDOM_UUID From patchwork Wed Sep 13 21:42:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 813631 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xswD047QRz9s5L for ; Thu, 14 Sep 2017 07:44:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 45ACAC224ED; Wed, 13 Sep 2017 21:43:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DE409C2257C; Wed, 13 Sep 2017 21:43:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7AAA0C224CE; Wed, 13 Sep 2017 21:43:18 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id BD6E0C22545 for ; Wed, 13 Sep 2017 21:43:14 +0000 (UTC) Received: from localhost (unknown [75.164.166.0]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 1A7451AB4F; Wed, 13 Sep 2017 14:43:14 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Wed, 13 Sep 2017 14:42:56 -0700 Message-Id: <20170913214256.8031-5-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170913214256.8031-1-vagrant@debian.org> References: <20170913214256.8031-1-vagrant@debian.org> Cc: Vagrant Cascadian Subject: [U-Boot] [v2 PATCH 4/4] Inherit default value for bootdelay from distro_bootcmd on odroid. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The default value with distro_bootcmd is 2 seconds, which is reasonably fast, and provides a consistent experience across platforms supporting distro_bootcmd. The current bootdelay value of 0 seconds is a bit challenging to interrupt when desired. Cc: Jaehoon Chung Signed-off-by: Vagrant Cascadian --- include/configs/odroid.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 731c607e70..5758381b84 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -176,7 +176,6 @@ "mmcbootpart=1\0" \ "mmcrootdev=0\0" \ "mmcrootpart=2\0" \ - "bootdelay=0\0" \ "dfu_alt_system="CONFIG_DFU_ALT \ "dfu_alt_info=Please reset the board\0" \ "consoleon=set console console=ttySAC1,115200n8; save; reset\0" \