global: Rename SPL_ to XPL_

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

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index a5eebb95e5c6d58188c21da27cf56f8c61f1da8e..e0045e2227133ae682f83871af03662b087c6554 100644 (file)
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -1,31 +1,34 @@
+# SPDX-License-Identifier: GPL-2.0+

 #
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, [email protected].
 #
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, [email protected].

-#
-# SPDX-License-Identifier:     GPL-2.0+
-#

 
 

-ifndef CONFIG_STANDALONE_LOAD_ADDR
-ifneq ($(CONFIG_ARCH_OMAP2PLUS),)
-CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
+ifeq ($(CONFIG_ARM64),y)
+FIXED_REG := -ffixed-x18

 else
 else

-CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
-endif
+FIXED_REG := -ffixed-r9

 endif
 
 endif
 

-CFLAGS_NON_EFI := -fno-pic -ffixed-r9 -ffunction-sections -fdata-sections
+CFLAGS_NON_EFI := -fno-pic $(FIXED_REG) -ffunction-sections -fdata-sections \
+                 -fstack-protector-strong

 CFLAGS_EFI := -fpic -fshort-wchar
 
 CFLAGS_EFI := -fpic -fshort-wchar
 

+ifneq ($(LTO_ENABLE)$(CONFIG_USE_PRIVATE_LIBGCC),yy)

 LDFLAGS_FINAL += --gc-sections
 LDFLAGS_FINAL += --gc-sections

-PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections \
-                    -fno-common -ffixed-r9
+endif
+
+ifneq ($(LTO_ENABLE),y)
+PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
+endif
+
+PLATFORM_RELFLAGS += -fno-common $(FIXED_REG)

 PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \
 PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \

