Update CPU=or1k to CPU=mor1kx for upstream change.

.travis.yml

@@ -76,12 +76,12 @@ env:
    - C=lm32.minimal P=tinyfpga_bx      T="base"      F=stub
    - C=lm32.minimal P=upduino_v1       T="base"      F=stub
    # or1k base targets
-   - C=or1k         P=arty             T="base net"
-   - C=or1k         P=atlys            T="base net"
-   - C=or1k         P=mimas_a7         T="base net"
-   - C=or1k         P=mimasv2          T="base"
-   - C=or1k         P=opsis            T="base net"
-   - C=or1k         P=pipistrello      T="base"
+   - C=mor1kx       P=arty             T="base net"
+   - C=mor1kx       P=atlys            T="base net"
+   - C=mor1kx       P=mimas_a7         T="base net"
+   - C=mor1kx       P=mimasv2          T="base"
+   - C=mor1kx       P=opsis            T="base net"
+   - C=mor1kx       P=pipistrello      T="base"
    # vexriscv Base targets
    - C=vexriscv     P=arty             T="base net"
    - C=vexriscv     P=mimas_a7         T="base net"
@@ -103,10 +103,10 @@ env:
    #--------------------------------------------
    # Linux Targets
    #--------------------------------------------
-   - C=or1k.linux   P=arty             T="net"       F=linux
-   - C=or1k.linux   P=atlys            T="net"       F=linux
-   - C=or1k.linux   P=nexys_video      T="net"       F=linux
-   - C=or1k.linux   P=opsis            T="net"       F=linux
+   - C=mor1kx.linux P=arty             T="net"       F=linux
+   - C=mor1kx.linux P=atlys            T="net"       F=linux
+   - C=mor1kx.linux P=nexys_video      T="net"       F=linux
+   - C=mor1kx.linux P=opsis            T="net"       F=linux
    #--------------------------------------------
    # Video Targets
    #--------------------------------------------

.travis/run.inc.sh

@@ -13,7 +13,7 @@ echo "Running with PLATFORMS='$PLATFORMS'"
 
 if [ -z "$CPUS" ]; then
 	if [ -z "$CPU" ]; then
-		CPUS="lm32 or1k picorv32 vexriscv"
+		CPUS="lm32 mor1kx picorv32 vexriscv"
 	else
 		CPUS="$CPU"
 		unset CPU

Makefile

@@ -98,7 +98,7 @@ ifeq ($(CPU),lm32)
 CPU_ARCH=lm32
 CPU_ENDIANNESS=big
 endif
-ifeq ($(CPU),or1k)
+ifeq ($(CPU),mor1kx)
 CPU_ARCH=or1k
 CPU_ENDIANNESS=big
 endif
@@ -504,7 +504,7 @@ help:
 	@echo "                        (current: $(TARGET), default: $(DEFAULT_TARGET))"
 	@echo ""
 	@echo " CPU describes which soft-CPU to use on the FPGA."
-	@echo " CPU=lm32 OR or1k OR picorv32 OR vexriscv"
+	@echo " CPU=lm32 OR mor1kx OR picorv32 OR vexriscv"
 	@echo "                        (current: $(CPU), default: $(DEFAULT_CPU))"
 	@echo ""
 	@echo " CPU_VARIANT describes which soft-CPU variant to use on the FPGA."

scripts/build-linux.sh

@@ -33,8 +33,8 @@ make info
 #set -x
 set -e
 
-if [ "$CPU" != or1k -a "$CPU" != "vexriscv" ]; then
-	echo "Linux is only supported on or1k or vexriscv at the moment."
+if [ "$CPU" != mor1kx -a "$CPU" != "vexriscv" ]; then
+	echo "Linux is only supported on mor1kx or vexriscv at the moment."
 	exit 1
 fi
 if [ "$CPU_VARIANT" != "linux" ]; then
@@ -131,10 +131,13 @@ LITEX_DT_BRANCH=master
 )
 
 # Build linux-litex
-if [ ${CPU_ARCH} = or1k ]; then
+if [ ${CPU} = mor1kx ]; then
 	export ARCH=openrisc
-else
+elif [ ${CPU} = vexriscv ]; then
 	export ARCH=rv32
+else
+	echo "Unknown CPU"
+	exit 1
 fi
 export CROSS_COMPILE=${CPU_ARCH}-elf-newlib-
 TARGET_LINUX_BUILD_DIR=$(dirname $TOP_DIR/$FIRMWARE_FILEBASE)

scripts/build-qemu.sh

@@ -53,9 +53,12 @@ case $CPU in
 	lm32)
 		QEMU_CPU=lm32
 		;;
-	or1k)
+	mor1kx)
 		QEMU_CPU=or1k
 		;;
+	vexriscv)
+		QEMU_CPU=rv32
+		;;
 	*)
 		echo "CPU $CPU isn't supported at the moment."
 		exit 1

scripts/download-env.sh

@@ -379,8 +379,10 @@ check_version openocd $OPENOCD_VERSION
 echo ""
 echo "Installing C compiler toolchain"
 echo "---------------------------------------"
-if [ "$CPU" = "lm32" -o "$CPU" = "or1k" ]; then
-	CPU_ARCH=$CPU
+if [ "$CPU" = "lm32" ]; then
+	CPU_ARCH=lm32
+elif [ "$CPU" = "mor1kx" ]; then
+	CPU_ARCH=or1k
 elif [ "$CPU" = "vexriscv" -o "$CPU" = "picorv32" -o "$CPU" = "minerva" ]; then
 	CPU_ARCH=riscv32
 fi

scripts/enter-env.sh

@@ -320,8 +320,10 @@ check_version openocd $OPENOCD_VERSION || return 1
 echo ""
 echo "Checking C compiler toolchain"
 echo "---------------------------------------"
-if [ "$CPU" = "lm32" -o "$CPU" = "or1k" ]; then
-	CPU_ARCH=$CPU
+if [ "$CPU" = "lm32" ]; then
+	CPU_ARCH=lm32
+elif [ "$CPU" = "mor1kx" ]; then
+	CPU_ARCH=or1k
 elif [ "$CPU" = "vexriscv" -o "$CPU" = "picorv32" -o "$CPU" = "minerva" ]; then
 	CPU_ARCH=riscv32
 fi