diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-06 15:46:38 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-06 15:46:38 -0400 |
commit | 6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30 (patch) | |
tree | 3c560d567a76e9850e0195fb892d7e1fbaeed198 /arch/m68k/config.mk | |
parent | 2f5fbb5b39f7b67044dda5c35e4a4b31685a3109 (diff) | |
parent | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (diff) | |
download | u-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.tar.gz |
Merge branch 'next'
Merge all outstanding changes from the current next branch in now that
we have released.
Diffstat (limited to 'arch/m68k/config.mk')
-rw-r--r-- | arch/m68k/config.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk index 88b1a409f26..ed592334af2 100644 --- a/arch/m68k/config.mk +++ b/arch/m68k/config.mk @@ -3,10 +3,6 @@ # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -ifeq ($(CROSS_COMPILE),) -CROSS_COMPILE := m68k-elf- -endif - CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000 PLATFORM_CPPFLAGS += -D__M68K__ |