X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=f7867d92041bf705a1973414cc64fa86afe0042f;hp=fb677cb05302fdcd4c577beeee135260b8b1d476;hb=f28623e0f1a387644ace978774790c74bad4e0e8;hpb=8e190fb0ff508ccf4962bbfbf8295a431805c12b

diff --git a/Makefile.upstream b/Makefile.upstream
index fb677cb..f7867d9 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -113,13 +113,11 @@ environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bi
 	touch $@
 
 .build_nestedvm: .vendor .download_nestedvm
-	cd upstream/nestedvm; make usr=$(shell pwd)/upstream/install
+	cd upstream/nestedvm; make usr=$(shell pwd)/upstream/install all env.sh
 	touch $@
 
 .install_nestedvm: .build_nestedvm
 	touch $@
-	touch .install_gcc-3.3_mips-unknown-elf
-	touch .install_binutils-2.13.2.1_mips-unknown-elf
 
 .download_org.ibex.crypto:
 	mkdir -p upstream/org.ibex.crypto
@@ -188,22 +186,7 @@ endif
 	cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
 	touch $@
 
-.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@
-.install_gcc-3.3_mips-unknown-elf:           .install_mips2java; touch $@
-
-.download_mips2java:
-	mkdir -p upstream/install
-	curl http://www.megacz.com/tmp/mips.snapshot.tgz | tar -C upstream -xvzf -
-#	echo '/1 :pserver:cvs@cvs.ibex.org:2401/ A' >> ~/.cvspass
-#	cd upstream; cvs -d :pserver:cvs@cvs.ibex.org:/ co mips
-	cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
-	touch $@
-
-.install_mips2java: .download_mips2java
-	(cd upstream/mips; make)
-	touch $@
-
-.install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4
+.install_freetype-2.1.4_mips-unknown-elf: .install_nestedvm .download_freetype-2.1.4
 	cd upstream/freetype-2.1.4/src; \
 	   make setup ansi; \
 	   PATH=$$PATH:`pwd`/../../install/bin make \
@@ -223,6 +206,9 @@ endif
 
 .install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
 
+.install_gcc-3.3_mips-unknown-elf: .install_nestedvm
+	touch $@
+
 .install_%_$(target): .build_%_$(target)
 	@echo -e "\n\033[1minstalling $*...\033[0m"
 	cd upstream/$*/build-$(target); \