aboutsummaryrefslogtreecommitdiff
path: root/boot/barebox
diff options
context:
space:
mode:
authorGravatar Yegor Yefremov <yegorslists@googlemail.com>2016-05-06 07:46:04 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-05-06 15:48:01 +0200
commitf80735ce39165762f33e06d2a54c1d1db5206e12 (patch)
tree88c3906c0fe4fd8ab89c18ce73ad95ba71adba2c /boot/barebox
parent1cc99eb33ea7ebed9052d6e4f848d7fe5e3ed74f (diff)
downloadbuildroot-f80735ce39165762f33e06d2a54c1d1db5206e12.tar.gz
buildroot-f80735ce39165762f33e06d2a54c1d1db5206e12.tar.bz2
barebox: add an option to embed environment image
Barebox provides an option to embed a custom environment image into barebox binary. This image will be used, when the environment found in the environment sector is invalid. Both embedded and external images can be used together, so having both options at the same time is justified. This patch sets barebox Kconfig option CONFIG_DEFAULT_ENVIRONMENT_PATH to user specified path. This way one can use such BR's variables like BR2_EXTERNAL, TOPDIR etc. to provide paths to custom environment folders. Cc: Pieter Smith <pieter@boesman.nl> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'boot/barebox')
-rw-r--r--boot/barebox/barebox-aux/Config.in17
-rw-r--r--boot/barebox/barebox.mk9
-rw-r--r--boot/barebox/barebox/Config.in17
3 files changed, 43 insertions, 0 deletions
diff --git a/boot/barebox/barebox-aux/Config.in b/boot/barebox/barebox-aux/Config.in
index 35aadc0e4a..315e1a3fca 100644
--- a/boot/barebox/barebox-aux/Config.in
+++ b/boot/barebox/barebox-aux/Config.in
@@ -57,3 +57,20 @@ config BR2_TARGET_BAREBOX_AUX_CUSTOM_ENV_PATH
the additions needed. The output will be an image in the
barebox devfs format, stored in the images directory, with
the same name as the directory name given here.
+
+config BR2_TARGET_BAREBOX_AUX_CUSTOM_EMBEDDED_ENV_PATH
+ string "Embedded environment path"
+ help
+ If this option is not empty, it is the path to a custom
+ embedded barebox environment. This image will be used when
+ the environment found in the environment sector is
+ invalid. This option sets the barebox Kconfig option
+ CONFIG_DEFAULT_ENVIRONMENT_PATH to the specified path. This
+ way it is possible to use Buildroot variables like
+ BR2_EXTERNAL, TOPDIR etc. to refer to the custom
+ environment.
+
+ Depending on your setup, the custom embedded environment
+ will probably be based on either the content of the
+ defaultenv or defaultenv-2 directories in the barebox source
+ code.
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 949fb9fe38..832297eef6 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -39,6 +39,8 @@ $(1)_DEPENDENCIES = host-lzop
$(1)_LICENSE = GPLv2 with exceptions
$(1)_LICENSE_FILES = COPYING
+$(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH))
+
ifneq ($$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR)),)
define $(1)_APPLY_CUSTOM_PATCHES
$$(APPLY_PATCHES) $$(@D) \
@@ -96,6 +98,13 @@ define $(1)_INSTALL_CUSTOM_ENV
endef
endif
+ifneq ($$($(1)_CUSTOM_EMBEDDED_ENV_PATH),)
+define $(1)_KCONFIG_FIXUP_CMDS
+ $$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_ENVIRONMENT,$$(@D)/.config)
+ $$(call KCONFIG_SET_OPT,CONFIG_DEFAULT_ENVIRONMENT_PATH,"$$($(1)_CUSTOM_EMBEDDED_ENV_PATH)",$$(@D)/.config)
+endef
+endif
+
define $(1)_BUILD_CMDS
$$($(1)_BUILD_BAREBOXENV_CMDS)
$$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D)
diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in
index bf13ea5ca3..f5e3bae8d5 100644
--- a/boot/barebox/barebox/Config.in
+++ b/boot/barebox/barebox/Config.in
@@ -63,3 +63,20 @@ config BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH
the additions needed. The output will be an image in the
barebox devfs format, stored in the images directory, with
the same name as the directory name given here.
+
+config BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH
+ string "Embedded environment path"
+ help
+ If this option is not empty, it is the path to a custom
+ embedded barebox environment. This image will be used when
+ the environment found in the environment sector is
+ invalid. This option sets the barebox Kconfig option
+ CONFIG_DEFAULT_ENVIRONMENT_PATH to the specified path. This
+ way it is possible to use Buildroot variables like
+ BR2_EXTERNAL, TOPDIR etc. to refer to the custom
+ environment.
+
+ Depending on your setup, the custom embedded environment
+ will probably be based on either the content of the
+ defaultenv or defaultenv-2 directories in the barebox source
+ code.