diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2021-03-22 14:39:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-03-23 12:16:26 +0100 |
| commit | 22a41fca64e1184ccc954a23bb75e7dc0614670c (patch) | |
| tree | 7b3ac405ae1825be57428f2fd89504993d04247d /images | |
| parent | 410544558f35542dbcd07ebf0c8fb09d7e844a93 (diff) | |
| download | barebox-22a41fca64e1184ccc954a23bb75e7dc0614670c.tar.gz barebox-22a41fca64e1184ccc954a23bb75e7dc0614670c.tar.xz | |
RISC-V: erizo: migrate to PBL
We now have everything in place to migrate erizo to PBL.
As currently, this is the only board, we can drop all non-PBL support
in the same go.
Cc: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
| -rw-r--r-- | images/.gitignore | 1 | ||||
| -rw-r--r-- | images/Makefile | 4 | ||||
| -rw-r--r-- | images/Makefile.riscv | 12 |
3 files changed, 17 insertions, 0 deletions
diff --git a/images/.gitignore b/images/.gitignore index 377c14ceb3..eafdb44b5b 100644 --- a/images/.gitignore +++ b/images/.gitignore @@ -31,3 +31,4 @@ barebox.sum *.image *.mvebu1img *.stm32 +*.nmon diff --git a/images/Makefile b/images/Makefile index 84492a154d..ee1347f6b6 100644 --- a/images/Makefile +++ b/images/Makefile @@ -42,6 +42,8 @@ # both as entrypoint and as filename # +include scripts/Makefile.lib + quiet_cmd_objcopy_bin = OBJCOPYB $@ cmd_objcopy_bin = \ $(OBJCOPY) -O binary $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ && \ @@ -64,6 +66,7 @@ PBL_CPPFLAGS += -fdata-sections -ffunction-sections $(obj)/%.pbl: $(pbl-lds) $(BAREBOX_PBL_OBJS) $(obj)/piggy.o $(obj)/sha_sum.o FORCE $(call if_changed,elf__,$(*F)) + $(call cmd,prelink__) $(obj)/%.pblb: $(obj)/%.pbl FORCE $(call if_changed,objcopy_bin,$(*F)) @@ -164,6 +167,7 @@ include $(srctree)/images/Makefile.at91 include $(srctree)/images/Makefile.zynq include $(srctree)/images/Makefile.zynqmp include $(srctree)/images/Makefile.layerscape +include $(srctree)/images/Makefile.riscv pblb-$(CONFIG_BOARD_GENERIC_DT) += start_dt_2nd diff --git a/images/Makefile.riscv b/images/Makefile.riscv new file mode 100644 index 0000000000..463c6ce440 --- /dev/null +++ b/images/Makefile.riscv @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +quiet_cmd_erizo_nmon_image = MKIMAGE $@ + cmd_erizo_nmon_image = $(srctree)/scripts/erizo-nmon-image $< $@ || \ + echo "WARNING: Couldn't create erizo nmon image due to previous errors." + +$(obj)/%.nmon: $(obj)/%.img FORCE + $(call if_changed,erizo_nmon_image) + +pblb-$(CONFIG_BOARD_ERIZO_GENERIC) += start_erizo_generic +FILE_barebox-erizo-generic.img = start_erizo_generic.pblb +image-$(CONFIG_BOARD_ERIZO_GENERIC) += barebox-erizo-generic.img barebox-erizo-generic.nmon |