diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-09 15:28:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-12-03 09:17:09 +0100 |
| commit | 5a1a5ed2537d7d12f851f3778707681d6c08d6e8 (patch) | |
| tree | 730e26cba815bdca0849115b1207ff2dcfe4c52e /images/Makefile.omap3 | |
| parent | 4cd223777314233e681c3eef54ead81932d891fc (diff) | |
| download | barebox-5a1a5ed2537d7d12f851f3778707681d6c08d6e8.tar.gz barebox-5a1a5ed2537d7d12f851f3778707681d6c08d6e8.tar.xz | |
ARM: images: use piggydata
The way we assemble the multi images on ARM is rather complicated and
error prone. We currently cat the compressed barebox image behind the
PBL executable and need some magic to obtain the size of the payload and
also have to do tricks to reliably get a pointer to the compressed
image.
This patch switches over to compile the compressed payload into the PBL
image itself which has proven to work for the single PBL case and for
the ARM Linux Kernel aswell.
The goal is to unify the single PBL and the multi PBL cases together in
the future to get an easier startup path for ARM.
This patch has been tested on the i.MX53 QSB, i.MX53 Vincell, Beaglebone
black (both MLO and 2nd stage) and a Phytec phyFLEX i.MX6 board.
SoCFPGA Arria10 has also be changed slightly with this patch. We used to
generate a single image (barebox-socfpga-achilles.img) which was
used as xload image and full image. We now instead generate two images:
barebox-socfpga-achilles-xload.img and barebox-socfpga-achilles.img, the
former loaded by the ROM and the latter loaded by the xload image.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images/Makefile.omap3')
| -rw-r--r-- | images/Makefile.omap3 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/images/Makefile.omap3 b/images/Makefile.omap3 index 694ec30836..4d87b1da26 100644 --- a/images/Makefile.omap3 +++ b/images/Makefile.omap3 @@ -6,10 +6,10 @@ quiet_cmd_omap3_mlo_image = MLO $@ $(obj)/%.omap3_mlo: $(obj)/% FORCE $(call if_changed,omap3_mlo_image) -pblx-$(CONFIG_MACH_BEAGLE) += start_omap3_beagleboard_sdram start_omap3_beagleboard_sram -FILE_barebox-beagleboard.img = start_omap3_beagleboard_sdram.pblx +pblb-$(CONFIG_MACH_BEAGLE) += start_omap3_beagleboard_sdram start_omap3_beagleboard_sram +FILE_barebox-beagleboard.img = start_omap3_beagleboard_sdram.pblb omap3-barebox-$(CONFIG_MACH_BEAGLE) += barebox-beagleboard.img -FILE_barebox-beagleboard-mlo.img = start_omap3_beagleboard_sram.pblx.omap3_mlo +FILE_barebox-beagleboard-mlo.img = start_omap3_beagleboard_sram.pblb.omap3_mlo omap3-mlo-$(CONFIG_MACH_BEAGLE) += barebox-beagleboard-mlo.img ifdef CONFIG_OMAP_BUILD_IFT |