Merge tag 'rpi-next-2020.07.2' of https://gitlab.denx.de/u-boot/custodians/u-boot...

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

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 907c69371b944705875fc0246763fd699acbd6a4..f25603109e0081d581ab703d1236a2e5660a8e5a 100644 (file)
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -1,12 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
 
 ifndef CONFIG_STANDALONE_LOAD_ADDR
-ifneq ($(CONFIG_ARCH_OMAP2),)
+ifneq ($(CONFIG_ARCH_OMAP2PLUS),)
 CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
 else
 CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
@@ -23,13 +21,18 @@ 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,)
+LLVM_RELFLAGS          := $(call cc-option,-mllvm,) \
+                       $(call cc-option,-mno-movt,)
 PLATFORM_RELFLAGS      += $(LLVM_RELFLAGS)
 
 PLATFORM_CPPFLAGS += -D__ARM__
 
+ifdef CONFIG_ARM64
+PLATFORM_ELFFLAGS += -B aarch64 -O elf64-littleaarch64
+else
+PLATFORM_ELFFLAGS += -B arm -O elf32-littlearm
+endif
+
 # Choose between ARM/Thumb instruction sets
 ifeq ($(CONFIG_$(SPL_)SYS_THUMB_BUILD),y)
 AFLAGS_IMPLICIT_IT     := $(call as-option,-Wa$(comma)-mimplicit-it=always)
@@ -45,7 +48,7 @@ endif
 
 # Only test once
 ifeq ($(CONFIG_$(SPL_)SYS_THUMB_BUILD),y)
-archprepare: checkthumb
+archprepare: checkthumb checkgcc6
 
 checkthumb:
        @if test "$(call cc-name)" = "gcc" -a \
@@ -55,8 +58,18 @@ checkthumb:
                echo '*** Your board is configured for THUMB mode.'; \
                false; \
        fi
+else
+archprepare: checkgcc6
 endif
 
+checkgcc6:
+       @if test "$(call cc-name)" = "gcc" -a \
+                       "$(call cc-version)" -lt "0600"; then \
+               echo '*** Your GCC is older than 6.0 and is not supported'; \
+               false; \
+       fi
+
+
 # Try if EABI is supported, else fall back to old API,
 # i. e. for example:
 # - with ELDK 4.2 (EABI supported), use:
@@ -120,15 +133,19 @@ endif
 # limit ourselves to the sections we want in the .bin.
 ifdef CONFIG_ARM64
 OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \
-               -j .u_boot_list -j .rela.dyn -j .got -j .got.plt
+               -j .u_boot_list -j .rela.dyn -j .got -j .got.plt \
+               -j .binman_sym_table -j .text_rest
 else
 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
+               -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn \
+               -j .binman_sym_table -j .text_rest
 endif
 
-ifdef CONFIG_OF_EMBED
+# if a dtb section exists we always have to include it
+# there are only two cases where it is generated
+# 1) OF_EMBEDED is turned on
+# 2) unit tests include device tree blobs
 OBJCOPYFLAGS += -j .dtb.init.rodata
-endif
 
 ifdef CONFIG_EFI_LOADER
 OBJCOPYFLAGS += -j .efi_runtime -j .efi_runtime_rel