From e13896aa54d9ccb93b637b476d555e032a5a668e Mon Sep 17 00:00:00 2001
From: Nathaniel Graff <nathaniel.graff@sifive.com>
Date: Wed, 30 Jan 2019 13:51:39 -0800
Subject: Replace all mee with metal

Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>
---
 Makefile                         | 56 ++++++++++++++++++++--------------------
 README.md                        | 24 ++++++++---------
 bsp/coreip-e31-arty/design.dts   |  2 +-
 bsp/coreip-s51-arty/design.dts   |  2 +-
 bsp/freedom-e310-arty/design.dts |  2 +-
 bsp/sifive-hifive1/design.dts    |  2 +-
 scripts/standalone.mk            |  8 +++---
 7 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/Makefile b/Makefile
index 994d3d7..91ff31f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ include $(extra_configs)
 endif
 
 # Select Legacy BSP or Freedom Metal BSP
-# Allowed values are 'legacy' and 'mee'
+# Allowed values are 'legacy' and 'metal'
 BSP ?= legacy
 
 # Use BOARD as a synonym for TARGET
@@ -28,7 +28,7 @@ LINK_TARGET ?= flash
 GDB_PORT ?= 3333
 
 else # MEE
-BSP = mee
+override BSP = metal
 BSP_SUBDIR ?= 
 PROGRAM ?= hello
 TARGET ?= sifive-hifive1
@@ -79,25 +79,25 @@ help:
 	@echo " SiFive Freedom E Software Development Kit "
 	@echo " Makefile targets:"
 	@echo ""
-	@echo " software BSP=mee [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
+	@echo " software BSP=metal [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
 	@echo "    Build a software program to load with the"
 	@echo "    debugger."
 	@echo ""
-	@echo " mee BSP=mee [TARGET=$(TARGET)]"
+	@echo " metal BSP=metal [TARGET=$(TARGET)]"
 	@echo "    Build the MEE library for TARGET"
 	@echo ""
-	@echo " clean BSP=mee [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
+	@echo " clean BSP=metal [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
 	@echo "    Clean compiled objects for a specified "
 	@echo "    software program."
 	@echo ""
-	@echo " upload BSP=mee [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
+	@echo " upload BSP=metal [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
 	@echo "    Launch OpenOCD to flash your program to the"
 	@echo "    on-board Flash."
 	@echo ""
-	@echo " debug BSP=mee [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
+	@echo " debug BSP=metal [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
 	@echo "    Launch OpenOCD and attach GDB to the running program."
 	@echo ""
-	@echo " standalone BSP=mee STANDALONE_DEST=/path/to/desired/location"
+	@echo " standalone BSP=metal STANDALONE_DEST=/path/to/desired/location"
 	@echo "            [PROGRAM=$(PROGRAM) TARGET=$(TARGET)]:"
 	@echo "    Export a program for a single target into a standalone"
 	@echo "    project directory at STANDALONE_DEST."
@@ -115,7 +115,7 @@ clean:
 # format or fixed text of the output without consulting the 
 # Freedom Studio dev team.
 #############################################################
-ifeq ($(BSP),mee)
+ifeq ($(BSP),metal)
 
 # MEE boards are any folders that aren't the Legacy BSP or update-targets.sh
 EXCLUDE_TARGET_DIRS = drivers env include libwrap update-targets.sh
@@ -133,13 +133,13 @@ endif
 #############################################################
 # Compiles an instance of the MEE targeted at $(TARGET)
 #############################################################
-ifeq ($(BSP),mee)
-MEE_SOURCE_PATH	  ?= freedom-mee
-MEE_LDSCRIPT	   = $(BSP_DIR)/mee.lds
-MEE_HEADER	   = $(BSP_DIR)/mee.h
+ifeq ($(BSP),metal)
+MEE_SOURCE_PATH	  ?= freedom-metal
+MEE_LDSCRIPT	   = $(BSP_DIR)/metal.lds
+MEE_HEADER	   = $(BSP_DIR)/metal.h
 
