diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:36 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:36 +0200 |
| commit | 6e30646fa28908b3f199d070ebb85151fef52a10 (patch) | |
| tree | ad26005307ee7fe7674feeb68cb452091e7188c7 /images/Makefile | |
| parent | 904298deb07d532a76de153a42c6f678d2e4c740 (diff) | |
| parent | f93b5f8eb973a62affbaf134f07d367649ed3ae4 (diff) | |
| download | barebox-6e30646fa28908b3f199d070ebb85151fef52a10.tar.gz barebox-6e30646fa28908b3f199d070ebb85151fef52a10.tar.xz | |
Merge branch 'for-next/tegra'
Conflicts:
arch/arm/dts/Makefile
images/Makefile
Diffstat (limited to 'images/Makefile')
| -rw-r--r-- | images/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/images/Makefile b/images/Makefile index e6732bf69f..ec033abeda 100644 --- a/images/Makefile +++ b/images/Makefile @@ -109,6 +109,7 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F)) include $(srctree)/images/Makefile.imx include $(srctree)/images/Makefile.mvebu include $(srctree)/images/Makefile.socfpga +include $(srctree)/images/Makefile.tegra targets += $(image-y) pbl.lds barebox.x barebox.z targets += $(patsubst %,%.pblx,$(pblx-y)) |