From 42e9ad556ddae97dde3a55d649213a606efb01c0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 22 Feb 2019 15:02:55 -0800 Subject: [PATCH] Makefile: Set the platform variables before parsing the platforms Ensure the platform variable PLATFORM_RISCV_XLEN is set before we parse the platform files. This fixes the 32-bit openSBI FW_JUMP_ADDR. Signed-off-by: Alistair Francis --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ae68f55..6463f54 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,15 @@ DTC = dtc # Guess the compillers xlen OPENSBI_CC_XLEN := $(shell TMP=`$(CC) -dumpmachine | sed 's/riscv\([0-9][0-9]\).*/\1/'`; echo $${TMP}) +# Setup platform XLEN +ifndef PLATFORM_RISCV_XLEN + ifeq ($(OPENSBI_CC_XLEN), 32) + PLATFORM_RISCV_XLEN = 32 + else + PLATFORM_RISCV_XLEN = 64 + endif +endif + # Setup list of objects.mk files ifdef PLATFORM platform-object-mks=$(shell if [ -d $(platform_dir) ]; then find $(platform_dir) -iname "objects.mk" | sort -r; fi) @@ -112,14 +121,7 @@ deps-y+=$(platform-common-objs-path-y:.o=.dep) deps-y+=$(lib-objs-path-y:.o=.dep) deps-y+=$(firmware-objs-path-y:.o=.dep) -# Setup platform XLEN, ABI, ISA and Code Model -ifndef PLATFORM_RISCV_XLEN - ifeq ($(OPENSBI_CC_XLEN), 32) - PLATFORM_RISCV_XLEN = 32 - else - PLATFORM_RISCV_XLEN = 64 - endif -endif +# Setup platform ABI, ISA and Code Model ifndef PLATFORM_RISCV_ABI ifeq ($(PLATFORM_RISCV_XLEN), 32) PLATFORM_RISCV_ABI = ilp$(PLATFORM_RISCV_XLEN) -- 2.7.4