Merge git://git.denx.de/u-boot-nand-flash

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

diff --git a/arch/openrisc/config.mk b/arch/openrisc/config.mk
index 13015ebc21ffb9cf91cdb1448754d86c1ad476d9..bfdb71f0befabe70c2afc3963efac26100eb2f4a 100644 (file)
--- a/arch/openrisc/config.mk
+++ b/arch/openrisc/config.mk
@@ -5,12 +5,12 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-CROSS_COMPILE ?= or32-elf-
+ifeq ($(CROSS_COMPILE),)
+CROSS_COMPILE := or1k-elf-
+endif
 
 # r10 used for global object pointer, already set in OR32 GCC but just to be
 # clear
-PLATFORM_CPPFLAGS += -DCONFIG_OPENRISC -D__OR1K__ -ffixed-r10
+PLATFORM_CPPFLAGS += -D__OR1K__ -ffixed-r10
 
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
-
-LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds