diff options
| -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: |
