Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / arch / arm / config.mk

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 9af6c37218e9ee46f74be23e8dace155f1fd113c..542b897c31e0e93b84ba06eb54a5475099550cb8 100644 (file)
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -19,6 +19,12 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections \
 PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \
       $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
 
+# LLVM support
+LLVMS_RELFLAGS         := $(call cc-option,-mllvm,) \
+                       $(call cc-option,-target arm-none-eabi,) \
+                       $(call cc-option,-arm-use-movt=0,)
+PLATFORM_RELFLAGS      += $(LLVM_RELFLAGS)
+
 PLATFORM_CPPFLAGS += -D__ARM__
 
 # Choose between ARM/Thumb instruction sets
@@ -114,8 +120,8 @@ endif
 ifdef CONFIG_ARM64
 OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .u_boot_list -j .rela.dyn
 else
-OBJCOPYFLAGS += -j .text -j .secure_text -j .rodata -j .hash -j .data -j \
-       .got -j .got.plt -j .u_boot_list -j .rel.dyn
+OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .hash \
+               -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn
 endif
 
 ifdef CONFIG_OF_EMBED
@@ -138,4 +144,7 @@ else
 ALL-y += u-boot.imx
 endif
 endif
+ifneq ($(CONFIG_VF610),)
+ALL-y += u-boot.vyb
+endif
 endif