top: Rename back CROSS_COMPILE_PREFIX to CROSS_COMPILE

The name CROSS_COMPILE is an industry standard used across
open-source project to specify cross-compiler prefix.

In fact, distro build systems such as buildroot and yocto
assume CROSS_COMPILE to be supported by projects added
as packages to these build systems.

This patch rename back CROSS_COMPILE_PREFIX to CROSS_COMPILE.

Signed-off-by: Anup Patel <anup.patel@wdc.com>

diff --git a/Makefile b/Makefile
index bbd18f6..9c55559 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ deps-y+=$(lib-objs-path-y:.o=.dep)
 deps-y+=$(firmware-objs-path-y:.o=.dep)
 
 # Setup compilation environment
-cpp=$(CROSS_COMPILE_PREFIX)cpp
+cpp=$(CROSS_COMPILE)cpp
 cppflags+=-DOPENSBI_MAJOR=$(MAJOR)
 cppflags+=-DOPENSBI_MINOR=$(MINOR)
 cppflags+=-I$(platform_dir)/include
@@ -110,7 +110,7 @@ cppflags+=-I$(platform_common_dir)/include
 cppflags+=-I$(include_dir)
 cppflags+=$(platform-cppflags-y)
 cppflags+=$(firmware-cppflags-y)
-cc=$(CROSS_COMPILE_PREFIX)gcc
+cc=$(CROSS_COMPILE)gcc
 cflags=-g -Wall -Werror -nostdlib -fno-strict-aliasing -O2
 cflags+=-fno-omit-frame-pointer -fno-optimize-sibling-calls
 cflags+=-mno-save-restore -mstrict-align
@@ -118,7 +118,7 @@ cflags+=$(cppflags)
 cflags+=$(platform-cflags-y)
 cflags+=$(firmware-cflags-y)
 cflags+=$(EXTRA_CFLAGS)
-as=$(CROSS_COMPILE_PREFIX)gcc
+as=$(CROSS_COMPILE)gcc
 asflags=-g -Wall -nostdlib -D__ASSEMBLY__
 asflags+=-fno-omit-frame-pointer -fno-optimize-sibling-calls
 asflags+=-mno-save-restore -mstrict-align
@@ -126,15 +126,15 @@ asflags+=$(cppflags)
 asflags+=$(platform-asflags-y)
 asflags+=$(firmware-asflags-y)
 asflags+=$(EXTRA_ASFLAGS)
-ar=$(CROSS_COMPILE_PREFIX)ar
+ar=$(CROSS_COMPILE)ar
 arflags=rcs
-ld=$(CROSS_COMPILE_PREFIX)gcc
+ld=$(CROSS_COMPILE)gcc
 ldflags=-g -Wall -nostdlib -Wl,--build-id=none
 ldflags+=$(platform-ldflags-y)
 ldflags+=$(firmware-ldflags-y)
-merge=$(CROSS_COMPILE_PREFIX)ld
+merge=$(CROSS_COMPILE)ld
 mergeflags=-r
-objcopy=$(CROSS_COMPILE_PREFIX)objcopy
+objcopy=$(CROSS_COMPILE)objcopy
 
 # Setup functions for compilation
 define dynamic_flags

diff --git a/README.md b/README.md
index 69a65c1..7b142d5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ OpenSBI provides three components:
 Building and Installing generic *libsbi.a*
 ------------------------------------------
 
-For cross-compiling, the environment variable *CROSS_COMPILE_PREFIX* must
+For cross-compiling, the environment variable *CROSS_COMPILE* must
 be defined to specify the toolchain executable name prefix, e.g.
 *riscv64-unknown-elf-* if the gcc executable used is
 *riscv64-unknown-elf-gcc*.