From: Fabio Estevam <festevam@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] boot/uboot: Fix SPL binary installation
Date: Wed, 5 Oct 2016 18:48:16 -0300 [thread overview]
Message-ID: <1475704096-22801-1-git-send-email-festevam@gmail.com> (raw)
Commit fad58cefa4a392b ("boot/uboot: allow to build multiple U-Boot images")
broke U-Boot SPL binary installation. Taking mx6cubox_defconfig target as an example:
LD u-boot
OBJCOPY u-boot-nodtb.bin
COPY u-boot.bin
MKIMAGE u-boot.img
>>> uboot 2016.09.01 Installing to target
>>> uboot 2016.09.01 Installing to images directory
cp -dpf /home/fabio/buildroot/output/build/uboot-2016.09.01/u-boot.bin /home/fabio/buildroot/output/images/
cp -dpf /home/fabio/buildroot/output/build/uboot-2016.09.01/u-boot.img /home/fabio/buildroot/output/images/
cp -dpf /home/fabio/buildroot/output/build/uboot-2016.09.01/SPL /home/fabio/buildroot/output/images/
cp: cannot stat '/home/fabio/buildroot/output/build/uboot-2016.09.01/SPL': No such file or directory
Fix this problem by adding the SPL binary into UBOOT_BINS and UBOOT_MAKE_TARGET
variables.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
boot/uboot/uboot.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 7379a4d..237ef26 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -71,6 +71,11 @@ UBOOT_BINS += u-boot-dtb.img
UBOOT_MAKE_TARGET += all u-boot-dtb.img
endif
+ifeq ($(BR2_TARGET_UBOOT_SPL),y)
+UBOOT_BINS += $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))
+UBOOT_MAKE_TARGET += $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))
+endif
+
ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
UBOOT_BINS += u-boot.img
UBOOT_MAKE_TARGET += u-boot.img
@@ -201,11 +206,6 @@ define UBOOT_INSTALL_IMAGES_CMDS
)
$(if $(BR2_TARGET_UBOOT_FORMAT_NAND),
cp -dpf $(@D)/u-boot.sb $(BINARIES_DIR))
- $(if $(BR2_TARGET_UBOOT_SPL),
- $(foreach f,$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)), \
- cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
- )
- )
$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \
$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
--
2.7.4
next reply other threads:[~2016-10-05 21:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-05 21:48 Fabio Estevam [this message]
2016-10-05 22:14 ` [Buildroot] [PATCH] boot/uboot: Fix SPL binary installation Arnout Vandecappelle
2016-10-05 22:24 ` Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475704096-22801-1-git-send-email-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox