diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-26 11:23:30 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-10 14:35:33 +0100 |
| commit | 509f62209907d6cc4c8d4b4e95aff91c7684f5db (patch) | |
| tree | 1e38bfaf62d450e9025c4502e460214baeb14729 /images | |
| parent | ace667e6bba1de3c24a02c9197c6872a6d2ea94e (diff) | |
| download | barebox-509f62209907d6cc4c8d4b4e95aff91c7684f5db.tar.gz barebox-509f62209907d6cc4c8d4b4e95aff91c7684f5db.tar.xz | |
ARM: Make multi images startup process simpler
The multi image startup process used to have three binaries involved:
- The lowlevel board code to initialize SDRAM
- the uncompressor
- the regular (compressed) barebox binary
Drop the uncompressor and put the uncompress code into the lowlevel
board code binary. This makes the startup process easier.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/images/Makefile b/images/Makefile index ec033abeda..b080a8cda8 100644 --- a/images/Makefile +++ b/images/Makefile @@ -69,10 +69,10 @@ $(obj)/%.pblb: $(obj)/%.pbl FORCE quiet_cmd_pblx ?= PBLX $@ cmd_pblx ?= cat $(obj)/$(patsubst %.pblx,%.pblb,$(2)) > $@; \ - $(call size_append, $(obj)/barebox.x) >> $@; \ - cat $(obj)/barebox.x >> $@ + $(call size_append, $(obj)/barebox.z) >> $@; \ + cat $(obj)/barebox.z >> $@ -$(obj)/%.pblx: $(obj)/%.pblb $(obj)/barebox.x FORCE +$(obj)/%.pblx: $(obj)/%.pblb $(obj)/barebox.z FORCE $(call if_changed,pblx,$(@F)) $(obj)/%.s: $(obj)/% FORCE @@ -93,12 +93,6 @@ quiet_cmd_selfextract = COMP $@ $(call size_append, $<) >> $@; \ cat $< >> $@ -pblx-y += start_uncompress -# barebox.x - self extracting barebox binary -# ---------------------------------------------------------------- -$(obj)/barebox.x: $(obj)/barebox.z $(obj)/start_uncompress.pblb FORCE - $(call if_changed,selfextract) - # %.img - create a copy from another file # ---------------------------------------------------------------- .SECONDEXPANSION: |