53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 71a7cc3c73..d171e590c6 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -246,8 +246,6 @@ ifeq ($(HOSTARCH),$(ARCH))
|
|
CROSS_COMPILE ?=
|
|
endif
|
|
|
|
-export CROSS_COMPILE=aarch64-none-elf-
|
|
-
|
|
KCONFIG_CONFIG ?= .config
|
|
export KCONFIG_CONFIG
|
|
|
|
diff --git a/arch/arm/cpu/armv8/g12b/firmware/scp_task/Makefile b/arch/arm/cpu/armv8/g12b/firmware/scp_task/Makefile
|
|
index 82f31b88bb..7b227f6b8a 100644
|
|
--- a/arch/arm/cpu/armv8/g12b/firmware/scp_task/Makefile
|
|
+++ b/arch/arm/cpu/armv8/g12b/firmware/scp_task/Makefile
|
|
@@ -6,7 +6,7 @@ include $(buildtree)/include/autoconf.mk
|
|
include $(buildtree)/.config
|
|
|
|
# Select ARMv7-m bare-metal toolchain
|
|
-CROSS_COMPILE=arm-none-eabi-
|
|
+CROSS_COMPILE=arm-eabi-
|
|
ASM=$(CROSS_COMPILE)as
|
|
CC=$(CROSS_COMPILE)gcc
|
|
CPP=$(CROSS_COMPILE)cpp
|
|
diff --git a/common/cmd_source.c b/common/cmd_source.c
|
|
index 3917cea8c4..919672f60f 100644
|
|
--- a/common/cmd_source.c
|
|
+++ b/common/cmd_source.c
|
|
@@ -29,11 +29,11 @@
|
|
#include <linux/ctype.h>
|
|
|
|
static
|
|
-int check_odroid_script(ulong addr, char *product)
|
|
+int check_odroid_script(ulong addr)
|
|
{
|
|
char *buf;
|
|
char magic[32];
|
|
- int size = snprintf(magic, sizeof(magic), "%s-uboot-config\n", product);
|
|
+ int size = snprintf(magic, sizeof(magic), "jelos-uboot-config\n");
|
|
|
|
buf = map_sysmem(addr, 0);
|
|
if (strncasecmp(magic, buf, size))
|
|
@@ -154,7 +154,7 @@ source (ulong addr, const char *fit_uname)
|
|
#endif
|
|
default:
|
|
#if defined(CONFIG_ODROID_COMMON)
|
|
- size = check_odroid_script(addr, CONFIG_DEVICE_PRODUCT);
|
|
+ size = check_odroid_script(addr);
|
|
if (size > 0) {
|
|
data = (u32*)(addr + size);
|
|
len = simple_strtoul(getenv("filesize"), NULL, 16) - size;
|