From 5570f0ed5e13a6d5e011afbeb169f56df38889d3 Mon Sep 17 00:00:00 2001
From: Nathaniel Graff <nathaniel.graff@sifive.com>
Date: Thu, 7 Mar 2019 09:47:43 -0800
Subject: Remove BSP checks from Makefile

Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>
---
 scripts/libmetal.mk   | 16 ++++++++--------
 scripts/standalone.mk |  4 ----
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/scripts/libmetal.mk b/scripts/libmetal.mk
index 6e6aada..e00c9cf 100644
--- a/scripts/libmetal.mk
+++ b/scripts/libmetal.mk
@@ -1,10 +1,10 @@
 
 #############################################################
-# Compiles an instance of the MEE targeted at $(TARGET)
+# Compiles an instance of Metal targeted at $(TARGET)
 #############################################################
-MEE_SOURCE_PATH	  ?= freedom-metal
-MEE_LDSCRIPT	   = $(BSP_DIR)/metal.lds
-MEE_HEADER	   = $(BSP_DIR)/metal.h
+METAL_SOURCE_PATH ?= freedom-metal
+METAL_LDSCRIPT	   = $(BSP_DIR)/metal.lds
+METAL_HEADER	   = $(BSP_DIR)/metal.h
 
 .PHONY: metal
 metal: $(BSP_DIR)/install/stamp
@@ -14,14 +14,14 @@ $(BSP_DIR)/build/Makefile:
 	@mkdir -p $(dir $@)
 	cd $(dir $@) && \
 		CFLAGS="-march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -ffunction-sections -fdata-sections -g -mcmodel=$(RISCV_CMODEL)" \
-		$(abspath $(MEE_SOURCE_PATH)/configure) \
+		$(abspath $(METAL_SOURCE_PATH)/configure) \
 		--host=$(CROSS_COMPILE) \
 		--prefix=$(abspath $(BSP_DIR)/install) \
 		--disable-maintainer-mode \
 		--with-preconfigured \
 		--with-machine-name=$(TARGET) \
-		--with-machine-header=$(abspath $(MEE_HEADER)) \
-		--with-machine-ldscript=$(abspath $(MEE_LDSCRIPT)) \
+		--with-machine-header=$(abspath $(METAL_HEADER)) \
+		--with-machine-ldscript=$(abspath $(METAL_LDSCRIPT)) \
 		--with-builtin-libgloss
 	touch -c $@
 
@@ -44,5 +44,5 @@ clean-metal:
 clean: clean-metal
 
 metal_install: metal
-	$(MAKE) -C $(MEE_SOURCE_PATH) install
+	$(MAKE) -C $(METAL_SOURCE_PATH) install
 
diff --git a/scripts/standalone.mk b/scripts/standalone.mk
index 921d6a1..fd0c28d 100644
--- a/scripts/standalone.mk
+++ b/scripts/standalone.mk
@@ -76,8 +76,6 @@ SEGGER_JLINK_GDB_SERVER := JLinkGDBServer
 # Software
 #############################################################
 
-ifneq ($(BSP),legacy)
-
 PROGRAM_ELF ?= $(SRC_DIR)/$(PROGRAM)
 
 .PHONY: all
@@ -125,5 +123,3 @@ clean-software:
 	$(MAKE) -C $(SRC_DIR) clean
 clean: clean-software
 
-endif # BSP != legacy
-
-- 
cgit v1.2.3