diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:24:46 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:24:46 +0100 |
commit | 9c2aa617030a44f3d336b5fef3861eac142290d2 (patch) | |
tree | 5d7781f36a0c5677c6c49431f79a3760da46b5b3 /images | |
parent | 048b03641e9350bbf6672ce22003a663eebe0c3f (diff) | |
parent | d7db7df1879e17d547e123f9a56abeac26aab203 (diff) | |
download | barebox-9c2aa617030a44f3d336b5fef3861eac142290d2.tar.gz barebox-9c2aa617030a44f3d336b5fef3861eac142290d2.tar.xz |
Merge branch 'for-next/imx-image'
Conflicts:
arch/arm/dts/Makefile
Diffstat (limited to 'images')
-rw-r--r-- | images/Makefile.imx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/images/Makefile.imx b/images/Makefile.imx index 597e4c3883..5b650de69b 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -119,6 +119,11 @@ CFG_start_imx6dl_sabrelite.pblx.imximg = $(board)/freescale-mx6-sabrelite/flash- FILE_barebox-freescale-imx6dl-sabrelite.img = start_imx6dl_sabrelite.pblx.imximg image-$(CONFIG_MACH_SABRELITE) += barebox-freescale-imx6dl-sabrelite.img +pblx-$(CONFIG_MACH_SABRESD) += start_imx6q_sabresd +CFG_start_imx6q_sabresd.pblx.imximg = $(board)/freescale-mx6-sabresd/flash-header-mx6-sabresd.imxcfg +FILE_barebox-freescale-imx6q-sabresd.img = start_imx6q_sabresd.pblx.imximg +image-$(CONFIG_MACH_SABRESD) += barebox-freescale-imx6q-sabresd.img + pblx-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += start_imx6dl_hummingboard CFG_start_imx6dl_hummingboard.pblx.imximg = $(board)/solidrun-hummingboard/flash-header-solidrun-hummingboard.imxcfg FILE_barebox-solidrun-imx6dl-hummingboard.img = start_imx6dl_hummingboard.pblx.imximg |