From patchwork Wed Jul 25 03:18:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 949001 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41b0p51pBDz9s1x for ; Wed, 25 Jul 2018 13:19:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id ECC82C221D2; Wed, 25 Jul 2018 03:19:10 +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 D06D0C221CC; Wed, 25 Jul 2018 03:18:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 18E05C221B5; Wed, 25 Jul 2018 03:18:52 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id 42D52C22177 for ; Wed, 25 Jul 2018 03:18:49 +0000 (UTC) Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 3D6BE1A9C3; Tue, 24 Jul 2018 20:18:48 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Wed, 25 Jul 2018 11:18:32 +0800 Message-Id: <20180725031835.5666-2-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180725031835.5666-1-vagrant@debian.org> References: <20180725031835.5666-1-vagrant@debian.org> Cc: Marek Vasut , Tom Rini , Vagrant Cascadian Subject: [U-Boot] [PATCH v2 1/4] arm: odroid: Use standard environment variable names kernel_addr_r, ramdisk_addr_r and fdt_addr_r. 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" Replace non-standard variable names kerneladdr, initrdaddr and fdtaddr with kernel_addr_r, ramdisk_addr_r and fdt_addr_r, as documented in u-boot README. Acked-by: Lukasz Majewski Signed-off-by: Vagrant Cascadian --- Changes in v2: None include/configs/odroid.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 92811cfc54..b7b75c0dc0 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -100,21 +100,21 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \ "boot.scr\0" \ - "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ + "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kernel_addr_r} " \ "${kernelname}\0" \ - "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ + "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${ramdisk_addr_r} " \ "${initrdname}\0" \ - "loaddtb=load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ + "loaddtb=load mmc ${mmcbootdev}:${mmcbootpart} ${fdt_addr_r} " \ "${fdtfile}\0" \ "check_ramdisk=" \ "if run loadinitrd; then " \ - "setenv initrd_addr ${initrdaddr};" \ + "setenv initrd_addr ${ramdisk_addr_r};" \ "else " \ "setenv initrd_addr -;" \ "fi;\0" \ "check_dtb=" \ "if run loaddtb; then " \ - "setenv fdt_addr ${fdtaddr};" \ + "setenv fdt_addr ${fdt_addr_r};" \ "else " \ "setenv fdt_addr;" \ "fi;\0" \ @@ -125,27 +125,24 @@ "run loadbootscript;" \ "source ${scriptaddr}\0" \ "boot_fit=" \ - "setenv kerneladdr 0x42000000;" \ "setenv kernelname Image.itb;" \ "run loadkernel;" \ "run kernel_args;" \ - "bootm ${kerneladdr}#${boardname}\0" \ + "bootm ${kernel_addr_r}#${boardname}\0" \ "boot_uimg=" \ - "setenv kerneladdr 0x40007FC0;" \ "setenv kernelname uImage;" \ "run check_dtb;" \ "run check_ramdisk;" \ "run loadkernel;" \ "run kernel_args;" \ - "bootm ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \ + "bootm ${kernel_addr_r} ${initrd_addr} ${fdt_addr};\0" \ "boot_zimg=" \ - "setenv kerneladdr 0x40007FC0;" \ "setenv kernelname zImage;" \ "run check_dtb;" \ "run check_ramdisk;" \ "run loadkernel;" \ "run kernel_args;" \ - "bootz ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \ + "bootz ${kernel_addr_r} ${initrd_addr} ${fdt_addr};\0" \ "autoboot=" \ "if test -e mmc 0 boot.scr; then; " \ "run boot_script; " \ @@ -167,9 +164,10 @@ "consoleon=set console console=ttySAC1,115200n8; save; reset\0" \ "consoleoff=set console console=ram; save; reset\0" \ "initrdname=uInitrd\0" \ - "initrdaddr=42000000\0" \ + "ramdisk_addr_r=0x42000000\0" \ "scriptaddr=0x42000000\0" \ - "fdtaddr=40800000\0" + "fdt_addr_r=0x40800000\0" \ + "kernel_addr_r=0x41000000\0" /* GPT */ From patchwork Wed Jul 25 03:18:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 949002 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41b0ph5y2Xz9ryt for ; Wed, 25 Jul 2018 13:20:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8061EC221C5; Wed, 25 Jul 2018 03:19:27 +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 9D01BC221D8; Wed, 25 Jul 2018 03:19:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 30DE9C221BD; Wed, 25 Jul 2018 03:18:56 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id A9B1DC221CB for ; Wed, 25 Jul 2018 03:18:52 +0000 (UTC) Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 58AB51A9C3; Tue, 24 Jul 2018 20:18:51 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Wed, 25 Jul 2018 11:18:33 +0800 Message-Id: <20180725031835.5666-3-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180725031835.5666-1-vagrant@debian.org> References: <20180725031835.5666-1-vagrant@debian.org> Cc: Marek Vasut , Tom Rini , Vagrant Cascadian Subject: [U-Boot] [PATCH v2 2/4] arm: odroid: Increase default env size in preparation for 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" Adding distro_bootcmd support bumps the default environment size over 4500. Increase to SZ_16K to allow for room to grow in the future. Acked-by: Lukasz Majewski Signed-off-by: Vagrant Cascadian --- Changes in v2: - Change from 16384 to SZ_16K, as suggested by Minkyu Kang. 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 b7b75c0dc0..07882aca9a 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -50,7 +50,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 SZ_16K #define CONFIG_ENV_OFFSET (SZ_1K * 1280) /* 1.25 MiB offset */ #define CONFIG_ENV_OVERWRITE From patchwork Wed Jul 25 03:18:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 949003 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41b0qG2V2Jz9ryt for ; Wed, 25 Jul 2018 13:20:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B4C22C221BD; Wed, 25 Jul 2018 03:19:43 +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 96E03C221C5; Wed, 25 Jul 2018 03:19:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3A622C221C2; Wed, 25 Jul 2018 03:18:59 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id 396DEC221BC for ; Wed, 25 Jul 2018 03:18:55 +0000 (UTC) Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 32CB61A9D6; Tue, 24 Jul 2018 20:18:53 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Wed, 25 Jul 2018 11:18:34 +0800 Message-Id: <20180725031835.5666-4-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180725031835.5666-1-vagrant@debian.org> References: <20180725031835.5666-1-vagrant@debian.org> Cc: Marek Vasut , Tom Rini , Vagrant Cascadian Subject: [U-Boot] [PATCH v2 3/4] arm: odroid: Enable distro_bootcmd support. 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" Enable distro_bootcmd for a standardized boot process across multiple platforms. Acked-by: Lukasz Majewski Signed-off-by: Vagrant Cascadian --- Changes in v2: None include/configs/odroid.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 07882aca9a..a4d1a76c36 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -41,7 +41,7 @@ /* Console configuration */ -#define CONFIG_BOOTCOMMAND "run autoboot" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run autoboot" #define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ @@ -83,6 +83,12 @@ "bl2 raw 0x1f 0x1d;" \ "tzsw raw 0x83f 0x138\0" +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) + +#include + /* * Bootable media layout: * dev: SD eMMC(part boot) @@ -167,7 +173,8 @@ "ramdisk_addr_r=0x42000000\0" \ "scriptaddr=0x42000000\0" \ "fdt_addr_r=0x40800000\0" \ - "kernel_addr_r=0x41000000\0" + "kernel_addr_r=0x41000000\0" \ + BOOTENV /* GPT */ From patchwork Wed Jul 25 03:18:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 949004 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=debian.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41b0qZ4H1Hz9ryt for ; Wed, 25 Jul 2018 13:20:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4ED76C221CA; Wed, 25 Jul 2018 03:19:59 +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 D086AC221B5; Wed, 25 Jul 2018 03:19:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3535BC221A9; Wed, 25 Jul 2018 03:19:02 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id A173BC221B5 for ; Wed, 25 Jul 2018 03:18:58 +0000 (UTC) Received: from localhost (unknown [IPv6:2600:3c01:e000:21:21:21:0:100b]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 98BA41A9FD; Tue, 24 Jul 2018 20:18:57 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Wed, 25 Jul 2018 11:18:35 +0800 Message-Id: <20180725031835.5666-5-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180725031835.5666-1-vagrant@debian.org> References: <20180725031835.5666-1-vagrant@debian.org> Cc: Marek Vasut , Tom Rini , Vagrant Cascadian Subject: [U-Boot] [PATCH v2 4/4] arm: odroid: Inherit default value for bootdelay from 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" 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. Acked-by: Lukasz Majewski Signed-off-by: Vagrant Cascadian --- Changes in v2: None include/configs/odroid.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index a4d1a76c36..67a790ef02 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -164,7 +164,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" \