diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:38:17 +0200 |
| commit | 18ea2863bf76d6cd81c83706b5eb180dc5ad23bc (patch) | |
| tree | ae51ca9e03b538a58c576e1fa79983ec31e22269 /images/Makefile | |
| parent | c408a4ecbee60a9d512930972c09c6f9e365a671 (diff) | |
| parent | 893f30f614da5ed132265f5c4da767ec26a8edf5 (diff) | |
| download | barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.gz barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
arch/arm/boards/beagle/board.c
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 6ee1dccac0..a5f589b303 100644 --- a/images/Makefile +++ b/images/Makefile @@ -107,6 +107,7 @@ include $(srctree)/images/Makefile.imx include $(srctree)/images/Makefile.imxhabv4 include $(srctree)/images/Makefile.mvebu include $(srctree)/images/Makefile.mxs +include $(srctree)/images/Makefile.omap3 include $(srctree)/images/Makefile.rockchip include $(srctree)/images/Makefile.socfpga include $(srctree)/images/Makefile.tegra |