-.PHONY: mee
-mee: $(BSP_DIR)/install/stamp
+.PHONY: metal
+metal: $(BSP_DIR)/install/stamp
 
 $(BSP_DIR)/build/Makefile:
 	@rm -rf $(dir $@)
@@ -163,20 +163,20 @@ $(BSP_DIR)/install/stamp: $(BSP_DIR)/build/Makefile
 
 $(BSP_DIR)/install/lib/libriscv%.a: $(BSP_DIR)/install/stamp ;@:
 
-$(BSP_DIR)/install/lib/libmee.a: $(BSP_DIR)/install/lib/libriscv__mmachine__$(TARGET).a
+$(BSP_DIR)/install/lib/libmetal.a: $(BSP_DIR)/install/lib/libriscv__mmachine__$(TARGET).a
 	cp $< $@
 
-$(BSP_DIR)/install/lib/libmee-gloss.a: $(BSP_DIR)/install/lib/libriscv__menv__mee.a
+$(BSP_DIR)/install/lib/libmetal-gloss.a: $(BSP_DIR)/install/lib/libriscv__menv__metal.a
 	cp $< $@
 
-.PHONY: clean-mee
-clean-mee:
+.PHONY: clean-metal
+clean-metal:
 	rm -rf $(BSP_DIR)/install
 	rm -rf $(BSP_DIR)/build
-clean: clean-mee
+clean: clean-metal
 endif
 
-mee_install: mee
+metal_install: metal
 	$(MAKE) -C $(MEE_SOURCE_PATH) install
 
 #############################################################
@@ -203,7 +203,7 @@ clean: clean-elf2hex
 # Standalone Project Export
 #############################################################
 
-ifeq ($(BSP),mee)
+ifeq ($(BSP),metal)
 ifeq ($(STANDALONE_DEST),)
 standalone:
 	$(error Please provide STANDALONE_DEST to create a standalone project)
@@ -219,8 +219,8 @@ standalone: \
 		$(STANDALONE_DEST) \
 		$(STANDALONE_DEST)/bsp \
 		$(STANDALONE_DEST)/src \
-		$(BSP_DIR)/install/lib/libmee.a \
-		$(BSP_DIR)/install/lib/libmee-gloss.a \
+		$(BSP_DIR)/install/lib/libmetal.a \
+		$(BSP_DIR)/install/lib/libmetal-gloss.a \
 		$(SRC_DIR) \
 		scripts/standalone.mk
 	cp -r $(addprefix $(BSP_DIR)/,$(filter-out build,$(shell ls $(BSP_DIR)))) $</bsp/
@@ -241,7 +241,7 @@ endif
 # In this top level Makefile, just describe how to turn the elf into
 # $(PROGRAM_HEX)
 
-ifeq ($(BSP),mee)
+ifeq ($(BSP),metal)
 $(PROGRAM_HEX): \
 		scripts/elf2hex/install/bin/$(CROSS_COMPILE)-elf2hex \
 		$(PROGRAM_ELF)
@@ -279,7 +279,7 @@ else
 RISCV_OPENOCD=openocd
 endif
 
-ifeq ($(BSP),mee)
+ifeq ($(BSP),metal)
 
 upload: $(PROGRAM_ELF)
 	scripts/upload --elf $(PROGRAM_ELF) --openocd $(RISCV_OPENOCD) --gdb $(RISCV_GDB) --openocd-config bsp/$(TARGET)/openocd.cfg
@@ -287,7 +287,7 @@ upload: $(PROGRAM_ELF)
 debug: $(PROGRAM_ELF)
 	scripts/debug --elf $(PROGRAM_ELF) --openocd $(RISCV_OPENOCD) --gdb $(RISCV_GDB) --openocd-config bsp/$(TARGET)/openocd.cfg
 
-else # BSP != mee
+else # BSP != metal
 
 OPENOCDCFG ?= bsp/env/$(TARGET)/openocd.cfg
 OPENOCDARGS += -f $(OPENOCDCFG)
@@ -321,4 +321,4 @@ GDBCMDS += -ex "target extended-remote localhost:$(GDB_PORT)"
 run_gdb:
 	$(RISCV_GDB) $(PROGRAM_DIR)/$(PROGRAM) $(GDBARGS) $(GDBCMDS)
 
