diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-11-12 13:10:47 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-11-12 13:11:17 +0100 |
| commit | 7a3f9ac3ce264d17402b279a9861b5405cbe54f4 (patch) | |
| tree | 93f0a1ad98e9a0abb5286157b0f1f3076f5e442c /rules/barebox.make | |
| parent | baa9d1881e35852b764f34800706f8f60ca1dcba (diff) | |
| download | ptxdist-7a3f9ac3ce264d17402b279a9861b5405cbe54f4.tar.gz ptxdist-7a3f9ac3ce264d17402b279a9861b5405cbe54f4.tar.xz | |
barebox: in new versions barebox-flash-image is used instead of barebox.bin
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/barebox.make')
| -rw-r--r-- | rules/barebox.make | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index ae005039b..ac10127e0 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -124,7 +124,11 @@ ifdef PTXCONF_BAREBOX_BAREBOXENV @$(call install_finish, barebox) endif - @install -D -m644 $(BAREBOX_DIR)/barebox.bin $(IMAGEDIR)/barebox-image + @if [ -e $(BAREBOX_DIR)/barebox-flash-image ]; then \ + install -D -m644 $(BAREBOX_DIR)/barebox-flash-image $(IMAGEDIR)/barebox-image; \ + else \ + install -D -m644 $(BAREBOX_DIR)/barebox.bin $(IMAGEDIR)/barebox-image; \ + fi @if [ -e $(BAREBOX_DIR)/common/barebox_default_env ]; then \ install -D -m644 $(BAREBOX_DIR)/common/barebox_default_env $(IMAGEDIR)/barebox-default-environment; \ else \ |