Merge pull request #250 from pulp-platform/aottaviano/various-1

treewide: Fix litmus and secure boot tests

carfield.mk

@@ -42,7 +42,7 @@ include $(CAR_ROOT)/bender-safed.mk
 ######################
 
 CAR_NONFREE_REMOTE ?= [email protected]:carfield/carfield-nonfree.git
-CAR_NONFREE_COMMIT ?= f18bbb8
+CAR_NONFREE_COMMIT ?= cf13e1d
 
 ## @section Carfield platform nonfree components
 ## Clone the non-free verification IP for Carfield. Some components such as CI scripts and ASIC
@@ -334,7 +334,7 @@ $(LITMUS_TEST_LIST): $(LITMUS_WORK_DIR)
 	basename -a `find $(LITMUS_DIR)/binaries/ -name "*.elf" | sed 's/\[/\\\[/g'` > $@
 
 $(LITMUS_TESTS):
-	$(MAKE) car-hw-sim CHS_BOOTMODE=0 CHS_PRELMODE=1 CHS_BINARY=$(LITMUS_DIR)/binaries/$@ | tee $(LITMUS_WORK_DIR)/$@.log
+	$(MAKE) car-vsim-sim-run CHS_BOOTMODE=0 CHS_PRELMODE=1 CHS_BINARY=$(LITMUS_DIR)/binaries/$@ | tee $(LITMUS_WORK_DIR)/$@.log
 
 $(LITMUS_WORK_DIR)/%.uart.log: %
 	sed -n 's/^# \[UART\] \(.*\S\)\s*$$/\1/p' $(LITMUS_WORK_DIR)/$<.log > $@

target/.gitignore

@@ -1,6 +1,6 @@
 sim/vsim/modelsim.ini
-sim/vsim/carfield_compile.tcl
-sim/vsimtranscript
+sim/vsim/compile.carfield_soc.tcl
+sim/vsim/transcript
 sim/vsim/work/
 sim/vsim/uart/
 sim/src/hyp_vip