-endif # BSP == mee
+endif # BSP == metal
diff --git a/README.md b/README.md
index 7cce370..297412e 100644
--- a/README.md
+++ b/README.md
@@ -50,10 +50,10 @@ of Freedom E SDK.
         the Freedom Metal library to the target device. It is included as reference
         so that users of Freedom Metal are aware of what features and peripherals
         are available on the target.
-    * mee.h
+    * metal.h
       - The Freedom Metal machine header which is used internally to Freedom Metal
         to instantiate structures to support the target device.
-    * mee.lds
+    * metal.lds
       - The linker script for the target device.
     * openocd.cfg (for development board and FPGA targets)
       - Used to configure OpenOCD for flashing and debugging the target device.
@@ -124,7 +124,7 @@ the legacy version of the examples from this repository.
   - watchdog
 
 Legacy examples can be built using the same commands as the Freedom Metal examples and simply
-omitting the `BSP=mee` argument or substituting it with `BSP=legacy`.
+omitting the `BSP=metal` argument or substituting it with `BSP=legacy`.
 
 ### Setting up the SDK ###
 
@@ -187,8 +187,8 @@ git submodule update --init --recursive
 
 To ease the transition for consumers of the Legacy SDK, we've namespaced
 the new Freedom Metal examples behind the environment variable `BSP`. To use the
-Freedom Metal examples, you may `export BSP=mee` in your shell environment, or simply
-pass `BSP=mee` as an argument to your `make` invocations as you see in the following
+Freedom Metal examples, you may `export BSP=metal` in your shell environment, or simply
+pass `BSP=metal` as an argument to your `make` invocations as you see in the following
 example commands.
 
 #### Building an Example ####
@@ -196,7 +196,7 @@ example commands.
 To compile a bare-metal RISC-V program:
 
 ```
-make BSP=mee [PROGRAM=hello] [TARGET=sifive-hifive1] software
+make BSP=metal [PROGRAM=hello] [TARGET=sifive-hifive1] software
 ```
 
 The square brackets in the above command indicate optional parameters for the
@@ -206,12 +206,12 @@ If, for example, you wished to build the `timer-interrupt` example for the S51
 Arty FPGA Evaluation target, you would instead run the command
 
 ```
-make BSP=mee PROGRAM=timer-interrupt TARGET=coreip-s51-arty software
+make BSP=metal PROGRAM=timer-interrupt TARGET=coreip-s51-arty software
 ```
 
 #### Building a Legacy Example ####
 
-The legacy examples can still be built by omitting `BSP=mee` or by substituting
+The legacy examples can still be built by omitting `BSP=metal` or by substituting
 `BSP=legacy`. For example, to build the legacy `demo_gpio` application for
 HiFive 1, run:
 
@@ -222,19 +222,19 @@ make PROGRAM=demo_gpio TARGET=freedom-e300-hifive1 software
 #### Uploading to the Target Board ####
 
 ```
-make BSP=mee [PROGRAM=hello] [TARGET=sifive-hifive1] upload
+make BSP=metal [PROGRAM=hello] [TARGET=sifive-hifive1] upload
 ```
 
 #### Debugging a Target Program ####
 
 ```
-make BSP=mee [PROGRAM=hello] [TARGET=sifive-hifive1] debug
+make BSP=metal [PROGRAM=hello] [TARGET=sifive-hifive1] debug
 ```
 
 #### Cleaning a Target Program Build Directory ####
 
 ```
-make BSP=mee [PROGRAM=hello] [TARGET=sifive-hifive1] clean
+make BSP=metal [PROGRAM=hello] [TARGET=sifive-hifive1] clean
 ```
 
 #### Create a Standalone Project ####
@@ -247,7 +247,7 @@ Legacy Freedom E SDK.
 `STANDALONE_DEST` is a required argument to provide the desired project location.
 
 ```
-make BSP=mee [PROGRAM=hello] [TARGET=sifive-hifive1] STANDALONE_DEST=/path/to/desired/location standalone
+make BSP=metal [PROGRAM=hello] [TARGET=sifive-hifive1] STANDALONE_DEST=/path/to/desired/location standalone
 ```
 
 Run `make help` for more commands.
