diff options
| author | Marcin Niestroj <m.niestroj@grinn-global.com> | 2017-06-21 09:03:53 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-21 21:40:33 +0200 |
| commit | 9c61322c46ef202fe59a2fe6cf7b56ccd30ce3fa (patch) | |
| tree | f7ab016df9431ce9a5d4d907df5c36dc80465635 | |
| parent | 0f7b5d4a9f3a78be07e22c81db41f88e45e8c0cf (diff) | |
| download | buildroot-9c61322c46ef202fe59a2fe6cf7b56ccd30ce3fa.tar.gz buildroot-9c61322c46ef202fe59a2fe6cf7b56ccd30ce3fa.zip | |
barebox: support multiple image files
Add support for specifying multiple image files in
BR2_TARGET_BAREBOX_IMAGE_FILE config option.
This is useful for boards with several RAM size variants.
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
[Thomas: rename internal variable from $(1)_IMAGE_FILE to
$(1)_IMAGE_FILES.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | boot/barebox/barebox-aux/Config.in | 4 | ||||
| -rw-r--r-- | boot/barebox/barebox.mk | 6 | ||||
| -rw-r--r-- | boot/barebox/barebox/Config.in | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/boot/barebox/barebox-aux/Config.in b/boot/barebox/barebox-aux/Config.in index ec3b97cb8a..d39d24f763 100644 --- a/boot/barebox/barebox-aux/Config.in +++ b/boot/barebox/barebox-aux/Config.in @@ -30,9 +30,9 @@ config BR2_TARGET_BAREBOX_AUX_CONFIG_FRAGMENT_FILES that will be merged to the main Barebox configuration file. config BR2_TARGET_BAREBOX_AUX_IMAGE_FILE - string "Image filename" + string "Image file names" help - Name of the generated barebox image, which will be copied to + Space-separated list of barebox images which will be copied to the images directory. If left empty, defaults to: diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 1690e8fa59..b811e322b5 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -109,11 +109,11 @@ define $(1)_BUILD_CMDS $$($(1)_BUILD_CUSTOM_ENV) endef -$(1)_IMAGE_FILE = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE)) +$(1)_IMAGE_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE)) define $(1)_INSTALL_IMAGES_CMDS - if test -n "$$($(1)_IMAGE_FILE)"; then \ - cp -L $$(@D)/$$($(1)_IMAGE_FILE) $$(BINARIES_DIR) ; \ + if test -n "$$($(1)_IMAGE_FILES)"; then \ + cp -L $$(foreach image,$$($(1)_IMAGE_FILES),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ elif test -h $$(@D)/barebox-flash-image ; then \ cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \ else \ diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in index 3d8d014561..0be26adf93 100644 --- a/boot/barebox/barebox/Config.in +++ b/boot/barebox/barebox/Config.in @@ -31,9 +31,9 @@ config BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES that will be merged to the main Barebox configuration file. config BR2_TARGET_BAREBOX_IMAGE_FILE - string "Image filename" + string "Image file names" help - Name of the generated barebox image, which will be copied to + Space-separated list of barebox images which will be copied to the images directory. If left empty, defaults to: |
