Merge remote-tracking branch 'litex-buildenv/master'

timvideos · Aug 27, 2018 · 4a97842 · 4a97842
2 parents b3aa0a3 + 7f3d338
commit 4a97842
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -407,6 +407,7 @@ flash: image-flash
 	@true
 
 env:
+	@echo "export FULL_PLATFORM='$(FULL_PLATFORM)'"
 	@echo "export PLATFORM='$(PLATFORM)'"
 	@echo "export PLATFORM_EXPANSION='$(PLATFORM_EXPANSION)'"
 	@echo "export TARGET='$(TARGET)'"

diff --git a/scripts/build-micropython.sh b/scripts/build-micropython.sh
@@ -76,7 +76,7 @@ export BUILDINC_DIRECTORY="$(realpath $TARGET_BUILD_DIR/software/include)"
 export BUILD="$(realpath $TARGET_MPY_BUILD_DIR)"
 OLD_DIR=$PWD
 cd $TARGET_MPY_BUILD_DIR
-make V=1 -C $(realpath ../../../../third_party/micropython/litex/) -j$JOBS
+make V=1 -C $(realpath ../../../../third_party/micropython/ports/fupy/) -j$JOBS
 cd $OLD_DIR
 
 # Generate a firmware image suitable for flashing.