diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 09:32:42 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 09:32:42 +0100 |
commit | 4b0561d84198f8d696fd51cfc27aeac8c7482a8c (patch) | |
tree | b606414d6bfe1332209a282955233a1d87547f40 /spl | |
parent | a891601ce51edbafa1a2750c96a618e4fcbca1c2 (diff) | |
parent | a5e15bbb42512ee5be53967019e9649816790d7e (diff) | |
download | u-boot-imx-4b0561d84198f8d696fd51cfc27aeac8c7482a8c.zip u-boot-imx-4b0561d84198f8d696fd51cfc27aeac8c7482a8c.tar.gz u-boot-imx-4b0561d84198f8d696fd51cfc27aeac8c7482a8c.tar.bz2 |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'spl')
-rw-r--r-- | spl/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spl/Makefile b/spl/Makefile index 2a787af..0caa982 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -166,8 +166,13 @@ endif all: $(ALL-y) ifdef CONFIG_SAMSUNG +ifdef CONFIG_VAR_SIZE_SPL +VAR_SIZE_PARAM = --vs +else +VAR_SIZE_PARAM = +endif $(obj)$(BOARD)-spl.bin: $(obj)u-boot-spl.bin - $(OBJTREE)/tools/mk$(BOARD)spl $< $@ + $(OBJTREE)/tools/mk$(BOARD)spl $(VAR_SIZE_PARAM) $< $@ endif $(obj)$(SPL_BIN).bin: $(obj)$(SPL_BIN) |