All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philip Balister <philip@balister.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] zynq: Allow board specific files to over write CONFIG_EXTRA_ENV_SETTINGS.
Date: Thu, 21 Apr 2016 14:14:32 -0400	[thread overview]
Message-ID: <1461262472-732-1-git-send-email-philip@opensdr.com> (raw)

The zynq-common.h header file is usually included last in the board specific
header file. Check if the CONFIG_EXTRA_ENV_SETTINGS variable is set before
applying the default value. This makes it easier for a board to set a
board specific environment.

Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Philip Balister <philip@opensdr.com>
---
 include/configs/zynq-common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 9ff3df2..ea8b0b0 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -205,6 +205,7 @@
 #endif
 
 /* Default environment */
+#ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"fit_image=fit.itb\0"		\
 	"load_addr=0x2000000\0"		\
@@ -227,6 +228,7 @@
 			"load usb 0 ${load_addr} ${fit_image} && " \
 			"bootm ${load_addr}; fi\0" \
 		DFU_ALT_INFO
+#endif
 
 #define CONFIG_BOOTCOMMAND		"run $modeboot"
 #define CONFIG_BOOTDELAY		3 /* -1 to Disable autoboot */
-- 
2.5.5

             reply	other threads:[~2016-04-21 18:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-21 18:14 Philip Balister [this message]
2016-04-22  4:41 ` [U-Boot] [PATCH] zynq: Allow board specific files to over write CONFIG_EXTRA_ENV_SETTINGS Michal Simek

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=1461262472-732-1-git-send-email-philip@opensdr.com \
    --to=philip@balister.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.