diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-09-09 13:44:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-01 22:34:08 +0200 |
| commit | 0be48260b8c391997ae842ac6b655e04a423c331 (patch) | |
| tree | 194a236d539e03bff1638b491808a843ff277bb3 /images | |
| parent | c123df1fc8b57b52d81cc462c084eb0fb09a0d8a (diff) | |
| download | barebox-0be48260b8c391997ae842ac6b655e04a423c331.tar.gz barebox-0be48260b8c391997ae842ac6b655e04a423c331.tar.xz | |
ARM: Merge single pbl with multi pbl
So far we have two different implementations for PBL: One for a single
PBL and one for multiple images. This patch implements the single PBL
case as a special case of the multi PBL case. With this the single PBL
becomes a multi PBL image with the entry point start_pbl.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/images/Makefile b/images/Makefile index dd39f44afb..ceb00618d2 100644 --- a/images/Makefile +++ b/images/Makefile @@ -164,10 +164,17 @@ include $(srctree)/images/Makefile.at91 include $(srctree)/images/Makefile.zynqmp include $(srctree)/images/Makefile.layerscape + pblb-$(CONFIG_BOARD_ARM_GENERIC_DT) += start_dt_2nd FILE_barebox-dt-2nd.img = start_dt_2nd.pblb image-$(CONFIG_BOARD_ARM_GENERIC_DT) += barebox-dt-2nd.img +ifdef CONFIG_ARM +pblb-$(CONFIG_PBL_SINGLE_IMAGE) += start_pbl +FILE_barebox.img = start_pbl.pblb +image-$(CONFIG_PBL_SINGLE_IMAGE) += barebox.img +endif + ifneq ($(pblx-y)$(pblx-),) $(error pblx- has been removed. Please use pblb- instead.) endif |