jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

barebox: support multi-image-build image selection

Browse Source 
Support optional selection of the built image filename in a
multi-image barebox build. This makes it possible to specify which
image to pick in a multi-image barebox config such as the
am335x_defconfig.

Signed-off-by: Pieter Smith <pieter@boesman.nl>
[Thomas:
 - remove default "", since this is the default for string options
 - rename the prompt from "Barebox image filename" to "Image filename"
 - slightly improve the Config.in help text.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Pieter Smith 2016-04-24 11:18:43 +02:00 committed by Thomas Petazzoni
parent 7181375669
commit cb8b5a7321
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boot/barebox/Config.in
View File

@ -97,6 +97,16 @@ config BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES
A space-separated list of configuration fragment files, A space-separated list of configuration fragment files,
that will be merged to the main Barebox configuration file. that will be merged to the main Barebox configuration file.
config BR2_TARGET_BAREBOX_IMAGE_FILE
string "Image filename"
help
Name of the generated barebox image, which will be copied to
the images directory.
If left empty, defaults to:
- barebox.bin for barebox versions older than 2012.10.
- barebox-flash-image for later versions.
config BR2_TARGET_BAREBOX_BAREBOXENV config BR2_TARGET_BAREBOX_BAREBOXENV
bool "bareboxenv tool in target" bool "bareboxenv tool in target"
help help

6
boot/barebox/barebox.mk
View File

@ -91,8 +91,12 @@ define BAREBOX_BUILD_CMDS
$(BAREBOX_BUILD_CUSTOM_ENV) $(BAREBOX_BUILD_CUSTOM_ENV)
endef endef
BAREBOX_IMAGE_FILE = $(call qstrip,$(BR2_TARGET_BAREBOX_IMAGE_FILE))
define BAREBOX_INSTALL_IMAGES_CMDS define BAREBOX_INSTALL_IMAGES_CMDS
if test -h $(@D)/barebox-flash-image ; then \ if test -n "$(BAREBOX_IMAGE_FILE)"; then \
cp -L $(@D)/$(BAREBOX_IMAGE_FILE) $(BINARIES_DIR) ; \
elif test -h $(@D)/barebox-flash-image ; then \
cp -L $(@D)/barebox-flash-image $(BINARIES_DIR)/barebox.bin ; \ cp -L $(@D)/barebox-flash-image $(BINARIES_DIR)/barebox.bin ; \
else \ else \
cp $(@D)/barebox.bin $(BINARIES_DIR);\ cp $(@D)/barebox.bin $(BINARIES_DIR);\