summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-04-18 19:24:13 -0400
committerTom Rini <trini@konsulko.com>2015-04-18 19:24:13 -0400
commitb8d7652c81689a69bc6eaa206cf875bbe632831c (patch)
tree07dfe799746a81e14b939e3d52157d4aaa319881 /Makefile
parent9efaca3e847696ed40fca1dbbc621fcc35b8d94c (diff)
parent35ce2dc4d1148b66ce9271d15879dbfec5dd57f4 (diff)
downloadtalos-obmc-uboot-b8d7652c81689a69bc6eaa206cf875bbe632831c.tar.gz
talos-obmc-uboot-b8d7652c81689a69bc6eaa206cf875bbe632831c.zip
Merge branch 'buildman' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index dc25f70ce0..1e52008385 100644
--- a/Makefile
+++ b/Makefile
@@ -729,7 +729,7 @@ DO_STATIC_RELA =
endif
# Always append ALL so that arch config.mk's can add custom ones
-ALL-y += u-boot.srec u-boot.bin System.map binary_size_check
+ALL-y += u-boot.srec u-boot.bin System.map u-boot.cfg binary_size_check
ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
ifeq ($(CONFIG_SPL_FSL_PBL),y)
@@ -871,6 +871,11 @@ ifndef CONFIG_SYS_UBOOT_START
CONFIG_SYS_UBOOT_START := 0
endif
+# Create a file containing the configuration options the image was built with
+quiet_cmd_cpp_cfg = CFG $@
+cmd_cpp_cfg = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
+ -D__ASSEMBLY__ -x assembler-with-cpp -P -dM -E -o $@ $<
+
MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \
-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
-n "U-Boot $(UBOOTRELEASE) for $(BOARD) board"
@@ -901,6 +906,9 @@ u-boot.sha1: u-boot.bin
u-boot.dis: u-boot
$(OBJDUMP) -d $< > $@
+u-boot.cfg: include/config.h
+ $(call if_changed,cpp_cfg)
+
ifdef CONFIG_TPL
SPL_PAYLOAD := tpl/u-boot-with-tpl.bin
else
OpenPOWER on IntegriCloud