diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-13 12:57:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-13 12:57:13 +0200 |
| commit | 1ef7837c37bd55d2efa4c8602ef39964d9024a5b (patch) | |
| tree | 25a7a3dc6dd42e32a8e419e7d24ec97e3d1321ff /images | |
| parent | 3506a2331d6e5e730e879d885a1086a990f2a711 (diff) | |
| parent | 4cc0a3d9c547b452755ae2c0300d601473696591 (diff) | |
| download | barebox-1ef7837c37bd55d2efa4c8602ef39964d9024a5b.tar.gz barebox-1ef7837c37bd55d2efa4c8602ef39964d9024a5b.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile.imx | 5 | ||||
| -rw-r--r-- | images/Makefile.mxs | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/images/Makefile.imx b/images/Makefile.imx index eacc76eaa2..aa30d4a213 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -234,3 +234,8 @@ pblx-$(CONFIG_MACH_GW_VENTANA) += start_imx6q_gw54xx_1gx64 CFG_start_imx6q_gw54xx_1gx64.pblx.imximg = $(board)/gateworks-ventana/flash-header-ventana-quad-1gx64.imxcfg FILE_barebox-gateworks-imx6q-ventana-1gx64.img = start_imx6q_gw54xx_1gx64.pblx.imximg image-$(CONFIG_MACH_GW_VENTANA) += barebox-gateworks-imx6q-ventana-1gx64.img + +pblx-$(CONFIG_MACH_ELTEC_HIPERCAM) += start_imx6dl_eltec_hipercam +CFG_start_imx6dl_eltec_hipercam.pblx.imximg = $(board)/eltec-hipercam/flash-header-eltec-hipercam.imxcfg +FILE_barebox-eltec-hipercam.img = start_imx6dl_eltec_hipercam.pblx.imximg +image-$(CONFIG_MACH_ELTEC_HIPERCAM) += barebox-eltec-hipercam.img diff --git a/images/Makefile.mxs b/images/Makefile.mxs index 733f83bd1f..69b92ce235 100644 --- a/images/Makefile.mxs +++ b/images/Makefile.mxs @@ -23,7 +23,6 @@ mxs23cfg = $(srctree)/arch/arm/mach-mxs/mxs23img.cfg mxs28cfg = $(srctree)/arch/arm/mach-mxs/mxs28img.cfg pblx-$(CONFIG_MACH_DUCKBILL) += start_barebox_duckbill prep_start_barebox_duckbill -PREP_start_barebox_duckbill.pblx.mxsbs = start_barebox_duckbill_prep CFG_start_barebox_duckbill.mxsbs = $(mxs28cfg) FILE_barebox-duckbill-bootstream.img = start_barebox_duckbill.mxsbs image-$(CONFIG_MACH_DUCKBILL) += barebox-duckbill-bootstream.img @@ -33,7 +32,6 @@ FILE_barebox-duckbill-2nd.img = start_barebox_duckbill.pblx image-$(CONFIG_MACH_DUCKBILL) += barebox-duckbill-2nd.img pblx-$(CONFIG_MACH_TX28) += start_barebox_karo_tx28 prep_start_barebox_karo_tx28 -PREP_start_barebox_karo_tx28.pblx.mxsbs = start_barebox_karo_tx28_prep CFG_start_barebox_karo_tx28.mxsbs = $(mxs28cfg) FILE_barebox-karo-tx28-bootstream.img = start_barebox_karo_tx28.mxsbs image-$(CONFIG_MACH_TX28) += barebox-karo-tx28-bootstream.img @@ -43,7 +41,6 @@ FILE_barebox-karo-tx28-2nd.img = start_barebox_karo_tx28.pblx image-$(CONFIG_MACH_TX28) += barebox-karo-tx28-2nd.img pblx-$(CONFIG_MACH_MX28EVK) += start_barebox_freescale_mx28evk prep_start_barebox_freescale_mx28evk -PREP_start_barebox_freescale_mx28evk.pblx.mxsbs = start_barebox_freescale_mx28evk_prep CFG_start_barebox_freescale_mx28evk.mxsbs = $(mxs28cfg) FILE_barebox-freescale-mx28evk-bootstream.img = start_barebox_freescale_mx28evk.mxsbs image-$(CONFIG_MACH_MX28EVK) += barebox-freescale-mx28evk-bootstream.img @@ -53,7 +50,6 @@ FILE_barebox-freescale-mx28evk-2nd.img = start_barebox_freescale_mx28evk.pblx image-$(CONFIG_MACH_MX28EVK) += barebox-freescale-mx28evk-2nd.img pblx-$(CONFIG_MACH_IMX233_OLINUXINO) += start_barebox_olinuxino_imx23 prep_start_barebox_olinuxino_imx23 -PREP_start_barebox_olinuxino_imx23.pblx.mxsbs = start_barebox_olinuxino_imx23_prep; CFG_start_barebox_olinuxino_imx23.mxsbs = $(mxs23cfg) FILE_barebox-olinuxino-imx23-bootstream.img = start_barebox_olinuxino_imx23.mxsbs image-$(CONFIG_MACH_IMX233_OLINUXINO) += barebox-olinuxino-imx23-bootstream.img |