diff --git a/bsp/coreip-e31-arty/design.dts b/bsp/coreip-e31-arty/design.dts
index 96698e9..c69740e 100644
--- a/bsp/coreip-e31-arty/design.dts
+++ b/bsp/coreip-e31-arty/design.dts
@@ -8,7 +8,7 @@
 
         chosen {
                 stdout-path = "/soc/serial@20000000:115200";
-                mee,entry = <&L12 0x400000>;
+                metal,entry = <&L12 0x400000>;
         };
 
 	L17: cpus {
diff --git a/bsp/coreip-s51-arty/design.dts b/bsp/coreip-s51-arty/design.dts
index ea349bb..6c7379d 100644
--- a/bsp/coreip-s51-arty/design.dts
+++ b/bsp/coreip-s51-arty/design.dts
@@ -8,7 +8,7 @@
 
         chosen {
                 stdout-path = "/soc/serial@20000000:115200";
-                mee,entry = <&L12 0x400000>;
+                metal,entry = <&L12 0x400000>;
         };
 
 	L17: cpus {
diff --git a/bsp/freedom-e310-arty/design.dts b/bsp/freedom-e310-arty/design.dts
index 73f8fbb..74da572 100644
--- a/bsp/freedom-e310-arty/design.dts
+++ b/bsp/freedom-e310-arty/design.dts
@@ -8,7 +8,7 @@
 
         chosen {
                 stdout-path = "/soc/serial@10013000:115200";
-                mee,entry = <&sip0 0x400000>;
+                metal,entry = <&sip0 0x400000>;
         };
 
         cpus {
diff --git a/bsp/sifive-hifive1/design.dts b/bsp/sifive-hifive1/design.dts
index 26e4048..abccd6c 100644
--- a/bsp/sifive-hifive1/design.dts
+++ b/bsp/sifive-hifive1/design.dts
@@ -8,7 +8,7 @@
 
         chosen {
                 stdout-path = "/soc/serial@10013000:115200";
-                mee,entry = <&sip0 0x400000>;
+                metal,entry = <&sip0 0x400000>;
         };
 
         cpus {
diff --git a/scripts/standalone.mk b/scripts/standalone.mk
index a73093f..52926ac 100644
--- a/scripts/standalone.mk
+++ b/scripts/standalone.mk
@@ -83,9 +83,9 @@ PROGRAM_SRCS = $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/*.h) $(wildcard
 
 $(PROGRAM_ELF): \
 		$(PROGRAM_SRCS) \
-		$(BSP_DIR)/install/lib/libmee.a \
-		$(BSP_DIR)/install/lib/libmee-gloss.a \
-		$(BSP_DIR)/mee.lds
+		$(BSP_DIR)/install/lib/libmetal.a \
+		$(BSP_DIR)/install/lib/libmetal-gloss.a \
+		$(BSP_DIR)/metal.lds
 	$(MAKE) -C $(dir $@) $(notdir $@) \
 		AR=$(RISCV_AR) \
 		CC=$(RISCV_GCC) \
@@ -93,7 +93,7 @@ $(PROGRAM_ELF): \
 		CFLAGS="-Os -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -g -mcmodel=medany -I$(abspath $(BSP_DIR)/install/include/)" \
 		CXXFLAGS="-Os -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -g -mcmodel=medany -I$(abspath $(BSP_DIR)/install/include/)" \
 		LDFLAGS="-nostartfiles -nostdlib -L$(sort $(dir $(abspath $(filter %.a,$^)))) -T$(abspath $(filter %.lds,$^))" \
-		LDLIBS="-Wl,--start-group -lc -lgcc -lmee -lmee-gloss -Wl,--end-group"
+		LDLIBS="-Wl,--start-group -lc -lgcc -lmetal -lmetal-gloss -Wl,--end-group"
 	touch -c $@
 
 .PHONY: clean-software
-- 
cgit v1.2.3