diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
| commit | 904298deb07d532a76de153a42c6f678d2e4c740 (patch) | |
| tree | 613d135d183962bf4dee1f5aef9449fbaceb0acd /images/Makefile | |
| parent | ebf9022f2eee564fc4b0e4b37a8267319923d808 (diff) | |
| parent | fe4ecd1dbfc44d0fe420e8b28a984738d74f3b69 (diff) | |
| download | barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.gz barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.xz | |
Merge branch 'for-next/socfpga'
Conflicts:
scripts/Makefile
Diffstat (limited to 'images/Makefile')
| -rw-r--r-- | images/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/images/Makefile b/images/Makefile index b87f522c15..e6732bf69f 100644 --- a/images/Makefile +++ b/images/Makefile @@ -108,6 +108,7 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F)) include $(srctree)/images/Makefile.imx include $(srctree)/images/Makefile.mvebu +include $(srctree)/images/Makefile.socfpga targets += $(image-y) pbl.lds barebox.x barebox.z targets += $(patsubst %,%.pblx,$(pblx-y)) @@ -123,5 +124,5 @@ images: $(addprefix $(obj)/, $(image-y)) FORCE @for i in $(image-y); do echo $$i; done clean-files := *.pbl *.pblb *.pblx *.map start_*.imximg *.img barebox.z start_*.kwbimg \ - start_*.kwbuartimg + start_*.kwbuartimg *.socfpgaimg clean-files += pbl.lds |