+                    $(call cc-option,-mgeneral-regs-only) \

       $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
 
 # LLVM support
       $(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__
 PLATFORM_RELFLAGS      += $(LLVM_RELFLAGS)
 
 PLATFORM_CPPFLAGS += -D__ARM__


@@ -37,7 +40,7 @@ PLATFORM_ELFFLAGS += -B arm -O elf32-littlearm
 endif
 
 # Choose between ARM/Thumb instruction sets
 endif
 
 # Choose between ARM/Thumb instruction sets

-ifeq ($(CONFIG_$(SPL_)SYS_THUMB_BUILD),y)
+ifeq ($(CONFIG_$(XPL_)SYS_THUMB_BUILD),y)

 AFLAGS_IMPLICIT_IT     := $(call as-option,-Wa$(comma)-mimplicit-it=always)
 PF_CPPFLAGS_ARM                := $(AFLAGS_IMPLICIT_IT) \
                        $(call cc-option, -mthumb -mthumb-interwork,\
 AFLAGS_IMPLICIT_IT     := $(call as-option,-Wa$(comma)-mimplicit-it=always)
 PF_CPPFLAGS_ARM                := $(AFLAGS_IMPLICIT_IT) \
                        $(call cc-option, -mthumb -mthumb-interwork,\


@@ -50,7 +53,7 @@ PF_CPPFLAGS_ARM := $(call cc-option,-marm,) \
 endif
 
 # Only test once
 endif
 
 # Only test once

-ifeq ($(CONFIG_$(SPL_)SYS_THUMB_BUILD),y)
+ifeq ($(CONFIG_$(XPL_)SYS_THUMB_BUILD),y)

 archprepare: checkthumb checkgcc6
 
 checkthumb:
 archprepare: checkthumb checkgcc6
 
 checkthumb:


@@ -68,8 +71,8 @@ endif
 checkgcc6:
        @if test "$(call cc-name)" = "gcc" -a \
                        "$(call cc-version)" -lt "0600"; then \
 checkgcc6:
        @if test "$(call cc-name)" = "gcc" -a \
                        "$(call cc-version)" -lt "0600"; then \

-               echo -n '*** Your GCC is older than 6.0 and will not be '; \
-               echo 'supported starting in v2018.01.'; \
+               echo '*** Your GCC is older than 6.0 and is not supported'; \
+               false; \

        fi
 
 
        fi
 
 


@@ -96,7 +99,7 @@ PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_ARM) $(PF_CPPFLAGS_ABI)
 ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
 # This file is parsed many times, so the string may get added multiple
 # times. Also, the prefix needs to be different based on whether
 ifneq (,$(findstring -mabi=aapcs-linux,$(PLATFORM_CPPFLAGS)))
 # This file is parsed many times, so the string may get added multiple
 # times. Also, the prefix needs to be different based on whether

-# CONFIG_SPL_BUILD is defined or not. 'filter-out' the existing entry
+# CONFIG_XPL_BUILD is defined or not. 'filter-out' the existing entry

 # before adding the correct one.
 PLATFORM_LIBS := arch/arm/lib/eabi_compat.o \
        $(filter-out arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS))
 # before adding the correct one.
 PLATFORM_LIBS := arch/arm/lib/eabi_compat.o \
        $(filter-out arch/arm/lib/eabi_compat.o, $(PLATFORM_LIBS))


@@ -113,7 +116,7 @@ LDFLAGS_u-boot += -pie
 #
 # http://sourceware.org/bugzilla/show_bug.cgi?id=12532
 #
 #
 # http://sourceware.org/bugzilla/show_bug.cgi?id=12532
 #

-ifeq ($(CONFIG_$(SPL_)SYS_THUMB_BUILD),y)
+ifeq ($(CONFIG_$(XPL_)SYS_THUMB_BUILD),y)

 ifeq ($(GAS_BUG_12532),)
 export GAS_BUG_12532:=$(shell if [ $(call binutils-version) -lt 0222 ] ; \
        then echo y; else echo n; fi)
 ifeq ($(GAS_BUG_12532),)
 export GAS_BUG_12532:=$(shell if [ $(call binutils-version) -lt 0222 ] ; \
        then echo y; else echo n; fi)


@@ -123,9 +126,9 @@ PLATFORM_RELFLAGS += -fno-optimize-sibling-calls
 endif
 endif
 
 endif
 endif
 

-ifneq ($(CONFIG_SPL_BUILD),y)
+ifneq ($(CONFIG_XPL_BUILD),y)

 # Check that only R_ARM_RELATIVE relocations are generated.
 # Check that only R_ARM_RELATIVE relocations are generated.

-ALL-y += checkarmreloc
+INPUTS-y += checkarmreloc

 # The movt / movw can hardcode 16 bit parts of the addresses in the
 # instruction. Relocation is not supported for that case, so disable
 # such usage by requiring word relocations.
 # The movt / movw can hardcode 16 bit parts of the addresses in the
 # instruction. Relocation is not supported for that case, so disable
 # such usage by requiring word relocations.


@@ -136,34 +139,40 @@ 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 \
 # 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 \
 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
 
 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
 OBJCOPYFLAGS += -j .dtb.init.rodata

-endif

 
 ifdef CONFIG_EFI_LOADER
 OBJCOPYFLAGS += -j .efi_runtime -j .efi_runtime_rel
 endif
 
 
 ifdef CONFIG_EFI_LOADER
 OBJCOPYFLAGS += -j .efi_runtime -j .efi_runtime_rel
 endif
 

-ifneq ($(CONFIG_IMX_CONFIG),)
+ifdef CONFIG_MACH_IMX
+ifneq ($(CONFIG_IMX_CONFIG),"")

 ifdef CONFIG_SPL
 ifdef CONFIG_SPL

-ifndef CONFIG_SPL_BUILD
-ALL-y += SPL
+ifndef CONFIG_XPL_BUILD
+INPUTS-y += SPL

 endif
 else
 ifeq ($(CONFIG_OF_SEPARATE),y)
 endif
 else
 ifeq ($(CONFIG_OF_SEPARATE),y)

-ALL-y += u-boot-dtb.imx
+INPUTS-y += u-boot-dtb.imx

 else
 else

-ALL-y += u-boot.imx
+INPUTS-y += u-boot.imx

 endif
 endif
 ifneq ($(CONFIG_VF610),)
 endif
 endif
 ifneq ($(CONFIG_VF610),)

-ALL-y += u-boot.vyb
+INPUTS-y += u-boot.vyb
+endif

 endif
 endif
 
 endif
 endif