public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Vagrant Cascadian <vagrant@debian.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/2] omap3_pandora: Only set bootargs if distro_bootcmd failed to load.
Date: Tue, 30 Aug 2016 13:16:32 -0700	[thread overview]
Message-ID: <20160830201632.10704-3-vagrant@debian.org> (raw)
In-Reply-To: <20160830201632.10704-1-vagrant@debian.org>

As bootargs is hard-coded for the default behavior on the
omap3_pandora, only set the bootargs if distro_bootcmd fails to
load. This leaves distro_bootcmd free to use alternate boot arguments.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
---

 include/configs/omap3_pandora.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index fd51811..b664319 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -88,6 +88,7 @@
 
 #define CONFIG_BOOTCOMMAND \
 	"run distro_bootcmd; " \
+	"setenv bootargs ${bootargs_ubi}; " \
 	"if mmc rescan && load mmc 0:1 ${loadaddr} autoboot.scr; then " \
 		"source ${loadaddr}; " \
 	"fi; " \
@@ -102,7 +103,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	DEFAULT_LINUX_BOOT_ENV \
 	"usbtty=cdc_acm\0" \
-	"bootargs=ubi.mtd=4 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs " \
+	"bootargs_ubi=ubi.mtd=4 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs " \
 		"rw rootflags=bulk_read vram=6272K omapfb.vram=0:3000K\0" \
 	"mtdparts=" MTDPARTS_DEFAULT "\0" \
 	BOOTENV \
-- 
2.9.3

  parent reply	other threads:[~2016-08-30 20:16 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-30 20:16 [U-Boot] [PATCH 0/2] Add support for config_distro_bootcmd to the omap3_pandora target Vagrant Cascadian
2016-08-30 20:16 ` [U-Boot] [PATCH 1/2] omap3_pandora: Switch to use config_distro_bootcmd Vagrant Cascadian
2016-09-07 17:59   ` [U-Boot] [U-Boot, " Tom Rini
2016-08-30 20:16 ` Vagrant Cascadian [this message]
2016-09-07 17:59   ` [U-Boot] [U-Boot, 2/2] omap3_pandora: Only set bootargs if distro_bootcmd failed to load Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160830201632.10704-3-vagrant@debian.org \
    --to=vagrant@debian.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox