Merge tag 'mips-pull-2019-11-16' of git://git.denx.de/u-boot-mips

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

diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk
index 219e66683d2f7c82c8b5f3ddf19ad5ba264a0fbc..84654eb3ed87e72a153f43ee3831377f323f0755 100644 (file)
--- a/arch/riscv/config.mk
+++ b/arch/riscv/config.mk
@@ -10,10 +10,6 @@
 # Rick Chen, Andes Technology Corporation <rick@andestech.com>
 #
 
-ifeq ($(CROSS_COMPILE),)
-CROSS_COMPILE := riscv32-unknown-linux-gnu-
-endif
-
 32bit-emul             := elf32lriscv
 64bit-emul             := elf64lriscv
 
@@ -27,12 +23,12 @@ PLATFORM_LDFLAGS    += -m $(64bit-emul)
 EFI_LDS                        := elf_riscv64_efi.lds
 endif
 
-CONFIG_STANDALONE_LOAD_ADDR = 0x00000000 \
-                             -T $(srctree)/examples/standalone/riscv.lds
+CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
 
 PLATFORM_CPPFLAGS      += -ffixed-gp -fpic
-PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -gdwarf-2 -ffunction-sections
-LDFLAGS_u-boot += --gc-sections -static -pie
+PLATFORM_RELFLAGS      += -fno-common -gdwarf-2 -ffunction-sections \
+                          -fdata-sections
+LDFLAGS_u-boot         += --gc-sections -static -pie
 
 EFI_CRT0               := crt0_riscv_efi.o
 EFI_RELOC              := reloc_riscv_efi.o