Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] uboot: add option customizing the name of environment image
Date: Mon, 18 Dec 2017 17:55:57 +0300	[thread overview]
Message-ID: <20171218145557.19360-1-didin@synopsys.com> (raw)

Historically, in buildroot the name of binary environment image
file is "uboot-env.bin". But in upstream u-boot default name
for this file is "uboot.env":

http://git.denx.de/?p=u-boot.git;a=blob;f=env/Kconfig#l394

For some boards U-Boot environment is stored in FAT partition, not as
a raw blob on SD-card, so the name of environment file must be correct.
For customizing name of envimage file option BR2_TARGET_UBOOT_ENVIMAGE_FILENAME
has been added. For backward compatibility by default value of this
option is set to "uboot-env.bin".

Signed-off-by: Evgeniy Didin <didin@synopsys.com>
Cc: Alexey Brodkin <abrodkin@synopsys.com>
Cc: arc-buildroot at synopsys.com
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/uboot/Config.in | 8 ++++++++
 boot/uboot/uboot.mk  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 2829d2ca5e..e05ae15238 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -430,6 +430,14 @@ config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT
 	  Buildroot is compatible with the "redundant environment"
 	  mechanism of U-Boot.
 
+config BR2_TARGET_UBOOT_ENVIMAGE_FILENAME
+	string "Custom filename for environment image"
+	default "uboot-env.bin"
+	help
+	  Some platforms require setting custom name for U-Boot
+	  environment image. For backward compatibility
+	  default filename is "uboot-env.bin".
+
 endif # BR2_TARGET_UBOOT_ENVIMAGE
 
 config BR2_TARGET_UBOOT_BOOT_SCRIPT
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index d2f241cd8b..5ebd1df89d 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -250,7 +250,7 @@ define UBOOT_GENERATE_ENV_IMAGE
 	$(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
 		$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
 		$(if $(filter BIG,$(BR2_ENDIAN)),-b) \
-		-o $(BINARIES_DIR)/uboot-env.bin \
+		-o $(BINARIES_DIR)/$(BR2_TARGET_UBOOT_ENVIMAGE_FILENAME) \
 		$(@D)/buildroot-env.txt
 endef
 endif
-- 
2.11.0

             reply	other threads:[~2017-12-18 14:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-18 14:55 Evgeniy Didin [this message]
2018-02-06 16:28 ` [Buildroot] [PATCH] uboot: add option customizing the name of environment image Bryce Ferguson
2018-04-01 22:38 ` Thomas Petazzoni

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=20171218145557.19360-1-didin@synopsys.com \
    --to=evgeniy.didin@synopsys.com \
    --cc=buildroot@busybox.net \
    /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