summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-08-20 23:41:07 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2018-08-31 08:30:07 +0200
commitb4e43bf44a43edd852cab4ece6ccbbbc1939e7d6 (patch)
tree484aa7573ac09461dd938faee0b254e0cbf12842 /images
parentdb6ee951649939a4a7c75d7ba7f20a4342f76780 (diff)
downloadbarebox-b4e43bf44a43edd852cab4ece6ccbbbc1939e7d6.tar.gz
barebox-b4e43bf44a43edd852cab4ece6ccbbbc1939e7d6.tar.xz
Revert "i.MX: Add provisions to boot from IRAM"
After being introduced 3 years ago this feature ended up being "obsoleted by events" and project it was supposed to be a part of winded down. Revert this feature due to: a) Lack of users b) Existence of better way to make barebox load via SRAM as intermediary step that does not require two separate images to be built (.imx-sram-img) This reverts commit 903c9477a08c5655161779ef4144886928ecc7d1. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
-rw-r--r--images/Makefile.imx27
1 files changed, 5 insertions, 22 deletions
diff --git a/images/Makefile.imx b/images/Makefile.imx
index aefc52af49..746fc1439f 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -5,14 +5,8 @@
# %.imximg - convert into i.MX image
# ----------------------------------------------------------------
-ifdef CONFIG_ARCH_IMX_XLOAD
$(obj)/%.imximg: $(obj)/% FORCE
- $(call cmd,check_file_size,$<,$(CONFIG_ARCH_IMX_UNUSED_IRAM_SIZE))
$(call if_changed,imx_image,$(CFG_$(@F)),)
-else
-$(obj)/%.imximg: $(obj)/% FORCE
- $(call if_changed,imx_image,$(CFG_$(@F)),)
-endif
$(obj)/%.simximg: $(obj)/% FORCE
$(call if_changed,imx_image,$(CFG_$(patsubst %.simximg,%.imximg,$(@F))),-s)
@@ -53,39 +47,28 @@ image-$(CONFIG_MACH_PCM038) += barebox-phytec-phycore-imx27.img
pblx-$(CONFIG_MACH_KINDLE_MX50) += start_imx50_kindle_d01100
CFG_start_imx50_kindle_d01100.pblx.imximg = $(board)/kindle-mx50/flash-header-kindle-lpddr1.imxcfg
FILE_barebox-kindle-d01100.img = start_imx50_kindle_d01100.pblx.imximg
-imx-barebox-$(CONFIG_MACH_KINDLE_MX50) += barebox-kindle-d01100.img
+image-$(CONFIG_MACH_KINDLE_MX50) += barebox-kindle-d01100.img
pblx-$(CONFIG_MACH_KINDLE_MX50) += start_imx50_kindle_d01200
CFG_start_imx50_kindle_d01200.pblx.imximg = $(board)/kindle-mx50/flash-header-kindle-lpddr1.imxcfg
FILE_barebox-kindle-d01200.img = start_imx50_kindle_d01200.pblx.imximg
-imx-barebox-$(CONFIG_MACH_KINDLE_MX50) += barebox-kindle-d01200.img
+image-$(CONFIG_MACH_KINDLE_MX50) += barebox-kindle-d01200.img
pblx-$(CONFIG_MACH_KINDLE_MX50) += start_imx50_kindle_ey21
CFG_start_imx50_kindle_ey21.pblx.imximg = $(board)/kindle-mx50/flash-header-kindle-lpddr2.imxcfg
FILE_barebox-kindle-ey21.img = start_imx50_kindle_ey21.pblx.imximg
-imx-barebox-$(CONFIG_MACH_KINDLE_MX50) += barebox-kindle-ey21.img
+image-$(CONFIG_MACH_KINDLE_MX50) += barebox-kindle-ey21.img
# ----------------------- i.MX51 based boards ---------------------------
pblx-$(CONFIG_MACH_FREESCALE_MX51_PDK) += start_imx51_babbage
CFG_start_imx51_babbage.pblx.imximg = $(board)/freescale-mx51-babbage/flash-header-imx51-babbage.imxcfg
FILE_barebox-freescale-imx51-babbage.img = start_imx51_babbage.pblx.imximg
-imx-barebox-$(CONFIG_MACH_FREESCALE_MX51_PDK) += barebox-freescale-imx51-babbage.img
-
-pblx-$(CONFIG_MACH_FREESCALE_MX51_PDK) += start_imx51_babbage_xload
-CFG_start_imx51_babbage_xload.pblx.imximg = $(board)/freescale-mx51-babbage/flash-header-imx51-babbage-xload.imxcfg
-FILE_barebox-freescale-imx51-babbage-xload.img = start_imx51_babbage_xload.pblx.imximg
-imx-xload-$(CONFIG_MACH_FREESCALE_MX51_PDK) += barebox-freescale-imx51-babbage-xload.img
+image-$(CONFIG_MACH_FREESCALE_MX51_PDK) += barebox-freescale-imx51-babbage.img
pblx-$(CONFIG_MACH_ZII_RDU1) += start_imx51_zii_rdu1
CFG_start_imx51_zii_rdu1.pblx.imximg = $(board)/zii-imx51-rdu1/flash-header-imx51-zii-rdu1.imxcfg
FILE_barebox-zii-imx51-rdu1.img = start_imx51_zii_rdu1.pblx.imximg
-imx-barebox-$(CONFIG_MACH_ZII_RDU1) += barebox-zii-imx51-rdu1.img
-
-ifdef CONFIG_ARCH_IMX_XLOAD
-image-y += $(imx-xload-y)
-else
-image-y += $(imx-barebox-y)
-endif
+image-$(CONFIG_MACH_ZII_RDU1) += barebox-zii-imx51-rdu1.img
pblx-$(CONFIG_MACH_EFIKA_MX_SMARTBOOK) += start_imx51_genesi_efikasb
CFG_start_imx51_genesi_efikasb.pblx.imximg = $(board)/efika-mx-smartbook/flash-header-imx51-genesi-efikasb.imxcfg